roku_builder 3.8.1 → 3.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3374b8a07e80ff6fbc630e47407547bca348986
-  data.tar.gz: ad8690cb4312f629218ff66a6845f3631d41208e
+  metadata.gz: 3f3dd0efa70ffdec9f99f7579b79b64b0d41ad96
+  data.tar.gz: 8f6be751c0502f1e2fd0fa6f9bc885af30228911
 SHA512:
-  metadata.gz: 32c2f4df3680ea15fa9aaa02c66e41a5ef5dcfc7999348786068f4a3c1f4650a90a677884724921d08b9e2a6662118e77c6011a78088d80e45d0f3f39dbeae63
-  data.tar.gz: 43e10ec15f221df63d2cf258a5c219074840366ac25205a5581362fe1c181a0c9a7a65cd4543ae55333f641681738f1690292cdd8933255a54a2e982b4c7541b
+  metadata.gz: efaa8062dd1ddf8d84e7960d9d241fefe55a16c7cf9056b45bdc970b27313a88c20cc8cf5c7b5c4f3bdfc83ded409720562a63f0517a97cdd7f8b2cf5d9fd19e
+  data.tar.gz: 6a475bd91f379f5b948730c6ba9cb201333277124132e1099053da3f0bfd6735e27c2f5803500c3407dd8da58a17152b68b71d257792b5d25133fec6abedca7e

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - "2.2.3"
+  - "2.2.4"

data/Gemfile.lock

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

data/bin/roku

@@ -10,7 +10,6 @@ require "pathname"
 
 options = {}
 options[:config] = '~/.roku_config.json'
-options[:stage] = 'production'
 options[:update_manifest] = false
 
 OptionParser.new do |opts|

data/lib/roku_builder/config_manager.rb

@@ -75,8 +75,6 @@ module RokuBuilder
     # Edit the roku config
     # @param config [String] path for the roku config
     # @param options [String] options to set in the config
-    # @param device [String] which device to use
-    # @param project [String] which project to use
     # @param stage[String] which stage to use
     # @return [Boolean] success
     def self.edit_config(config:, options:, logger:)
@@ -87,7 +85,7 @@ module RokuBuilder
       device = options[:device].to_sym if options[:device]
       device = config_object[:devices][:default] unless options[:device]
       stage = options[:stage].to_sym if options[:stage]
-      stage = :production unless options[:stage]
+      stage ||= config_object[:projects][project][:stages].keys[0].to_sym
       state = {
         project: project,
         device: device,

data/lib/roku_builder/config_parser.rb

@@ -114,8 +114,10 @@ module RokuBuilder
     # @return [Hash] The stage config hash
     def self.setup_stage_config(configs:, options:, logger:)
       stage_config = {logger: logger}
-      stage = options[:stage].to_sym
+      stage = options[:stage].to_sym if options[:stage]
       project_config = configs[:project_config]
+      stage ||= project_config[:stages].keys[0].to_sym
+      options[:stage] = stage
       stage_config[:root_dir] = project_config[:directory]
       stage_config[:method] = project_config[:stage_method]
       stage_config[:method] ||= :git

data/lib/roku_builder/version.rb

@@ -2,5 +2,5 @@
 
 module RokuBuilder
   # Version of the RokuBuilder Gem
-  VERSION = "3.8.1"
+  VERSION = "3.8.2"
 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.2.3"
+  spec.required_ruby_version = "~> 2.2.4"
 
   spec.add_dependency "rubyzip",             "~> 1.2"
   spec.add_dependency "faraday",             "~> 0.9"

data/tests/roku_builder/controller_commands_test.rb

@@ -16,7 +16,7 @@ class ControllerCommandsTest < Minitest::Test
     loader = Minitest::Mock.new
     stager = Minitest::Mock.new
 
-    options = {sideload: true, stage: 'production', config: "~/.roku_config.rb"}
+    options = {sideload: true, config: "~/.roku_config.rb"}
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
     # Test Success
@@ -56,7 +56,7 @@ class ControllerCommandsTest < Minitest::Test
     packager = Minitest::Mock.new
     inspector = Minitest::Mock.new
 
-    options = {package: true, inspect: true, stage: 'production', out_folder: "/tmp", config: "~/.roku_config.json"}
+    options = {package: true, inspect: true, out_folder: "/tmp", config: "~/.roku_config.json"}
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
     info = {app_name: "app", dev_id: "id", creation_date: "date", dev_zip: ""}
@@ -100,7 +100,7 @@ class ControllerCommandsTest < Minitest::Test
     packager = Minitest::Mock.new
     inspector = Minitest::Mock.new
 
-    options = {package: true, inspect: true, stage: 'production', out: "/tmp/out.pkg", config: "~/.roku_config.json"}
+    options = {package: true, inspect: true, out: "/tmp/out.pkg", config: "~/.roku_config.json"}
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
     info = {app_name: "app", dev_id: "id", creation_date: "date", dev_zip: ""}
@@ -142,7 +142,7 @@ class ControllerCommandsTest < Minitest::Test
     stager = Minitest::Mock.new
 
     code = nil
-    options = {build: true, stage: 'production', out_folder: "/tmp", config: "~/.roku_config.json"}
+    options = {build: true, out_folder: "/tmp", config: "~/.roku_config.json"}
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
     loader.expect(:build, "/tmp/build", [configs[:build_config]])
@@ -167,7 +167,7 @@ class ControllerCommandsTest < Minitest::Test
     stager = Minitest::Mock.new
 
     code = nil
-    options = {update: true, stage: 'production', out_folder: "/tmp", config: "~/.roku_config.json"}
+    options = {update: true, out_folder: "/tmp", config: "~/.roku_config.json"}
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
     mock.expect(:call, "1", [configs[:manifest_config]])
@@ -192,7 +192,7 @@ class ControllerCommandsTest < Minitest::Test
     mock = Minitest::Mock.new
 
     code = nil
-    options = {deeplink: true, stage: 'production', deeplink_options: "a:b", config: "~/.roku_config.json"}
+    options = {deeplink: true, deeplink_options: "a:b", config: "~/.roku_config.json"}
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
     mock.expect(:launch, "true", [configs[:deeplink_config]])
@@ -211,7 +211,7 @@ class ControllerCommandsTest < Minitest::Test
     sideload =  Proc.new {|a, b, c| ran_sideload = true}
 
     code = nil
-    options = {deeplink: true, set_stage: true, stage: 'production', deeplink_options: "a:b", config: "~/.roku_config.json"}
+    options = {deeplink: true, set_stage: true, deeplink_options: "a:b", config: "~/.roku_config.json"}
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
     mock.expect(:launch, "true", [configs[:deeplink_config]])
@@ -227,14 +227,19 @@ class ControllerCommandsTest < Minitest::Test
   def test_controller_commands_deeplink_fail
     logger = Logger.new("/dev/null")
     mock = Minitest::Mock.new
+    stager = Minitest::Mock.new
 
     code = nil
-    options = {deeplink: true, stage: 'production', deeplink_options: "a:b", config: "~/.roku_config.json"}
+    options = {deeplink: true, deeplink_options: "a:b", config: "~/.roku_config.json"}
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
     mock.expect(:launch, false, [configs[:deeplink_config]])
+    stager.expect(:stage, true)
+    stager.expect(:unstage, true)
     RokuBuilder::Linker.stub(:new, mock) do
-      code = RokuBuilder::Controller.send(:execute_commands, {options: options, config: config, configs: configs, logger: logger})
+      RokuBuilder::Stager.stub(:new, stager) do
+        code = RokuBuilder::Controller.send(:execute_commands, {options: options, config: config, configs: configs, logger: logger})
+      end
     end
     mock.verify
     assert_equal RokuBuilder::FAILED_DEEPLINKING, code
@@ -243,7 +248,7 @@ class ControllerCommandsTest < Minitest::Test
     logger = Logger.new("/dev/null")
     loader = Minitest::Mock.new
 
-    options = {delete: true, stage: 'production', config: "~/.roku_config.json"}
+    options = {delete: true, config: "~/.roku_config.json"}
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
     loader.expect(:unload, nil)
@@ -260,7 +265,7 @@ class ControllerCommandsTest < Minitest::Test
     logger = Logger.new("/dev/null")
     monitor = Minitest::Mock.new
 
-    options = {monitor: "main", stage: 'production', config: "~/.roku_config.json"}
+    options = {monitor: "main", config: "~/.roku_config.json"}
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
     monitor.expect(:monitor, nil, [configs[:monitor_config]])
@@ -277,7 +282,7 @@ class ControllerCommandsTest < Minitest::Test
     logger = Logger.new("/dev/null")
     navigator = Minitest::Mock.new
 
-    options = {navigate: "up", stage: 'production', config: ":execute_commands,/.roku_config.json"}
+    options = {navigate: "up", config: ":execute_commands,/.roku_config.json"}
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
     navigator.expect(:nav, true, [configs[:navigate_config]])
@@ -292,7 +297,7 @@ class ControllerCommandsTest < Minitest::Test
     logger = Logger.new("/dev/null")
     navigator = Minitest::Mock.new
 
-    options = {navigate: "up", stage: 'production', config: ":execute_commands,/.roku_config.json"}
+    options = {navigate: "up", config: ":execute_commands,/.roku_config.json"}
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
     navigator.expect(:nav, nil, [configs[:navigate_config]])
@@ -307,7 +312,7 @@ class ControllerCommandsTest < Minitest::Test
     logger = Logger.new("/dev/null")
     navigator = Minitest::Mock.new
 
-    options = {screen: "secret", stage: 'production', config: ":execute_commands,/.roku_config.json"}
+    options = {screen: "secret", config: ":execute_commands,/.roku_config.json"}
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
     navigator.expect(:screen, true, [configs[:screen_config]])
@@ -322,7 +327,7 @@ class ControllerCommandsTest < Minitest::Test
     logger = Logger.new("/dev/null")
     navigator = Minitest::Mock.new
 
-    options = {screens: true, stage: 'production', config: ":execute_commands,/.roku_config.json"}
+    options = {screens: true, config: ":execute_commands,/.roku_config.json"}
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
     navigator.expect(:screens, true)
@@ -337,7 +342,7 @@ class ControllerCommandsTest < Minitest::Test
     logger = Logger.new("/dev/null")
     navigator = Minitest::Mock.new
 
-    options = {text: "text string", stage: 'production', config: ":execute_commands,/.roku_config.json"}
+    options = {text: "text string", config: ":execute_commands,/.roku_config.json"}
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
     navigator.expect(:type, true, [configs[:text_config]])
@@ -352,7 +357,7 @@ class ControllerCommandsTest < Minitest::Test
     logger = Logger.new("/dev/null")
     tester = Minitest::Mock.new
 
-    options = {test: true, stage: 'production', config: "~/.roku_config.json"}
+    options = {test: true, config: "~/.roku_config.json"}
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
     tester.expect(:run_tests, true, [configs[:test_config]])
@@ -367,7 +372,7 @@ class ControllerCommandsTest < Minitest::Test
     logger = Logger.new("/dev/null")
     inspector = Minitest::Mock.new
 
-    options = {screencapture: true, stage: 'production', out: "/tmp/capture.jpg", config: "~/.roku_config.json"}
+    options = {screencapture: true, out: "/tmp/capture.jpg", config: "~/.roku_config.json"}
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
     inspector.expect(:screencapture, true, [configs[:screencapture_config]])
@@ -382,7 +387,7 @@ class ControllerCommandsTest < Minitest::Test
     logger = Logger.new("/dev/null")
     inspector = Minitest::Mock.new
 
-    options = {screencapture: true, stage: 'production', out: "/tmp", config: "~/.roku_config.json"}
+    options = {screencapture: true, out: "/tmp", config: "~/.roku_config.json"}
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
     inspector.expect(:screencapture, false, [configs[:screencapture_config]])
@@ -397,7 +402,7 @@ class ControllerCommandsTest < Minitest::Test
     logger = Logger.new("/dev/null")
     stager = Minitest::Mock.new
 
-    options = {print: 'title', stage: 'production', config: "~/.roku_config.json"}
+    options = {print: 'title', config: "~/.roku_config.json"}
     config = good_config
     configs = {stage_config: {}}
     code = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 3.8.1
+  version: 3.8.2
 platform: ruby
 authors:
 - greeneca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -338,7 +338,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.2.3
+      version: 2.2.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="