openhab-scripting 5.35.1 → 5.36.1

data/lib/openhab/rspec/karaf.rb

@@ -381,14 +381,8 @@ module OpenHAB
           ttp.class.field_reader :thingTypeTracker
           @thing_type_tracker = ttp.thingTypeTracker
           @thing_type_tracker.class.field_reader :openState
-          begin
-            org.openhab.core.config.core.xml.osgi.XmlDocumentBundleTracker::OpenState.field_reader :OPENED
-            opened = org.openhab.core.config.core.xml.osgi.XmlDocumentBundleTracker::OpenState.OPENED
-          rescue NameError
-            # @deprecated OH3.4
-            org.openhab.core.config.xml.osgi.XmlDocumentBundleTracker::OpenState.field_reader :OPENED
-            opened = org.openhab.core.config.xml.osgi.XmlDocumentBundleTracker::OpenState.OPENED
-          end
+          org.openhab.core.config.core.xml.osgi.XmlDocumentBundleTracker::OpenState.field_reader :OPENED
+          opened = org.openhab.core.config.core.xml.osgi.XmlDocumentBundleTracker::OpenState.OPENED
           sleep until @thing_type_tracker.openState == opened
           @bundle_context.bundles.each do |bundle|
             @thing_type_tracker.adding_bundle(bundle, nil)
@@ -399,14 +393,8 @@ module OpenHAB
           cdp.class.field_reader :configDescriptionTracker
           @config_description_tracker = cdp.configDescriptionTracker
           @config_description_tracker.class.field_reader :openState
-          begin
-            org.openhab.core.config.core.xml.osgi.XmlDocumentBundleTracker::OpenState.field_reader :OPENED
-            opened = org.openhab.core.config.core.xml.osgi.XmlDocumentBundleTracker::OpenState.OPENED
-          rescue NameError
-            # @deprecated OH3.4
-            org.openhab.core.config.xml.osgi.XmlDocumentBundleTracker::OpenState.field_reader :OPENED
-            opened = org.openhab.core.config.xml.osgi.XmlDocumentBundleTracker::OpenState.OPENED
-          end
+          org.openhab.core.config.core.xml.osgi.XmlDocumentBundleTracker::OpenState.field_reader :OPENED
+          opened = org.openhab.core.config.core.xml.osgi.XmlDocumentBundleTracker::OpenState.OPENED
           sleep until @config_description_tracker.openState == opened
           @bundle_context.bundles.each do |bundle|
             @config_description_tracker.adding_bundle(bundle, nil)
@@ -456,16 +444,6 @@ module OpenHAB
             )
 
             wait_for_service("org.openhab.core.thing.ThingManager") do |tm|
-              begin
-                # @deprecated OH3.4
-                tm.class.field_accessor :bundleResolver
-                tm.bundleResolver = Mocks::BundleResolver.instance
-              rescue NameError
-                # OH4
-                # I think the mock BundleResolver registration above is sufficient.
-                # It will be injected by OSGi and we don't need to override it again in OH4
-              end
-
               require_relative "mocks/safe_caller"
               field = tm.class.java_class.declared_field :safeCaller
               field.accessible = true
@@ -548,7 +526,7 @@ module OpenHAB
 
       def wait_for_service(service_name, filter: nil, &block)
         if defined?(OSGi) &&
-           (services = OSGi.services(service_name, filter: filter))
+           (services = OSGi.services(service_name, filter:))
           services.each(&block)
         end
 

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

@@ -103,26 +103,26 @@ module OpenHAB
           result
         end
 
-        def get_item_info # rubocop:disable Naming/AccessorMethodName must match Java interface
+        def get_item_info # rubocop:disable Naming/AccessorMethodName -- must match Java interface
           @data.to_set do |(n, entries)|
             [n, entries.length, entries.first.timestamp, entries.last.timestamp]
           end
         end
 
-        def get_default_strategies # rubocop:disable Naming/AccessorMethodName must match Java interface
+        def get_default_strategies # rubocop:disable Naming/AccessorMethodName -- must match Java interface
           [org.openhab.core.persistence.strategy.PersistenceStrategy::Globals::CHANGE]
         end
 
         private
 
-        def query_internal(filter, &block)
+        def query_internal(filter, &)
           if filter.item_name
             return unless @data.key?(filter.item_name)
 
-            query_item_internal(@data[filter.item_name], filter, &block)
+            query_item_internal(@data[filter.item_name], filter, &)
           else
             @data.each_value do |item_history|
-              query_item_internal(item_history, filter, &block)
+              query_item_internal(item_history, filter, &)
             end
           end
         end

data/lib/openhab/yard/html_helper.rb

@@ -26,7 +26,7 @@ module OpenHAB
       end
 
       def html_markup_markdown(text)
-        result = super(text)
+        result = super
 
         html = Nokogiri::HTML5.fragment(result)
         # re-link files in docs/*.md. They're written so they work on github without any

data/lib/openhab/yard.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-Dir[File.expand_path("yard/**/*.rb", __dir__)].sort.each do |f|
+Dir[File.expand_path("yard/**/*.rb", __dir__)].each do |f|
   require f
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 5.35.1
+  version: 5.36.1
 platform: ruby
 authors:
 - Brian O'Connell
@@ -9,7 +9,7 @@ authors:
 - Jimmy Tanagra
 bindir: bin
 cert_chain: []
-date: 2025-02-25 00:00:00.000000000 Z
+date: 2025-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,20 +53,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: ruby2_keywords
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -229,6 +215,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/openhab/console.rb
+- lib/openhab/console/irb.rb
+- lib/openhab/console/jline.rb
+- lib/openhab/console/registry.rb
+- lib/openhab/console/stdio.rb
 - lib/openhab/core.rb
 - lib/openhab/core/abstract_uid.rb
 - lib/openhab/core/actions.rb
@@ -292,7 +283,6 @@ files:
 - lib/openhab/core/items/semantics/enumerable.rb
 - lib/openhab/core/items/semantics/provider.rb
 - lib/openhab/core/items/semantics/semantic_tag.rb
-- lib/openhab/core/items/semantics/tag_class_methods.rb
 - lib/openhab/core/items/state_storage.rb
 - lib/openhab/core/items/string_item.rb
 - lib/openhab/core/items/switch_item.rb
@@ -333,6 +323,7 @@ files:
 - lib/openhab/core/things/uid.rb
 - lib/openhab/core/timer.rb
 - lib/openhab/core/types.rb
+- lib/openhab/core/types/command_description.rb
 - lib/openhab/core/types/comparable_type.rb
 - lib/openhab/core/types/date_time_type.rb
 - lib/openhab/core/types/decimal_type.rb
@@ -349,6 +340,7 @@ files:
 - lib/openhab/core/types/raw_type.rb
 - lib/openhab/core/types/refresh_type.rb
 - lib/openhab/core/types/rewind_fastforward_type.rb
+- lib/openhab/core/types/state_description.rb
 - lib/openhab/core/types/stop_move_type.rb
 - lib/openhab/core/types/string_list_type.rb
 - lib/openhab/core/types/string_type.rb
@@ -408,7 +400,6 @@ files:
 - lib/openhab/dsl/rules/triggers/conditions/duration.rb
 - lib/openhab/dsl/rules/triggers/conditions/generic.rb
 - lib/openhab/dsl/rules/triggers/cron/cron.rb
-- lib/openhab/dsl/rules/triggers/cron/cron_handler.rb
 - lib/openhab/dsl/rules/triggers/trigger.rb
 - lib/openhab/dsl/rules/triggers/updated.rb
 - lib/openhab/dsl/rules/triggers/watch/watch_handler.rb
@@ -480,14 +471,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.1.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.6
 specification_version: 4
 summary: JRuby Helper Libraries for openHAB Scripting
 test_files: []

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

@@ -1,73 +0,0 @@
-# frozen_string_literal: true
-
-module OpenHAB
-  module Core
-    module Items
-      module Semantics
-        # @deprecated OH3.4 didn't have SemanticTag class
-
-        #
-        # Adds tag attributes to the semantic tag class
-        #
-        module TagClassMethods
-          # @!visibility private
-          java_import org.openhab.core.semantics.SemanticTags
-
-          #
-          # Returns the tag's string representation
-          #
-          # @return [String]
-          #
-          def to_s
-            java_class.simple_name
-          end
-
-          #
-          # Returns the tag's label
-          #
-          # @param [java.util.Locale] locale The locale that the label should be in, if available.
-          #   When nil, the system's default locale is used.
-          #
-          # @return [String] The tag's label
-          #
-          def label(locale = nil)
-            SemanticTags.get_label(java_class, locale || java.util.Locale.default)
-          end
-
-          #
-          # Returns the tag's synonyms
-          #
-          # @param [java.util.Locale] locale The locale that the label should be in, if available.
-          #   When nil, the system's default locale is used.
-          #
-          # @return [Array<String>] The list of synonyms in the requested locale.
-          #
-          def synonyms(locale = nil)
-            unless SemanticTags.respond_to?(:get_synonyms)
-              return java_class.get_annotation(org.openhab.core.semantics.TagInfo.java_class).synonyms
-                               .split(",").map(&:strip)
-            end
-
-            SemanticTags.get_synonyms(java_class, locale || java.util.Locale.default).to_a
-          end
-
-          #
-          # Returns the tag's description
-          #
-          # @param [java.util.Locale] locale The locale that the description should be in, if available.
-          #   When nil, the system's default locale is used.
-          #
-          # @return [String] The tag's description
-          #
-          def description(locale = nil)
-            unless SemanticTags.respond_to?(:get_description)
-              return java_class.get_annotation(org.openhab.core.semantics.TagInfo.java_class).description
-            end
-
-            SemanticTags.get_description(java_class, locale || java.util.Locale.default)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/openhab/dsl/rules/triggers/cron/cron_handler.rb

@@ -1,118 +0,0 @@
-# frozen_string_literal: true
-
-# @deprecated OH3.4 this module is not needed in OH4+
-return unless OpenHAB::Core.version < OpenHAB::Core::V4_0
-
-require "singleton"
-
-require_relative "cron"
-
-module OpenHAB
-  module DSL
-    module Rules
-      module Triggers
-        # @!visibility private
-        #
-        # Cron trigger handler that provides trigger ID
-        #
-        module CronHandler
-          # Cron Trigger Handler that provides trigger IDs
-          # Unfortunatly because the CronTriggerHandler in openHAB core is marked internal
-          # the entire thing must be recreated here
-          class CronTriggerHandler < org.openhab.core.automation.handler.BaseTriggerModuleHandler
-            include org.openhab.core.scheduler.SchedulerRunnable
-            include org.openhab.core.automation.handler.TimeBasedTriggerHandler
-
-            # Provides access to protected fields
-            field_accessor :callback
-
-            # Creates a new CronTriggerHandler
-            # @param [org.openhab.core.automation.Trigger] trigger openHAB trigger associated with handler
-            #
-            def initialize(trigger)
-              @trigger = trigger
-              @scheduler = OSGi.service("org.openhab.core.scheduler.CronScheduler")
-              @schedule = nil
-              @expression = trigger.configuration.get("cronExpression")
-              super(trigger)
-            end
-
-            #
-            # Set the callback to execute when cron trigger fires
-            # @param [Object] callback to run
-            #
-            def setCallback(callback) # rubocop:disable Naming/MethodName
-              synchronized do
-                super(callback)
-                @schedule = @scheduler.schedule(self, @expression)
-                logger.trace { "Scheduled cron job '#{@expression}' for trigger '#{@trigger.id}'." }
-              end
-            end
-
-            #
-            # Get the temporal adjuster
-            # @return [CronAdjuster]
-            #
-            def getTemporalAdjuster # rubocop:disable Naming/MethodName
-              org.openhab.core.scheduler.CronAdjuster.new(@expression)
-            end
-
-            #
-            # Execute the callback
-            #
-            def run
-              callback&.triggered(@trigger, { "module" => @trigger.id })
-            end
-
-            #
-            # Dispose of the handler
-            # cancel the cron scheduled task
-            #
-            def dispose
-              synchronized do
-                super
-                return unless @schedule
-
-                @schedule.cancel(true)
-                @schedule = nil
-              end
-              logger.trace { "cancelled job for trigger '#{@trigger.id}'." }
-            end
-          end
-
-          # Implements the ScriptedTriggerHandlerFactory interface to create a new Cron Trigger Handler
-          class CronTriggerHandlerFactory
-            include Singleton
-            include org.openhab.core.automation.module.script.rulesupport.shared.factories.ScriptedTriggerHandlerFactory
-
-            def initialize
-              Core.automation_manager.add_trigger_handler(
-                Cron::CRON_TRIGGER_MODULE_ID,
-                self
-              )
-
-              Core.automation_manager.add_trigger_type(org.openhab.core.automation.type.TriggerType.new(
-                                                         Cron::CRON_TRIGGER_MODULE_ID,
-                                                         nil,
-                                                         "A specific instant occurs",
-                                                         "Triggers when the specified instant occurs",
-                                                         nil,
-                                                         org.openhab.core.automation.Visibility::VISIBLE,
-                                                         nil
-                                                       ))
-              logger.trace("Added script cron trigger handler")
-            end
-
-            # Invoked by openHAB core to get a trigger handler for the supplied trigger
-            # @param [org.openhab.core.automation.Trigger] trigger
-            #
-            # @return [CronTriggerHandler] trigger handler for supplied trigger
-            def get(trigger)
-              CronTriggerHandler.new(trigger)
-            end
-          end
-        end
-      end
-    end
-  end
-end