roku_builder 3.3.3 → 3.3.4

data/tests/roku_builder/error_handler_test.rb

@@ -0,0 +1,76 @@
+require_relative "test_helper.rb"
+
+class RokuBuilder::ErrorHandler
+  class << self
+    def abort
+      #do nothing
+    end
+  end
+end
+
+class ErrorHandlerTest < Minitest::Test
+  def test_handle_error_codes
+    error_groups = {
+      fatal: {
+        options_code: [
+          RokuBuilder::EXTRA_COMMANDS,
+          RokuBuilder::NO_COMMANDS,
+          RokuBuilder::EXTRA_SOURCES,
+          RokuBuilder::NO_SOURCE,
+          RokuBuilder::BAD_CURRENT,
+          RokuBuilder::BAD_DEEPLINK,
+          RokuBuilder::BAD_IN_FILE
+        ],
+        configure_code:[
+          RokuBuilder::CONFIG_OVERWRITE,
+        ],
+        device_code: [
+          RokuBuilder::BAD_DEVICE,
+          RokuBuilder::NO_DEVICES,
+        ],
+        load_code: [
+          RokuBuilder::MISSING_CONFIG,
+          RokuBuilder::INVALID_CONFIG,
+          RokuBuilder::MISSING_MANIFEST,
+          RokuBuilder::UNKNOWN_DEVICE,
+          RokuBuilder::UNKNOWN_PROJECT,
+          RokuBuilder::UNKNOWN_STAGE,
+        ],
+        command_code: [
+          RokuBuilder::FAILED_SIDELOAD,
+          RokuBuilder::FAILED_SIGNING,
+          RokuBuilder::FAILED_DEEPLINKING,
+          RokuBuilder::FAILED_NAVIGATING,
+          RokuBuilder::FAILED_SCREENCAPTURE
+        ]
+      },
+      info: {
+        device_code: [
+          RokuBuilder::CHANGED_DEVICE
+        ],
+        configure_code:[
+          RokuBuilder::SUCCESS
+        ]
+      },
+      warn: {
+        load_code: [
+          RokuBuilder::DEPRICATED_CONFIG
+        ]
+      }
+    }
+    error_groups.each_pair do |type,errors|
+      errors.each_pair do |key,value|
+        value.each do |code|
+          logger = Minitest::Mock.new
+          options = {logger: logger}
+          options[:options] = {} if key == :load_code
+          options[key] = code
+          logger.expect(type, nil)  {|string| string.class == String}
+          method = "handle_#{key}s"
+          RokuBuilder::ErrorHandler.send(method.to_sym, **options)
+          logger.verify
+        end
+      end
+    end
+  end
+end

data/tests/roku_builder/inspector_test.rb

@@ -55,6 +55,7 @@ class InspectorTest < Minitest::Test
       assert_equal payload[:password], arg2[:passwd]
       assert payload[:archive] === arg2[:archive]
     end
+    faraday.expect(:headers, {})
     faraday.expect(:request, nil, [:digest, device_config[:user], device_config[:password]])
     faraday.expect(:request, nil, [:multipart])
     faraday.expect(:request, nil, [:url_encoded])
@@ -131,6 +132,7 @@ class InspectorTest < Minitest::Test
       assert_equal payload[:password], arg2[:passwd]
       assert payload[:archive] === arg2[:archive]
     end
+    faraday.expect(:headers, {})
     faraday.expect(:request, nil, [:digest, device_config[:user], device_config[:password]])
     faraday.expect(:request, nil, [:multipart])
     faraday.expect(:request, nil, [:url_encoded])
@@ -190,6 +192,7 @@ class InspectorTest < Minitest::Test
       assert_equal payload[:password], arg2[:passwd]
       assert payload[:archive] === arg2[:archive]
     end
+    faraday.expect(:headers, {})
     faraday.expect(:request, nil, [:digest, device_config[:user], device_config[:password]])
     faraday.expect(:request, nil, [:multipart])
     faraday.expect(:request, nil, [:url_encoded])

data/tests/roku_builder/keyer_test.rb

@@ -22,7 +22,6 @@ class KeyerTest < Minitest::Test
     response.expect(:body, body)
 
 
-    package_info = {}
     dev_id = nil
     keyer = RokuBuilder::Keyer.new(**device_config)
     Faraday.stub(:new, connection, faraday) do
@@ -55,7 +54,6 @@ class KeyerTest < Minitest::Test
     response.expect(:body, body)
 
 
-    package_info = {}
     dev_id = nil
     keyer = RokuBuilder::Keyer.new(**device_config)
     Faraday.stub(:new, connection, faraday) do
@@ -95,11 +93,14 @@ class KeyerTest < Minitest::Test
       assert_equal payload[:password], arg2[:passwd]
       assert payload[:archive] === arg2[:archive]
     end
+    faraday.expect(:headers, {})
     faraday.expect(:request, nil, [:digest, device_config[:user], device_config[:password]])
     faraday.expect(:request, nil, [:multipart])
     faraday.expect(:request, nil, [:url_encoded])
     faraday.expect(:adapter, nil, [Faraday.default_adapter])
 
+    # This test fails with SEED=21894 due to the random number generator
+    # spitting out the same number twice
     dev_id = Proc.new { Random.rand(100) }
     keyer = RokuBuilder::Keyer.new(**device_config)
     key_changed = nil

data/tests/roku_builder/linker_test.rb

@@ -12,10 +12,11 @@ class LinkerTest < Minitest::Test
       password: "password",
       logger: Logger.new("/dev/null")
     }
-    path = "/launch/dev?a=A&b=B:C&d=a%5Cb"
+    path = "/launch/dev?a=A&b=B%3AC&d=a%5Cb"
     options = 'a:A, b:B:C, d:a\b'
 
     connection.expect(:post, response, [path])
+    faraday.expect(:headers, {})
     faraday.expect(:request, nil, [:digest, device_config[:user], device_config[:password]])
     faraday.expect(:request, nil, [:multipart])
     faraday.expect(:request, nil, [:url_encoded])

data/tests/roku_builder/loader_test.rb

@@ -25,6 +25,7 @@ class LoaderTest < Minitest::Test
     }
     path = "/plugin_install"
 
+    faraday.expect(:headers, {})
     faraday.expect(:request, nil, [:digest, device_config[:user], device_config[:password]])
     faraday.expect(:request, nil, [:multipart])
     faraday.expect(:request, nil, [:url_encoded])
@@ -83,6 +84,7 @@ class LoaderTest < Minitest::Test
     }
     path = "/plugin_install"
 
+    faraday.expect(:headers, {})
     faraday.expect(:request, nil, [:digest, device_config[:user], device_config[:password]])
     faraday.expect(:request, nil, [:multipart])
     faraday.expect(:request, nil, [:url_encoded])

data/tests/roku_builder/manifest_manager_test.rb

@@ -2,35 +2,32 @@ require_relative "test_helper.rb"
 
 class ManifestManagerTest < Minitest::Test
   def test_manifest_manager_update
-    logger = Logger.new('/dev/null')
     root_dir = File.join(File.dirname(__FILE__), "test_files", "manifest_manager_test")
     FileUtils.cp(File.join(root_dir, "manifest_template"), File.join(root_dir, "manifest"))
     build_version = nil
     Time.stub(:now, Time.new(2001, 02, 01)) do
-      build_version = RokuBuilder::ManifestManager.update_build(root_dir: root_dir, logger: logger)
+      build_version = RokuBuilder::ManifestManager.update_build(root_dir: root_dir)
     end
     assert_equal "020101.2", build_version
     FileUtils.rm(File.join(root_dir, "manifest"))
   end
 
   def test_manifest_manager_update_missing_build_number
-    logger = Logger.new('/dev/null')
     root_dir = File.join(File.dirname(__FILE__), "test_files", "manifest_manager_test")
     FileUtils.cp(File.join(root_dir, "manifest_template_2"), File.join(root_dir, "manifest"))
     build_version = nil
     Time.stub(:now, Time.new(2001, 02, 01)) do
-      build_version = RokuBuilder::ManifestManager.update_build(root_dir: root_dir, logger: logger)
+      build_version = RokuBuilder::ManifestManager.update_build(root_dir: root_dir)
     end
     assert_equal "020101.1", build_version
     FileUtils.rm(File.join(root_dir, "manifest"))
   end
 
   def test_manifest_manager_build_version
-    logger = Logger.new('/dev/null')
     root_dir = File.join(File.dirname(__FILE__), "test_files", "manifest_manager_test")
     FileUtils.cp(File.join(root_dir, "manifest_template"), File.join(root_dir, "manifest"))
     build_version = nil
-    build_version = RokuBuilder::ManifestManager.build_version(root_dir: root_dir, logger: logger)
+    build_version = RokuBuilder::ManifestManager.build_version(root_dir: root_dir)
     assert_equal "010101.1", build_version
     FileUtils.rm(File.join(root_dir, "manifest"))
   end

data/tests/roku_builder/monitor_test.rb

@@ -9,15 +9,11 @@ class MonitorTest < Minitest::Test
       password: "password",
       logger: Logger.new("/dev/null")
     }
-    monitor_config = {
-      'Host' => device_config[:ip],
-      'Post' => 8085
-    }
     monitor = RokuBuilder::Monitor.new(**device_config)
 
     connection.expect(:waitfor, nil) do |config|
-      assert_equal /./, config['Match']
-      assert_equal false, config['Timeout']
+      assert_equal(/./, config['Match'])
+      assert_equal(false, config['Timeout'])
     end
 
     def monitor.gets
@@ -40,20 +36,16 @@ class MonitorTest < Minitest::Test
       password: "password",
       logger: Logger.new("/dev/null")
     }
-    monitor_config = {
-      'Host' => device_config[:ip],
-      'Post' => 8085
-    }
     monitor = RokuBuilder::Monitor.new(**device_config)
 
     connection.expect(:waitfor, nil) do |config|
-      assert_equal /./, config['Match']
-      assert_equal false, config['Timeout']
+      assert_equal(/./, config['Match'])
+      assert_equal(false, config['Timeout'])
     end
     connection.expect(:puts, nil, ["text"])
 
     def monitor.gets
-      @count = 0 unless @count
+      @count ||= 0
       sleep(0.1)
       case @count
       when 0

data/tests/roku_builder/navigator_test.rb

@@ -54,6 +54,8 @@ class NavigatorTest < Minitest::Test
           response.expect(:success?, true)
         end
       end
+      faraday.expect(:headers, {})
+      faraday.expect(:request, nil, [:digest, device_config[:user], device_config[:password]])
       faraday.expect(:request, nil, [:multipart])
       faraday.expect(:request, nil, [:url_encoded])
       faraday.expect(:adapter, nil, [Faraday.default_adapter])

data/tests/roku_builder/test_helper.rb

@@ -1,6 +1,44 @@
 require "simplecov"
+require "coveralls"
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter::new([
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+])
 SimpleCov.start
 
 require "byebug"
 require "roku_builder"
 require "minitest/autorun"
+
+
+def good_config
+  {
+    devices: {
+      default: :roku,
+      roku: {
+        ip: "192.168.0.100",
+        user: "user",
+        password: "password"
+      }
+    },
+    projects: {
+      default: :project1,
+      project1: {
+        directory: "/dev/null",
+        folders: ["resources","source"],
+        files: ["manifest"],
+        app_name: "<app name>",
+        stages:{
+          production: {
+            branch: "production",
+            key: {
+              keyed_pkg: "/dev/null",
+              password: "<password for pkg>"
+            }
+          }
+        }
+      }
+    }
+  }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.4
 platform: ruby
 authors:
 - greeneca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.9
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.9
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: net-ping
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '8.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -215,6 +229,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -224,7 +240,11 @@ files:
 - config.json.example
 - lib/roku_builder.rb
 - lib/roku_builder/config_manager.rb
+- lib/roku_builder/config_parser.rb
+- lib/roku_builder/config_validator.rb
 - lib/roku_builder/controller.rb
+- lib/roku_builder/controller_commands.rb
+- lib/roku_builder/error_handler.rb
 - lib/roku_builder/inspector.rb
 - lib/roku_builder/keyer.rb
 - lib/roku_builder/linker.rb
@@ -239,8 +259,11 @@ files:
 - rakefile
 - roku_builder.gemspec
 - tests/roku_builder/config_manager_test.rb
-- tests/roku_builder/controller_config_test.rb
+- tests/roku_builder/config_parser_test.rb
+- tests/roku_builder/config_validator_test.rb
+- tests/roku_builder/controller_commands_test.rb
 - tests/roku_builder/controller_test.rb
+- tests/roku_builder/error_handler_test.rb
 - tests/roku_builder/inspector_test.rb
 - tests/roku_builder/keyer_test.rb
 - tests/roku_builder/linker_test.rb