openhab-jrubyscripting 5.0.0.rc2 → 5.0.0.rc4

data/lib/openhab/rspec/karaf.rb

@@ -77,7 +77,12 @@ module OpenHAB
 
         return if service.get_instance("rspec")
 
-        service.clone_instance(root_instance.name, "rspec", settings, false)
+        begin
+          service.clone_instance(root_instance.name, "rspec", settings, false)
+        rescue java.lang.NullPointerException
+          retry if fix_rmi_registry_npe
+          raise
+        end
       ensure
         extra_loaders = ::JRuby.runtime.instance_config.extra_loaders
         loader = extra_loaders.find { |l| l.class_loader == @karaf_instance_loader }
@@ -99,6 +104,7 @@ module OpenHAB
           java.lang.System.set_property("felix.cm.dir", felix_cm)
           # not handled by karaf instances
           java.lang.System.set_property("openhab.userdata", path)
+          @oh_userdata = nil
           java.lang.System.set_property("openhab.logdir", "#{path}/logs")
         end
         cleanup_instance
@@ -129,6 +135,7 @@ module OpenHAB
 
         set_up_bundle_listener
         wait_for_start
+        Mocks::SynchronousExecutor.instance.main_thread = Thread.current
         set_jruby_script_presets
         @main
       end
@@ -258,8 +265,6 @@ module OpenHAB
             props.remove("transformation")
             props.remove("ui")
             props.remove("binding") unless include_bindings
-            # except we need jrubyscripting
-            props.put("automation", "jrubyscripting")
             cfg.update(props)
 
             # configure persistence to use the mock service
@@ -302,7 +307,6 @@ module OpenHAB
       private_constant :BLOCKED_BUNDLE_TREES
 
       ALLOWED_BUNDLES = %w[
-        org.openhab.automation.jrubyscripting
         org.openhab.core.io.monitor
       ].freeze
       private_constant :ALLOWED_BUNDLES
@@ -420,12 +424,23 @@ module OpenHAB
               java.util.Hashtable.new(org.osgi.framework.Constants::SERVICE_RANKING => 1.to_java(:int))
             )
 
-            require_relative "mocks/thing_handler"
-            thf = Mocks::ThingHandlerFactory.instance
-            bundle = org.osgi.framework.FrameworkUtil.get_bundle(org.openhab.core.thing.Thing)
-            Mocks::BundleResolver.instance.register_class(thf.class, bundle)
-            bundle.bundle_context.register_service(org.openhab.core.thing.binding.ThingHandlerFactory.java_class, thf,
-                                                   nil)
+            wait_for_service("org.openhab.core.thing.ThingManager") do |tm|
+              tm.class.field_accessor :bundleResolver
+
+              tm.bundleResolver = Mocks::BundleResolver.instance
+
+              require_relative "mocks/safe_caller"
+              field = tm.class.java_class.declared_field :safeCaller
+              field.accessible = true
+              field.set(tm, Mocks::SafeCaller.instance)
+
+              require_relative "mocks/thing_handler"
+              thf = Mocks::ThingHandlerFactory.instance
+              bundle = org.osgi.framework.FrameworkUtil.get_bundle(org.openhab.core.thing.Thing)
+              Mocks::BundleResolver.instance.register_class(thf.class, bundle)
+              bundle.bundle_context.register_service(org.openhab.core.thing.binding.ThingHandlerFactory.java_class, thf,
+                                                     nil)
+            end
           end
           if bundle_name == "org.openhab.core.automation"
             org.openhab.core.automation.internal.TriggerHandlerCallbackImpl.field_accessor :executor
@@ -549,31 +564,22 @@ module OpenHAB
       # import global variables and constants that the DSL expects,
       # since we're going to be running it in this same VM
       def set_jruby_script_presets
-        wait_for_service("org.openhab.core.automation.module.script.ScriptEngineFactory",
-                         filter: "(service.config.description.uri=automation:jruby)") do |jrubyscripting|
-          # "org.openhab.core.automation.module.script.internal.ScriptExtensionManager") do |sem|
-          sem = OSGi.service(
-            "org.openhab.core.automation.module.script.internal.ScriptExtensionManager"
-          )
+        wait_for_service("org.openhab.core.automation.module.script.internal.ScriptExtensionManager") do |sem|
           # since we're not created by the ScriptEngineManager, this never gets set; manually set it
           $se = $scriptExtension = ScriptExtensionManagerWrapper.new(sem)
           scope_values = sem.find_default_presets("rspec")
-          scope_values = scope_values.entry_set
-
-          %w[mapInstancePresets mapGlobalPresets].each do |method_name|
-            method = jrubyscripting.class.java_class.get_declared_method(method_name, java.util.Map::Entry.java_class)
-
-            method.accessible = true
-            scope_values = scope_values.map { |e| method.invoke(nil, e) }
-          end
+          scope_values = scope_values.entry_set.to_a
 
           scope_values.each do |entry|
             key = entry.key
             value = entry.value
             # convert Java classes to Ruby classes
             value = value.ruby_class if value.is_a?(java.lang.Class) # rubocop:disable Lint/UselessAssignment
-            # constants need to go into the global namespace
-            key = "::#{key}" if ("A".."Z").cover?(key[0])
+            # variables are globals; constants go into the global namespace
+            key = case key[0]
+                  when "a".."z" then "$#{key}"
+                  when "A".."Z" then "::#{key}"
+                  end
             eval("#{key} = value unless defined?(#{key})", nil, __FILE__, __LINE__) # rubocop:disable Security/Eval
           end
         end
@@ -796,7 +802,6 @@ module OpenHAB
                     <f:feature>openhab-core-model-sitemap</f:feature>
                     <f:feature>openhab-core-model-thing</f:feature>
                     <f:feature>openhab-core-storage-json</f:feature>
-                    <f:feature>openhab-automation-jrubyscripting</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>
@@ -806,6 +811,24 @@ module OpenHAB
           </featuresProcessing>
         XML
       end
+
+      def fix_rmi_registry_npe
+        full_path = File.join(oh_userdata, "etc/org.apache.karaf.management.cfg")
+        stat = File.stat(full_path)
+        return false unless stat.file? && stat.size.zero?
+
+        contents = <<~TEXT
+          # This file was autogenerated by openhab-jrubyscripting.
+          # Feel free to customize.
+          rmiRegistryPort = 1099
+          rmiServerPort = 44444
+        TEXT
+        begin
+          File.write(full_path, contents)
+        rescue Errno::EACCESS
+          abort "Unable to write to `#{full_path}`. Please use sudo and set it to:\n\n#{contents}"
+        end
+      end
     end
   end
 end

data/lib/openhab/rspec/mocks/synchronous_executor.rb

@@ -16,19 +16,25 @@ module OpenHAB
       end
 
       class SynchronousExecutor < java.util.concurrent.ScheduledThreadPoolExecutor
-        class << self
-          def instance
-            @instance ||= new(1)
-          end
+        include Singleton
+
+        attr_accessor :main_thread
+
+        def initialize
+          super(1)
         end
 
         def submit(runnable)
+          return super unless Thread.current == main_thread
+
           runnable.respond_to?(:run) ? runnable.run : runnable.call
 
           java.util.concurrent.CompletableFuture.completed_future(nil)
         end
 
         def execute(runnable)
+          return super unless Thread.current == main_thread
+
           runnable.run
         end
 
@@ -37,6 +43,7 @@ module OpenHAB
         def shutdown_now
           []
         end
+        alias_method :shutdownNow, :shutdown_now
       end
 
       class SynchronousExecutorMap

data/lib/openhab/rspec/mocks/timer.rb

@@ -50,6 +50,7 @@ module OpenHAB
         end
 
         def reschedule(time = nil)
+          Thread.current[:openhab_rescheduled_timer] = true if Thread.current[:openhab_rescheduled_timer] == self
           @execution_time = new_execution_time(time || @time)
           @executed = false
 
@@ -62,8 +63,8 @@ module OpenHAB
           raise "Timer already cancelled" if cancelled?
           raise "Timer already executed" if terminated?
 
-          super
           @executed = true
+          super
         end
 
         def cancel

data/lib/openhab/rspec/suspend_rules.rb

@@ -21,7 +21,9 @@ module OpenHAB
               process_queue(create_queue(inputs), mod, inputs)
             end
           rescue Exception => e
-            @run_context.logger.log_exception(e)
+            raise if defined?(::RSpec) && ::RSpec.current_example.example_group.propagate_exceptions?
+
+            @run_context.send(:logger).log_exception(e)
           end
         end
       end
@@ -29,7 +31,7 @@ module OpenHAB
       # DSL::Rules::AutomationRule.prepend(AutomationRule)
 
       module DSL
-        def after(*)
+        def after(*, **)
           return if SuspendRules.suspended?
 
           super

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-jrubyscripting
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc2
+  version: 5.0.0.rc4
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-22 00:00:00.000000000 Z
+date: 2022-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -354,6 +368,11 @@ files:
 - lib/openhab/core/profile_factory.rb
 - lib/openhab/core/provider.rb
 - lib/openhab/core/registry.rb
+- lib/openhab/core/rules.rb
+- lib/openhab/core/rules/module.rb
+- lib/openhab/core/rules/provider.rb
+- lib/openhab/core/rules/registry.rb
+- lib/openhab/core/rules/rule.rb
 - lib/openhab/core/script_handling.rb
 - lib/openhab/core/things.rb
 - lib/openhab/core/things/channel.rb
@@ -392,8 +411,10 @@ files:
 - lib/openhab/core_ext.rb
 - lib/openhab/core_ext/java/class.rb
 - lib/openhab/core_ext/java/duration.rb
+- lib/openhab/core_ext/java/list.rb
 - lib/openhab/core_ext/java/local_date.rb
 - lib/openhab/core_ext/java/local_time.rb
+- lib/openhab/core_ext/java/map.rb
 - lib/openhab/core_ext/java/month.rb
 - lib/openhab/core_ext/java/month_day.rb
 - lib/openhab/core_ext/java/period.rb
@@ -404,6 +425,7 @@ files:
 - lib/openhab/core_ext/ruby/array.rb
 - lib/openhab/core_ext/ruby/class.rb
 - lib/openhab/core_ext/ruby/date.rb
+- lib/openhab/core_ext/ruby/date_time.rb
 - lib/openhab/core_ext/ruby/numeric.rb
 - lib/openhab/core_ext/ruby/range.rb
 - lib/openhab/core_ext/ruby/time.rb
@@ -434,7 +456,6 @@ files:
 - lib/openhab/dsl/rules/triggers/updated.rb
 - lib/openhab/dsl/rules/triggers/watch/watch.rb
 - lib/openhab/dsl/rules/triggers/watch/watch_handler.rb
-- lib/openhab/dsl/script_handling.rb
 - lib/openhab/dsl/things/builder.rb
 - lib/openhab/dsl/thread_local.rb
 - lib/openhab/dsl/timer_manager.rb

data/lib/openhab/dsl/script_handling.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module OpenHAB
-  module DSL
-  end
-end