roku_builder 4.22.6 → 4.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90140ab7e4b496a8d416fe3f97528c7c703e3b2454c96d76b04ef5bca00b79d3
-  data.tar.gz: adbbbc91a49e66cf79bb1cccffb92d90429c4cfc70e64d0bbf498563af955280
+  metadata.gz: 373790650070231c745746cd44c6ad316f34746e27fd73a4849b2d02279df624
+  data.tar.gz: de065657de7cf806f4db60a01230eef93d1f92aba581c5456752367e01554900
 SHA512:
-  metadata.gz: 33237bd2989eae2fd3c6c7130f1c5ccca17761c03e60bf1144038531559807e0e2fd3f40acbd5a56493350e2f2b527cbee7adccba3ce72faee30f595ec1b1dda
-  data.tar.gz: ace218a8fb325fb3684bcce31890147ee1104576c7c1d8198392157311aeb6b9c2fbe8e957fd70af9a85d041643a0f32b65f92d28642ed2567628fe7d1282d0c
+  metadata.gz: 16a02701b5eaed8f0f6dbee5edd0c42d3f26481139384aac9ecc545c96695259d0c4509274b3543cf5fd137c55f9ae19e27dda9f21a0813a725f6d1e0ae870ce
+  data.tar.gz: 01fbc2cd1d4bf08f4ee2f8a8fed846300d0a6629b54cb6a45484af7b4ff0388dde3ebfc84ac7d940bed5697700c5be690bc7491c10fcc366a374c59a8caaf75f

data/lib/roku_builder/config.rb

@@ -126,7 +126,12 @@ module RokuBuilder
       if File.exist?(local_config_path) and !@loaded_configs.include?(File.expand_path(local_config_path))
         local_config_hash = read_config(File.open(local_config_path))
         add_missing_directories(local_config_hash)
+        local_sub_configs = "./.roku_config/*.json"
         @config = @config.deep_merge(local_config_hash)
+        Dir.glob("./.roku_config/*.json").each do |sub_config_path|
+          sub_config_hash = read_config(File.open(sub_config_path))
+          @config = @config.deep_merge(sub_config_hash)
+        end
       end
     end
 

data/lib/roku_builder/plugins/analyzer.rb

@@ -65,11 +65,13 @@ module RokuBuilder
     def run_sca_tool(path:, ssai:)
       if OS.unix?
         command = File.join(File.dirname(__FILE__), "sca-cmd", "bin", "sca-cmd")
+        stderr = "/dev/null"
       else
         command = File.join(File.dirname(__FILE__), "sca-cmd", "bin", "sca-cmd.bat")
+        stderr = "nul"
       end
       @logger.debug("Command: '#{command}'")
-      results = `#{command} #{path}`.split("\n")
+      results = `#{command} #{path} 2>#{stderr}`.split("\n")
       process_sca_results(results, ssai)
     end
 
@@ -96,6 +98,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.6"
+  VERSION = "4.23.0"
 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("core")
+      refute_nil plugin_name
+      assert_match "RokuBuilder::Core", plugin_name.to_s
+    end
   end
 end
 

data/test/roku_builder/test_config.rb

@@ -163,6 +163,37 @@ module RokuBuilder
       assert_equal `pwd`.chomp, config.raw[:projects][:p2][:directory]
     end
 
+    def test_config_read_local_sub_config
+      options = build_options({config: File.join(test_files_path(ConfigTest), "config.json"), validate: true})
+      config = Config.new(options: options)
+
+      mock = Minitest::Mock.new
+      io = proc { |path|
+        if path == './.roku_config.json' or path == "keys.json"
+          mock
+        else
+          IO.new(IO.sysopen(path))
+        end
+      }
+      local_config_content = IO.read(File.join(test_files_path(ConfigTest), "local.json"))
+      mock.expect(:read, local_config_content)
+      local_sub_config_content = IO.read(File.join(test_files_path(ConfigTest), "local_sub.json"))
+      mock.expect(:read, local_sub_config_content)
+
+      File.stub(:exist?, true) do
+        File.stub(:open, io) do
+          Dir.stub(:glob, ["keys.json"]) do
+            config.load
+          end
+        end
+      end
+
+      mock.verify
+      refute_nil config.raw[:keys]
+      refute_nil config.raw[:keys][:test_key]
+      assert_equal "password", config.raw[:keys][:test_key][:password]
+    end
+
     def test_config_edit
       orginal = File.join(test_files_path(ConfigTest), "config.json")
       tmp = File.join(test_files_path(ConfigTest), "tmpconfig.json")

data/test/roku_builder/test_files/analyzer_test/source/main.brs

@@ -23,6 +23,10 @@ sub main(externalParams)
   scene.observeField("exitApplication", port)
   scene.observeField("sessionLength", port)
 
+  scene.signalBeacon("AppLaunchComplete")
+  scene.signalBeacon("AppDialogInitiate")
+  scene.signalBeacon("AppDialogComplete")
+
   while(true)
     msg = wait(0, port)
     msgType = type(msg)

data/test/roku_builder/test_files/config_test/local_sub.json

@@ -0,0 +1,8 @@
+{
+  "keys": {
+    "test_key": {
+      "keyed_pkg": "/key/path",
+      "password": "password"
+    }
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.22.6
+  version: 4.23.0
 platform: ruby
 authors:
 - greeneca
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -557,6 +557,7 @@ files:
 - test/roku_builder/test_files/config_test/child.json
 - test/roku_builder/test_files/config_test/config.json
 - test/roku_builder/test_files/config_test/local.json
+- test/roku_builder/test_files/config_test/local_sub.json
 - test/roku_builder/test_files/config_test/multi_repeat_stages.json
 - test/roku_builder/test_files/config_test/no_default_device.json
 - test/roku_builder/test_files/config_test/no_default_project.json
@@ -684,6 +685,7 @@ test_files:
 - test/roku_builder/test_files/config_test/child.json
 - test/roku_builder/test_files/config_test/config.json
 - test/roku_builder/test_files/config_test/local.json
+- test/roku_builder/test_files/config_test/local_sub.json
 - test/roku_builder/test_files/config_test/multi_repeat_stages.json
 - test/roku_builder/test_files/config_test/no_default_device.json
 - test/roku_builder/test_files/config_test/no_default_project.json