openhab-scripting 5.50.0 → 5.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b70d205b061cb7bea4228face2481a0ccdb11a9947c8b4194b972db0a15c6935
-  data.tar.gz: 60ac7bf7347d4027766fc0285e61bcb849203196e2d625e8181da4e04e96c220
+  metadata.gz: f53f1018eaf8a1915bbfe5897cbe0ba0985c1ce0497bd8eacb03f7b09aaa2e2c
+  data.tar.gz: 458412ea19dc5cfd6e351e4cdd656b14cfd5184f84503cb27b9abfc9aaeec05c
 SHA512:
-  metadata.gz: 13014e726aa0efe66e5e1034f31f0a5c6688c7e19373cd314dfc93145137ce9232b8fa710c889b69dc2f07f18b109649f73fb20e720bde56e5bee8b10168601e
-  data.tar.gz: 264e3d3d6b351e466b9317728fabf1f086addbd6318ab1a349d57b711a7d26559cf85d8619d8b41cd31969edf7af8dda844ffad128f6edce6cb00538fba8cf15
+  metadata.gz: 0be40fe6f7188db7f896017a78ec4c42b3259811ae2bf5a63ca3c95f9ce26f8fd414e847610cb586987fcf94f1ef0e7848f621a19c04b38cb060ea4dac163fec
+  data.tar.gz: d345bb2045d9c30b4e356454acd499732ac8c0ca6ec588e960d3baccd10706b4e5759d4b5dabe66942476cca9b8fb4041b64d618187c4c7bb47c839a90d445af

data/lib/openhab/core/rules/rule.rb

@@ -173,18 +173,34 @@ module OpenHAB
         # Manually trigger the rule
         #
         # @param [Object, nil] event The event to pass to the rule's execution blocks.
+        # @param [Boolean] async Run the rule asynchronously.
+        #   When `true`, the method returns right away and the rule continues running in a separate thread.
         # @param [Boolean] consider_conditions Whether to check the conditions of the called rules.
         # @param [kwargs] context The context to pass to the conditions and the actions of the rule.
-        # @return [Hash] A copy of the rule context, including possible return values.
+        # @return [Hash, java.util.concurrent.Future<Hash>] A copy of the rule context,
+        #   including possible return values.
+        #   When `async` is true, a {java.util.concurrent.Future Future} object is returned
+        #   that will resolve to the context once the rule has finished executing.
+        #   To wait for the rule to complete and retrieve the context, call `#get` on the returned Future.
+        # @raise [NotImplementedError] if asynchronous execution isn't supported by the `RuleManager` implementation.
         #
-        def trigger(event = nil, consider_conditions: false, **context)
+        # @since openHAB 5.2 The `async` parameter was added to enable asynchronous rule execution.
+        #
+        def trigger(event = nil, async: false, consider_conditions: false, **context)
           event ||= org.openhab.core.automation.events.AutomationEventFactory
                        .createExecutionEvent(uid, nil, "manual")
           context.transform_keys!(&:to_s)
           # Unwrap any proxies and pass raw objects (items, things)
           context.transform_values! { |value| value.is_a?(Delegator) ? value.__getobj__ : value }
           context["event"] = event
-          Rules.manager.run_now(uid, consider_conditions, context)
+
+          return Rules.manager.run_now(uid, consider_conditions, context) unless async
+
+          begin
+            Rules.manager.run_async(uid, consider_conditions, context)
+          rescue java.lang.UnsupportedOperationException, NoMethodError
+            raise NotImplementedError
+          end
         end
         alias_method :run, :trigger
       end

data/lib/openhab/core.rb

@@ -156,6 +156,42 @@ module OpenHAB
           ]
         end.freeze
       end
+
+      #
+      # Returns the current start level of the openHAB runtime.
+      #
+      # Start levels represent runtime startup progress as integer values:
+      #
+      # - `10` - OSGi application start level reached (bundles activated).
+      # - `20` - Model entities (items, things, links, persistence config) loaded.
+      # - `30` - Item states restored from persistence service, where applicable.
+      # - `40` - Rules loaded and parsed; script engine factories available.
+      # - `50` - Rule engine executed all "system started" rules and is active.
+      # - `70` - User interface is up and running.
+      # - `80` - All things have been initialized.
+      # - `100` - Startup is fully complete.
+      #
+      # @example Checking if startup is complete
+      #   if OpenHAB::Core.startlevel == 100
+      #     logger.info "openHAB startup complete!"
+      #   end
+      #
+      # @example Checking if things are initialized
+      #   if OpenHAB::Core.startlevel >= 80
+      #     logger.info "Things are ready."
+      #   end
+      #
+      # @return [Integer, nil] The current start level integer, or `nil` if the
+      #   StartLevelService is unavailable.
+      #
+      # @see OpenHAB::DSL::Rules::BuilderDSL#on_start on_start rule trigger
+      # @see OpenHAB::Core::Events::StartlevelEvent StartlevelEvent
+      #
+      def startlevel
+        @start_level_service ||= OSGi.service("org.openhab.core.service.StartLevelService")
+        @start_level_service&.start_level
+      end
+      alias_method :start_level, :startlevel
     end
 
     import_default_presets unless defined?($ir)

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

@@ -1512,6 +1512,8 @@ module OpenHAB
         #   end
         #
         # @see https://www.openhab.org/docs/configuration/rules-dsl.html#system-based-triggers System based triggers
+        # @see OpenHAB::Core::Events::StartlevelEvent
+        # @see OpenHAB::Core.startlevel
         #
         def on_start(at_level: nil, at_levels: nil, attach: nil)
           levels = Array.wrap(at_level) | Array.wrap(at_levels)

data/lib/openhab/dsl/version.rb

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

data/lib/openhab/rspec/karaf.rb

@@ -366,6 +366,7 @@ module OpenHAB
         "org.openhab.core.model.rule.runtime" => nil,
         "org.openhab.core.model.rule" => nil,
         "org.openhab.core.model.sitemap.runtime" => nil,
+        "org.openhab.core.ui" => nil,
         "org.openhab.core.voice" => nil
       }.freeze
       private_constant :BLOCKED_COMPONENTS
@@ -805,11 +806,14 @@ module OpenHAB
                     <f:feature>openhab-core-model-script</f:feature>
                     <f:feature>openhab-core-model-sitemap</f:feature>
                     <f:feature>openhab-core-model-thing</f:feature>
+                    <f:feature>openhab-core-model-yaml</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>
+                    <!-- openhab-core-model-yaml imports org.openhab.core.ui.components since OH 5.2 -->
+                    <f:bundle>mvn:org.openhab.core.bundles/org.openhab.core.ui/#{version}</f:bundle>
                   </feature>
                 </replacement>
               </featureReplacements>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 5.50.0
+  version: 5.51.0
 platform: ruby
 authors:
 - Brian O'Connell
@@ -11,6 +11,20 @@ bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +45,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: irb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: marcel
   requirement: !ruby/object:Gem::Requirement
@@ -361,7 +403,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.18
 specification_version: 4
 summary: JRuby Helper Libraries for openHAB Scripting
 test_files: []