roku_builder 3.8.5 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e69a8b0a723f44c117d5ad9ae4522dbb7aad0eb
-  data.tar.gz: 7255b70fa5193336e44fa93252310e6b0accea2a
+  metadata.gz: 3f57f3dc9e27633cf6455dd16f475e29c3ad4ac7
+  data.tar.gz: 0d772e6d322cd620e17a6ad861ec6188a77fbaa6
 SHA512:
-  metadata.gz: 4c6ea13b6683e837ae814c9fd4132527711ee1935404010905c73a6466d3ea39be566a49900045e5124530009fbfd552c314171892ccd51022a744786ecff999
-  data.tar.gz: c9b6a34923ff4b7d47c02d635ded9633e0aa151d7bc90cacc5883105c875a5f8d1738094e559882f3e0788cfea40458378b343e7759789c1a87a4fda92cdfa32
+  metadata.gz: 9e5f2ac10ed8c2788e5105b117db686cbedb628be12894b9a1867474dbeee934ff739359157ad471d34de1fb05d2c15a47e7460b9cce48daa7db40b74f7e5fe2
+  data.tar.gz: 41774f8096866ae56473ad8d9bbd970ece9403728ac88e680d7558550c85adfdfcc51a458a7b4842bd625b9ec5c05b132bc913c946bdaf8762d702264a715074

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    roku_builder (3.8.5)
+    roku_builder (3.9.0)
       faraday (~> 0.9)
       faraday-digestauth (~> 0.2)
       git (~> 1.3)
-      net-ping (~> 1.7)
+      net-ping (~> 2.0)
       net-telnet (~> 0.1)
       nokogiri (~> 1.6)
       rubyzip (~> 1.2)
@@ -67,7 +67,7 @@ GEM
     multipart-post (2.0.0)
     nenv (0.3.0)
     net-http-digest_auth (1.4)
-    net-ping (1.7.8)
+    net-ping (2.0.1)
     net-telnet (0.1.1)
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)

data/README.md

@@ -308,7 +308,6 @@ directory:
 
 ## Improvements
 
- * Account for missing folders or files
  * Increase testing
    * Config Unit Tests
    * Intergration Tests

data/bin/roku

@@ -12,7 +12,12 @@ options = {}
 options[:config] = '~/.roku_config.json'
 options[:update_manifest] = false
 
-OptionParser.new do |opts|
+logger = Logger.new(STDOUT)
+logger.formatter = proc {|severity, datetime, _progname, msg|
+  "[%s #%s] %5s: %s\n\r" % [datetime.strftime("%Y-%m-%d %H:%M:%S.%4N"), $$, severity, msg]
+}
+
+parser = OptionParser.new do |opts|
   opts.banner = "Usage: roku <command> [options]"
 
   opts.on("-l", "--sideload", "Command: Sideload an app") do
@@ -75,11 +80,11 @@ OptionParser.new do |opts|
     options[:profile] = c
   end
 
-  opts.on("--do-stage", "Command: Run the stager. Used for scripting. Alwasy run --do-unscript after") do
+  opts.on("--do-stage", "Command: Run the stager. Used for scripting. Always run --do-unscript after") do
     options[:dostage] = true
   end
 
-  opts.on("--do-unstage", "Command: Run the unstager. Used for scripting. Alwasy run --do-script first") do
+  opts.on("--do-unstage", "Command: Run the unstager. Used for scripting. Always run --do-script first") do
     options[:dounstage] = true
   end
 
@@ -178,6 +183,12 @@ OptionParser.new do |opts|
     puts RokuBuilder::VERSION
     exit
   end
-end.parse!
+end
+
+begin
+  parser.parse!
+  RokuBuilder::Controller.run(options: options, logger: logger)
+rescue OptionParser::ParseError => e
+  logger.fatal e.message
+end
 
-RokuBuilder::Controller.run(options: options)

data/config.json.example

@@ -19,12 +19,15 @@
       "stages":{
         "production": {
           "branch": "production",
-          "key": {
-            "keyed_pkg": "<path/to/signed/pkg>",
-            "password": "<password for pkg>"
-          }
+          "key": "key1"
         }
       }
     }
+  },
+  "keys": {
+    "key1": {
+      "keyed_pkg": "<path/to/signed/package>",
+      "password": "<password>"
+    }
   }
 }

data/lib/roku_builder/config_parser.rb

@@ -32,7 +32,7 @@ module RokuBuilder
       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)
+      setup_package_config(config: config, configs: configs, options: options, stage: stage)
       setup_simple_configs(configs: configs, options: options, logger: logger)
       return [SUCCESS, configs]
     end
@@ -135,11 +135,11 @@ module RokuBuilder
         if options[:ref]
           stage_config[:key] = options[:ref]
         else
-          return nil unless project_config[:stages][stage]
+          return [nil, nil] unless project_config[:stages][stage]
           stage_config[:key] = project_config[:stages][stage][:branch]
         end
       when :script
-        return nil unless project_config[:stages][stage]
+        return [nil, nil] unless project_config[:stages][stage]
         stage_config[:key] = project_config[:stages][stage][:script]
       end
       configs[:stage_config] = stage_config
@@ -182,10 +182,13 @@ module RokuBuilder
     # @param configs [Hash] The parsed configs hash
     # @param options [Hash] The options hash
     # @param stage [Symbol] The stage to package
-    def self.setup_package_config(configs:, options:, stage:)
+    def self.setup_package_config(config:, configs:, options:, stage:)
       if options[:package] or options[:key]
         # Create Key Config
         configs[:key] = configs[:project_config][:stages][stage][:key]
+        if configs[:key].class == String
+          configs[:key] = config[:keys][configs[:key].to_sym]
+        end
       end
       if options[:package]
         # Create Package Config

data/lib/roku_builder/config_validator.rb

@@ -20,7 +20,8 @@ module RokuBuilder
   STAGE_MISSING_BRANCH      = 16
   STAGE_MISSING_SCRIPT      = 17
   PROJECT_STAGE_METHOD_BAD  = 18
-
+  KEY_MISSING_PATH          = 19
+  KEY_MISSING_PASSWORD      = 20
 
   MISSING_STAGE_METHOD      = -1
 
@@ -50,6 +51,11 @@ module RokuBuilder
           end
         }
       end
+      if config[:keys]
+        config[:keys].each {|key,key_config|
+          validate_key(codes: codes, key: key_config)
+        }
+      end
       codes.uniq!
       codes.push(0) if codes.empty?
       codes
@@ -79,6 +85,8 @@ module RokuBuilder
         "A project stage is missing its branch.",
         "A project stage is missing its script.",
         "A project as an invalid stage method.",
+        "A key is missing its keyed package path.",
+        "A key is missing its password.", #20
         #===============WARNINGS===============#
         "A project is missing its stage method."
       ]
@@ -150,6 +158,20 @@ module RokuBuilder
     end
     private_class_method :validate_stage
 
+    # Validates a roku config project
+    # @param codes [Array] array of error codes
+    # @param project [Hash] project config object
+    def self.validate_key(codes:, key:)
+      errors= [
+        [KEY_MISSING_PATH, (!key[:keyed_pkg])],
+        [KEY_MISSING_PATH, (key[:keyed_pkg] == "<path/to/signed/package>")],
+        [KEY_MISSING_PASSWORD, (!key[:password])],
+        [KEY_MISSING_PASSWORD, (key[:password] == "<password>")],
+      ]
+      process_errors(codes: codes, errors: errors)
+    end
+    private_class_method :validate_key
+
     def self.process_errors(codes:, errors:)
       errors.each do |error|
         codes.push(error[0]) if error[1]

data/lib/roku_builder/controller.rb

@@ -7,11 +7,7 @@ module RokuBuilder
 
     # Run the builder
     # @param options [Hash] The options hash
-    def self.run(options:)
-      logger = Logger.new(STDOUT)
-      logger.formatter = proc {|severity, datetime, _progname, msg|
-        "[%s #%s] %5s: %s\n\r" % [datetime.strftime("%Y-%m-%d %H:%M:%S.%4N"), $$, severity, msg]
-      }
+    def self.run(options:, logger:)
       if options[:debug]
         logger.level = Logger::DEBUG
       elsif options[:verbose]

data/lib/roku_builder/controller_commands.rb

@@ -49,7 +49,7 @@ module RokuBuilder
         success = loader.sideload(**configs[:sideload_config])[0]
       end
       stager.unstage
-      unless success == FAILED_SIDELOAD
+      if success == SUCCESS
         logger.info "App Sideloaded; staged using #{stager.method}"
       end
       success

data/lib/roku_builder/error_handler.rb

@@ -113,6 +113,10 @@ module RokuBuilder
         abort
       when BAD_PRINT_ATTRIBUTE
         logger.fatal "Unknown print attribute"
+        abort
+      when MISSING_MANIFEST
+        logger.fatal 'Manifest file missing'
+        abort
       end
     end
 

data/lib/roku_builder/linker.rb

@@ -17,7 +17,10 @@ module RokuBuilder
       unless payload.keys.count > 0
         @logger.warn "No options sent to launched app"
       else
-        path = "#{path}?#{parameterize(payload)}"
+        payload = parameterize(payload)
+        path = "#{path}?#{payload}"
+        @logger.info "Deeplink:"
+        @logger.info payload
       end
 
       conn = multipart_connection(port: 8060)

data/lib/roku_builder/loader.rb

@@ -21,15 +21,19 @@ module RokuBuilder
       build_version = nil
       if infile
         build_version = ManifestManager.build_version(root_dir: infile)
+        return [MISSING_MANIFEST, nil] if outfile == MISSING_MANIFEST
         outfile = infile
       else
         # Update manifest
         if update_manifest
           build_version = ManifestManager.update_build(root_dir: @root_dir)
+          return [MISSING_MANIFEST, nil] if outfile == MISSING_MANIFEST
         else
           build_version = ManifestManager.build_version(root_dir: @root_dir)
+          return [MISSING_MANIFEST, nil] if outfile == MISSING_MANIFEST
         end
         outfile = build(build_version: build_version, content: content)
+        return [MISSING_MANIFEST, nil] if outfile == MISSING_MANIFEST
       end
       path = "/plugin_install"
       # Connect to roku and upload file
@@ -55,6 +59,7 @@ module RokuBuilder
     # @return [String] Path of the build
     def build(build_version: nil, outfile: nil, content: nil)
       build_version = ManifestManager.build_version(root_dir: @root_dir) unless build_version
+      return MISSING_MANIFEST if build_version == MISSING_MANIFEST
       content ||= {}
       unless content and content[:folders]
         content[:folders] = Dir.entries(@root_dir).select {|entry| File.directory? File.join(@root_dir, entry) and !(entry =='.' || entry == '..') }
@@ -69,10 +74,14 @@ module RokuBuilder
       # Add folders to zip
       content[:folders].each do |folder|
         base_folder = File.join(@root_dir, folder)
-        entries = Dir.entries(base_folder)
-        entries.delete(".")
-        entries.delete("..")
-        writeEntries(@root_dir, entries, folder, content[:excludes], io)
+        if File.exist?(base_folder)
+          entries = Dir.entries(base_folder)
+          entries.delete(".")
+          entries.delete("..")
+          writeEntries(@root_dir, entries, folder, content[:excludes], io)
+        else
+          @logger.warn "Missing Folder: #{base_folder}"
+        end
       end
       # Add file to zip
       writeEntries(@root_dir, content[:files], "", content[:excludes], io)
@@ -114,7 +123,11 @@ module RokuBuilder
           writeEntries(root_dir, subdir, zipFilePath, excludes, io)
         else
           unless excludes.include?(zipFilePath)
-            io.get_output_stream(zipFilePath) { |f| f.puts(File.open(diskFilePath, "rb").read()) }
+            if File.exist?(diskFilePath)
+              io.get_output_stream(zipFilePath) { |f| f.puts(File.open(diskFilePath, "rb").read()) }
+            else
+              @logger.warn "Missing File: #{diskFilePath}"
+            end
           end
         end
       }

data/lib/roku_builder/manifest_manager.rb

@@ -9,7 +9,7 @@ module RokuBuilder
     # @param root_dir [String] Path to the root directory for the app
     # @return [String] Build version on success, empty string otherwise
     def self.update_build(root_dir:)
-
+      return MISSING_MANIFEST unless self.check_manifest(root_dir: root_dir)
       build_version = self.build_version(root_dir: root_dir).split(".")
       if 2 == build_version.length
         iteration = build_version[1].to_i + 1
@@ -24,14 +24,17 @@ module RokuBuilder
       self.build_version(root_dir: root_dir)
     end
 
+
     # Retrive the build version from the manifest file
     # @param root_dir [String] Path to the root directory for the app
     # @return [String] Build version on success, empty string otherwise
     def self.build_version(root_dir:)
+      return MISSING_MANIFEST unless self.check_manifest(root_dir: root_dir)
       read_manifest(root_dir: root_dir)[:build_version]
     end
 
     def self.read_manifest(root_dir:)
+      return MISSING_MANIFEST unless self.check_manifest(root_dir: root_dir)
       attrs = {}
       get_attrs = lambda  { |file|
         file.each_line do |line|
@@ -90,6 +93,23 @@ module RokuBuilder
       end
     end
 
+    # Check to make sure that the manifest file exists
+    # @param root_dir [String] Path to the root directory for the app
+    # @return [Boolean] True if manifest exists, false otherwise
+    def self.check_manifest(root_dir:)
+      return false unless File.exist?(root_dir)
+      if File.directory?(root_dir)
+        path = File.join(root_dir, 'manifest')
+        return false unless File.exist?(path)
+      elsif File.extname(root_dir) == ".zip"
+        Zip::File.open(root_dir) do |zip_file|
+          entry = zip_file.glob("manifest").first
+          return false unless entry
+        end
+      end
+      true
+    end
+
     # Returns the default manafest values
     # @return [Hash] default manifest values
     def self.default_params

data/lib/roku_builder/version.rb

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

data/roku_builder.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "faraday",             "~> 0.9"
   spec.add_dependency "faraday-digestauth",  "~> 0.2"
   spec.add_dependency "git",                 "~> 1.3"
-  spec.add_dependency "net-ping",            "~> 1.7"
+  spec.add_dependency "net-ping",            "~> 2.0"
   spec.add_dependency "net-telnet",          "~> 0.1"
   spec.add_dependency "nokogiri",            "~> 1.6"
 

data/tests/roku_builder/controller_test.rb

@@ -142,23 +142,18 @@ class ControllerTest < Minitest::Test
     ]
     tests.each do |test|
       logger = Minitest::Mock.new
-      logger.expect(:formatter=, nil) do |proc_object|
-        proc_object.class == Proc and proc_object.arity == 4
-      end
       logger.expect(:level=, nil, [test[:level]])
-      Logger.stub(:new, logger) do
-        RokuBuilder::Controller.stub(:validate_options, nil) do
-          RokuBuilder::ErrorHandler.stub(:handle_options_codes, nil) do
-            RokuBuilder::Controller.stub(:configure, nil) do
-              RokuBuilder::ErrorHandler.stub(:handle_configure_codes, nil) do
-                RokuBuilder::ConfigManager.stub(:load_config, nil) do
-                  RokuBuilder::ErrorHandler.stub(:handle_load_codes, nil) do
-                    RokuBuilder::Controller.stub(:check_devices, nil) do
-                      RokuBuilder::ErrorHandler.stub(:handle_device_codes, nil) do
-                        RokuBuilder::Controller.stub(:execute_commands, nil) do
-                          RokuBuilder::ErrorHandler.stub(:handle_command_codes, nil) do
-                            RokuBuilder::Controller.run(options: test[:options])
-                          end
+      RokuBuilder::Controller.stub(:validate_options, nil) do
+        RokuBuilder::ErrorHandler.stub(:handle_options_codes, nil) do
+          RokuBuilder::Controller.stub(:configure, nil) do
+            RokuBuilder::ErrorHandler.stub(:handle_configure_codes, nil) do
+              RokuBuilder::ConfigManager.stub(:load_config, nil) do
+                RokuBuilder::ErrorHandler.stub(:handle_load_codes, nil) do
+                  RokuBuilder::Controller.stub(:check_devices, nil) do
+                    RokuBuilder::ErrorHandler.stub(:handle_device_codes, nil) do
+                      RokuBuilder::Controller.stub(:execute_commands, nil) do
+                        RokuBuilder::ErrorHandler.stub(:handle_command_codes, nil) do
+                          RokuBuilder::Controller.run(options: test[:options], logger: logger)
                         end
                       end
                     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 3.8.5
+  version: 3.9.0
 platform: ruby
 authors:
 - greeneca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: net-telnet
   requirement: !ruby/object:Gem::Requirement