openhab-scripting 4.32.1 → 4.32.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 89c274fd9901e8ccc5d1890a7cf41dbf17ab6d79eb2b798b4e86dde9101cdd11
4
- data.tar.gz: dea8df6ebfb5b572745df0f4ab2b33ac251d74f0fe694ca4759e227f0588b4c3
3
+ metadata.gz: 5b99944ff8d378d0c6b9dbcffa3de3e1d8337625aea405841edad758b9595450
4
+ data.tar.gz: 2cbdc97d7d8b425c32a5b3b030f6f35d0103df2c230ecffb175b58c4a7b27edf
5
5
  SHA512:
6
- metadata.gz: 7ddee7681015930c085afe7fa68a6c6b913e414097d8da32ed9519b2d701ad71699f9bc585186f9cf229fb67633f3781995b04099290b67dd781ba9d5e167e93
7
- data.tar.gz: a8d606a0b5c1fe02822955ad03fd6affbf111a774581cb1706ab7661af874ef907004c73e21bfa445f16780e27f65090b140ab83487b3dc2b6729ac1fba01b03
6
+ metadata.gz: e3dc7186b93fab441e08fc2c0c6f0a3c4df5d20429168a6ad5d62f221260ee338fe87d8f980d30f8127fb4f671baa93727606c57665ae0a1c8e2d4a346a19336
7
+ data.tar.gz: 9a9987c6560789e8a4f6e9ff419618b5493a526e6c5b662bb83919d928b08f5623e1108f2bb28e82ecba26b55372b05c8bb629f867be332f01f409874fc23bb0
@@ -9,12 +9,10 @@ module OpenHAB
9
9
  # Patches OpenHAB actions
10
10
  #
11
11
  module Actions
12
- java_import Java::OrgOpenhabCoreAutomationModuleScriptInternalDefaultscope::ScriptThingActions
13
-
14
12
  #
15
13
  # MonkeyPatching ScriptThingActions
16
14
  #
17
- class ScriptThingActions
15
+ class << $actions # rubocop:disable Style/GlobalVars
18
16
  field_reader :THING_ACTIONS_MAP
19
17
 
20
18
  #
@@ -23,7 +21,7 @@ module OpenHAB
23
21
  # @return [Set] of keys for defined actions in the form of 'scope-thing_uid'
24
22
  #
25
23
  def action_keys
26
- ScriptThingActions.THING_ACTIONS_MAP.keys
24
+ self.class.THING_ACTIONS_MAP.keys
27
25
  end
28
26
  end
29
27
  end
@@ -20,8 +20,7 @@ module OpenHAB
20
20
  # Invert the type
21
21
  # @return [OnOffType] +OFF+ if +ON+, +ON+ if +OFF+
22
22
  def !
23
- return OFF if on?
24
- return ON if off?
23
+ on? ? OFF : ON
25
24
  end
26
25
  end
27
26
  end
@@ -8,7 +8,8 @@ module OpenHAB
8
8
  #
9
9
  # Provides access to the OpenHAB logging using a Ruby logging methods
10
10
  #
11
- module Log
11
+
12
+ module Core
12
13
  #
13
14
  # Ruby Logger that forwards messages at appropriate levels to OpenHAB Logger
14
15
  #
@@ -105,7 +106,9 @@ module OpenHAB
105
106
  #
106
107
  def log_exception(exception, rule_name)
107
108
  exception = clean_backtrace(exception)
108
- error { "#{exception.message} (#{exception.class})\nIn rule: #{rule_name}\n#{exception.backtrace&.join("\n")}" }
109
+ error do
110
+ "#{exception.message} (#{exception.class})\nIn rule: #{rule_name}\n#{exception.backtrace&.join("\n")}"
111
+ end
109
112
  end
110
113
 
111
114
  private
@@ -152,6 +155,12 @@ module OpenHAB
152
155
  end
153
156
  end
154
157
  end
158
+ end
159
+
160
+ module Log
161
+ #
162
+ # Ruby Logger that forwards messages at appropriate levels to OpenHAB Logger
163
+ #
155
164
 
156
165
  # Logger caches
157
166
  @loggers = {}
@@ -180,7 +189,7 @@ module OpenHAB
180
189
  # of logger name requires lots of operations and logger
181
190
  # names for some objects are specific to the class
182
191
  logger_name = logger_name(object)
183
- @loggers[logger_name] ||= Logger.new(logger_name)
192
+ @loggers[logger_name] ||= OpenHAB::Core::Logger.new(logger_name)
184
193
  end
185
194
 
186
195
  private
@@ -5,5 +5,5 @@
5
5
  #
6
6
  module OpenHAB
7
7
  # @return [String] Version of OpenHAB helper libraries
8
- VERSION = '4.32.1'
8
+ VERSION = '4.32.4'
9
9
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: openhab-scripting
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.32.1
4
+ version: 4.32.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brian O'Connell
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-02-21 00:00:00.000000000 Z
11
+ date: 2022-02-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler