openhab-scripting 5.18.0 → 5.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1a3e61eb7613c8235e61cf99dc8d97d4c8403d8c2af21f873434ebf89ecff49
-  data.tar.gz: '09330d12003c08cd0af744d14c52287e9588c9b440975839e3cbd18d4914e027'
+  metadata.gz: cfc9ae60d0f82fc677a157ac0efd58c12fc597f5ac8f3d79d7aa9c472e2c5d3a
+  data.tar.gz: b8bf1721d064b2f88554722518496aa6c53b89407a9fb212880972725e49901f
 SHA512:
-  metadata.gz: 2ee2f0a8eb080aaed28d4484f23828d3e926f957a574e67ab5231ab44cf2dcb46897e841a9a481cdadfa30e1d026b4f4375755ee85f75954707208001d3442d5
-  data.tar.gz: 95ff1eb5298403900d9fb3370efaf9c3ffa7f356c40d5176a5d9ccf64fce3b6f701b8ddbb2f1103cb3102f3628cf9f27b0e9209cc44e97537eb0e832cc64061d
+  metadata.gz: 8e50f4ce2c5832a39b3ab9c7b7a489b22697a23b20ce803a633f28ea9b44ed2661a820cdefd00bc54c71cb212a2c1a1d96c35c413937cd3ac514aec55a4c13da
+  data.tar.gz: a298851e7255074cb21d9fd4e495a8c8dc750425b0db3319ab17353c2e07106e0f669a40912bbe98cc6db9f252ff70ebe68b9c94fb7366c4b257200da13eefda

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

@@ -73,7 +73,7 @@ module OpenHAB
         #     run { logger.info "Happy new day!" }
         #   end
         #
-        def rule(name = nil, id: nil, replace: false, script: nil, binding: nil, &block)
+        def rule(name = nil, id: nil, replace: nil, script: nil, binding: nil, &block)
           raise ArgumentError, "Block is required" unless block
 
           inferred_id = nil
@@ -89,7 +89,7 @@ module OpenHAB
 
             if replace
               logger.debug { "Removing existing rule '#{builder.uid}'." } if DSL.rules.remove(builder.uid)
-            else
+            elsif replace.nil?
               id_not_inferred = inferred_id.nil? || inferred_id != builder.uid
               if id_not_inferred && (existing_rule = $rules.get(builder.uid))
                 logger.warn "Rule '#{builder.uid}' is not created because " \

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

@@ -44,22 +44,27 @@ module OpenHAB
           #   @see BuilderDSL#$1
           def def_terse_rule(trigger)
             class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
-              def #{trigger}(*args, id: nil, name: nil, description: nil,       # def changed(*args, id: nil, name: nil, description: nil,
-                  tag: nil, tags: nil, on_load: false, **kwargs, &block)        #     tag: nil, tags: nil, on_load: false, **kwargs, &block)
-                raise ArgumentError, "Block is required" unless block           #   raise ArgumentError, "Block is required" unless block
-                                                                                #
-                id ||= NameInference.infer_rule_id_from_block(block)            #   id ||= NameInference.infer_rule_id_from_block(block)
-                script = block.source rescue nil                                #   script = block.source rescue nil
-                caller_binding = block.binding                                  #   caller_binding = block.binding
-                rule name, id: id, script: script, binding: caller_binding do   #   rule name, id: id, script: script, binding: caller_binding do
-                  self.on_load if on_load                                       #     self.on_load if on_load
-                  self.description(description) if description                  #     self.description(description) if description
-                  self.tags(*Array.wrap(tag), *Array.wrap(tags))                #     self.tags(*Array.wrap(tag), *Array.wrap(tags))
-                  #{trigger}(*args, **kwargs)                                   #     changed(*args, **kwargs)
-                  run(&block)                                                   #     run(&block)
-                end                                                             #   end
-              end                                                               # end
-              module_function #{trigger.inspect}                                # module_function :changed
+              def #{trigger}(*args, id: nil, name: nil, description: nil,  # def changed(*args, id: nil, name: nil, description: nil,
+                  tag: nil, tags: nil, on_load: false, **kwargs, &block)   #     tag: nil, tags: nil, on_load: false, **kwargs, &block)
+                raise ArgumentError, "Block is required" unless block      #   raise ArgumentError, "Block is required" unless block
+                                                                           #
+                replace = nil                                              #   replace = nil
+                unless id                                                  #   unless id
+                  replace = false                                          #     replace = false
+                  id = NameInference.infer_rule_id_from_block(block)       #     id = NameInference.infer_rule_id_from_block(block)
+                end                                                        #   end
+                script = block.source rescue nil                           #   script = block.source rescue nil
+                caller_binding = block.binding                             #   caller_binding = block.binding
+                rule name, id: id, replace: replace, script: script,       #   rule name, id: id, replace: replace, script: script
+                  binding: caller_binding do                               #     binding: caller_binding do
+                  self.on_load if on_load                                  #     self.on_load if on_load
+                  self.description(description) if description             #     self.description(description) if description
+                  self.tags(*Array.wrap(tag), *Array.wrap(tags))           #     self.tags(*Array.wrap(tag), *Array.wrap(tags))
+                  #{trigger}(*args, **kwargs)                              #     changed(*args, **kwargs)
+                  run(&block)                                              #     run(&block)
+                end                                                        #   end
+              end                                                          # end
+              module_function #{trigger.inspect}                           # module_function :changed
             RUBY
           end
         end

data/lib/openhab/dsl/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 5.18.0
+  version: 5.18.1
 platform: ruby
 authors:
 - Brian O'Connell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-05 00:00:00.000000000 Z
+date: 2024-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -485,7 +485,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.7
 signing_key: 
 specification_version: 4
 summary: JRuby Helper Libraries for openHAB Scripting