openhab-scripting 5.24.1 → 5.24.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54dc0e0852b8b85308e1f130d17148b15d4906a78b910e5b70ea40a70d0c62a9
-  data.tar.gz: f2f5d323c52ad8cd7aa675ce71f87cfbad50526831388df86d183b27eba2f100
+  metadata.gz: 5c0fb1468d6bd40e3c969eb3da64c2291998d1c25f869ce8eadcdee5d8025f82
+  data.tar.gz: 1055efc1de0e69ecbd3f0c3ef7368f96c3edab4ae8395aeeb3da53b2bfcc2403
 SHA512:
-  metadata.gz: 6bcec6e15d7fcfc6143b86996f276a8140932cb4dd6627d89e1d47a996d252cf8ab21620258c3a1f2b195ccc6d535c59bbbb1ebee46656f593fb13974f01b197
-  data.tar.gz: 1e498846c24823319fa02a59b81c2400468b4463e95568051d45dcd111206238c5d97aa5901fdfb689816141a480bef1f7373d2ac554c170008323fd28ec88a9
+  metadata.gz: 779278a803232e079c5fc50f3094259b9d27500b82bc872bc7f38731f5dd836612a2582b558e50041d3098578fe1af3d2aa856c6e6400c3a854dba474e043a64
+  data.tar.gz: c3426e6d46f3edf2a6807b65c02ef12e4c2130ab943ec930b9815720458d45d0fc7a272a72829bd8b00be96c2e6549829cb5a07def11fbf647ccea942cfd89a7

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

@@ -111,6 +111,15 @@ module OpenHAB
           info.nil? || info.status_detail == RuleStatusDetail::DISABLED
         end
 
+        #
+        # Check if the rule's status detail != `DISABLED`
+        #
+        # @return [true, false]
+        #
+        def enabled?
+          !disabled?
+        end
+
         #
         # Checks if this rule has at least one of the given tags.
         #

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

@@ -2134,7 +2134,11 @@ module OpenHAB
           added_rule.actions.first.configuration.put("type", "application/x-ruby")
           added_rule.actions.first.configuration.put("script", script) if script
 
-          process_on_load { |module_id| rule.execute(nil, { "module" => module_id }) }
+          if enabled
+            process_on_load { |module_id| rule.execute(nil, { "module" => module_id }) }
+          else
+            added_rule.disable
+          end
 
           added_rule
         end
@@ -2181,8 +2185,6 @@ module OpenHAB
             logger.warn "Rule '#{uid}' has no triggers, not creating rule"
           elsif !execution_blocks?
             logger.warn "Rule '#{uid}' has no execution blocks, not creating rule"
-          elsif !enabled
-            logger.trace { "Rule '#{uid}' marked as disabled, not creating rule." }
           else
             return true
           end

data/lib/openhab/dsl/version.rb

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

data/lib/openhab/log.rb

@@ -13,11 +13,14 @@ module OpenHAB
   # Logging is available everywhere through the {#logger} object.
   #
   # The logging prefix is `org.openhab.automation.jrubyscripting`.
+  #
   # Logging within file-based rules will have the name of the file appended to
   # the logger name. Logging inside of a rule will have the id of the rule
-  # appended to the logger name. Any classes will have the full class anem
+  # appended to the logger name. Any classes will have the full class name
   # appended to the logger name.
   #
+  # Logging within UI-based rules will have the rule UID appended to the logger.
+  #
   # @example The following entries are in a file named 'log_test.rb'
   #   logger.trace('Test logging at trace') # 2020-12-03 18:05:20.903 [TRACE] [org.openhab.automation.jrubyscripting.log_test] - Test logging at trace
   #   logger.debug('Test logging at debug') # 2020-12-03 18:05:32.020 [DEBUG] [org.openhab.automation.jrubyscripting.log_test] - Test logging at debug
@@ -25,12 +28,22 @@ module OpenHAB
   #   logger.info('Test logging at info')   # 2020-12-03 18:05:41.817 [INFO ] [org.openhab.automation.jrubyscripting.log_test] - Test logging at info
   #   logger.error('Test logging at error') # 2020-12-03 18:06:02.021 [ERROR] [org.openhab.automation.jrubyscripting.log_test] - Test logging at error
   #
+  # @example From a UI-based rule with UID 'rule_uid'
+  #   logger.info('Test logging at info')   # 2020-12-03 18:05:41.817 [INFO ] [org.openhab.automation.jrubyscripting.script.rule_uid] - Test logging at info
+  #
   # @example The following entries are in a file named 'log_test.rb'
+  #   # Enable trace log level for all the rules in this file
+  #   logger.level = :trace
+  #
   #   rule 'foo' do
-  #     run { logger.trace('Test logging at trace') } # 2020-12-03 18:05:20.903 [TRACE] [org.openhab.automation.jrubyscripting.foo] - Test logging at trace
+  #     run { logger.trace('Test logging at trace') } # 2020-12-03 18:05:20.903 [TRACE] [org.openhab.automation.jrubyscripting.log_test.rule.log_test:1] - Test logging at trace
   #     on_load
   #   end
   #
+  #   rule 'foo with id', id: "foo_id" do
+  #     run { logger.trace('Test logging at trace') } # 2020-12-03 18:05:20.903 [TRACE] [org.openhab.automation.jrubyscripting.log_test.rule.foo_id] - Test logging at trace
+  #     on_load
+  #   end
   #
   # @example A log entry from inside a class
   #   class MyClass

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 5.24.1
+  version: 5.24.2
 platform: ruby
 authors:
 - Brian O'Connell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-26 00:00:00.000000000 Z
+date: 2024-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler