openhab-jrubyscripting 5.0.0.rc6 → 5.0.0.rc9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '073238949bf5ae76587de8f6bfedc6ef15c2e3ab86303fe6f7c1ca8ec874c33e'
-  data.tar.gz: 4846aaca23d7f772f558777ab8703cb6ea7d4e6b307c47a8f507fe468963620c
+  metadata.gz: b818f8062ce950e265819455075b42fd1cf2d1fc6270b57f547b3e93f19f0656
+  data.tar.gz: '08c396633d12172da0751719196247319731205b9ee6704ea4844bd3709321aa'
 SHA512:
-  metadata.gz: 2a89863d588557b92642b12ba341c12c101b39079c18035cfec040b02172ee8b789d03c3b6f8bd7a636e9b72be6379819b654b19ec90dc6edfa7c2d4f738a515
-  data.tar.gz: a1c2906913f3578c75ee806aa45ded0017610a5e582280bc8bf19fc08316e2dfc539b0aa2829128ed65de24cf07f038d67faa259d3dd8847f3e9aaec05a60ea2
+  metadata.gz: ac9760ebe37190c941c973a4526ec8b8a7a2b1584585f324f80c531849f879f7cb471bcbac1beae02f3412fb6822fbb7e50e343e6e015e5ddbb9f5b552712a70
+  data.tar.gz: bc0ec52bafce17c3f090984370d98695fa49bfc1799293d1d6f421764f7a8ecfbe814c6d2b7bd6b03f023c0daefa517f3595bebcd7c0af53d0ce53ee153d4360

data/lib/openhab/core.rb

@@ -88,7 +88,7 @@ module OpenHAB
       end
     end
 
-    import_default_presets
+    import_default_presets unless defined?($ir)
   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.0.0.rc6"
+    VERSION = "5.0.0.rc9"
   end
 end

data/lib/openhab/rspec/helpers.rb

@@ -184,7 +184,7 @@ module OpenHAB
       def autorequires
         ENV["RUBYLIB"] ||= ""
         ENV["RUBYLIB"] += ":" unless ENV["RUBYLIB"].empty?
-        ENV["RUBYLIB"] += rubylib_dir
+        ENV["RUBYLIB"] += rubylib_dirs.join(":")
 
         $LOAD_PATH.unshift(*ENV["RUBYLIB"]
           .split(File::PATH_SEPARATOR)
@@ -265,10 +265,15 @@ module OpenHAB
       # @return [void]
       #
       def load_rules
-        automation_path = "#{org.openhab.core.OpenHAB.config_folder}/automation/jsr223"
+        automation_path = "#{org.openhab.core.OpenHAB.config_folder}/automation/ruby"
+        lib_dirs = rubylib_dirs.map { |d| File.join(d, "") }
+        lib_dirs << File.join(gem_home, "")
 
         SuspendRules.suspend_rules do
           files = Dir["#{automation_path}/**/*.rb"]
+          files.reject! do |f|
+            lib_dirs.any? { |l| f.start_with?(l) }
+          end
           files.sort_by { |f| [get_start_level(f), f] }.each do |f|
             load f
           rescue Exception => e
@@ -376,8 +381,17 @@ module OpenHAB
         ca.get_configuration("org.openhab.automation.jrubyscripting", nil)&.properties
       end
 
-      def rubylib_dir
-        jrubyscripting_config&.get("rubylib") || "#{org.openhab.core.OpenHAB.config_folder}/automation/lib/ruby"
+      def gem_home
+        gem_home = jrubyscripting_config&.get("gem_home")
+        return "#{org.openhab.core.OpenHAB.config_folder}/automation/ruby/.gem" unless gem_home
+
+        # strip everything after the first {
+        gem_home.split("{", 2).first
+      end
+
+      def rubylib_dirs
+        jrubyscripting_config&.get("rubylib")&.split(File::PATH_SEPARATOR) ||
+          ["#{org.openhab.core.OpenHAB.config_folder}/automation/ruby/lib"]
       end
 
       def get_start_level(file)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-jrubyscripting
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc6
+  version: 5.0.0.rc9
 platform: ruby
 authors:
 - Cody Cutrer
@@ -488,7 +488,6 @@ files:
 - lib/openhab/rspec/shell.rb
 - lib/openhab/rspec/suspend_rules.rb
 - lib/openhab/yard.rb
-- lib/openhab/yard/base_helper.rb
 - lib/openhab/yard/cli/stats.rb
 - lib/openhab/yard/code_objects/group_object.rb
 - lib/openhab/yard/code_objects/java/base.rb
@@ -503,8 +502,6 @@ files:
 - lib/openhab/yard/handlers/jruby/java_import_handler.rb
 - lib/openhab/yard/handlers/jruby/mixin_handler.rb
 - lib/openhab/yard/html_helper.rb
-- lib/openhab/yard/markdown_directive.rb
-- lib/openhab/yard/markdown_helper.rb
 - lib/openhab/yard/tags/constant_directive.rb
 - lib/openhab/yard/tags/group_directive.rb
 - lib/openhab/yard/tags/library.rb

data/lib/openhab/yard/base_helper.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require "nokogiri"
-
-module OpenHAB
-  module YARD
-    # @!visibility private
-    module BaseHelper
-      def preprocess(text)
-        html = Nokogiri::HTML5.fragment(text)
-
-        context = if ENV["ADDON"]
-                    :addon
-                  else
-                    :yard
-                  end
-
-        # process directives on which content is supposed to be included in this context
-        node = html.children.first
-        loop do
-          break unless node
-
-          next_node = node.next
-
-          if node.comment? && (directive = MarkdownDirective.new(node)).directive?
-            next_node = directive.process(context) || next_node
-          end
-          node = next_node
-        end
-
-        html.to_s
-      end
-
-      def link_object(obj, title = nil, *)
-        ::YARD::Handlers::JRuby::Base.infer_java_class(obj) if obj.is_a?(String)
-        obj = ::YARD::Registry.resolve(object, obj, true, true) if obj.is_a?(String)
-        if obj.is_a?(::YARD::CodeObjects::Java::Base) && (see = obj.docstring.tag(:see))
-          # link to the first see tag
-          return linkify(see.name, title&.to_s || see.text)
-        end
-
-        super
-      end
-    end
-  end
-end

data/lib/openhab/yard/markdown_directive.rb

@@ -1,125 +0,0 @@
-# frozen_string_literal: true
-
-require "nokogiri"
-
-module OpenHAB
-  module YARD
-    # @!visibility private
-    class MarkdownDirective
-      attr_reader :comment, :context
-
-      def initialize(comment)
-        @comment = comment
-        @lines = comment.text.split("\n")
-        directive_text = @lines.first.strip
-
-        @multiline = @lines.length > 1
-        @directive = false
-        return unless (match = directive_text.match(%r{^<(/)?(!)?([a-z]+)-only>$}))
-
-        @closing = match[1]
-        @context = match[3].to_sym
-        @inverted = match[2]
-
-        if closing? && multiline?
-          log.warn "In file `#{file}':#{line}: Multiline closing directives are not allowed (#{directive_text})."
-          return
-        end
-        @directive = true
-      end
-
-      def directive?
-        @directive
-      end
-
-      def multiline?
-        @multiline
-      end
-
-      def closing?
-        @closing
-      end
-
-      def inverted?
-        @inverted
-      end
-
-      def match?(context)
-        result = context == self.context
-        result = !result if inverted?
-        result
-      end
-
-      def closing_directive
-        return nil if multiline?
-
-        unless instance_variable_defined?(:@closing_directive)
-          next_node = @comment.next
-          loop do
-            return @closing_directive = nil unless next_node
-
-            if next_node.comment?
-              directive = MarkdownDirective.new(next_node)
-              if directive.directive? &&
-                 directive.closing? &&
-                 directive.context == context &&
-                 directive.inverted? == inverted?
-                return @closing_directive = next_node
-              end
-            end
-
-            next_node = next_node.next
-          end
-        end
-        @closing_directive
-      end
-
-      def process(context)
-        return unless directive?
-        return if closing?
-
-        matched = match?(context)
-
-        # if it's a matched multiline, extract the contents and insert them directly,
-        # and remove the comment
-        if multiline?
-          result = comment.next
-          comment.before(Nokogiri::HTML5.fragment(@lines[1..].join("\n"))) if matched
-          comment.remove
-          return result
-        end
-
-        unless closing_directive
-          log.warn "In file `#{file}':#{line}: Unmatched directive <#{"!" if inverted?}#{context}-only>."
-          return
-        end
-
-        result = closing_directive.next
-
-        unless matched
-          # remove all nodes between the opening and closing directives
-          comment.next.remove while comment.next != closing_directive
-        end
-        # now remove the directives themselves
-        closing_directive.remove
-        comment.remove
-        result
-      end
-
-      def file
-        ((defined?(@file) && @file) ? @file.filename : object.file) || "(unknown)"
-      end
-
-      def line
-        return @line if instance_variable_defined?(@line)
-
-        @line = (if defined?(@file) && @file
-                   1
-                 else
-                   (object.docstring.line_range ? object.docstring.line_range.first : 1)
-                 end) + (match ? $`.count("\n") : 0)
-        @line += comment.line - 1
-      end
-    end
-  end
-end

data/lib/openhab/yard/markdown_helper.rb

@@ -1,99 +0,0 @@
-# frozen_string_literal: true
-
-require "nokogiri"
-
-module OpenHAB
-  module YARD
-    # @!visibility private
-    module MarkdownHelper
-      # @group Linking Objects and URLs
-
-      def diskfile
-        preprocess(super)
-      end
-
-      # mostly copied from HTMLHelper
-      def resolve_links(text)
-        blockquotes = false
-        text.gsub(%r{(```)|(\\|!)?\{(?!\})(\S+?)(?:\s([^\}]*?\S))?\}(?=[\W<]|.+</|$)}m) do |str|
-          blockquote = $1
-          escape = $2
-          name = $3
-          title = $4
-          match = $&
-          if blockquote
-            blockquotes = !blockquotes
-            next str
-          end
-          next str if blockquotes
-
-          next(match[1..-1]) if escape
-
-          next(match) if name[0, 1] == '|'
-
-          if object.is_a?(String)
-            object
-          else
-            link = linkify(name, title)
-            if (link == name || link == title) && (name + ' ' + link !~ /\A<a\s.*>/)
-              match = /(.+)?(\{#{Regexp.quote name}(?:\s.*?)?\})(.+)?/.match(text)
-              file = (defined?(@file) && @file ? @file.filename : object.file) || '(unknown)'
-              line = (defined?(@file) && @file ? 1 : (object.docstring.line_range ? object.docstring.line_range.first : 1)) + (match ? $`.count("\n") : 0)
-              log.warn "In file `#{file}':#{line}: Cannot resolve link to #{name} from text" + (match ? ":" : ".") +
-                       "\n\t" + (match[1] ? '...' : '') + match[2].delete("\n") + (match[3] ? '...' : '') if match
-            end
-
-            link
-          end
-        end
-      end
-
-      # mostly copied from HTMLHelper
-      def link_object(obj, title = nil, anchor = nil, relative = true)
-        return title if obj.nil?
-
-        obj = Registry.resolve(object, obj, true, true) if obj.is_a?(String)
-
-        was_const = false
-        # Re-link references to constants that are aliases to their target. But keep
-        # their current title.
-        while obj.is_a?(CodeObjects::ConstantObject) && obj.target
-          title ||= h(object.relative_path(obj)).to_s
-          was_const = true
-          obj = obj.target
-        end
-        return link_object(obj, title, anchor, relative) if was_const
-
-        title = if title
-                  title.to_s
-                elsif object.is_a?(CodeObjects::Base)
-                  # Check if we're linking to a class method in the current
-                  # object. If we are, create a title in the format of
-                  # "CurrentClass.method_name"
-                  if obj.is_a?(CodeObjects::MethodObject) && obj.scope == :class && obj.parent == object
-                    h([object.name, obj.sep, obj.name].join)
-                  elsif obj.title != obj.path
-                    h(obj.title)
-                  else
-                    h(object.relative_path(obj))
-                  end
-                else
-                  h(obj.title)
-                end
-        return title unless serializer
-        return title if obj.is_a?(CodeObjects::Proxy)
-
-        link = url_for(obj, anchor, relative)
-        link ? link_url(link, title, title: h("#{obj.title} (#{obj.type})")) : title
-      rescue Parser::UndocumentableError
-        log.warn "The namespace of link #{obj.inspect} is a constant or invalid."
-        title || obj.to_s
-      end
-
-      def link_url(url, title = nil, _params = nil)
-        title ||= url
-        "[#{title}](#{url})"
-      end
-    end
-  end
-end