roku_builder 3.6.3 → 3.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7f742dbc20bf1b9b2c0d4630766b4cfe8331bcc
-  data.tar.gz: 0cc26f2c74cefc294825774d4224350bb776d9ad
+  metadata.gz: 5491a8115dec46aaf4d5aa694bc5d32b66ac39bf
+  data.tar.gz: 01a9774a5829a0966e6d05dd9187141d00bba712
 SHA512:
-  metadata.gz: 6fa6683a5282913bfe575478f4bf944585890def77ef21dd76ec52e3bbcf0d89294a3cb749728f9ccbd5352d5d01aa6b279c06c5b7b5a9b34df4a84b4ec230b4
-  data.tar.gz: 07a18218d5a80791d8af63f529255db433379fa85b0ab1e3dc92eb03c64ec85979f690fad382e17d4d0b7a13aefd693c6c11efa5a9d5aee6259787e1570cf054
+  metadata.gz: 387ce09f99b318904e27b96a8c698f3dd357242e68d3422802306beb5daafb415dea3d69bf92cab81e1c7cd0130a07c9d21585dcca33b157f19dfbd7d4ae2438
+  data.tar.gz: 3c141ea7b5f3f83c886fc70a905c683e4d229aed277499ec7f4311a8aae24a81ba0a8cedbed15820d19f6704a505f2f4bf4b221c7b4a22be818d9a32f9e51af1

data/Gemfile.lock

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

data/bin/roku

@@ -68,6 +68,10 @@ OptionParser.new do |opts|
     options[:key] = true
   end
 
+  opts.on("--print ATTRIBUTE", "Command: Print attribute for scripting") do |a|
+    options[:print] = a
+  end
+
   opts.on("--screen SCREEN", "Command: show a screen") do |s|
     options[:screen] = s
   end

data/lib/roku_builder.rb

@@ -25,6 +25,7 @@ require "roku_builder/loader"
 require "roku_builder/packager"
 require "roku_builder/linker"
 require "roku_builder/tester"
+require "roku_builder/scripter"
 require "roku_builder/manifest_manager"
 require "roku_builder/config_manager"
 require "roku_builder/config_validator"
@@ -134,6 +135,9 @@ module RokuBuilder
 
   # Did not sideload as content is identical
   IDENTICAL_SIDELOAD = 13
+
+  # Bad print attribute
+  BAD_PRINT_ATTRIBUTE = 14
 end
 
 class ::String

data/lib/roku_builder/controller.rb

@@ -162,7 +162,7 @@ module RokuBuilder
     def self.commands
       [:sideload, :package, :test, :deeplink,:configure, :validate, :delete,
         :navigate, :text, :build, :monitor, :update, :screencapture, :key, :screen,
-        :screens, :applist]
+        :screens, :applist, :print]
     end
 
     # List of depricated options

data/lib/roku_builder/controller_commands.rb

@@ -150,6 +150,19 @@ module RokuBuilder
       end
     end
 
+    # Run Print
+    # @param options [Hash] user options
+    # @param configs [Hash] parsed configs
+    def self.print(options:, configs:)
+      stager = Stager.new(**configs[:stage_config])
+      code = nil
+      if stager.stage
+        code = Scripter.print(attribute: options[:print].to_sym, configs: configs)
+      end
+      stager.unstage
+      code
+    end
+
     # Run a simple command
     # @param klass [Class] class of object to create
     # @param method [Symbol] methog to run on klass

data/lib/roku_builder/error_handler.rb

@@ -111,6 +111,8 @@ module RokuBuilder
       when FAILED_SCREENCAPTURE
         logger.fatal "Failed to Capture Screen"
         abort
+      when BAD_PRINT_ATTRIBUTE
+        logger.fatal "Unknown print attribute"
       end
     end
 

data/lib/roku_builder/manifest_manager.rb

@@ -10,64 +10,45 @@ module RokuBuilder
     # @return [String] Build version on success, empty string otherwise
     def self.update_build(root_dir:)
 
-      build_version = ""
-
-      temp_file = Tempfile.new('manifest')
-      path = File.join(root_dir, 'manifest')
-      begin
-        File.open(path, 'r') do |file|
-          file.each_line do |line|
-            if line.include?("build_version")
-
-              #Update build version.
-              build_version = line.split(".")
-              if 2 == build_version.length
-                iteration = build_version[1].to_i + 1
-                build_version[0] = Time.now.strftime("%m%d%y")
-                build_version[1] = iteration
-                build_version = build_version.join(".")
-              else
-                #Use current date.
-                build_version = Time.now.strftime("%m%d%y")+".1"
-              end
-              temp_file.puts "build_version=#{build_version}"
-            else
-              temp_file.puts line
-            end
-          end
-        end
-        temp_file.rewind
-        FileUtils.cp(temp_file.path, path)
-      ensure
-        temp_file.close
-        temp_file.unlink
+      build_version = self.build_version(root_dir: root_dir).split(".")
+      if 2 == build_version.length
+        iteration = build_version[1].to_i + 1
+        build_version[0] = Time.now.strftime("%m%d%y")
+        build_version[1] = iteration
+        build_version = build_version.join(".")
+      else
+        #Use current date.
+        build_version = Time.now.strftime("%m%d%y")+".0001"
       end
-      build_version
+      self.update_manifest(root_dir: root_dir, attributes: {build_version: build_version})
+      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:)
-      build_version = ""
-      get_version = lambda  { |file|
+      read_manifest(root_dir: root_dir)[:build_version]
+    end
+
+    def self.read_manifest(root_dir:)
+      attrs = {}
+      get_attrs = lambda  { |file|
         file.each_line do |line|
-          if line.include?("build_version")
-            build_version = line.split("=")[1].chomp
-          end
+          key, value = line.split("=")
+          attrs[key.chomp.to_sym]= value.chomp
         end
       }
       if File.directory?(root_dir)
         path = File.join(root_dir, 'manifest')
-        build_version = ""
-        File.open(path, 'r', &get_version)
+        File.open(path, 'r', &get_attrs)
       elsif File.extname(root_dir) == ".zip"
         Zip::File.open(root_dir) do |zip_file|
           entry = zip_file.glob("manifest").first
-          entry.get_input_stream(&get_version)
+          entry.get_input_stream(&get_attrs)
         end
       end
-      build_version
+      attrs
     end
 
     # Update attributes in the app manifest

data/lib/roku_builder/scripter.rb

@@ -0,0 +1,37 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
+module RokuBuilder
+
+  # Helper for extending for scripting
+  class Scripter
+
+    # Prints attributes from config or project to allow scripting
+    # @param attribute [Symbol] attribute to print
+    # @param configs [Hash] Parsed config hash
+    def self.print(attribute:, configs:)
+      attributes = [
+        :title, :build_version, :app_version, :root_dir
+      ]
+
+      unless attributes.include? attribute
+        return BAD_PRINT_ATTRIBUTE
+      end
+
+      read_config = {root_dir: configs[:project_config][:directory]}
+
+      case attribute
+      when :root_dir
+        printf "%s", configs[:project_config][:directory]
+      when :title
+        printf "%s", ManifestManager.read_manifest(**read_config)[:title]
+      when :build_version
+        printf "%s", ManifestManager.read_manifest(**read_config)[:build_version]
+      when :app_version
+        major = ManifestManager.read_manifest(**read_config)[:major_version]
+        minor = ManifestManager.read_manifest(**read_config)[:minor_version]
+        printf "%s.%s", major, minor
+      end
+      SUCCESS
+    end
+  end
+end

data/lib/roku_builder/version.rb

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

data/tests/roku_builder/keyer_test.rb

@@ -101,8 +101,10 @@ class KeyerTest < Minitest::Test
     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
+    # This test fails with the following seeds due to the random number
+    # generator spitting out the same number twice
+    # SEED=21894
+    # SEED=31813
     dev_id = Proc.new { Random.rand(100) }
     keyer = RokuBuilder::Keyer.new(**device_config)
     key_changed = nil

data/tests/roku_builder/manifest_manager_test.rb

@@ -21,7 +21,7 @@ class ManifestManagerTest < Minitest::Test
     Time.stub(:now, Time.new(2001, 02, 01)) do
       build_version = RokuBuilder::ManifestManager.update_build(root_dir: root_dir)
     end
-    assert_equal "020101.1", build_version
+    assert_equal "020101.0001", build_version
     FileUtils.rm(File.join(root_dir, "manifest"))
   end
 

data/tests/roku_builder/scripter_test.rb

@@ -0,0 +1,85 @@
+# ********** Copyright Viacom, Inc. Apache 2.0 **********
+
+require_relative "test_helper.rb"
+
+class Scriptertest < Minitest::Test
+
+  def test_scripter_print_bad_attr
+    code = RokuBuilder::Scripter.print(attribute: :bad, configs: {})
+    assert_equal RokuBuilder::BAD_PRINT_ATTRIBUTE, code
+  end
+
+  def test_scripter_print_config_values
+    call_count = 0
+    code = nil
+    fake_print = lambda { |message, path|
+      assert_equal "%s", message
+      assert_equal "/dev/null", path
+      call_count+=1
+    }
+    configs = {project_config: {directory: "/dev/null"}}
+    RokuBuilder::Scripter.stub(:printf, fake_print) do
+      code = RokuBuilder::Scripter.print(attribute: :root_dir, configs: configs)
+    end
+    assert_equal 1, call_count
+    assert_equal RokuBuilder::SUCCESS, code
+  end
+
+  def test_scripter_print_manifest_title
+    call_count = 0
+    code = nil
+    fake_print = lambda { |message, title|
+      assert_equal "%s", message
+      assert_equal "title", title
+      call_count+=1
+    }
+    manifest = {title: "title"}
+    configs = {project_config: {directory: "/dev/null"}}
+    RokuBuilder::Scripter.stub(:printf, fake_print) do
+      RokuBuilder::ManifestManager.stub(:read_manifest, manifest) do
+        code = RokuBuilder::Scripter.print(attribute: :title, configs: configs)
+      end
+    end
+    assert_equal 1, call_count
+    assert_equal RokuBuilder::SUCCESS, code
+  end
+
+  def test_scripter_print_manifest_build_version
+    call_count = 0
+    code = nil
+    fake_print = lambda { |message, build|
+      assert_equal "%s", message
+      assert_equal "010101.0001", build
+      call_count+=1
+    }
+    manifest = {build_version: "010101.0001"}
+    configs = {project_config: {directory: "/dev/null"}}
+    RokuBuilder::Scripter.stub(:printf, fake_print) do
+      RokuBuilder::ManifestManager.stub(:read_manifest, manifest) do
+        code = RokuBuilder::Scripter.print(attribute: :build_version, configs: configs)
+      end
+    end
+    assert_equal 1, call_count
+    assert_equal RokuBuilder::SUCCESS, code
+  end
+
+  def test_scripter_print_manifest_app_version
+    call_count = 0
+    code = nil
+    fake_print = lambda { |message, major, minor|
+      assert_equal "%s.%s", message
+      assert_equal "1", major
+      assert_equal "0", minor
+      call_count+=1
+    }
+    manifest = {major_version: "1", minor_version: "0"}
+    configs = {project_config: {directory: "/dev/null"}}
+    RokuBuilder::Scripter.stub(:printf, fake_print) do
+      RokuBuilder::ManifestManager.stub(:read_manifest, manifest) do
+        code = RokuBuilder::Scripter.print(attribute: :app_version, configs: configs)
+      end
+    end
+    assert_equal 1, call_count
+    assert_equal RokuBuilder::SUCCESS, code
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 3.6.3
+  version: 3.6.4
 platform: ruby
 authors:
 - greeneca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -267,6 +267,7 @@ files:
 - lib/roku_builder/monitor.rb
 - lib/roku_builder/navigator.rb
 - lib/roku_builder/packager.rb
+- lib/roku_builder/scripter.rb
 - lib/roku_builder/stager.rb
 - lib/roku_builder/tester.rb
 - lib/roku_builder/util.rb
@@ -287,6 +288,7 @@ files:
 - tests/roku_builder/monitor_test.rb
 - tests/roku_builder/navigator_test.rb
 - tests/roku_builder/packager_test.rb
+- tests/roku_builder/scripter_test.rb
 - tests/roku_builder/stager_test.rb
 - tests/roku_builder/test_files/controller_config_test/valid_config.json
 - tests/roku_builder/test_files/controller_test/load_config_test.json