roku_builder 4.16.1 → 4.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6a3e4bd8c77f11f513140b9429bf590bd7d61a1
-  data.tar.gz: 0b816aab48e6ffe5303ba740b068b1cf55416682
+  metadata.gz: 0f330332e0ec4f1832974dee629495887c1f3be1
+  data.tar.gz: 3b3f9230bfaaffc212e746465754489efcf39bf3
 SHA512:
-  metadata.gz: 5eede887d08c2505cdde41e30839795a61b07b7f98a50ffcdf7521169f76e367fa58364dc94503a2f59a55606854d07a6e4cd2871cf994111135167272ee411a
-  data.tar.gz: b62a5ded206dd32074409f89f4f52126b2b9d6b091a808f7723f702fe61e01a9bf64ee3076ba6d1a5d4ba5d15089411206932a48f14150fec781c28d0227c778
+  metadata.gz: 840ef1b935ba37594e9134b11736513b856add2e99741d5161f8b5fdd8c78e7b705ef25763eeedc838c1280777d9b639fbf2c983a60575ecf608910e0a3e5a1c
+  data.tar.gz: 18e06f83b9720f426c4ed6d2b4980b95692a0205f3747cd5405d2d28e2a34be66953e888d63aa32e447169be918d383dceae43e6b60ec3dbcb8c0902783a991f

data/CHANGELOG

@@ -1,3 +1,7 @@
+ = 4.17.0 =
+
+ - Add ability to convert a package to squashfs
+
  = 4.16.1 =
 
  - Fixes for indentation checker

data/lib/roku_builder/hash.rb

@@ -1,9 +1,14 @@
 # ********** Copyright 2016 Viacom, Inc. Apache 2.0 **********
 
 class ::Hash
-  def deep_merge(second)
+  def deep_merger
     merger = proc { |_key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2  }
-    self.merge(second, &merger)
+  end
+  def deep_merge(second)
+    self.merge(second, &deep_merger)
+  end
+  def deep_merge!(second)
+    self.merge!(second, &deep_merger)
   end
   def deep_dup
     Marshal.load(Marshal.dump(self))

data/lib/roku_builder/plugins/loader.rb

@@ -10,7 +10,8 @@ module RokuBuilder
       {
         sideload: {source: true, device: true, stage: true},
         build: {source: true, stage: true, exclude: true},
-        delete: {device: true}
+        delete: {device: true},
+        squash: {device: true}
       }
     end
 
@@ -25,6 +26,9 @@ module RokuBuilder
       parser.on("-b", "--build", "Build a zip to be sideloaded") do
         options[:build] = true
       end
+      parser.on("--squash", "Convert currently sideloaded application to squashfs") do
+        options[:squash] = true
+      end
       parser.separator "Options:"
       parser.on("-x", "--exclude", "Apply exclude config to sideload") do
         options[:exclude] = true
@@ -70,6 +74,15 @@ module RokuBuilder
       end
     end
 
+    # Convert sideloaded app to squashfs
+    def squash(options:, ignoreFailure: false)
+      payload =  {mysubmit: "Convert to squashfs", archive: ""}
+      response  = multipart_connection.post "/plugin_install", payload
+      unless response.status == 200 and response.body =~ /Conversion succeeded/ or ignoreFailure
+        raise ExecutionError, "Failed Converting to Squashfs"
+      end
+    end
+
     def copy(options:, path:)
       @options = options
       @target = path

data/lib/roku_builder/plugins/packager.rb

@@ -37,7 +37,9 @@ module RokuBuilder
     def package(options:)
       check_options(options)
       #sideload
-      Loader.new(config: @config).sideload(options: options)
+      loader = Loader.new(config: @config)
+      loader.sideload(options: options)
+      loader.squash(options: options) if @config.stage[:squash]
       #rekey
       key(options: options)
       #package

data/lib/roku_builder/version.rb

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

data/test/roku_builder/plugins/test_loader.rb

@@ -34,9 +34,10 @@ module RokuBuilder
       parser = OptionParser.new
       options = {}
       Loader.parse_options(parser: parser, options: options)
-      argv = ["roku", "-s", "-d", "-b", "-x"]
+      argv = ["roku", "-l", "--squash", "-d", "-b", "-x"]
       parser.parse! argv
       assert options[:sideload]
+      assert options[:squash]
       assert options[:delete]
       assert options[:build]
       assert options[:exclude]
@@ -112,6 +113,22 @@ module RokuBuilder
         loader.delete(options: @options)
       end
     end
+    def test_loader_squash
+      @request_stubs.push(stub_request(:post, "http://#{@device_config[:ip]}/plugin_install").
+        to_return(status: 200, body: "Conversion succeeded", headers: {}))
+
+      loader = Loader.new(config: @config)
+      loader.squash(options: @options)
+    end
+    def test_loader_squash_fail
+      @request_stubs.push(stub_request(:post, "http://#{@device_config[:ip]}/plugin_install").
+        to_return(status: 200, body: "Conversion failed", headers: {}))
+
+      loader = Loader.new(config: @config)
+      assert_raises ExecutionError do
+        loader.squash(options: @options)
+      end
+    end
     def test_copy_files
       loader = Loader.new(config: @config)
       Dir.mktmpdir do |dir|

data/test/roku_builder/plugins/test_packager.rb

@@ -72,7 +72,6 @@ module RokuBuilder
         packager.package(options: options)
       end
     end
-
     def test_packager_package
       loader = Minitest::Mock.new
       inspector = Minitest::Mock.new
@@ -118,6 +117,54 @@ module RokuBuilder
       inspector.verify
       logger.verify
     end
+    def test_packager_package_squash
+      loader = Minitest::Mock.new
+      inspector = Minitest::Mock.new
+      io = Minitest::Mock.new
+      logger = Minitest::Mock.new
+      config = good_config(PackagerTest)
+      config[:projects][:project1][:stages][:production][:squash] = true
+      config, options = build_config_options_objects(PackagerTest, {package: true, stage: "production", inspect_package: true, verbose: true}, false, config)
+
+      @requests.push(stub_request(:post, "http://192.168.0.100/plugin_inspect").
+        to_return(status: 200, body: "", headers: {}).times(2))
+      body = "<a href=\"pkgs\">pkg_url</a>"
+      @requests.push(stub_request(:post, "http://192.168.0.100/plugin_package").
+        to_return(status: 200, body: body, headers: {}).times(2))
+      body = "package_body"
+      @requests.push(stub_request(:get, "http://192.168.0.100/pkgs/pkg_url").
+        to_return(status: 200, body: body, headers: {}))
+
+      loader.expect(:sideload, nil, [Hash])
+      loader.expect(:squash, nil, [Hash])
+      io.expect(:write, nil, ["package_body"])
+      inspector.expect(:inspect, nil, [Hash])
+
+      logger.expect(:debug, nil, [String])
+      io.expect(:each_line, nil)
+      logger.expect(:info, nil) do |message|
+        assert_match(/\/tmp\//, message)
+      end
+
+      Logger.class_variable_set(:@@instance, logger)
+      packager = Packager.new(config: config)
+      dev_id = Proc.new {"#{Random.rand(999999999999)}"}
+      Loader.stub(:new, loader) do
+        Time.stub(:now, Time.at(0)) do
+          File.stub(:open, nil, io) do
+            Inspector.stub(:new, inspector) do
+              packager.stub(:dev_id, dev_id) do
+                packager.package(options: options)
+              end
+            end
+          end
+        end
+      end
+      io.verify
+      loader.verify
+      inspector.verify
+      logger.verify
+    end
     def test_packager_dev_id
       body = "v class=\"roku-font-5\"><label>Your Dev ID: &nbsp;</label> dev_id<hr></div>"
       @requests.push(stub_request(:get, "http://192.168.0.100/plugin_package").

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.16.1
+  version: 4.17.0
 platform: ruby
 authors:
 - greeneca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2019-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip