roku_builder 3.6.2 → 3.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cda87c8c79464c6cbaadc76552d553d1d4f992f8
-  data.tar.gz: b2f72f1595cb30bc54ba7fabde915ff1f5761454
+  metadata.gz: e7f742dbc20bf1b9b2c0d4630766b4cfe8331bcc
+  data.tar.gz: 0cc26f2c74cefc294825774d4224350bb776d9ad
 SHA512:
-  metadata.gz: f4bc039de589e530c0424df8067bc0985d54ce37ef356cd212a7d668a4934391ca41490d83d5af0710b291edf7a274b7a7787fb080275b43350a47cdacf7e5a8
-  data.tar.gz: f7470fa07bb4bb460ffc011d71a58bc278414674b0718b286cc4b1844a9f93bee3a441dc00912cef2aa3fec905be71258eb4ed72da065f9d04924574fe1dee09
+  metadata.gz: 6fa6683a5282913bfe575478f4bf944585890def77ef21dd76ec52e3bbcf0d89294a3cb749728f9ccbd5352d5d01aa6b279c06c5b7b5a9b34df4a84b4ec230b4
+  data.tar.gz: 07a18218d5a80791d8af63f529255db433379fa85b0ab1e3dc92eb03c64ec85979f690fad382e17d4d0b7a13aefd693c6c11efa5a9d5aee6259787e1570cf054

data/Gemfile

@@ -1,3 +1,5 @@
+# ********** Copyright 2016 Viacom, Inc. Apache 2.0 **********
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in roku_builder.gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roku_builder (3.6.2)
+    roku_builder (3.6.3)
       faraday (~> 0.9)
       faraday-digestauth (~> 0.2)
       git (~> 1.3)

data/Guardfile

@@ -1,3 +1,5 @@
+# ********** Copyright 2016 Viacom, Inc. Apache 2.0 **********
+
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 

data/LICENSE.txt

@@ -1,22 +1,14 @@
-Copyright (c) 2016 Viacom Inc.
+Copyright 2016 Viacom, Inc.
 
-MIT License
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+    http://www.apache.org/licenses/LICENSE-2.0
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -312,3 +312,7 @@ directory:
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin feature/my-new-feature`)
 5. Create a new Pull Request
+
+## License
+
+On June 1st, 2016, we switched this project from the MIT License to Apache 2.0

data/bin/roku

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# ********** Copyright 2016 Viacom, Inc. Apache 2.0 **********
 
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 

data/lib/roku_builder.rb

@@ -1,3 +1,5 @@
+# ********** Copyright 2016 Viacom, Inc. Apache 2.0 **********
+
 require "logger"
 require "faraday"
 require "faraday/digestauth"
@@ -134,7 +136,7 @@ module RokuBuilder
   IDENTICAL_SIDELOAD = 13
 end
 
-class String
+class ::String
   def underscore
     word = self.dup
     word.gsub!(/::/, '/')
@@ -145,3 +147,10 @@ class String
     word
   end
 end
+
+class ::Hash
+  def deep_merge(second)
+    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2  }
+    self.merge(second, &merger)
+  end
+end

data/lib/roku_builder/config_manager.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 module RokuBuilder
 
   # Load and validate config files.
@@ -53,6 +55,15 @@ module RokuBuilder
             value[:stage_method] = value[:stage_method].to_sym
           end
         end
+        config[:projects].each_pair do |key, value|
+          unless key == :default
+            if value[:parent] and config[:projects][value[:parent].to_sym]
+              new_value = config[:projects][value[:parent].to_sym]
+              new_value = new_value.deep_merge value
+              config[:projects][key] = new_value
+            end
+          end
+        end
         config
       rescue JSON::ParserError
         logger.fatal "Config file is not valid JSON"

data/lib/roku_builder/config_parser.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 module RokuBuilder
 
   # Contains methods that will parse the loaded config and generate
@@ -27,7 +29,7 @@ module RokuBuilder
       project_config = setup_project_config(config: config, options: options)
       return [project_config, nil, nil] unless project_config.class == Hash
       configs[:project_config] = project_config
-      stage_config, stage = setup_stage_config(configs: configs, options: options, logger: logger)
+      stage = setup_stage_config(configs: configs, options: options, logger: logger)[1]
       return [UNKNOWN_STAGE, nil, nil] unless stage
       setup_sideload_config(configs: configs, options: options)
       setup_package_config(configs: configs, options: options, stage: stage)

data/lib/roku_builder/config_validator.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 module RokuBuilder
 
   MISSING_DEVICES           = 1
@@ -30,18 +32,22 @@ module RokuBuilder
     # @return [Array] error codes for valid config (see self.error_codes)
     def self.validate_config(config:)
       codes = []
-      validate_device_structure(codes: codes, config: config)
-      validate_project_structure(codes: codes, config: config)
+      validate_structure(codes: codes, config: config)
       if config[:devices]
-        config[:devices].each {|k,v|
-          next if k == :default
-          validate_device(codes: codes, device: v)
+        config[:devices].each {|device, device_config|
+          next if device == :default
+          validate_device(codes: codes, device: device_config)
         }
       end
       if config[:projects]
-        config[:projects].each {|project,v|
+        config[:projects].each {|project,project_config|
           next if project == :default
-          validate_project(codes: codes, project: v)
+          validate_project(codes: codes, project: project_config)
+          if project_config[:stages]
+            project_config[:stages].each {|_stage, stage_config|
+              validate_stage(codes: codes, stage: stage_config, project: project_config)
+            }
+          end
         }
       end
       codes.uniq!
@@ -78,40 +84,39 @@ module RokuBuilder
       ]
     end
 
-    # Validates the roku config config structure
-    # @param codes [Array] array of error codes
-    # @param config [Hash] roku config object
-    def self.validate_device_structure(codes:, config:)
-      codes.push(MISSING_DEVICES) if not config[:devices]
-      codes.push(MISSING_DEVICES_DEFAULT) if config[:devices] and not config[:devices][:default]
-      codes.push(DEVICE_DEFAULT_BAD) if config[:devices] and config[:devices][:default] and not config[:devices][:default].is_a?(Symbol)
-    end
-    private_class_method :validate_device_structure
-
-    # Validates the roku config project structure
+    # Validates the roku config structure
     # @param codes [Array] array of error codes
     # @param config [Hash] roku config object
-    def self.validate_project_structure(codes:, config:)
-      codes.push(MISSING_PROJECTS) if not config[:projects]
-      codes.push(MISSING_PROJECTS_DEFAULT) if config[:projects] and not config[:projects][:default]
-      codes.push(MISSING_PROJECTS_DEFAULT) if config[:projects] and config[:projects][:default] == "<project id>".to_sym
-      codes.push(PROJECTS_DEFAULT_BAD) if config[:projects] and config[:projects][:default] and not config[:projects][:default].is_a?(Symbol)
+    def self.validate_structure(codes:, config:)
+      errors = [
+        [MISSING_DEVICES, !config[:devices]],
+        [MISSING_DEVICES_DEFAULT, (config[:devices] and !config[:devices][:default])],
+        [DEVICE_DEFAULT_BAD, (config[:devices] and config[:devices][:default] and !config[:devices][:default].is_a?(Symbol))],
+        [MISSING_PROJECTS, (!config[:projects])],
+        [MISSING_PROJECTS_DEFAULT, (config[:projects] and !config[:projects][:default])],
+        [MISSING_PROJECTS_DEFAULT, (config[:projects] and config[:projects][:default] == "<project id>".to_sym)],
+        [PROJECTS_DEFAULT_BAD, (config[:projects] and config[:projects][:default] and !config[:projects][:default].is_a?(Symbol))]
+      ]
+      process_errors(codes: codes, errors: errors)
     end
-    private_class_method :validate_project_structure
+    private_class_method :validate_structure
 
     # Validates a roku config device
     # @param codes [Array] array of error codes
     # @param device [Hash] device config object
     def self.validate_device(codes:, device:)
-      codes.push(DEVICE_MISSING_IP) if not device[:ip]
-      codes.push(DEVICE_MISSING_IP) if device[:ip] == "xxx.xxx.xxx.xxx"
-      codes.push(DEVICE_MISSING_IP) if device[:ip] == ""
-      codes.push(DEVICE_MISSING_USER) if not device[:user]
-      codes.push(DEVICE_MISSING_USER) if device[:user] == "<username>"
-      codes.push(DEVICE_MISSING_USER) if device[:user] == ""
-      codes.push(DEVICE_MISSING_PASSWORD) if not device[:password]
-      codes.push(DEVICE_MISSING_PASSWORD) if device[:password] == "<password>"
-      codes.push(DEVICE_MISSING_PASSWORD) if device[:password] == ""
+      errors = [
+        [DEVICE_MISSING_IP, (!device[:ip])],
+        [DEVICE_MISSING_IP, (device[:ip] == "xxx.xxx.xxx.xxx")],
+        [DEVICE_MISSING_IP, (device[:ip] == "")],
+        [DEVICE_MISSING_USER, (!device[:user])],
+        [DEVICE_MISSING_USER, (device[:user] == "<username>")],
+        [DEVICE_MISSING_USER, (device[:user] == "")],
+        [DEVICE_MISSING_PASSWORD, (!device[:password])],
+        [DEVICE_MISSING_PASSWORD, (device[:password] == "<password>")],
+        [DEVICE_MISSING_PASSWORD, (device[:password] == "")]
+      ]
+      process_errors(codes: codes, errors: errors)
     end
     private_class_method :validate_device
 
@@ -119,19 +124,36 @@ module RokuBuilder
     # @param codes [Array] array of error codes
     # @param project [Hash] project config object
     def self.validate_project(codes:, project:)
-      codes.push(PROJECT_MISSING_APP_NAME) if not project[:app_name]
-      codes.push(PROJECT_MISSING_DIRECTORY) if not project[:directory]
-      codes.push(PROJECT_MISSING_FOLDERS) if not project[:folders]
-      codes.push(PROJECT_FOLDERS_BAD) if project[:folders] and not project[:folders].is_a?(Array)
-      codes.push(PROJECT_MISSING_FILES) if not project[:files]
-      codes.push(PROJECT_FILES_BAD) if project[:files] and not project[:files].is_a?(Array)
-      codes.push(MISSING_STAGE_METHOD) unless project[:stage_method]
-      codes.push(PROJECT_STAGE_METHOD_BAD) unless [:git, :script, nil].include?(project[:stage_method])
-      project[:stages].each {|_stage,value|
-        codes.push(STAGE_MISSING_BRANCH) if not value[:branch] and project[:stage_method] == :git
-        codes.push(STAGE_MISSING_SCRIPT) if not value[:script] and project[:stage_method] == :script
-      }
+      errors= [
+        [PROJECT_MISSING_APP_NAME, (!project[:app_name])],
+        [PROJECT_MISSING_DIRECTORY, (!project[:directory])],
+        [PROJECT_MISSING_FOLDERS, (!project[:folders])],
+        [PROJECT_FOLDERS_BAD, (project[:folders] and !project[:folders].is_a?(Array))],
+        [PROJECT_MISSING_FILES, (!project[:files])],
+        [PROJECT_FILES_BAD, (project[:files] and !project[:files].is_a?(Array))],
+        [MISSING_STAGE_METHOD, ( !project[:stage_method])],
+        [PROJECT_STAGE_METHOD_BAD, (![:git, :script, nil].include?(project[:stage_method]))]
+      ]
+      process_errors(codes: codes, errors: errors)
     end
     private_class_method :validate_project
+
+    # Validates a roku config project
+    # @param codes [Array] array of error codes
+    # @param project [Hash] project config object
+    def self.validate_stage(codes:, stage:, project:)
+      errors= [
+        [STAGE_MISSING_BRANCH, (!stage[:branch] and project[:stage_method] == :git)],
+        [STAGE_MISSING_SCRIPT, (!stage[:script] and project[:stage_method] == :script)],
+      ]
+      process_errors(codes: codes, errors: errors)
+    end
+    private_class_method :validate_stage
+
+    def self.process_errors(codes:, errors:)
+      errors.each do |error|
+        codes.push(error[0]) if error[1]
+      end
+    end
   end
 end

data/lib/roku_builder/controller.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 module RokuBuilder
 
   # Controls all interaction with other classes

data/lib/roku_builder/controller_commands.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 module RokuBuilder
 
   # Commands that the controller uses to interface with the rest of the gem.
@@ -43,7 +45,7 @@ module RokuBuilder
       success = nil
       if stager.stage
         loader = Loader.new(**config)
-        success, version = loader.sideload(**configs[:sideload_config])
+        success = loader.sideload(**configs[:sideload_config])[0]
       end
       stager.unstage
       unless success == FAILED_SIDELOAD
@@ -169,7 +171,7 @@ module RokuBuilder
         success = instance.send(method)
       end
       return failure unless failure.nil? or success
-      logger.info ()
+      logger.info "#{klass} call #{method} successfully"
       SUCCESS
     end
   end

data/lib/roku_builder/error_handler.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 module RokuBuilder
 
   # Contains methods to handle errors from different sources.

data/lib/roku_builder/inspector.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 module RokuBuilder
 
   # Collects information on a package for submission

data/lib/roku_builder/keyer.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 module RokuBuilder
 
   # Change or get dev key

data/lib/roku_builder/linker.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 module RokuBuilder
 
   # Launch application, sending parameters

data/lib/roku_builder/loader.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 module RokuBuilder
 
   # Load/Unload/Build roku applications

data/lib/roku_builder/manifest_manager.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 module RokuBuilder
 
   # Updates or retrives build version

data/lib/roku_builder/monitor.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 module RokuBuilder
 
   # Monitor development Logs

data/lib/roku_builder/navigator.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 module RokuBuilder
 
   # Navigation methods

data/lib/roku_builder/packager.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 module RokuBuilder
 
   # Method of packaging app for submission

data/lib/roku_builder/stager.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 module RokuBuilder
 
   # Change stage of roku application

data/lib/roku_builder/tester.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 module RokuBuilder
 
   # Method for running unit tests

data/lib/roku_builder/util.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 module RokuBuilder
 
   # Super class for device utilities

data/lib/roku_builder/version.rb

@@ -1,4 +1,6 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 module RokuBuilder
   # Version of the RokuBuilder Gem
-  VERSION = "3.6.2"
+  VERSION = "3.6.3"
 end

data/rakefile

@@ -1,3 +1,5 @@
+# ********** Copyright 2016 Viacom, Inc. Apache 2.0 **********
+
 require 'rake'
 require 'rake/testtask'
 

data/tests/roku_builder/config_manager_test.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 require_relative "test_helper.rb"
 
 class ConfigManagerTest < Minitest::Test
@@ -265,4 +267,19 @@ class ConfigManagerTest < Minitest::Test
     io.verify
   end
 
+  def test_config_manager_parent_config
+    logger = Logger.new("/dev/null")
+    target_config = File.join(File.dirname(__FILE__), "test_files", "controller_test", "configure_test.json")
+    File.delete(target_config) if File.exist?(target_config)
+    FileUtils.cp(File.join(File.dirname(target_config), "parent_config.json"), target_config)
+
+    options = {validate: true, config: target_config, stage: :production}
+    code, config, configs = RokuBuilder::ConfigManager.load_config(options: options, logger: logger)
+    assert_equal RokuBuilder::SUCCESS, code
+    assert_equal "app2", config[:projects][:p2][:app_name]
+    assert_equal "/dev/null", config[:projects][:p2][:directory]
+    assert_equal 2, config[:projects][:p2][:files].count
+    assert_equal 2, config[:projects][:p2][:folders].count
+  end
+
 end

data/tests/roku_builder/config_parser_test.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 require_relative "test_helper.rb"
 
 class ConfigParserTest < Minitest::Test
@@ -38,7 +40,7 @@ class ConfigParserTest < Minitest::Test
       options: {stage: "production"},
       logger: Logger.new("/dev/null")
     }
-    config, stage = RokuBuilder::ConfigParser.send(:setup_stage_config, **args)
+    config = RokuBuilder::ConfigParser.send(:setup_stage_config, **args)[0]
     assert_equal args[:configs][:project_config][:stages][:production][:script], config[:key]
   end
 
@@ -48,7 +50,7 @@ class ConfigParserTest < Minitest::Test
       options: {stage: "production", ref: "git-ref"},
       logger: Logger.new("/dev/null")
     }
-    config, stage = RokuBuilder::ConfigParser.send(:setup_stage_config, **args)
+    config = RokuBuilder::ConfigParser.send(:setup_stage_config, **args)[0]
     assert_equal args[:options][:ref], config[:key]
   end
 

data/tests/roku_builder/config_validator_test.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 require_relative "test_helper.rb"
 
 class ConfigValidatorTest < Minitest::Test

data/tests/roku_builder/controller_commands_test.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 require_relative "test_helper.rb"
 
 class ControllerCommandsTest < Minitest::Test

data/tests/roku_builder/controller_test.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 require_relative "test_helper.rb"
 
 class ControllerTest < Minitest::Test

data/tests/roku_builder/error_handler_test.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 require_relative "test_helper.rb"
 
 class RokuBuilder::ErrorHandler

data/tests/roku_builder/inspector_test.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 require_relative "test_helper.rb"
 
 class InspectorTest < Minitest::Test

data/tests/roku_builder/keyer_test.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 require_relative "test_helper.rb"
 
 class KeyerTest < Minitest::Test

data/tests/roku_builder/linker_test.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 require_relative "test_helper.rb"
 
 class LinkerTest < Minitest::Test

data/tests/roku_builder/loader_test.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 require_relative "test_helper.rb"
 
 class LoaderTest < Minitest::Test

data/tests/roku_builder/manifest_manager_test.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 require_relative "test_helper.rb"
 
 class ManifestManagerTest < Minitest::Test

data/tests/roku_builder/monitor_test.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 require_relative "test_helper.rb"
 
 class MonitorTest < Minitest::Test

data/tests/roku_builder/navigator_test.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 require_relative "test_helper.rb"
 
 class NavigatorTest < Minitest::Test

data/tests/roku_builder/packager_test.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 require_relative "test_helper.rb"
 
 class PackagerTest < Minitest::Test

data/tests/roku_builder/stager_test.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 require_relative "test_helper.rb"
 
 class StagerTest < Minitest::Test
@@ -148,8 +150,6 @@ class StagerTest < Minitest::Test
     root_dir = File.join(File.dirname(__FILE__), "test_files", "stager_test")
     branch_name = 'branch'
     git = Minitest::Mock.new
-    branch = Minitest::Mock.new
-    stashes = Minitest::Mock.new
     logger = Minitest::Mock.new
 
     stager_config = {
@@ -170,6 +170,7 @@ class StagerTest < Minitest::Test
       stager.instance_variable_set(:@current_branch, "branch")
       assert !stager.unstage
     end
+    git.verify
     logger.verify
   end
 

data/tests/roku_builder/test_files/controller_test/parent_config.json

@@ -0,0 +1,34 @@
+{
+  "devices": {
+    "default": "roku",
+    "roku": {
+      "ip": "111.222.333.444",
+      "user": "user",
+      "password": "pass"
+    }
+  },
+  "projects": {
+    "default": "p1",
+    "p1": {
+      "directory": "/dev/null",
+      "folders": ["resources","source"],
+      "files": ["manifest"],
+      "app_name": "app",
+      "stage_method": "git",
+      "stages":{
+        "production": {
+          "branch": "master",
+          "key": {
+            "keyed_pkg": "/dev/null",
+            "password": "password"
+          }
+        }
+      }
+    },
+    "p2": {
+      "parent": "p1",
+      "app_name": "app2",
+      "files": ["manifest", "config.json"]
+    }
+  }
+}

data/tests/roku_builder/test_helper.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 require "simplecov"
 require "coveralls"
 

data/tests/roku_builder/tester_test.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 require_relative "test_helper.rb"
 
 class TesterTest < Minitest::Test
@@ -33,7 +35,7 @@ class TesterTest < Minitest::Test
 
   def test_tester_runtests_and_handle
     waitfor = Proc.new do |end_reg, &blk|
-      assert_equal /\*\*\*\*\* ENDING TESTS \*\*\*\*\*/, end_reg
+      assert_equal(/\*\*\*\*\* ENDING TESTS \*\*\*\*\*/, end_reg)
       txt = "Fake Text"
       blk.call(txt) == false
     end

data/tests/roku_builder/util_test.rb

@@ -1,3 +1,5 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
 require_relative "test_helper.rb"
 
 class UtilTest < Minitest::Test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.6.3
 platform: ruby
 authors:
 - greeneca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-30 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -290,6 +290,7 @@ files:
 - tests/roku_builder/stager_test.rb
 - tests/roku_builder/test_files/controller_config_test/valid_config.json
 - tests/roku_builder/test_files/controller_test/load_config_test.json
+- tests/roku_builder/test_files/controller_test/parent_config.json
 - tests/roku_builder/test_files/controller_test/valid_config.json
 - tests/roku_builder/test_files/loader_test/a
 - tests/roku_builder/test_files/loader_test/manifest