openhab-scripting 5.44.1 → 5.45.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd60fb96afbab0b86a01d0cbfce296604179e63899be95d6faefdc27e805dfe5
-  data.tar.gz: 88a9935ff405de0fef0cf645e936ea521fe940c88a8e40da6069183476019c00
+  metadata.gz: 6a6ff4c8c427bbcf314fb2226da8fcc4791ee9395394f404e88567a4417e1b4f
+  data.tar.gz: 254980e2b97d5cd3f3c44990ed5e1cd84e0c31d2a8a9490146d317e0c2f3d9a9
 SHA512:
-  metadata.gz: 8851a00c95338d7797062a7d901a763146ee96f4a8f652b3a30b380c5248961b3f418661c2cd2b899d292a7077723bbca818e778223996a98165b84a35c6cab6
-  data.tar.gz: 4ff6ccb08cb630373a385daec0bbb9accf3ec13358e373942fea74fb2f95c0b8f489a22f0de7b37f52765611a7ca6a921f743e1e57b7d3adf57e78fe2f362e1e
+  metadata.gz: 01b946e0402acf49358f2de450960fd716f654c668bd40f419a5c768672d2bd7272fa89d5bef1c0e7f61f57968156c2a9d9b2a47b01b0e6065432962df568a12
+  data.tar.gz: 6ef1bc5b35034eac211a4024586e04d27c8aeeba8f2e7d21ab6999ba32b6d72c567a29c81010b559685af51d2bd69d461ea32726149c044fe090a8aa757fd09f

data/lib/openhab/core/actions/transformation.rb

@@ -7,7 +7,7 @@ module OpenHAB
       class Transformation
         class << self
           # @!visibility private
-          alias_method :raw_transform, :transform if instance_methods.include?(:transform)
+          alias_method :raw_transform, :transform if method_defined?(:transform)
 
           #
           # Applies a transformation of a given type with some function to a value.

data/lib/openhab/core/actions/voice.rb

@@ -7,7 +7,7 @@ module OpenHAB
       class Voice
         class << self
           # @!visibility private
-          alias_method :raw_say, :say if instance_methods.include?(:say)
+          alias_method :raw_say, :say if method_defined?(:say)
 
           #
           # Say text via openHAB Text-To-Speech service, Voice.say()

data/lib/openhab/core/gem.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+openhab_spec = Gem::Specification.new do |s|
+  s.name = "openhab"
+  s.version = -(ENV["OPENHAB_VERSION"] || "5.1.0")
+
+  def s.deleted_gem?
+    false
+  end
+
+  def s.installation_missing?
+    false
+  end
+end
+
+Gem::Specification.add_spec(openhab_spec)
+Gem.post_reset { Gem::Specification.add_spec(openhab_spec) }

data/lib/openhab/core/items.rb

@@ -42,7 +42,7 @@ module OpenHAB
         def def_predicate_methods(klass)
           values_for_enums(klass.ACCEPTED_DATA_TYPES).each do |state|
             _command_predicate, state_predicate = Types::PREDICATE_ALIASES[state.to_s]
-            next if klass.instance_methods.include?(state_predicate)
+            next if klass.method_defined?(state_predicate)
 
             logger.trace { "Defining #{klass}##{state_predicate} for #{state}" }
             klass.class_eval <<~RUBY, __FILE__, __LINE__ + 1
@@ -62,7 +62,7 @@ module OpenHAB
         def def_command_methods(klass)
           values_for_enums(klass.ACCEPTED_COMMAND_TYPES).each do |value|
             command = Types::COMMAND_ALIASES[value.to_s]
-            next if klass.instance_methods.include?(command)
+            next if klass.method_defined?(command)
 
             if value.is_a?(Types::State)
               logger.trace { "Defining #{klass}/Enumerable##{command}/#{command}! for #{value}" }
@@ -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/lazy_array.rb

@@ -36,14 +36,14 @@ module OpenHAB
 
       # Delegate any other methods to the actual array, exclude mutating methods
       def method_missing(method, ...)
-        return to_a.send(method, ...) if method[-1] != "!" && Array.instance_methods.include?(method)
+        return to_a.send(method, ...) if method[-1] != "!" && Array.method_defined?(method)
 
         super
       end
 
       # @!visibility private
       def respond_to_missing?(method, include_private = false)
-        return true if method[-1] != "!" && Array.instance_methods.include?(method.to_sym)
+        return true if method[-1] != "!" && Array.method_defined?(method.to_sym)
 
         super
       end

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

@@ -225,7 +225,7 @@ module OpenHAB
           # @deprecated OH 4.2 Remove version check when dropping OH 4.2
           return true if OpenHAB::Core.version >= OpenHAB::Core::V4_3 && to_instant.respond_to?(method)
           return true if zoned_date_time.respond_to?(method)
-          return true if ::Time.instance_methods.include?(method.to_sym)
+          return true if ::Time.method_defined?(method.to_sym)
 
           super
         end
@@ -241,7 +241,7 @@ module OpenHAB
           end
 
           return zoned_date_time.send(method, ...) if zoned_date_time.respond_to?(method)
-          return to_time.send(method, ...) if ::Time.instance_methods.include?(method.to_sym)
+          return to_time.send(method, ...) if ::Time.method_defined?(method.to_sym)
 
           super
         end

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.rb

@@ -17,6 +17,8 @@ module OpenHAB
     V5_0 = Gem::Version.new("5.0.0").freeze
     # @!visibility private
     V5_1 = Gem::Version.new("5.1.0").freeze
+    # @!visibility private
+    V5_2 = Gem::Version.new("5.2.0").freeze
 
     # @return [Gem::Version] Returns the current openHAB version as a Gem::Version object
     #   Note, this strips off snapshots, milestones and RC versions and returns the release version.
@@ -159,6 +161,10 @@ end
 require_relative "core/provider"
 
 Dir[File.expand_path("core/**/*.rb", __dir__)].each do |f|
+  # already been run by either a binstub, or the addon
+  next if f.end_with?("gem.rb")
   # metadata is autoloaded
-  require f unless f.include?("/metadata/")
+  next if f.include?("/metadata/")
+
+  require f
 end

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

@@ -36,7 +36,7 @@ module OpenHAB
         #   @return [true,false] Returns true if the duration is less than zero.
         #
 
-        unless instance_methods.include?(:positive?)
+        unless method_defined?(:positive?)
           #
           # @return [true, false] Returns true if the duration is greater than zero.
           #

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

@@ -3,5 +3,5 @@
 # Extensions to Symbol
 class Symbol
   # Ruby 3.0 already has #name
-  alias_method :name, :to_s unless instance_methods.include?(:name)
+  alias_method :name, :to_s unless method_defined?(:name)
 end

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

@@ -106,29 +106,33 @@ module OpenHAB
                       unit_label: nil,
                       verify: false)
           # Extract the named arguments into a hash
-          @parameters << method(__method__).parameters
-                                           .select { |param_type, _| param_type == :key } # rubocop:disable Style/HashSlice
-                                           .to_h { |_, key| [key, binding.local_variable_get(key)] }
-                                           .then do |p|
-            p[:options] = p[:options].map do |opt_value, opt_label|
-              org.openhab.core.config.core.ParameterOption.new(opt_value, opt_label)
-            end
-            p[:filter_criteria] = p[:filter_criteria].map do |filter_name, filter_value|
-              org.openhab.core.config.core.FilterCriteria.new(filter_name, filter_value)
-            end
-            p[:minimum] = p.delete(:min)&.to_d&.to_java
-            p[:maximum] = p.delete(:max)&.to_d&.to_java
-            p[:step] = p.delete(:step)&.to_d&.to_java
-            p[:group_name] ||= @current_group
-            type = org.openhab.core.config.core.ConfigDescriptionParameter::Type.value_of(type.to_s.upcase)
+          @parameters <<
+            method(__method__)
+            .parameters
+            .select { |param_type, _| param_type == :key } # rubocop:disable Style/HashSlice
+            .to_h { |_, key| [key, binding.local_variable_get(key)] }
+            .then do |p|
+              p[:options] = p[:options].map do |opt_value, opt_label|
+                org.openhab.core.config.core.ParameterOption.new(opt_value, opt_label)
+              end
+              p[:filter_criteria] = p[:filter_criteria].map do |filter_name, filter_value|
+                org.openhab.core.config.core.FilterCriteria.new(filter_name, filter_value)
+              end
+              p[:minimum] = p.delete(:min)&.to_d&.to_java
+              p[:maximum] = p.delete(:max)&.to_d&.to_java
+              p[:step] = p.delete(:step)&.to_d&.to_java
+              p[:group_name] ||= @current_group
+              type = org.openhab.core.config.core.ConfigDescriptionParameter::Type.value_of(type.to_s.upcase)
 
-            parameter = org.openhab.core.config.core.ConfigDescriptionParameterBuilder.create(name.to_s, type)
+              parameter = org.openhab.core.config.core.ConfigDescriptionParameterBuilder.create(
+                name.to_s, type
+              )
 
-            p.each do |key, value|
-              parameter.send(:"with_#{key}", value) unless value.nil?
+              p.each do |key, value|
+                parameter.send(:"with_#{key}", value) unless value.nil?
+              end
+              parameter.build
             end
-            parameter.build
-          end
         end
 
         #

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

@@ -152,7 +152,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/version.rb

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

data/lib/openhab/rspec/helpers.rb

@@ -201,7 +201,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") || ""
@@ -268,16 +268,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
         rescue NameError

data/lib/openhab/rspec/karaf.rb

@@ -786,7 +786,7 @@ module OpenHAB
 
               <blacklistedFeatures>
                 <feature>openhab-runtime-ui</feature>
-                <feature>openhab-core-ui*</feature>
+                <feature>openhab-core-ui</feature>
                 <feature>openhab-misc-*</feature>
                 <feature>openhab-persistence-*</feature>
                 <feature>openhab-package-standard</feature>
@@ -807,6 +807,7 @@ module OpenHAB
                     <f:feature>openhab-core-model-sitemap</f:feature>
                     <f:feature>openhab-core-model-thing</f:feature>
                     <f:feature>openhab-core-storage-json</f:feature>
+                    <f:feature>openhab-core-ui-icon</f:feature>
                     <f:feature>openhab-transport-http</f:feature>
                     <f:feature prerequisite="true">wrapper</f:feature>
                     <f:bundle>mvn:org.openhab.core.bundles/org.openhab.core.karaf/#{version}</f:bundle>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 5.44.1
+  version: 5.45.0
 platform: ruby
 authors:
 - Brian O'Connell
@@ -53,6 +53,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: openhab
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.3'
 email:
 - broconne+github@gmail.com
 - cody@cutrer.us
@@ -100,6 +120,7 @@ files:
 - lib/openhab/core/events/startlevel_event.rb
 - lib/openhab/core/events/thing_status_info_event.rb
 - lib/openhab/core/events/timer_event.rb
+- lib/openhab/core/gem.rb
 - lib/openhab/core/items.rb
 - lib/openhab/core/items/accepted_data_types.rb
 - lib/openhab/core/items/call_item.rb