roku_builder 4.22.5 → 4.22.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff75b5fd7976aa19af20672846c724440f9c00cfdfddcf516e3c9fc736df31b3
-  data.tar.gz: a7dc6e1bbd189831f75c87ea616d92164c58e2271aca276fd881760a0a3d72c0
+  metadata.gz: 914ac6d549694894942d8d6904f65a24b83f146841191dcd04a7c367e04902f7
+  data.tar.gz: b2fa7a6ddfdb98276d2a34f15eba26b385c8b1b5e5c72ba635cd589434252bbb
 SHA512:
-  metadata.gz: 0f80b706f07170642bb5fb2a754ecccd42d66e672ff355c94c353480edfb75b18aca8a78e3c13e40835bb6160a9622984aea331794a37e4fb75fbf70abd1345d
-  data.tar.gz: 4f6f9697af2923ddac05ccb67d1f4f17f095730a87126acb0d61325ef0bca2fe7a1a38a34b480da85cac8c0b5b149df692f94489cb85a5ced588d53c714e7478
+  metadata.gz: 35c1dc3f99d5761397b924e38473424fd302c52a5dd0111b3c326e247358d3a4a2c16aefde7cab6377ecccdf0bef3447ad46e09f69916b35fb62e4a18a97d0d3
+  data.tar.gz: 3bc352f2204af791ddfc8d0a7ca7993ab97a0da684f8bc54e70a07a5190913cd1294181d9b0cf5ddf22d0edb664b8fcae6deef6fa893b46085facddc51a52e85

data/lib/roku_builder/plugins/analyzer.rb

@@ -64,7 +64,7 @@ module RokuBuilder
 
     def run_sca_tool(path:, ssai:)
       if OS.unix?
-         command = "export JAVA_HOME='JDK 11'; " + File.join(File.dirname(__FILE__), "sca-cmd", "bin", "sca-cmd")
+        command = File.join(File.dirname(__FILE__), "sca-cmd", "bin", "sca-cmd")
       else
         command = File.join(File.dirname(__FILE__), "sca-cmd", "bin", "sca-cmd.bat")
       end
@@ -96,6 +96,11 @@ module RokuBuilder
         if ssai and /SetAdUrl\(\) method is missing/.match(@sca_warning[:message])
           return false
         end
+        libraries = @config.project[:libraries]
+        libraries ||= []
+        if @sca_warning[:path] and libraries.any_is_start?(@sca_warning[:path].gsub(/pkg:/, "")) and not @options[:include_libraries]
+          return false
+        end
         return true
       end
       return false

data/lib/roku_builder/plugins/core.rb

@@ -75,8 +75,9 @@ module RokuBuilder
       parser.on("--debug", "Print Debug messages") do
         options[:debug] = true
       end
-      parser.on("-h", "--help", "Show this message") do
-        puts parser
+      parser.on("-h", "--help [PLUGIN]", "Show help") do |h|
+        help_text = self.get_help_text(parser: parser, options: options, plugin_name: h)
+        puts help_text
         exit
       end
       parser.on("-v", "--version", "Show version") do
@@ -112,6 +113,30 @@ module RokuBuilder
     def dounstage(options:)
       Stager.new(config: @config, options: options).unstage
     end
+
+    def self.get_help_text(parser:, options:, plugin_name:)
+      plugin = self.get_plugin_by_name(plugin_name)
+      if nil == plugin
+        return parser.to_s
+      else
+        pluginParser = OptionParser.new
+        pluginParser.separator ""
+        pluginParser.separator "Options for #{plugin}:"
+        plugin.parse_options(parser: pluginParser, options: options)
+        return pluginParser.to_s
+      end
+    end
+
+    def self.get_plugin_by_name(name)
+      if name.nil?
+        return nil
+      end
+      pluginIndex = RokuBuilder.plugins.map{|pluginClass| pluginClass.name.split('::').last().downcase}.index(name.downcase)
+      if !pluginIndex.nil?
+        plugin = RokuBuilder.plugins[pluginIndex]
+        return plugin
+      end
+    end
   end
   RokuBuilder.register_plugin(Core)
 end

data/lib/roku_builder/plugins/indentation_inspector.rb

@@ -55,6 +55,8 @@ module RokuBuilder
               end
             elsif @prev_line =~ /^\s*\bfor\b|^\s*\bwhile\b/i
               @ind += @count
+            elsif @prev_line =~ /^\s*\btry\b|^\s*\bcatch\b/i
+              @ind += @count
             end
           end
           if line =~ /^\'/ or line =~ /\'indent-ignore/
@@ -62,11 +64,13 @@ module RokuBuilder
           elsif line =~ /^\s*[\}\]\)]/
             @ind -= @count
           elsif line =~ /^\s*\bfunction\b|^\s*\bsub\b/i
-            @ind -= 0
+            # Don't change indentation
           elsif line =~ /^\s*:?\s*#?end\b|^\s*#?endif\b|^\s*endfor\b|^\s*\bnext\b/i
             @ind -= @count
           elsif line =~ /^\s*#?else\b|^\s*elseif\b/i
             @ind -= @count
+          elsif line =~ /^\s*#?catch\b/i
+            @ind -= @count
           end
         end
       end

data/lib/roku_builder/version.rb

@@ -2,5 +2,5 @@
 
 module RokuBuilder
   # Version of the RokuBuilder Gem
-  VERSION = "4.22.5"
+  VERSION = "4.22.9"
 end

data/test/roku_builder/plugins/test_core.rb

@@ -108,6 +108,25 @@ module RokuBuilder
         core.dounstage(options: options)
       end
     end
+    def test_core_help
+      parser = OptionParser.new
+      options = {}
+      help_text = Core.get_help_text(parser: parser, options: options, plugin_name: nil)
+      assert help_text
+    end
+    def test_core_help_plugin
+      parser = OptionParser.new
+      options = {}
+      help_text = Core.get_help_text(parser: parser, options: options, plugin_name: "Loader")
+      assert help_text
+    end
+    def test_core_get_plugin_by_name
+      parser = OptionParser.new
+      options = {}
+      plugin_name = Core.get_plugin_by_name("loader")
+      assert plugin_name
+      assert_match "RokuBuilder::Loader", plugin_name.to_s
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.22.5
+  version: 4.22.9
 platform: ruby
 authors:
 - greeneca
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip