From 7f1f66dc2c5b1d2b5f8410d5a53c236793f6d614 Mon Sep 17 00:00:00 2001 From: John McCrae Date: Thu, 11 Jul 2024 07:07:30 -0700 Subject: [PATCH 1/2] Updating gems Signed-off-by: John McCrae --- Gemfile | 7 ++++--- lib/wmi-lite/wmi_exception.rb | 2 +- wmi-lite.gemspec | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 9307af8..e4fec54 100644 --- a/Gemfile +++ b/Gemfile @@ -9,9 +9,10 @@ group :docs do end group :test do - gem "chefstyle", "= 1.2.0" + # gem "chefstyle", "= 1.2.0" + gem "chefstyle" gem "rspec", "~> 3.1" - gem "docile", "~> 1.3.5" # pin until we drop ruby support 2.4 + gem "docile" gem "rake" end @@ -19,5 +20,5 @@ group :debug do gem "pry" gem "pry-byebug" gem "rb-readline" - gem "simplecov", "~> 0.18.5" # pin until we drop ruby support 2.4 + gem "simplecov" end diff --git a/lib/wmi-lite/wmi_exception.rb b/lib/wmi-lite/wmi_exception.rb index b950af3..2343850 100644 --- a/lib/wmi-lite/wmi_exception.rb +++ b/lib/wmi-lite/wmi_exception.rb @@ -40,7 +40,7 @@ def translate_error_code(error_message) # Parse the error to get the error status code error_code_match = error_message.match(/[^\:]+\:\s*([0-9A-Fa-f]{1,8}).*/) error_code = error_code_match.captures.first if error_code_match - error_code ? error_code : "" + error_code || "" end def translate_wmi_connect_error_message(native_message, error_code, namespace) diff --git a/wmi-lite.gemspec b/wmi-lite.gemspec index b6484fc..b47ea8e 100644 --- a/wmi-lite.gemspec +++ b/wmi-lite.gemspec @@ -1,4 +1,4 @@ -lib = File.expand_path("../lib", __FILE__) +lib = File.expand_path("lib", __dir__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require "wmi-lite/version" From c7c87ae46cf8097754ab0b1b6d2240b55a3f43f1 Mon Sep 17 00:00:00 2001 From: John McCrae Date: Thu, 11 Jul 2024 07:15:19 -0700 Subject: [PATCH 2/2] Updating gems Signed-off-by: John McCrae --- .expeditor/verify.pipeline.yml | 24 ------------------------ Gemfile | 1 - 2 files changed, 25 deletions(-) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 8f95135..9ec4c7d 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -9,30 +9,6 @@ expeditor: steps: -- label: run-specs-ruby-2.5 - command: - - .expeditor/run_linux_tests.sh rake - expeditor: - executor: - docker: - image: ruby:2.5 - -- label: run-specs-ruby-2.6 - command: - - .expeditor/run_linux_tests.sh rake - expeditor: - executor: - docker: - image: ruby:2.6 - -- label: run-specs-ruby-2.7 - command: - - .expeditor/run_linux_tests.sh rake - expeditor: - executor: - docker: - image: ruby:2.7 - - label: run-specs-ruby-3.0 command: - .expeditor/run_linux_tests.sh rake diff --git a/Gemfile b/Gemfile index e4fec54..a846257 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,6 @@ group :docs do end group :test do - # gem "chefstyle", "= 1.2.0" gem "chefstyle" gem "rspec", "~> 3.1" gem "docile"