openhab-scripting 5.52.0 → 5.52.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44b392f4d106e9bc092ddf981e4597e6fd68c4d4eaca45120f6409712ec877ad
-  data.tar.gz: cd319b4063c404b98d922878c5aaa75c8e5278be43ed05dc52d7e03d80d64e24
+  metadata.gz: 812b7da8502621c2f714866875c11481f05e8a58f095e754f95516a7d7c7ab5c
+  data.tar.gz: d5649ec57124b188ca983aa1c24985bfe54819d4b5f6940439ccb695e38c7596
 SHA512:
-  metadata.gz: 3c0d8fabc27ea76a5aa3d9f9062f7371a61f20017535192ac410e57ac13c1c5a03b50970fdb61a6bdb7d6729572282765d55cec7475920037a23b761511dbf51
-  data.tar.gz: a49a9d2f4827353397c126c30a89e9ffb00a50693ec3ca9d0b20bf9e7c05de972190e5bb60e0672f492553a63fa13622694c678006041c61a9038ce2ea6cf4f6
+  metadata.gz: 37898f5f960c4d26cfcf6f217d1279c28443a3218890b55a4befc6445c0b87491c3f2b65d7bf92247d280cc54e50dd54bbd53df6a6394968f951d4bde575834f
+  data.tar.gz: f91109958718c7ab2e0a0220f60a95ff65cb1e788f5455751fbbfbcc7bd94fe7bba409ad331a24592e55a4aef33348288f8987a907e70f82592cbcd802d8eb3e

data/lib/openhab/console/irb.rb

@@ -12,6 +12,13 @@ module OpenHAB
     module IRB
       class Exit < Exception; end # rubocop:disable Lint/InheritException
 
+      module InteractiveStdin
+        def tty?
+          $stdin.tty?
+        end
+      end
+      STDIN.singleton_class.prepend(InteractiveStdin) # rubocop:disable Style/GlobalStdStream
+
       module Irb
         # Define #exit instead of using Kernel#exit, to raise an error if we're not
         # on the main thread (i.e. in the signal handler)

data/lib/openhab/core/dependency_tracking.rb

@@ -6,10 +6,11 @@ if defined?($dependencyListener)
   klass = Class.new(org.jruby.util.collections.StringArraySet) do
     def initialize(other)
       super(JRuby.runtime)
-      other.each { |feature| append(feature) }
+      other.each { |feature| append(JRuby.runtime.current_context, feature) }
     end
 
-    def append(name)
+    # JRuby's load service uses the overload that takes a ThreadContext.
+    def append(context, name)
       $dependencyListener.accept(name)
 
       super

data/lib/openhab/core/events/source.rb

@@ -102,14 +102,13 @@ module OpenHAB
             raise ArgumentError, "Specify one of bundle_or_actor, bundle or actor"
           end
 
-          # rubocop:disable Style/CaseEquality
+          # rubocop:disable-next Style/CaseEquality
           components.any? do |sender|
             (bundle && bundle === sender.bundle) ||
               (actor && actor === sender.actor) ||
               (bundle_or_actor && bundle_or_actor === sender.bundle) ||
               (bundle_or_actor && bundle_or_actor === sender.actor)
           end
-          # rubocop:enable Style/CaseEquality
         end
 
         #

data/lib/openhab/core/items/semantics.rb

@@ -557,7 +557,7 @@ end
 # @!parse Semantics = OpenHAB::Core::Items::Semantics
 
 # Additions to Enumerable to allow easily filtering groups of items based on the semantic model
-module Enumerable
+module Enumerable # rubocop:disable Style/OneClassPerFile
   #
   # @!group Filtering Methods
   #

data/lib/openhab/core/items.rb

@@ -128,10 +128,10 @@ module OpenHAB
                .select { |k| k <= GenericItem && k != GroupItem && k != StringItem }
                .sort { |a, b| (a < b) ? 1 : -1 }
                .each do |klass|
-                 klass.field_reader :ACCEPTED_COMMAND_TYPES, :ACCEPTED_DATA_TYPES unless klass == GenericItem
+        klass.field_reader :ACCEPTED_COMMAND_TYPES, :ACCEPTED_DATA_TYPES unless klass == GenericItem
 
-                 def_predicate_methods(klass)
-                 def_command_methods(klass)
+        def_predicate_methods(klass)
+        def_command_methods(klass)
       end
 
       prepend_accepted_data_types

data/lib/openhab/core/sitemaps/compatibility.rb

@@ -7,7 +7,8 @@ module OpenHAB
       # Compatibility helpers for old model-backed sitemaps and the new core sitemap registry.
       #
       # @deprecated OH 5.2: Remove entire module when dropping OH 5.1, collapsing calls to match the registry branch
-      # Don't forget to remove the reference to it in .yardopts
+      #   Don't forget to remove the reference to it in .yardopts
+      # @deprecated OH 5.3: Directly use argument for conditions and value for rules
       # @!visibility private
       module Compatibility
         class << self
@@ -15,6 +16,14 @@ module OpenHAB
             Provider.factory
           end
 
+          def set_rule_value(rule, value)
+            if rule.respond_to?(:value=)
+              rule.value = value
+            else
+              rule.argument = value
+            end
+          end
+
           if Provider.registry
             def supported_widget_type?(type)
               return true if type == :sitemap
@@ -35,7 +44,11 @@ module OpenHAB
             end
 
             def set_condition(condition, sign:, state:)
-              condition.value = "#{sign}#{state}"
+              if condition.respond_to?(:argument=)
+                condition.argument = "#{sign}#{state}"
+              else
+                condition.value = "#{sign}#{state}"
+              end
             end
           else
             def supported_widget_type?(type)

data/lib/openhab/core/types/quantity_type.rb

@@ -189,7 +189,7 @@ module OpenHAB
         }.each do |java_op, ruby_op|
           convert = "self.class.new(other, thread_unit)"
 
-          class_eval( # rubocop:disable Style/DocumentDynamicEvalDefinition -- https://github.com/rubocop/rubocop/issues/10179
+          class_eval(
             # def +(other)
             #   logger.trace { "#{self} + #{other} (#{other.class})" }
             #   other = other.state if other.is_a?(Core::Items::Persistence::PersistedState)

data/lib/openhab/core/types.rb

@@ -43,39 +43,39 @@ module OpenHAB
                .grep(Module)
                .select { |k| k < java.lang.Enum }
                .each do |klass|
-                 # make sure == from Type is inherited
-                 klass.remove_method(:==)
+        # make sure == from Type is inherited
+        klass.remove_method(:==)
 
-                 # dynamically define predicate methods
-                 klass.values.each do |value| # rubocop:disable Style/HashEachMethods -- this isn't a Ruby hash
-                   # include all the aliases that we define for items both command and
-                   # state aliases (since types can be interrogated as an incoming
-                   # command, or as the state of an item)
-                   command = :"#{Types::COMMAND_ALIASES[value.to_s]}?"
-                   states = Types::PREDICATE_ALIASES[value.to_s]
+        # dynamically define predicate methods
+        klass.values.each do |value| # rubocop:disable Style/HashEachMethods -- this isn't a Ruby hash
+          # include all the aliases that we define for items both command and
+          # state aliases (since types can be interrogated as an incoming
+          # command, or as the state of an item)
+          command = :"#{Types::COMMAND_ALIASES[value.to_s]}?"
+          states = Types::PREDICATE_ALIASES[value.to_s]
 
-                   ([command] | states).each do |method|
-                     logger.trace { "Defining #{klass}##{method} for #{value}" }
-                     klass.class_eval <<~RUBY, __FILE__, __LINE__ + 1
-                       def #{method}                                                 # def on?
-                         as(#{value.class.java_class.simple_name}).equal?(#{value})  #   as(OnOffType).equal?(ON)
-                       end                                                           # end
-                     RUBY
-                   end
+          ([command] | states).each do |method|
+            logger.trace { "Defining #{klass}##{method} for #{value}" }
+            klass.class_eval <<~RUBY, __FILE__, __LINE__ + 1
+              def #{method}                                                 # def on?
+                as(#{value.class.java_class.simple_name}).equal?(#{value})  #   as(OnOffType).equal?(ON)
+              end                                                           # end
+            RUBY
+          end
 
-                   method = states.last
-                   Events::ItemState.class_eval <<~RUBY, __FILE__, __LINE__ + 1
-                     def #{method}                                                            # def on?
-                       item_state.as(#{value.class.java_class.simple_name}).equal?(#{value})  #   item_state.as(OnOffType).equal?(ON)
-                     end                                                                      # end
-                   RUBY
+          method = states.last
+          Events::ItemState.class_eval <<~RUBY, __FILE__, __LINE__ + 1
+            def #{method}                                                            # def on?
+              item_state.as(#{value.class.java_class.simple_name}).equal?(#{value})  #   item_state.as(OnOffType).equal?(ON)
+            end                                                                      # end
+          RUBY
 
-                   Events::ItemStateChangedEvent.class_eval <<~RUBY, __FILE__, __LINE__ + 1
-                     def was_#{method}                                                            # def was_on?
-                       old_item_state.as(#{value.class.java_class.simple_name}).equal?(#{value})  #   old_item_state.as(OnOffType).equal?(ON)
-                     end                                                                          # end
-                   RUBY
-                 end
+          Events::ItemStateChangedEvent.class_eval <<~RUBY, __FILE__, __LINE__ + 1
+            def was_#{method}                                                            # def was_on?
+              old_item_state.as(#{value.class.java_class.simple_name}).equal?(#{value})  #   old_item_state.as(OnOffType).equal?(ON)
+            end                                                                          # end
+          RUBY
+        end
       end
     end
   end

data/lib/openhab/core_ext/java/list.rb

@@ -14,8 +14,6 @@ module Java::JavaUtil::List # rubocop:disable Style/ClassAndModuleChildren
                  :intersection,
                  :pack,
                  :product,
-                 :repeated_combination,
-                 :repeated_permutation,
                  :reverse,
                  :rotate,
                  :sample,
@@ -88,7 +86,7 @@ module Java::JavaUtil::List # rubocop:disable Style/ClassAndModuleChildren
     raise NotImplementedError unless block_given?
 
     itr = list_iterator
-    while itr.has_next? # rubocop:disable Style/WhileUntilModifier
+    while itr.has_next?
       itr.remove if yield(itr.next)
     end
     self
@@ -224,7 +222,7 @@ module Java::JavaUtil::List # rubocop:disable Style/ClassAndModuleChildren
     raise NotImplementedError unless block_given?
 
     itr = list_iterator
-    while itr.has_next? # rubocop:disable Style/WhileUntilModifier
+    while itr.has_next?
       itr.remove unless yield(itr.next)
     end
     self

data/lib/openhab/core_ext/java/map.rb

@@ -52,7 +52,7 @@ module Java::JavaUtil::Map # rubocop:disable Style/ClassAndModuleChildren
   end
 
   def transform_values
-    map do |k, v| # rubocop:disable Style/MapToHash, Style/HashTransformValues
+    map do |k, v| # rubocop:disable Style/MapToHash
       [k, (yield v)]
     end.to_h
   end

data/lib/openhab/core_ext/java/unit.rb

@@ -8,7 +8,7 @@ module Java::JavaxMeasure::Unit # rubocop:disable Style/ClassAndModuleChildren
 end
 
 # @!visibility private
-module Java::JavaxMeasure::Dimension # rubocop:disable Style/ClassAndModuleChildren
+module Java::JavaxMeasure::Dimension # rubocop:disable Style/ClassAndModuleChildren, Style/OneClassPerFile
   def inspect
     to_s
   end

data/lib/openhab/core_ext/ruby/numeric.rb

@@ -63,7 +63,7 @@ class Integer
 end
 
 # Extensions to Float
-class Float
+class Float # rubocop:disable Style/OneClassPerFile
   #
   # Create {Duration} of `self` milliseconds
   #
@@ -136,7 +136,7 @@ class Float
   alias_method :year, :years
 end
 
-module OpenHAB
+module OpenHAB # rubocop:disable Style/OneClassPerFile
   module CoreExt
     module Ruby
       #

data/lib/openhab/core_ext/ruby/object.rb

@@ -11,7 +11,7 @@ module OpenHAB
           def method_added(method)
             return super unless equal?(::Object)
 
-            if DSL.private_instance_methods.include?(method)
+            if DSL.private_method_defined?(method)
               # Duplicate methods that conflict with DSL onto `main`'s singleton class,
               # so that they'll take precedence over DSL's method.
               TOPLEVEL_BINDING.receiver.singleton_class.define_method(method, instance_method(method))

data/lib/openhab/dsl/items/builder.rb

@@ -154,7 +154,7 @@ module OpenHAB
               item.metadata
                   .reject { |namespace, _| builder.metadata.key?(namespace) }
                   .each do |namespace, metadata|
-                    item.metadata.delete(namespace) if metadata.provider == Core::Items::Metadata::Provider.current
+                item.metadata.delete(namespace) if metadata.provider == Core::Items::Metadata::Provider.current
               end
             else
               item = builder.build

data/lib/openhab/dsl/items/ensure.rb

@@ -33,8 +33,6 @@ module OpenHAB
           # check if this item is in the command's state before actually
           # sending the command
           %i[command update].each do |ensured_method|
-            # rubocop:disable Style/IfUnlessModifier
-
             # def command(state, **kwargs)
             #   # immediately send the command if it's a command, but not a state (like REFRESH)
             #   return super(state, **kwargs) if state.is_a?(Command) && !state.is_a?(State)
@@ -63,7 +61,6 @@ module OpenHAB
                 super(formatted_state, **kwargs)
               end
             RUBY
-            # rubocop:enable Style/IfUnlessModifier
           end
         end
 

data/lib/openhab/dsl/rules/builder.rb

@@ -152,7 +152,7 @@ module OpenHAB
         def script(name = nil, description: nil, id: nil, tag: nil, tags: nil, replace: false, script: nil, &block)
           raise ArgumentError, "Block is required" unless block
 
-          inferred_id = nil # rubocop:disable Lint/UselessAssignment -- it is used below
+          inferred_id = nil
           id ||= inferred_id = NameInference.infer_rule_id_from_block(block)
           name ||= id
           script ||= block.source rescue nil # rubocop:disable Style/RescueModifier
@@ -200,7 +200,7 @@ module OpenHAB
         def scene(name = nil, description: nil, id: nil, tag: nil, tags: nil, replace: false, script: nil, &block)
           raise ArgumentError, "Block is required" unless block
 
-          inferred_id = nil # rubocop:disable Lint/UselessAssignment
+          inferred_id = nil
           id ||= inferred_id = NameInference.infer_rule_id_from_block(block)
           name ||= id
           script ||= block.source rescue nil # rubocop:disable Style/RescueModifier

data/lib/openhab/dsl/sitemaps/builder.rb

@@ -257,14 +257,14 @@ module OpenHAB
           colors.delete(:default)&.tap { |default_color| colors.merge!(nil => default_color) }
 
           add_conditions(widget, method, colors.keys, :color) do |rule, key|
-            rule.argument = colors[key]
+            Core::Sitemaps::Compatibility.set_rule_value(rule, colors[key])
           end
         end
 
         def add_icons(widget)
           icon.delete(:default)&.tap { |default_icon| icon.merge!(nil => default_icon) }
           add_conditions(widget, :icon_rules, icon.keys, :icon) do |rule, key|
-            rule.argument = icon[key]
+            Core::Sitemaps::Compatibility.set_rule_value(rule, icon[key])
           end
         end
 
@@ -1415,7 +1415,7 @@ module OpenHAB
           missing_args = (REQUIRED_BUTTON_ARGS - kwargs.keys).compact
           unless missing_args.empty?
             args = kwargs.map { |k, v| "#{k}: #{v.inspect}" }.join(", ")
-            missing_args = missing_args.map(&:to_s).join(", ")
+            missing_args = missing_args.join(", ")
             raise ArgumentError, "button(#{args}) missing required parameters: #{missing_args}"
           end
 

data/lib/openhab/dsl/version.rb

@@ -4,6 +4,6 @@ module OpenHAB
   module DSL
     # Version of openHAB helper libraries
     # @return [String]
-    VERSION = "5.52.0"
+    VERSION = "5.52.1"
   end
 end

data/lib/openhab/rspec/helpers.rb

@@ -43,9 +43,7 @@ module OpenHAB
       end
     end
   end
-end
 
-module OpenHAB
   module RSpec
     #
     # Provides helper methods for use in specs, to easily work with and adjust
@@ -201,7 +199,7 @@ module OpenHAB
           .split(File::PATH_SEPARATOR)
             .reject(&:empty?)
             .reject do |path|
-              $LOAD_PATH.include?(path)
+                             $LOAD_PATH.include?(path)
                            end)
 
         requires = jrubyscripting_config&.get("require") || ""
@@ -275,16 +273,16 @@ module OpenHAB
             OSGi.service_component_classes(bundle)
                 .select { |klass, _services| klass.ancestors.include?(ast.java_class) }
                 .each do |klass, services|
-                  new_ast_klass = Class.new(ast)
-                  new_ast_klass.become_java!
-                  wrapped_storage_service = Mocks::AbstractStorageBasedTypeProviderWrappedStorageService
-                                            .new(storage_service,
-                                                 new_ast_klass.java_class,
-                                                 klass)
-                  new_ast = new_ast_klass.new(wrapped_storage_service)
-
-                  services -= [klass.name]
-                  OSGi.register_service(new_ast, *services, bundle: ast_bundle)
+              new_ast_klass = Class.new(ast)
+              new_ast_klass.become_java!
+              wrapped_storage_service = Mocks::AbstractStorageBasedTypeProviderWrappedStorageService
+                                        .new(storage_service,
+                                             new_ast_klass.java_class,
+                                             klass)
+              new_ast = new_ast_klass.new(wrapped_storage_service)
+
+              services -= [klass.name]
+              OSGi.register_service(new_ast, *services, bundle: ast_bundle)
             end
           end
         end

data/lib/openhab/rspec/mocks/thing_handler.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# rubocop:disable Naming/MethodName, Naming/AccessorMethodName
+# rubocop:disable Naming/AccessorMethodName
 
 require "singleton"
 
@@ -83,4 +83,4 @@ module OpenHAB
     end
   end
 end
-# rubocop:enable Naming/MethodName, Naming/AccessorMethodName
+# rubocop:enable Naming/AccessorMethodName

data/lib/openhab/yard/html_helper.rb

@@ -62,7 +62,7 @@ module OpenHAB
 
       # have to completely replace this method. only change is the regex splitting
       # into parts now allows `.` as part of the identifier
-      # rubocop:disable Style/NestedTernaryOperator, Style/StringConcatenation, Style/TernaryParentheses
+      # rubocop:disable-next Style/NestedTernaryOperator, Style/StringConcatenation, Style/TernaryParentheses
       def format_types(typelist, brackets = true) # rubocop:disable Style/OptionalBooleanParameter
         return unless typelist.is_a?(Array)
 
@@ -73,7 +73,6 @@ module OpenHAB
         end
         list.empty? ? "" : (brackets ? "(#{list.join(", ")})" : list.join(", "))
       end
-      # rubocop:enable Style/NestedTernaryOperator, Style/StringConcatenation, Style/TernaryParentheses
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 5.52.0
+  version: 5.52.1
 platform: ruby
 authors:
 - Brian O'Connell
@@ -63,16 +63,22 @@ dependencies:
   name: marcel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: method_source
   requirement: !ruby/object:Gem::Requirement
@@ -389,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.19
+rubygems_version: 4.0.24
 specification_version: 4
 summary: JRuby Helper Libraries for openHAB Scripting
 test_files: []