roku_builder 4.22.9 → 4.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 914ac6d549694894942d8d6904f65a24b83f146841191dcd04a7c367e04902f7
-  data.tar.gz: b2fa7a6ddfdb98276d2a34f15eba26b385c8b1b5e5c72ba635cd589434252bbb
+  metadata.gz: b072e460501a9671d72c7014a21bfb00754563439d6e9bef567988c51607a362
+  data.tar.gz: 3ee7363cd19dfdb08217498c107508299e26f692a4dfb040846e14cfc4402411
 SHA512:
-  metadata.gz: 35c1dc3f99d5761397b924e38473424fd302c52a5dd0111b3c326e247358d3a4a2c16aefde7cab6377ecccdf0bef3447ad46e09f69916b35fb62e4a18a97d0d3
-  data.tar.gz: 3bc352f2204af791ddfc8d0a7ca7993ab97a0da684f8bc54e70a07a5190913cd1294181d9b0cf5ddf22d0edb664b8fcae6deef6fa893b46085facddc51a52e85
+  metadata.gz: 5f4eee2ac6a7a516c508a1339ea70bc941c66901744322fe27ce743ec161649fe7623141d04458d330edf473a063775a5ffe6513414dea607336e1af26b69577
+  data.tar.gz: 45de05bd19128a26f5443104c84535bf1ca0466de87efb94c177854dd871ae344c04391b4e1e50870177b30b8fc84a2e7587506ee29bffdd6010eb05bc55efaa

data/README.md

@@ -1,9 +1,9 @@
 # RokuBuilder
 
 [![Gem Version](https://badge.fury.io/rb/roku_builder.svg)](https://badge.fury.io/rb/roku_builder)
-[![Build Status](https://travis-ci.org/ViacomInc/roku_builder.svg?branch=master)](https://travis-ci.org/ViacomInc/roku_builder)
 [![Coverage Status](https://coveralls.io/repos/github/ViacomInc/roku_builder/badge.svg?branch=master)](https://coveralls.io/github/ViacomInc/roku_builder?branch=master)
 [![Code Climate](https://codeclimate.com/github/ViacomInc/roku_builder/badges/gpa.svg)](https://codeclimate.com/github/ViacomInc/roku_builder)
+<!-- [![Build Status](https://travis-ci.org/ViacomInc/roku_builder.svg?branch=master)](https://travis-ci.org/ViacomInc/roku_builder) -->
 
 A tool to help with Roku Development. Assists with many development/deployment
 tasks. More information can be found in the [wiki](https://github.com/ViacomInc/roku_builder/wiki).

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,14 +169,17 @@ 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
 
     def get_global_key_config
+      raise ParseError, "No Keys Configured" unless @config[:keys]
       raise ParseError, "Unknown Key: #{@parsed[:key]}" unless @config[:keys][@parsed[:key].to_sym]
       @parsed[:key] = @config[:keys][@parsed[:key].to_sym].dup
       if @config[:keys][:key_dir]  and !@parsed[:key][:keyed_pkg].start_with?("./")

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
 

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}

data/lib/roku_builder/plugins/indentation_inspector.rb

@@ -14,7 +14,7 @@ module RokuBuilder
     end
 
     def check_line(line:, number:, comment:)
-      #byebug if number == 10 and @path.ends_with?(".brs")
+      #byebug if number == 190 and @path.ends_with?("ScreenManager.brs")
       set_indentation(line: line)
       regexp = /^#{@character}{#{@ind}}[^#{@character}]/
       unless line =~ regexp or line == "\n" or line =~ /\'indent-ignore/ or comment
@@ -47,10 +47,12 @@ module RokuBuilder
               @ind += @count
             elsif @prev_line =~ /:\s*\bfunction\b|:\s*\bsub\b/i
               @ind += @count
+            elsif @prev_line =~ /=\s*\bfunction\b|=\s*\bsub\b/i
+              @ind += @count
             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

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.9"
+  VERSION = "4.24.0"
 end

data/roku_builder.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = "~> 2.3"
+  spec.required_ruby_version = "~> 3.0"
 
   spec.add_dependency "rubyzip",             "~> 1.2"
   spec.add_dependency "faraday",             "~> 0.13"

data/test/roku_builder/plugins/test_core.rb

@@ -123,9 +123,9 @@ module RokuBuilder
     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
+      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/plugins/test_monitor.rb

@@ -138,7 +138,7 @@ module RokuBuilder
       all_text = "midline "
       txt = "split\nBrightScript Debugger> "
 
-      result = @monitor.send(:manage_text, {all_text: all_text, txt: txt})
+      result = @monitor.send(:manage_text, all_text: all_text, txt: txt)
 
       assert_equal "", result
 
@@ -148,7 +148,7 @@ module RokuBuilder
 
     def test_monitor_manage_text_connection_used
       assert_raises ExecutionError do
-        @monitor.send(:manage_text, {all_text: "", txt: "Console connection is already in use."})
+        @monitor.send(:manage_text, all_text: "", txt: "Console connection is already in use.")
       end
     end
   end

data/test/roku_builder/plugins/test_tester.rb

@@ -67,7 +67,7 @@ module RokuBuilder
       tester = Tester.new(config: config)
 
       text = "this\nis\na\ntest\nparagraph"
-      tester.send(:handle_text, {txt: text})
+      tester.send(:handle_text, txt: text)
 
       refute tester.instance_variable_get(:@in_tests)
     end
@@ -79,7 +79,7 @@ module RokuBuilder
 
       text = ["this","is","a","test","paragraph"]
 
-      tester.send(:handle_text, {txt: text.join("\n")})
+      tester.send(:handle_text, txt: text.join("\n"))
       assert_equal text, tester.instance_variable_get(:@logs)
       assert tester.instance_variable_get(:@in_tests)
     end
@@ -91,7 +91,7 @@ module RokuBuilder
       text = ["this","*Start testing*","is","a","test","*End testing*","paragraph"]
       verify_text = ["***************","***************","*Start testing*","is","a","test","*End testing*","*************","*************"]
 
-      tester.send(:handle_text, {txt: text.join("\n")})
+      tester.send(:handle_text, txt: text.join("\n"))
       refute tester.instance_variable_get(:@in_tests)
       assert_equal verify_text, tester.instance_variable_get(:@logs)
     end
@@ -103,7 +103,7 @@ module RokuBuilder
       text = ["connection already in use"]
 
       assert_raises IOError do
-        tester.send(:handle_text, {txt: text.join("\n")})
+        tester.send(:handle_text, txt: text.join("\n"))
       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"
+    }
+  }
+}

data/test/roku_builder/test_logger.rb

@@ -42,7 +42,7 @@ module RokuBuilder
     def test_logger_testing
       Logger.set_testing
       logger = Logger.instance
-      assert_equal "/dev/null", logger.instance_variable_get(:@logdev).instance_variable_get(:@filename)
+      assert_nil logger.instance_variable_get(:@logdev).instance_variable_get(:@filename)
     end
   end
 end

data/test/roku_builder/test_options.rb

@@ -26,7 +26,7 @@ module RokuBuilder
       parse_stub = lambda{ count+= 1; {validate: true} }
       options = Options.allocate
       options.stub(:parse, parse_stub) do
-        options.send(:initialize, {options: {validate: true}})
+        options.send(:initialize, options: {validate: true})
       end
       assert_equal 0, count
     end
@@ -133,7 +133,7 @@ module RokuBuilder
       options = Options.allocate
       options.stub(:source_command?, true) do
         assert_raises InvalidOptions do
-          options.send(:initialize, {options: {validate: true}})
+          options.send(:initialize, options: {validate: true})
           options.validate
         end
       end
@@ -164,7 +164,7 @@ module RokuBuilder
       logger.expect(:warn, nil, ["Depricated"])
       Logger.class_variable_set(:@@instance, logger)
       options.stub(:depricated_options, {validate: "Depricated"}) do
-        options.send(:initialize, {options: {validate: true}})
+        options.send(:initialize, options: {validate: true})
         options.validate
       end
       logger.verify

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.22.9
+  version: 4.24.0
 platform: ruby
 authors:
 - greeneca
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2022-01-06 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
@@ -625,14 +626,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Build Tool for Roku Apps
@@ -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