roku_builder 3.12.5 → 3.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b84000d926e8db3e7fd7b8c914b52f78f1a4ce4d
-  data.tar.gz: 40586d39402dd539138b215c31d2840e166b304e
+  metadata.gz: 7ef20c9d8920488e1f6102fbab02b28ccbb80673
+  data.tar.gz: cd1b32fbf7fb6ab5fdd115c7668011018e0f57e7
 SHA512:
-  metadata.gz: cbcd65228f732a9c7091fe806ee37b7136bd7a05c5007ac0b252cc96cc59d5b1da65c305791a2ddb29ea254ea0a52a7a94f21478c374037408e1f9772aca11b6
-  data.tar.gz: faf91298b57a59e4b01cd6e5a7944da703abba7be7edb4aa307e50704139e09b4ebe386bf3b9aa237ad5c3c69d66930405d76c822e09eeef4c3cf9c1089e7152
+  metadata.gz: 64bc408f43e49d29d271f6dc4a6d5caf455a2a66e6e14616cc1b2ee374df10bcfc31236a2a8d9baf854e9728c753a3f2255fb5916717cc21234f70c5436c4e3f
+  data.tar.gz: fa56cde1eaf03aa4908c8ff240f149847176a026dbe97ad556c563a354e67e3486f3e791ea1cc9c1fe4b5f1cca0aada1ac315d0ddddbd11ef925d1482499f86f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roku_builder (3.12.5)
+    roku_builder (3.12.6)
       faraday (~> 0.11)
       faraday-digestauth (~> 0.2)
       git (~> 1.3)
@@ -64,7 +64,7 @@ GEM
     net-http-digest_auth (1.4.1)
     net-ping (2.0.1)
     net-telnet (0.1.1)
-    nokogiri (1.7.0.1)
+    nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
     notiffany (0.1.1)
       nenv (~> 0.1)

data/README.md

@@ -52,8 +52,9 @@ following command:
     $ roku --configure
 
 This will create the file '~/.roku_config.json' with a default configuration.
-Edit this file to add appropriate values. The following are default
-configuration options:
+Edit this file to add appropriate values. A configuration example with the
+minimum require fields can be found in this project called 'config.json.min'.
+The following are default configuration options:
 
 ##### Top Level Configuration
 

data/config.json.example

@@ -3,7 +3,7 @@
     "default": "<device_id>",
     "<device_id>": {
       "ip": "xxx.xxx.xxx.xxx",
-      "user": "<username>",
+      "user": "rokudev",
       "password": "<password>"
     }
   },

data/config.json.min

@@ -0,0 +1,10 @@
+{
+  "devices": {
+    "default": "<device_id>",
+    "<device_id>": {
+      "ip": "xxx.xxx.xxx.xxx",
+      "user": "rokudev",
+      "password": "password"
+    }
+  }
+}

data/lib/roku_builder/config_manager.rb

@@ -49,20 +49,22 @@ module RokuBuilder
         config = build_config(config: config, logger: logger)
         return nil unless config
         config[:devices][:default] = config[:devices][:default].to_sym
-        config[:projects][:default] = config[:projects][:default].to_sym
-        config[:projects].each_pair do |key,value|
-          next if key == :default
-          next if key == :project_dir
-          if value[:stage_method]
-            value[:stage_method] = value[:stage_method].to_sym
+        if config[:projects]
+          config[:projects][:default] = config[:projects][:default].to_sym
+          config[:projects].each_pair do |key,value|
+            next if key == :default
+            next if key == :project_dir
+            if value[:stage_method]
+              value[:stage_method] = value[:stage_method].to_sym
+            end
           end
-        end
-        config[:projects].each_pair do |key, value|
-          unless key == :default or key == :project_dir
-            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
+          config[:projects].each_pair do |key, value|
+            unless key == :default or key == :project_dir
+              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
         end

data/lib/roku_builder/config_parser.rb

@@ -19,7 +19,7 @@ module RokuBuilder
         options[:device] = config[:devices][:default]
       end
       #set project
-      setup_project(config: config, options: options)
+      setup_project(config: config, options: options) if project_required(options: options)
       #set outfile
       setup_outfile(options: options, configs: configs)
       # Create Device Config
@@ -30,10 +30,11 @@ module RokuBuilder
       return [project_config, nil, nil] unless project_config.class == Hash
       configs[:project_config] = project_config
       stage = setup_stage_config(configs: configs, options: options, logger: logger)[1]
-      return [UNKNOWN_STAGE, nil, nil] unless stage
+      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)
       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)
       return [SUCCESS, configs]
     end
@@ -109,7 +110,7 @@ module RokuBuilder
           files: nil,
           stage_method: :current
         }
-      else
+      elsif project_required(options: options)
         project_config = config[:projects][options[:project].to_sym]
         return UNKNOWN_PROJECT unless project_config
         if config[:projects][:project_dir]
@@ -121,34 +122,43 @@ module RokuBuilder
     end
     private_class_method :setup_project_config
 
+    # Determine whether a project is required
+    # @param options [Hash] The options hash
+    # @return [Boolean] Whether a project is required or not
+    def self.project_required(options:)
+      has_source_command = (Controller.source_commands & options.keys).count > 0
+      non_project_source = ([:current, :in] & options.keys).count > 0
+      has_source_command and not non_project_source
+    end
+    private_class_method :project_required
+
     # Setup the project stage config
     # @param configs [Hash] The loaded config hash
     # @param options [Hash] The options hash
     # @return [Hash] The stage config hash
     def self.setup_stage_config(configs:, options:, logger:)
       stage_config = {logger: logger}
+      stage_config[:method] = ([:in, :current] & options.keys).first
       stage = options[:stage].to_sym if options[:stage]
-      project_config = configs[:project_config]
-      unless project_config[:stage_method] == :current
+      if project_required(options: options)
+        project_config = configs[:project_config]
         stage ||= project_config[:stages].keys[0].to_sym
-      else
-        stage = :current
-      end
-      options[:stage] = stage
-      stage_config[:root_dir] = project_config[:directory]
-      stage_config[:method] = project_config[:stage_method]
-      stage_config[:method] ||= :git
-      case stage_config[:method]
-      when :git
-        if options[:ref]
-          stage_config[:key] = options[:ref]
-        else
+        options[:stage] = stage
+        stage_config[:root_dir] = project_config[:directory]
+        stage_config[:method] = project_config[:stage_method]
+        stage_config[:method] ||= :git
+        case stage_config[:method]
+        when :git
+          if options[:ref]
+            stage_config[:key] = options[:ref]
+          else
+            return [nil, nil] unless project_config[:stages][stage]
+            stage_config[:key] = project_config[:stages][stage][:branch]
+          end
+        when :script
           return [nil, nil] unless project_config[:stages][stage]
-          stage_config[:key] = project_config[:stages][stage][:branch]
+          stage_config[:key] = project_config[:stages][stage][:script]
         end
-      when :script
-        return [nil, nil] unless project_config[:stages][stage]
-        stage_config[:key] = project_config[:stages][stage][:script]
       end
       configs[:stage_config] = stage_config
       configs[:stage] = stage
@@ -160,16 +170,18 @@ module RokuBuilder
     # @param options [Hash] The options hash
     # @param branch [String] the branch to sideload
     def self.setup_sideload_config(configs:, options:)
-      root_dir = configs[:project_config][:directory]
-      content = {
-        folders: configs[:project_config][:folders],
-        files: configs[:project_config][:files],
-      }
-      all_commands = options.keys & Controller.commands
-      if options[:exclude] or Controller.exclude_commands.include?(all_commands.first)
-        content[:excludes] = configs[:project_config][:excludes]
+      root_dir, content = nil, nil
+      if configs[:project_config]
+        root_dir = configs[:project_config][:directory]
+        content = {
+          folders: configs[:project_config][:folders],
+          files: configs[:project_config][:files],
+        }
+        all_commands = options.keys & Controller.commands
+        if options[:exclude] or Controller.exclude_commands.include?(all_commands.first)
+          content[:excludes] = configs[:project_config][:excludes]
+        end
       end
-
       # Create Sideload Config
       configs[:sideload_config] = {
         update_manifest: options[:update_manifest],
@@ -177,12 +189,8 @@ module RokuBuilder
         content: content
       }
       # Create Build Config
-      configs[:build_config] = {
-        content: content
-      }
-      configs[:init_params][:loader] = {
-        root_dir: root_dir
-      }
+      configs[:build_config] = { content: content }
+      configs[:init_params][:loader] = { root_dir: root_dir }
     end
     private_class_method :setup_sideload_config
 
@@ -249,15 +257,26 @@ module RokuBuilder
     end
     private_class_method :setup_active_configs
 
-    # Setup other configs
+    # Setup manifest configs
     # @param configs [Hash] The parsed configs hash
     # @param options [Hash] The options hash
     # @param logger [Logger] System logger
-    def self.setup_simple_configs(config:, configs:, options:)
+    def self.setup_manifest_configs(configs:, options:)
       # Create Manifest Config
+      root_dir = configs[:project_config][:directory] if configs[:project_config]
+      root_dir = options[:in] if options[:in]
+      root_dir = Pathname.pwd.to_s if options[:current]
       configs[:manifest_config] = {
-        root_dir: configs[:project_config][:directory]
+        root_dir: root_dir
       }
+    end
+    private_class_method :setup_manifest_configs
+
+    # Setup other configs
+    # @param configs [Hash] The parsed configs hash
+    # @param options [Hash] The options hash
+    # @param logger [Logger] System logger
+    def self.setup_simple_configs(config:, configs:, options:)
       # Create Deeplink Config
       configs[:deeplink_config] = {options: options[:deeplink]}
       if options[:app_id]

data/lib/roku_builder/config_validator.rb

@@ -5,7 +5,7 @@ module RokuBuilder
   MISSING_DEVICES           = 1
   MISSING_DEVICES_DEFAULT   = 2
   DEVICE_DEFAULT_BAD        = 3
-  MISSING_PROJECTS          = 4
+  #                         = 4
   MISSING_PROJECTS_DEFAULT  = 5
   PROJECTS_DEFAULT_BAD      = 6
   DEVICE_MISSING_IP         = 7
@@ -69,7 +69,7 @@ module RokuBuilder
         "Devices config is missing.",
         "Devices default is missing.",
         "Devices default is not a hash.",
-        "Projects config is missing.",
+        "",
         "Projects default is missing.", #5
         "Projects default is not a hash.",
         "A device config is missing its IP address.",
@@ -101,7 +101,6 @@ module RokuBuilder
         [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))]

data/lib/roku_builder/controller.rb

@@ -184,7 +184,7 @@ module RokuBuilder
     # List of depricated options
     # @return [Hash] Hash of depricated options and the warning message for each
     def self.depricated_options
-      {deeplink_depricated: "-L and --deeplink are depricated. Use -o -r --deeplink-options." }
+      {deeplink_depricated: "-L and --deeplink are depricated. Use -o or --deeplink-options." }
     end
 
     # List of source options
@@ -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]
+      [:sideload, :package, :test, :build, :key, :update]
     end
 
     # List of commands the activate the exclude files

data/lib/roku_builder/stager.rb

@@ -5,7 +5,7 @@ module RokuBuilder
   # Change stage of roku application
   class Stager
 
-    def initialize(key: nil, method:, root_dir:, logger:)
+    def initialize(key: nil, method:, root_dir: nil, logger:)
       @method = method
       @key = key
       @root_dir = root_dir
@@ -25,11 +25,9 @@ module RokuBuilder
     # @return [Boolean] whether the staging was successful or not
     def stage
       @orginal_directory = Dir.pwd
-      Dir.chdir(@root_dir) unless @root_dir == @orginal_directory
+      Dir.chdir(@root_dir) unless @root_dir.nil? or @root_dir == @orginal_directory
       case @method
-      when :current
-        # Do Nothing
-      when :working
+      when :current, :in, :working
         # Do Nothing
       when :git
         begin
@@ -48,12 +46,10 @@ module RokuBuilder
     # @return [Boolean] whether the revert was successful or not
     def unstage
       @orginal_directory ||= Dir.pwd
-      Dir.chdir(@root_dir) unless @root_dir == @orginal_directory
+      Dir.chdir(@root_dir) unless @root_dir.nil? or @root_dir == @orginal_directory
       unstage_success = true
       case @method
-      when :current
-        # Do Nothing
-      when :working
+      when :current, :in, :working
         # Do Nothing
       when :git
         begin

data/lib/roku_builder/version.rb

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

data/test/roku_builder/test_config_manager.rb

@@ -96,13 +96,6 @@ class ConfigManagerTest < Minitest::Test
     assert_nil config
     assert_nil configs
 
-    # Test Unknown Project
-    options = {validate: true, project: :bad, config: target_config}
-    code, config, configs = RokuBuilder::ConfigManager.load_config(options: options, logger: logger)
-    assert_equal RokuBuilder::UNKNOWN_PROJECT, code
-    assert_nil config
-    assert_nil configs
-
     # Test Depricated Config
     options = {validate: true, stage: 'production', config: target_config}
     RokuBuilder::ConfigValidator.stub(:validate_config, [-1]) do

data/test/roku_builder/test_config_parser.rb

@@ -10,6 +10,7 @@ class ConfigParserTest < Minitest::Test
       stage: 'production',
       update_manifest: false,
       fetch: false,
+      sideload: true
     }
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
@@ -19,6 +20,47 @@ class ConfigParserTest < Minitest::Test
     assert_equal "/dev/null", configs[:manifest_config][:root_dir]
   end
 
+  def test_manifest_config_in
+    logger = Logger.new("/dev/null")
+    options = {
+      config: File.expand_path(File.join(File.dirname(__FILE__), "test_files", "controller_config_test", "valid_config.json")),
+      in: "/dev/null/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 "/dev/null/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 = {
+      config: File.expand_path(File.join(File.dirname(__FILE__), "test_files", "controller_config_test", "valid_config.json")),
+      current: true,
+      update_manifest: false,
+      fetch: false,
+      sideload: true
+    }
+    code, configs = nil
+    config = good_config
+    Pathname.stub(:pwd, "/dev/null/infile") do
+      File.stub(:exist?, true) do
+        code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
+      end
+    end
+
+    assert_equal RokuBuilder::SUCCESS, code
+    assert_equal Hash, config.class
+    assert_equal "/dev/null/infile", configs[:manifest_config][:root_dir]
+    assert_equal :current, configs[:stage_config][:method]
+  end
+
   def test_setup_project_config_current
     args = {
       config: {},
@@ -37,7 +79,7 @@ class ConfigParserTest < Minitest::Test
   def test_setup_stage_config_script
     args = {
       configs: {project_config: {directory: "/tmp", stage_method: :script, stages: {production: {script: "script"}}}},
-      options: {stage: "production"},
+      options: {stage: "production", sideload: true},
       logger: Logger.new("/dev/null")
     }
     config = RokuBuilder::ConfigParser.send(:setup_stage_config, **args)[0]
@@ -47,7 +89,7 @@ class ConfigParserTest < Minitest::Test
   def test_setup_stage_config_git_ref
     args = {
       configs: {project_config: {directory: "/tmp", stage_method: :git, }},
-      options: {stage: "production", ref: "git-ref"},
+      options: {stage: "production", ref: "git-ref", sideload: true},
       logger: Logger.new("/dev/null")
     }
     config = RokuBuilder::ConfigParser.send(:setup_stage_config, **args)[0]
@@ -61,6 +103,7 @@ class ConfigParserTest < Minitest::Test
       stage: 'production',
       update_manifest: false,
       fetch: false,
+      sideload: true
     }
     config = good_config
 
@@ -78,7 +121,9 @@ class ConfigParserTest < Minitest::Test
 
   def test_manifest_config_project_directory
     logger = Logger.new("/dev/null")
-    options = {}
+    options = {
+      sideload: true
+    }
     config = good_config
     config[:projects][:project_dir] = "/tmp"
     config[:projects][:project1][:directory] = "project1"
@@ -102,6 +147,7 @@ class ConfigParserTest < Minitest::Test
       stage: 'production',
       update_manifest: false,
       fetch: false,
+      sideload: true
     }
     config = good_config
     config[:projects][:project_dir] = "/tmp"

data/test/roku_builder/test_config_validator.rb

@@ -92,7 +92,7 @@ class ConfigValidatorTest < Minitest::Test
     config = good_config
     config[:projects] = nil
     codes = RokuBuilder::ConfigValidator.validate_config(config: config)
-    assert_equal [4], codes
+    assert_equal [0], codes
   end
 
   def test_config_manager_validate_projects_default

data/test/roku_builder/test_stager.rb

@@ -39,6 +39,18 @@ class StagerTest < Minitest::Test
     assert stager.unstage
   end
 
+  def test_stager_stage_in
+    root_dir = File.join(File.dirname(__FILE__), "test_files", "stager_test")
+    stager_config = {
+      method: :in,
+      root_dir: root_dir,
+      logger: nil
+    }
+    stager = RokuBuilder::Stager.new(**stager_config)
+    assert stager.stage
+    assert stager.unstage
+  end
+
   def test_stager_stage_git_stash
     root_dir = File.join(File.dirname(__FILE__), "test_files", "stager_test")
     branch_name = 'branch'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 3.12.5
+  version: 3.12.6
 platform: ruby
 authors:
 - greeneca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -295,6 +295,7 @@ files:
 - README.md
 - bin/roku
 - config.json.example
+- config.json.min
 - lib/roku_builder.rb
 - lib/roku_builder/config_manager.rb
 - lib/roku_builder/config_parser.rb