roku_builder 4.22.7 → 4.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69615f3a8b72c6ab7583a501c9fca23c3988a4256a542301a9c93ac2eca56136
-  data.tar.gz: 270e35b7fc859dc9730aa915c3444fe16135f6a98529dbcef95b3a9d4122c4e3
+  metadata.gz: 1d1ca3fbc26d92a86625530b1578517b2db8f0932f10a723e27e471a08d848da
+  data.tar.gz: 8c06399f94abd5dd482bce4111da7f647ca16497ab021ffc838c0387d924691c
 SHA512:
-  metadata.gz: 5ea0f11db87686bf2c476dc7584fbb1fb4c62a466d739740fafad06dfee6abc7727cc9ce93bd770ba2ef955ce5417df1e47f0536edc990eb1ee44dce3b4fad89
-  data.tar.gz: 486cb4bdf607ad9fb427edc5a2a2e0429407654a1b9fe63463c6b92a015d3434a3fac4b3615984efd71ad4cb01ee0a99e95ae30224a708bdd8c2ec20f8ec0118
+  metadata.gz: ebd9c0cddf2a18fd73f69c864152b2e78fa942bb1ffc63862f35ad767623b3d9e109c14aa0fca8b5f5a7511967732677bb6f885aec5db8908ab8ac56257228bd
+  data.tar.gz: a6e9341c1e88ed59b10a6c2aafc6c9cff8646509e0cc7fa6092b549724d8964a5a2d822a67561fd058853b8fd8d80a25bc5df2acd4ccdf1bb10c6053f4b9d110

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/config_parser.rb

@@ -169,10 +169,12 @@ module RokuBuilder
     end
 
     def setup_key_config
-      if @parsed[:stage]
-        @parsed[:key] = @parsed[:stage][:key]
-        get_global_key_config if @parsed[:key].class == String
-        test_key_file
+      if @options.keyed_command?
+        if @parsed[:stage]
+          @parsed[:key] = @parsed[:stage][:key]
+          get_global_key_config if @parsed[:key].class == String
+          test_key_file
+        end
       end
     end
 

data/lib/roku_builder/config_validator.rb

@@ -26,7 +26,7 @@ module RokuBuilder
     KEY_MISSING_PATH          = 19
     KEY_MISSING_PASSWORD      = 20
     INVALID_MAPPING_INFO      = 21
-    MISSING_KEY               = 22
+    #                         = 22
     MISSING_STAGE_METHOD      = 23
 
     def initialize(config:)
@@ -153,7 +153,6 @@ module RokuBuilder
       errors= [
         [STAGE_MISSING_BRANCH, (!stage[:branch] and project[:stage_method] == :git)],
         [STAGE_MISSING_SCRIPT, (!stage[:script] and project[:stage_method] == :script)],
-        [MISSING_KEY, (!!stage[:key] and stage[:key].class == String and (!@config[:keys] or !@config[:keys][stage[:key].to_sym]))]
       ]
       process_errors(errors: errors)
     end

data/lib/roku_builder/options.rb

@@ -31,6 +31,10 @@ module RokuBuilder
       device_commands.include?(command)
     end
 
+    def keyed_command?
+      keyed_commands.include?(command)
+    end
+
     def has_source?
       !(keys & sources).empty?
     end
@@ -41,7 +45,7 @@ module RokuBuilder
       RokuBuilder.plugins.each do |plugin|
         plugin.commands.each do |command, attributes|
           commands << command
-          [:device, :source, :exclude].each do |type|
+          [:device, :source, :exclude, :keyed].each do |type|
             if attributes[type]
               send("#{type}_commands".to_sym) << command
             end
@@ -148,5 +152,11 @@ module RokuBuilder
     def device_commands
       @device_commands ||= []
     end
+
+    # List of commands that require a key
+    # @return [Array<Symbol>] List of commands that require a key
+    def keyed_commands
+      @keyed_commands ||= []
+    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
 
@@ -98,7 +100,7 @@ module RokuBuilder
         end
         libraries = @config.project[:libraries]
         libraries ||= []
-        if libraries.any_is_start?(@sca_warning[:path].gsub(/pkg:/, "")) and not @options[:include_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

data/lib/roku_builder/plugins/core.rb

@@ -8,7 +8,7 @@ module RokuBuilder
     def self.commands
       {
         configure: {},
-        validate: {},
+        validate: {keyed: true},
         increment: {source: true, stage: true},
         dostage: {source: true},
         dounstage: {source: true}
@@ -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

@@ -50,11 +50,13 @@ module RokuBuilder
             elsif @prev_line =~ /^\s*\bfunction\b|^\s*\bsub\b/i
               @ind += @count
             elsif @prev_line =~ /^\s*#?if\b|^\s*#?else\b/i
-              unless @prev_line =~ /\bthen\b[ \t ]*[^' \r\n']+.*$/i or @prev_line =~ /\breturn\b/i
+              unless @prev_line =~ /\bthen\b[ \t]*[^' \r\n]+.*$/i or @prev_line =~ /\breturn\b/i
                 @ind += @count
               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/plugins/packager.rb

@@ -7,9 +7,9 @@ module RokuBuilder
 
     def self.commands
       {
-        package: {device: true, source: true, stage: true, exclude: true},
+        package: {device: true, source: true, stage: true, exclude: true, keyed: true},
         genkey: {device: true},
-        key: {device: true, source: true}
+        key: {device: true, source: true, keyed: true}
       }
     end
 

data/lib/roku_builder/version.rb

@@ -2,5 +2,5 @@
 
 module RokuBuilder
   # Version of the RokuBuilder Gem
-  VERSION = "4.22.7"
+  VERSION = "4.23.1"
 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_config_validator.rb

@@ -167,13 +167,6 @@ module RokuBuilder
       assert_equal [15, -1], validator.instance_variable_get(:@codes)
     end
 
-    def test_config_manager_validate_project_key
-      config = good_config
-      config[:projects][:project2][:stages][:production][:key] = "b"
-      validator = ConfigValidator.new(config: config)
-      assert_equal [22], validator.instance_variable_get(:@codes)
-    end
-
     def test_config_manager_validate_keys_pkg
       config = good_config
       config[:keys][:a][:keyed_pkg] = nil

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.7
+  version: 4.23.1
 platform: ruby
 authors:
 - greeneca
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-09-24 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