fix: gemfile update to increment version past yanked gem and rubocop …

…fixes
boc-tothefuture · Dec 1, 2022 · bf59840 · bf59840
1 parent 48aa577
commit bf59840
Show file tree

Hide file tree

Showing 13 changed files with 67 additions and 72 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -10,49 +10,43 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     backport (1.2.0)
     benchmark (0.2.0)
     builder (3.2.4)
     coderay (1.1.3)
     colorator (1.1.0)
-    concurrent-ruby (1.1.9)
-    cucumber (7.1.0)
+    concurrent-ruby (1.1.10)
+    cucumber (8.0.0)
       builder (~> 3.2, >= 3.2.4)
-      cucumber-core (~> 10.1, >= 10.1.0)
-      cucumber-create-meta (~> 6.0, >= 6.0.1)
-      cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
-      cucumber-gherkin (~> 22.0, >= 22.0.0)
-      cucumber-html-formatter (~> 17.0, >= 17.0.0)
-      cucumber-messages (~> 17.1, >= 17.1.1)
-      cucumber-wire (~> 6.2, >= 6.2.0)
-      diff-lcs (~> 1.4, >= 1.4.4)
-      mime-types (~> 3.3, >= 3.3.1)
-      multi_test (~> 0.1, >= 0.1.2)
+      cucumber-ci-environment (~> 9.0, >= 9.0.4)
+      cucumber-core (~> 11.0, >= 11.0.0)
+      cucumber-cucumber-expressions (~> 15.1, >= 15.1.1)
+      cucumber-gherkin (~> 23.0, >= 23.0.1)
+      cucumber-html-formatter (~> 19.1, >= 19.1.0)
+      cucumber-messages (~> 18.0, >= 18.0.0)
+      diff-lcs (~> 1.5, >= 1.5.0)
+      mime-types (~> 3.4, >= 3.4.1)
+      multi_test (~> 1.1, >= 1.1.0)
       sys-uname (~> 1.2, >= 1.2.2)
-    cucumber-core (10.1.1)
-      cucumber-gherkin (~> 22.0, >= 22.0.0)
-      cucumber-messages (~> 17.1, >= 17.1.1)
+    cucumber-ci-environment (9.1.0)
+    cucumber-core (11.0.0)
+      cucumber-gherkin (~> 23.0, >= 23.0.1)
+      cucumber-messages (~> 18.0, >= 18.0.0)
       cucumber-tag-expressions (~> 4.1, >= 4.1.0)
-    cucumber-create-meta (6.0.4)
-      cucumber-messages (~> 17.1, >= 17.1.1)
-      sys-uname (~> 1.2, >= 1.2.2)
-    cucumber-cucumber-expressions (14.0.0)
-    cucumber-gherkin (22.0.0)
-      cucumber-messages (~> 17.1, >= 17.1.1)
-    cucumber-html-formatter (17.0.0)
-      cucumber-messages (~> 17.1, >= 17.1.0)
-    cucumber-messages (17.1.1)
+    cucumber-cucumber-expressions (15.2.0)
+    cucumber-gherkin (23.0.1)
+      cucumber-messages (~> 18.0, >= 18.0.0)
+    cucumber-html-formatter (19.2.0)
+      cucumber-messages (~> 18.0, >= 18.0.0)
+    cucumber-messages (18.0.0)
     cucumber-tag-expressions (4.1.0)
-    cucumber-wire (6.2.1)
-      cucumber-core (~> 10.1, >= 10.1.0)
-      cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
-    cuke_linter (1.2.1)
+    cuke_linter (1.3.0)
       cuke_modeler (>= 1.5, < 4.0)
-    cuke_modeler (3.15.0)
-      cucumber-gherkin (< 23.0)
+    cuke_modeler (3.18.0)
+      cucumber-gherkin (< 26.0)
     diff-lcs (1.5.0)
     e2mmap (0.1.0)
     em-websocket (0.5.3)
@@ -93,7 +87,7 @@ GEM
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     jaro_winkler (1.5.4-java)
-    jekyll (3.9.1)
+    jekyll (3.9.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -117,11 +111,13 @@ GEM
       jekyll (>= 3.8, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
+    json (2.6.2)
+    json (2.6.2-java)
     just-the-docs (0.3.3)
       jekyll (>= 3.8.5)
       jekyll-seo-tag (~> 2.0)
       rake (>= 12.3.1, < 13.1.0)
-    kramdown (2.3.1)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
@@ -136,22 +132,22 @@ GEM
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
-    multi_test (0.1.2)
+    multi_test (1.1.0)
     multi_xml (0.6.0)
     nenv (0.3.0)
-    nokogiri (1.13.3-arm64-darwin)
+    nokogiri (1.13.9-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.3-java)
+    nokogiri (1.13.9-java)
       racc (~> 1.4)
-    nokogiri (1.13.3-x86_64-darwin)
+    nokogiri (1.13.9-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.3-x86_64-linux)
+    nokogiri (1.13.9-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.21.0)
-    parser (3.1.1.0)
+    parallel (1.22.1)
+    parser (3.1.3.0)
       ast (~> 2.4.1)
     pastel (0.8.0)
       tty-color (~> 0.5)
@@ -170,31 +166,32 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
       spoon (~> 0.0)
-    public_suffix (4.0.6)
+    public_suffix (5.0.0)
     racc (1.6.0)
     racc (1.6.0-java)
     rainbow (3.1.1)
     rake (12.3.3)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (2.2.1)
+    regexp_parser (2.6.1)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
-    rouge (3.28.0)
-    rubocop (1.25.1)
+    rouge (3.30.0)
+    rubocop (1.39.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
+    rubocop-ast (1.24.0)
       parser (>= 3.1.1.0)
-    rubocop-performance (1.13.3)
+    rubocop-performance (1.15.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
@@ -209,7 +206,7 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
     shellany (0.0.1)
-    solargraph (0.44.3)
+    solargraph (0.47.2)
       backport (~> 1.2)
       benchmark
       bundler (>= 1.17.2)
@@ -229,14 +226,14 @@ GEM
     sys-uname (1.2.2)
       ffi (~> 1.1)
     thor (1.2.1)
-    tilt (2.0.10)
+    tilt (2.0.11)
     tty-color (0.6.0)
     tty-command (0.10.1)
       pastel (~> 0.8)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.3.0)
     webrick (1.7.0)
     yaml-lint (0.0.10)
-    yard (0.9.27)
+    yard (0.9.28)
       webrick (~> 1.7.0)
 
 PLATFORMS

diff --git a/features/step_definitions/files.rb b/features/step_definitions/files.rb
@@ -4,7 +4,7 @@
 
 def create_sub_file(dir, file)
   conf_sub_dir = File.join(conf_dir, dir)
-  Dir.mkdir conf_sub_dir unless File.exist? conf_sub_dir
+  FileUtils.mkdir_p conf_sub_dir
   temp_conf_file(conf_sub_dir)
   conf_file = File.join(conf_sub_dir, file)
   File.write(conf_file, SecureRandom.hex)

diff --git a/features/step_definitions/openhab.rb b/features/step_definitions/openhab.rb
@@ -208,7 +208,7 @@ def check_items(added:)
   elapsed = 0
   seconds.times do
     unless Rest.item_state(item) == state
-      raise "'#{item}' did not stay in state (#{state}) for #{seconds} seconds, "\
+      raise "'#{item}' did not stay in state (#{state}) for #{seconds} seconds, " \
             "changed to (#{Rest.item_state(item)}) within #{elapsed} seconds"
     end
 

diff --git a/features/support/openhab_rest.rb b/features/support/openhab_rest.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'pp'
 require 'httparty'
 require 'persistent_httparty'
 

diff --git a/lib/openhab/dsl/items/timed_command.rb b/lib/openhab/dsl/items/timed_command.rb
@@ -174,7 +174,7 @@ def execute(_mod = nil, inputs = nil)
               OpenHAB::DSL.import_presets
               @semaphore.synchronize do
                 thread_local(**@thread_locals) do
-                  logger.trace "Canceling implicit timer #{@timed_command_details.timer} for "\
+                  logger.trace "Canceling implicit timer #{@timed_command_details.timer} for " \
                                "#{@timed_command_details.item.id}  because received event #{inputs}"
                   @timed_command_details.timer.cancel
                   # Disabled due to OpenHAB design

diff --git a/lib/openhab/dsl/openhab.rb b/lib/openhab/dsl/openhab.rb
@@ -9,7 +9,7 @@ module OpenHAB
   # @return [Pathname] OpenHAB conf path
   #
   def self.conf_root
-    Pathname.new(ENV['OPENHAB_CONF'])
+    Pathname.new(ENV.fetch('OPENHAB_CONF', nil))
   end
 
   module DSL

diff --git a/lib/openhab/dsl/rules/automation_rule.rb b/lib/openhab/dsl/rules/automation_rule.rb
@@ -162,7 +162,7 @@ def check_guards(event:)
             now = Time.now
             return true if @between.cover? now
 
-            logger.trace("Skipped execution of rule '#{name}' because the current time #{now} "\
+            logger.trace("Skipped execution of rule '#{name}' because the current time #{now} " \
                          "is not between #{@between.begin} and #{@between.end}")
           else
             logger.trace("Skipped execution of rule '#{name}' because of guard #{@guard}")

diff --git a/lib/openhab/dsl/rules/triggers/changed.rb b/lib/openhab/dsl/rules/triggers/changed.rb
@@ -112,7 +112,7 @@ def trigger(item:, from:, to:, duration:, attach:)
           #
           def wait_trigger(item:, duration:, to: nil, from: nil, attach: nil)
             item_name = item.respond_to?(:name) ? item.name : item.to_s
-            logger.trace("Creating Changed Wait Change Trigger for Item(#{item_name}) Duration(#{duration}) "\
+            logger.trace("Creating Changed Wait Change Trigger for Item(#{item_name}) Duration(#{duration}) " \
                          "To(#{to}) From(#{from}) Attach(#{attach})")
             conditions = Conditions::Duration.new(to: to, from: from, duration: duration)
             changed_trigger(item: item, to: nil, from: nil, attach: attach, conditions: conditions)

diff --git a/lib/openhab/dsl/rules/triggers/conditions/duration.rb b/lib/openhab/dsl/rules/triggers/conditions/duration.rb
@@ -36,7 +36,7 @@ def initialize(to:, from:, duration:)
               @conditions = Conditions::Proc.new(to: to, from: from)
               @duration = duration
               @timer = nil
-              logger.trace "Created Duration Condition To(#{to}) From(#{from}) "\
+              logger.trace "Created Duration Condition To(#{to}) From(#{from}) " \
                            "Conditions(#{@conditions}) Duration(#{@duration})"
             end
 

diff --git a/lib/openhab/dsl/time/month_day.rb b/lib/openhab/dsl/time/month_day.rb
@@ -169,7 +169,7 @@ def <=>(other)
             self.<=>(MonthDay.parse(other))
           when OpenHAB::DSL::Between::MonthDayRange::DayOfYear
             # Compare with DayOfYear and invert result
-            -other.<=>(self)
+            -(other <=> self)
           else
             super
           end

diff --git a/lib/openhab/dsl/time/time_of_day.rb b/lib/openhab/dsl/time/time_of_day.rb
@@ -189,9 +189,9 @@ def succ
         def <=>(other)
           other_second_of_day = to_second_of_day(other)
           logger.trace do
-            "SOD(#{sod}) "\
-              "other SOD(#{other_second_of_day}) "\
-              "Other Class (#{other.class}) "\
+            "SOD(#{sod}) " \
+              "other SOD(#{other_second_of_day}) " \
+              "Other Class (#{other.class}) " \
               "Result (#{sod <=> other_second_of_day})"
           end
           sod <=> other_second_of_day

diff --git a/rakelib/github.rake b/rakelib/github.rake
@@ -2,7 +2,6 @@
 
 require 'json'
 require 'open3'
-require 'pp'
 
 OPENHAB_VERSIONS = ['3.3.0', '3.4.0.M5+3.4.0'].freeze
 

diff --git a/rakelib/openhab.rake b/rakelib/openhab.rake
@@ -160,11 +160,11 @@ namespace :openhab do
       openhab_zip = "openhab-#{@openhab_version}.zip"
       download_url = case @openhab_version
                      when /.*-SNAPSHOT/
-                       'https://ci.openhab.org/job/openHAB3-Distribution/lastSuccessfulBuild/artifact/'\
+                       'https://ci.openhab.org/job/openHAB3-Distribution/lastSuccessfulBuild/artifact/' \
                        "distributions/openhab/target/#{openhab_zip}"
                      else
                        # The same for releases and milestones
-                       'https://github.com/openhab/openhab-distro/releases/download/'\
+                       'https://github.com/openhab/openhab-distro/releases/download/' \
                        "#{@openhab_version}/#{openhab_zip}"
                      end
       Dir.chdir(OPENHAB_DIR) do
@@ -258,8 +258,8 @@ namespace :openhab do
 
   def openhab_env
     {
-      'LANG' => ENV['LANG'],
-      'JAVA_HOME' => ENV['JAVA_HOME'],
+      'LANG' => ENV.fetch('LANG', nil),
+      'JAVA_HOME' => ENV.fetch('JAVA_HOME', nil),
       'KARAF_REDIRECT' => karaf_log,
       'EXTRA_JAVA_OPTS' => '-Xmx4g',
       'OPENHAB_HTTP_PORT' => ENV['OPENHAB_HTTP_PORT'] || '8080',