openhab-scripting 5.38.0 → 5.38.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcf7591d994378fb216137014e04dae3321ba891e11f201336e1afc6f1b7226b
-  data.tar.gz: d9917f8c8f5ead81623e39b3c606ab0f4efe7da519f654b081498bd743ebc721
+  metadata.gz: 80e5c451235909f43f9b0b0a82f80a501f0a978d65f52d3bc8dcf8ae5e74fd5e
+  data.tar.gz: 57633cd38589cc8e9bd8d11c0bccf66761cdf0aaaffcdde4b6c77ee9388df527
 SHA512:
-  metadata.gz: 78aa38c7c90b81ead46d438543077abb55bf06db1476f6e73cf36577f4df10c3b305e5169de2df2580f7d1d963fd8e5a998521764d9377305f87717ff216fff5
-  data.tar.gz: 9a410509dc518a5019c3885d5123c8a1840a0a70c6abb99df85cdbc11897eb7d5367d6014c71ff16759baebe03083a409f8f254606f0fab22a51ef50f2cdcdc6
+  metadata.gz: 67035be352872b9eb97049875648d7e3c5c190e8ea10ee6eb580f039266746f927d24b51844c022c19e75dadd20baaf23450fb35d34d6df43b5046f7cf4fedc9
+  data.tar.gz: 74be0ee645c5ba2b480250a5dd3db36773596bb8aec3e0e27b5e96b48da765e4cf5a544d1ae4613ac761c6662e17bde7b1c5bce34038c212080f682dda64508d

data/lib/openhab/console.rb

@@ -1,5 +1,12 @@
 # frozen_string_literal: true
 
-raise "#{__FILE__} is only meant to be required from the context of the Karaf console" unless $terminal
+raise "#{__FILE__} is only meant to be required from the context of the Karaf console" unless $console
+
+begin
+  $terminal = $console.session.terminal
+rescue NoMethodError
+  puts "JRuby console is not available in this environment"
+  exit
+end
 
 ENV["TERM"] = $terminal.type

data/lib/openhab/core/items.rb

@@ -46,13 +46,13 @@ module OpenHAB
 
             logger.trace { "Defining #{klass}##{state_predicate} for #{state}" }
             klass.class_eval <<~RUBY, __FILE__, __LINE__ + 1
-              def #{state_predicate}                                                  # def on?
-                raw_state.as(#{state.class.java_class.simple_name}).equal?(#{state})  #   raw_state.as(OnOffType) == ON
-              end                                                                     # end
+              def #{state_predicate}                                                   # def on?
+                raw_state.as(#{state.class.java_class.simple_name}).equal?(#{state})   #   raw_state.as(OnOffType) == ON
+              end                                                                      # end
 
-              def was_#{state_predicate}                                              # def was_on?
-                last_state.as(#{state.class.java_class.simple_name}).equal?(#{state}) #   last_state.as(OnOffType) == ON
-              end                                                                     # end
+              def was_#{state_predicate}                                               # def was_on?
+                last_state&.as(#{state.class.java_class.simple_name}).equal?(#{state}) #   last_state.as(OnOffType) == ON
+              end                                                                      # end
             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.38.0"
+    VERSION = "5.38.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 5.38.0
+  version: 5.38.2
 platform: ruby
 authors:
 - Brian O'Connell
@@ -479,7 +479,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.8
 specification_version: 4
 summary: JRuby Helper Libraries for openHAB Scripting
 test_files: []