roku_builder 3.12.6 → 3.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ef20c9d8920488e1f6102fbab02b28ccbb80673
-  data.tar.gz: cd1b32fbf7fb6ab5fdd115c7668011018e0f57e7
+  metadata.gz: 9176b4d991a50edd2f0e9011fd487052eccb9897
+  data.tar.gz: 46e51f45694d978e9f39f6a6772cb81580eaddfa
 SHA512:
-  metadata.gz: 64bc408f43e49d29d271f6dc4a6d5caf455a2a66e6e14616cc1b2ee374df10bcfc31236a2a8d9baf854e9728c753a3f2255fb5916717cc21234f70c5436c4e3f
-  data.tar.gz: fa56cde1eaf03aa4908c8ff240f149847176a026dbe97ad556c563a354e67e3486f3e791ea1cc9c1fe4b5f1cca0aada1ac315d0ddddbd11ef925d1482499f86f
+  metadata.gz: 83dae8e4eefc66c8a74b7d9c1cbc7ea4bff311c1933d690f1374ec197ddcf5d116ebe2e97a6d9f0fb8528a31ada834fd329abe127ed6731fce2a177c64a16646
+  data.tar.gz: 855e6e1ff0cf89a8f962f513828209425e5aa270928611f1f0a999dccfb68dcbd09a379b0f6b791b4d956f0ad1a94d730570a5deadee41aa7cbc186e7b49f80b

data/CHANGELOG

@@ -1,3 +1,10 @@
+ = 3.12.6 =
+
+ - Update dependancies
+ - Allow no projects in config
+ - Fix in file handeling
+ - Update config
+
  = 3.12.5 =
 
   - Fix issue with inspector

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roku_builder (3.12.6)
+    roku_builder (3.12.7)
       faraday (~> 0.11)
       faraday-digestauth (~> 0.2)
       git (~> 1.3)
@@ -15,11 +15,11 @@ GEM
   specs:
     byebug (9.0.6)
     coderay (1.1.1)
-    coveralls (0.8.19)
+    coveralls (0.8.20)
       json (>= 1.8, < 3)
-      simplecov (~> 0.12.0)
+      simplecov (~> 0.14.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
+      thor (~> 0.19.4)
       tins (~> 1.6)
     docile (1.1.5)
     faraday (0.11.0)
@@ -80,13 +80,13 @@ GEM
     ruby_dep (1.5.0)
     rubyzip (1.2.1)
     shellany (0.0.1)
-    simplecov (0.12.0)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    term-ansicolor (1.4.0)
+    term-ansicolor (1.5.0)
       tins (~> 1.0)
     thor (0.19.4)
     tins (1.13.2)

data/lib/roku_builder.rb

@@ -127,6 +127,12 @@ module RokuBuilder
   # Missing out folder
   MISSING_OUT_FOLDER = 8
 
+  # Bad Project Directory
+  BAD_PROJECT_DIR = 9
+
+  # Bad Key File
+  BAD_KEY_FILE = 10
+
 
   ### Execute Codes ###
 

data/lib/roku_builder/config_parser.rb

@@ -14,10 +14,10 @@ module RokuBuilder
     # @return [Hash] Intermeidate configs
     def self.parse_config(options:, config:, logger:)
       configs = {init_params: {}}
+      #expand in
+      options[:in] = File.expand_path(options[:in]) if options[:in]
       #set device
-      unless options[:device]
-        options[:device] = config[:devices][:default]
-      end
+      options[:device] = config[:devices][:default] unless options[:device]
       #set project
       setup_project(config: config, options: options) if project_required(options: options)
       #set outfile
@@ -32,7 +32,8 @@ module RokuBuilder
       stage = setup_stage_config(configs: configs, options: options, logger: logger)[1]
       return [UNKNOWN_STAGE, nil, nil] if stage.nil? and project_required(options: options)
       setup_sideload_config(configs: configs, options: options)
-      setup_package_config(config: config, configs: configs, options: options, stage: stage)
+      code = setup_package_config(config: config, configs: configs, options: options, stage: stage)
+      return [code, nil, nil] unless code == SUCCESS
       setup_active_configs(config: config, configs: configs, options: options)
       setup_manifest_configs(configs: configs, options: options)
       setup_simple_configs(config: config, configs: configs, options: options)
@@ -116,6 +117,7 @@ module RokuBuilder
         if config[:projects][:project_dir]
           project_config[:directory] = File.join(config[:projects][:project_dir], project_config[:directory])
         end
+        return BAD_PROJECT_DIR unless Dir.exist?(project_config[:directory])
         project_config[:stage_method] = :working if options[:working]
       end
       project_config
@@ -207,6 +209,7 @@ module RokuBuilder
           if config[:keys][:key_dir]
             configs[:key][:keyed_pkg] = File.join(config[:keys][:key_dir], configs[:key][:keyed_pkg])
           end
+          return BAD_KEY_FILE unless File.exist?(configs[:key][:keyed_pkg])
         end
       end
       if options[:package]
@@ -224,6 +227,7 @@ module RokuBuilder
           configs[:inspect_config][:pkg] = File.join(configs[:out][:folder], configs[:out][:file])
         end
       end
+      return SUCCESS
     end
     private_class_method :setup_package_config
 

data/lib/roku_builder/controller.rb

@@ -196,7 +196,7 @@ module RokuBuilder
     # List of commands requiring a source option
     # @return [Array<Symbol>] List of command symbols that require a source in the options hash
     def self.source_commands
-      [:sideload, :package, :test, :build, :key, :update]
+      [:sideload, :package, :test, :build, :key, :update, :print]
     end
 
     # List of commands the activate the exclude files

data/lib/roku_builder/error_handler.rb

@@ -72,6 +72,12 @@ module RokuBuilder
       when UNKNOWN_STAGE
         logger.fatal "Unknown stage"
         abort
+      when BAD_PROJECT_DIR
+        logger.fatal "Invalid directory for project"
+        abort
+      when BAD_KEY_FILE
+        logger.fatal "Invalid key path"
+        abort
       end
     end
 

data/lib/roku_builder/version.rb

@@ -2,5 +2,5 @@
 
 module RokuBuilder
   # Version of the RokuBuilder Gem
-  VERSION = "3.12.6"
+  VERSION = "3.12.7"
 end

data/test/roku_builder/test_config_parser.rb

@@ -17,7 +17,7 @@ class ConfigParserTest < Minitest::Test
 
     assert_equal RokuBuilder::SUCCESS, code
     assert_equal Hash, config.class
-    assert_equal "/dev/null", configs[:manifest_config][:root_dir]
+    assert_equal "/tmp", configs[:manifest_config][:root_dir]
   end
 
   def test_manifest_config_in
@@ -38,6 +38,24 @@ class ConfigParserTest < Minitest::Test
     assert_equal :in, configs[:stage_config][:method]
   end
 
+  def test_manifest_config_in_expand
+    logger = Logger.new("/dev/null")
+    options = {
+      config: File.expand_path(File.join(File.dirname(__FILE__), "test_files", "controller_config_test", "valid_config.json")),
+      in: "./infile",
+      update_manifest: false,
+      fetch: false,
+      sideload: true
+    }
+    config = good_config
+    code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
+
+    assert_equal RokuBuilder::SUCCESS, code
+    assert_equal Hash, config.class
+    assert_equal File.join(Dir.pwd, "infile"), configs[:manifest_config][:root_dir]
+    assert_equal :in, configs[:stage_config][:method]
+  end
+
   def test_manifest_config_current
     logger = Logger.new("/dev/null")
     options = {
@@ -76,6 +94,63 @@ class ConfigParserTest < Minitest::Test
     assert_nil project[:files]
   end
 
+  def test_setup_project_config_good_project_dir
+    config = good_config
+    args = {
+      config: config,
+      options: {sideload: true, project: :project1}
+    }
+    project = {}
+    File.stub(:exist?, true) do
+      project = RokuBuilder::ConfigParser.send(:setup_project_config, **args)
+    end
+    refute_equal RokuBuilder::BAD_PROJECT_DIR, project
+  end
+
+  def test_setup_project_config_bad_project_dir
+    config = good_config
+    config[:projects][:project1][:directory] = "/dev/null"
+    args = {
+      config: config,
+      options: {sideload: true, project: :project1}
+    }
+    project = {}
+    File.stub(:exist?, true) do
+      project = RokuBuilder::ConfigParser.send(:setup_project_config, **args)
+    end
+    assert_equal RokuBuilder::BAD_PROJECT_DIR, project
+  end
+
+  def test_setup_project_config_bad_child_project_dir
+    config = good_config
+    config[:projects][:project_dir] = "/tmp"
+    config[:projects][:project1][:directory] = "bad"
+    args = {
+      config: config,
+      options: {sideload: true, project: :project1}
+    }
+    project = {}
+    File.stub(:exist?, true) do
+      project = RokuBuilder::ConfigParser.send(:setup_project_config, **args)
+    end
+    assert_equal RokuBuilder::BAD_PROJECT_DIR, project
+  end
+
+  def test_setup_project_config_bad_parent_project_dir
+    config = good_config
+    config[:projects][:project_dir] = "/bad"
+    config[:projects][:project1][:directory] = "good"
+    args = {
+      config: config,
+      options: {sideload: true, project: :project1}
+    }
+    project = {}
+    File.stub(:exist?, true) do
+      project = RokuBuilder::ConfigParser.send(:setup_project_config, **args)
+    end
+    assert_equal RokuBuilder::BAD_PROJECT_DIR, project
+  end
+
   def test_setup_stage_config_script
     args = {
       configs: {project_config: {directory: "/tmp", stage_method: :script, stages: {production: {script: "script"}}}},
@@ -116,7 +191,7 @@ class ConfigParserTest < Minitest::Test
 
     assert_equal RokuBuilder::SUCCESS, code
     assert_equal Hash, config.class
-    assert_equal "/dev/nuller", configs[:project_config][:directory]
+    assert_equal "/tmp", configs[:project_config][:directory]
   end
 
   def test_manifest_config_project_directory
@@ -133,7 +208,9 @@ class ConfigParserTest < Minitest::Test
     code = nil
     configs = nil
 
-    code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
+    Dir.stub(:exist?, true) do
+      code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
+    end
 
     assert_equal RokuBuilder::SUCCESS, code
     assert_equal Hash, config.class
@@ -158,7 +235,9 @@ class ConfigParserTest < Minitest::Test
     configs = nil
 
     Pathname.stub(:pwd, Pathname.new("/tmp/project2")) do
-      code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
+      Dir.stub(:exist?, true) do
+        code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
+      end
     end
 
     assert_equal RokuBuilder::SUCCESS, code
@@ -167,11 +246,12 @@ class ConfigParserTest < Minitest::Test
   end
 
   def test_manifest_config_key_directory
+    tmp_file = Tempfile.new("pkg")
     logger = Logger.new("/dev/null")
     options = {key: true, project: :project2}
     config = good_config
-    config[:keys][:key_dir] = "/tmp"
-    config[:keys][:a][:keyed_pkg] = "a"
+    config[:keys][:key_dir] = File.dirname(tmp_file.path)
+    config[:keys][:a][:keyed_pkg] = File.basename(tmp_file.path)
 
 
     code = nil
@@ -181,7 +261,40 @@ class ConfigParserTest < Minitest::Test
 
     assert_equal RokuBuilder::SUCCESS, code
     assert_equal Hash, config.class
-    assert_equal "/tmp/a", configs[:key][:keyed_pkg]
+    assert_equal tmp_file.path, configs[:key][:keyed_pkg]
+    tmp_file.close
+  end
+
+  def test_manifest_config_key_directory_bad
+    tmp_file = Tempfile.new("pkg")
+    logger = Logger.new("/dev/null")
+    options = {key: true, project: :project2}
+    config = good_config
+    config[:keys][:key_dir] = "/bad"
+    config[:keys][:a][:keyed_pkg] = File.basename(tmp_file.path)
+
+    code = nil
+    configs = nil
+
+    code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
+
+    assert_equal RokuBuilder::BAD_KEY_FILE, code
+  end
+
+  def test_manifest_config_key_path_bad
+    tmp_file = Tempfile.new("pkg")
+    logger = Logger.new("/dev/null")
+    options = {key: true, project: :project2}
+    config = good_config
+    config[:keys][:key_dir] = File.dirname(tmp_file.path)
+    config[:keys][:a][:keyed_pkg] = File.basename(tmp_file.path)+".bad"
+
+    code = nil
+    configs = nil
+
+    code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
+
+    assert_equal RokuBuilder::BAD_KEY_FILE, code
   end
 
   def test_setup_sideload_config

data/test/roku_builder/test_error_handler.rb

@@ -36,6 +36,8 @@ class ErrorHandlerTest < Minitest::Test
           RokuBuilder::UNKNOWN_DEVICE,
           RokuBuilder::UNKNOWN_PROJECT,
           RokuBuilder::UNKNOWN_STAGE,
+          RokuBuilder::BAD_PROJECT_DIR,
+          RokuBuilder::BAD_KEY_FILE
         ],
         command_code: [
           RokuBuilder::FAILED_SIDELOAD,

data/test/roku_builder/test_files/controller_config_test/valid_config.json

@@ -10,7 +10,7 @@
   "projects": {
     "default": "p1",
     "p1": {
-      "directory": "/dev/null",
+      "directory": "/dev/nuller",
       "folders": ["resources","source"],
       "files": ["manifest"],
       "app_name": "app",
@@ -18,7 +18,7 @@
         "production": {
           "branch": "master",
           "key": {
-            "keyed_pkg": "/dev/null",
+            "keyed_pkg": "/tmp",
             "password": "password"
           }
         }

data/test/roku_builder/test_helper.rb

@@ -27,7 +27,7 @@ def good_config
     projects: {
       default: :project1,
       project1: {
-        directory: "/dev/null",
+        directory: "/tmp",
         folders: ["resources","source"],
         files: ["manifest"],
         app_name: "<app name>",
@@ -36,14 +36,14 @@ def good_config
           production: {
             branch: "production",
             key: {
-              keyed_pkg: "/dev/null",
+              keyed_pkg: "/tmp",
               password: "<password for pkg>"
             }
           }
         }
       },
       project2: {
-        directory: "/dev/nuller",
+        directory: "/tmp",
         folders: ["resources","source"],
         files: ["manifest"],
         app_name: "<app name>",
@@ -58,7 +58,7 @@ def good_config
     },
     keys: {
       a: {
-        keyed_pkg: "/dev/null",
+        keyed_pkg: "/tmp",
         password: "password"
       }
     },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 3.12.6
+  version: 3.12.7
 platform: ruby
 authors:
 - greeneca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip