roku_builder 4.29.1 → 4.29.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a74435c26dad5e136130516be10f397638bb374f4f105a8ca25c438193b39151
-  data.tar.gz: 1fa12ee0b271ae1506b5d3ffe028da016fbafa208eee996b6f9fbedd5dbb3a0e
+  metadata.gz: 81cf2f851953864be0d4dd66937daf9e00386eabcd13b70afd4168dbd3b7b473
+  data.tar.gz: 8d58024ade2b9f3cc786f4f7ebb29b47884da7d1d7794becb631f977054dd492
 SHA512:
-  metadata.gz: a7a74b63df763ff355473e8f1d5e90c80ea0805c8539edf43d189199876ebf7fd801322e45020ae9192c888c53e9de39f2e23d2ebe95ce581a4e0016fb2db493
-  data.tar.gz: 202e8b749f4b0aa46d6a0ebd18aabae4a3c486214d5945b823e1cc897b0a36a1ed3d351c07f0e49bf89e612df92bed68d860d3b1797ff89a92af63a9c3bd8313
+  metadata.gz: '060098efb871fc1e846634331e8b69d0738ba8ade3dda92da6ae931c9c7d5b595b37d8d35ce329832a05224ffa852f7990bad7605ad490d6d2b0504333e79e0a'
+  data.tar.gz: 6cb5e1aee0f27363a0021feb135a5675083916cb9f73670a2273968047cc3175034f5828bc528d0874492a26bf40cb770c61adb626badbf77a06e9a35a59f06d

data/lib/roku_builder/device_manager.rb

@@ -39,12 +39,23 @@ module RokuBuilder
       File.delete(lock) if File.exist?(lock)
     end
 
+    def release_all
+      all_devices.each do |device_name|
+        device = Device.new(device_name, @config.devices[device_name])
+        release_device(device)
+      end
+    end
+
     private
 
-    def reserve_any(no_lock: false)
+    def all_devices
       default = @config.device_default
-      all_devices = @config.devices.keys.reject{|key, value| default == key}
-      all_devices.unshift(default)
+      devices = @config.devices.keys.reject{|key, value| default == key}
+      devices.unshift(default)
+      devices
+    end
+
+    def reserve_any(no_lock: false)
       all_devices.each do |device_name|
         device = Device.new(device_name, @config.devices[device_name])
         if device_available!(device: device, no_lock: no_lock)

data/lib/roku_builder/plugins/core.rb

@@ -11,7 +11,8 @@ module RokuBuilder
         validate: {keyed: true},
         increment: {source: true, stage: true},
         dostage: {source: true},
-        dounstage: {source: true}
+        dounstage: {source: true},
+        release_all_devices: {},
       }
     end
 
@@ -32,6 +33,9 @@ module RokuBuilder
       parser.on("--do-unstage", "Run the unstager. Used for scripting. Always run --do-script first") do
         options[:dounstage] = true
       end
+      parser.on("--release-all-devices", "Releases all devices, deleting lock files") do
+        options[:release_all_devices] = true
+      end
       parser.separator ""
       parser.separator "Config Options:"
       parser.on("-e", "--edit PARAMS", "Edit config params when configuring. (eg. a:b, c:d,e:f)") do |p|
@@ -123,6 +127,11 @@ module RokuBuilder
     def dounstage(options:)
       Stager.new(config: @config, options: options).unstage
     end
+    def release_all_devices(options:)
+      manager = DeviceManager.new(config: @config, options: @options)
+      manager.release_all
+      Logger.instance.info "All devices unlocked"
+    end
 
     def self.get_help_text(parser:, options:, plugin_name:)
       plugin = self.get_plugin_by_name(plugin_name)

data/lib/roku_builder/plugins/profiler.rb

@@ -139,8 +139,8 @@ module RokuBuilder
 
     # Print the node stats
     def get_stats
-      end_reg = /<\/All_Nodes>/
-      start_reg = /<All_Nodes>/
+      end_reg = /<\/All_Nodes/
+      start_reg = /<All_Nodes/
       lines = get_command_response(command: "sgnodes all", start_reg: start_reg, end_reg: end_reg)
       xml_string = lines.join("\n")
       stats = {"Total" => {count: 0}}
@@ -211,14 +211,14 @@ module RokuBuilder
     end
 
     def print_all_nodes
-      start_reg = /<All_Nodes>/
-      end_reg = /<\/All_Nodes>/
+      start_reg = /<All_Nodes/
+      end_reg = /<\/All_Nodes/
       lines = get_command_response(command: "sgnodes all", start_reg: start_reg, end_reg: end_reg)
       lines.each {|line| print line}
     end
     def print_root_nodes
-      start_reg = /<Root_Nodes>/
-      end_reg = /<\/Root_Nodes>/
+      start_reg = /<Root_Nodes/
+      end_reg = /<\/Root_Nodes/
       lines = get_command_response(command: "sgnodes roots", start_reg: start_reg, end_reg: end_reg)
       lines.each {|line| print line}
     end
@@ -230,14 +230,14 @@ module RokuBuilder
     end
     def print_image_information
       start_reg = /RoGraphics instance/
-      end_reg = /Available memory/
+      end_reg = /Available texture memory/
       lines = get_command_response(command: "r2d2_bitmaps", start_reg: start_reg, end_reg: end_reg)
       lines = sort_image_lines(lines, /0x[^\s]+\s+\d+\s+\d+\s+\d+\s+\d+/, 4)
       lines.each {|line| print line}
     end
     def print_memmory_usage
       start_reg = /RoGraphics instance/
-      end_reg = /Available memory/
+      end_reg = /Available texture memory/
       begin
       while true
         lines = get_command_response(command: "r2d2_bitmaps", start_reg: start_reg, end_reg: end_reg, ignore_warnings: true)
@@ -338,7 +338,7 @@ module RokuBuilder
         first_match = /RoGraphics instance (0x.*)/.match(line)
         if first_match
           while line != nil
-            usage_match = /Available memory (\d*) used (\d*) max (\d*)/.match(line)
+            usage_match = /Available texture memory (\d*) used (\d*) max (\d*)/.match(line)
               if usage_match
                 data[first_match[1]] = [usage_match[1].to_i, usage_match[2].to_i, usage_match[3].to_i]
                 break

data/lib/roku_builder/plugins/rokuapi.rb

@@ -86,10 +86,7 @@ module RokuBuilder
 
     def sorted_versions(versions)
       sorted = versions.sort do |a, b|
-        aa, ab = a["version"].split(".").map{|i| i.to_i}
-        ba, bb = b["version"].split(".").map{|i| i.to_i}
-        value = (aa == ba ? bb <=> ab : ba <=> aa)
-        value
+        DateTime.parse(b["createdDate"]) <=> DateTime.parse(a["createdDate"])
       end
       sorted
     end
@@ -98,7 +95,7 @@ module RokuBuilder
       path = "/external/channels/#{channel}/versions"
       params = nil
       unless @no_publish
-        params = {"channelState" => "Published"}
+        params = {"state" => "Published"}
       end
       api_post(path, path, package, params)
     end
@@ -127,7 +124,7 @@ module RokuBuilder
           "appFileBase64Encoded" => Base64.encode64(package.read)
         }.to_json
       end
-      connection('POST', token_path, body).post(api_path+path) do |request|
+      connection('POST', token_path, body, params).post(api_path+path) do |request|
         if params
           request.params = params
         end if
@@ -146,10 +143,10 @@ module RokuBuilder
       end
     end
 
-    def connection(method, path, body)
+    def connection(method, path, body, params = nil)
       service_urn = "urn:roku:cloud-services:chanprovsvc"
       connection = Faraday.new(url: HOST, headers: {
-        'Authorization' => "Bearer "+get_jwt_token(@api_key, service_urn, method, path, body),
+        'Authorization' => "Bearer "+get_jwt_token(@api_key, service_urn, method, path, body, params),
         'Content-Type' => 'application/json',
         'Accept' => 'application/json',
       }) do |f|
@@ -157,10 +154,11 @@ module RokuBuilder
       end
     end
 
-    def get_jwt_token(api_key, service_urn, method, path, body = nil)
+    def get_jwt_token(api_key, service_urn, method, path, body = nil, params = nil)
       key_file = File.expand_path(@config.api_keys[api_key.to_sym])
       raise InvalidOptions "Missing api key" unless key_file
       jwk = JWT::JWK.new(JSON.parse(File.read(key_file)))
+      path += "?" + URI.encode_www_form(params) if params
       header = {
         "typ" => "JWT",
         "kid" => jwk.export[:kid]

data/lib/roku_builder/version.rb

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

data/test/roku_builder/plugins/test_rokuapi.rb

@@ -63,13 +63,21 @@ module RokuBuilder
 
     def test_sorted_versions
       api = RokuAPI.new(config: @config)
-      versions = [{"version" => "1.9"}, {"version" => "1.11"}, {"version" => "2.3"}, {"version" => "2.4"}]
+      versions = [
+        {"version" => "1.9", "createdDate" => (DateTime.now - 30).to_s},
+        {"version" => "1.11", "createdDate" => (DateTime.now - 20).to_s},
+        {"version" => "2.3", "createdDate" => (DateTime.now - 10).to_s},
+        {"version" => "2.4", "createdDate" => (DateTime.now).to_s}
+      ]
       sorted = api.send(:sorted_versions, versions)
       assert_equal "2.4", sorted[0]["version"]
       assert_equal "2.3", sorted[1]["version"]
       assert_equal "1.11", sorted[2]["version"]
       assert_equal "1.9", sorted[3]["version"]
-      versions = [{"version" => "1.4"}, {"version" => "1.3"}]
+      versions = [
+        {"version" => "1.4", "createdDate" => (DateTime.now).to_s},
+        {"version" => "1.3", "createdDate" => (DateTime.now - 10).to_s}
+      ]
       sorted = api.send(:sorted_versions, versions)
       assert_equal "1.4", sorted[0]["version"]
       assert_equal "1.3", sorted[1]["version"]
@@ -95,16 +103,17 @@ module RokuBuilder
       assert_equal spec["path"], path
     end
 
-    def test_get_jwt_token_with_body
+    def test_get_jwt_token_with_body_and_params
       api = RokuAPI.new(config: @config)
       urn = "test:urn"
       method = "GET"
       path = "/test/path"
+      params = {"param" => "value"}
       body = {
         "appFileBase64Encoded" => Base64.encode64(File.open(File.join(test_files_path(RokuAPITest), "test.pkg")).read)
       }
       sha256 = Digest::SHA256.base64digest(body.to_json)
-      token = api.send(:get_jwt_token, @options[:api_key], urn, method, path, body.to_json)
+      token = api.send(:get_jwt_token, @options[:api_key], urn, method, path, body.to_json, params)
       jwk = JWT::JWK.new(JSON.parse(File.read(@config.api_keys[:key1])))
       decoded = JWT.decode(token, jwk.public_key, true, {algorithm: 'RS256'})
       assert_equal decoded[1]["typ"], "JWT"
@@ -116,7 +125,7 @@ module RokuBuilder
       refute_nil spec
       assert_equal spec["serviceUrn"], urn
       assert_equal spec["httpMethod"], method
-      assert_equal spec["path"], path
+      assert_equal spec["path"], path+"?"+URI.encode_www_form(params)
       assert_equal spec["bodySha256Base64"], sha256
     end
 
@@ -280,6 +289,7 @@ module RokuBuilder
       body.push(api_versions.first)
       body[1]["version"] = "1.3"
       body[1]["channelState"] = "Unpublished"
+      body[1]["createdDate"] = (DateTime.now -10).to_s
       response = Minitest::Mock.new
       response.expect(:success?, true)
       response.expect(:body, body[0].to_json)
@@ -337,7 +347,7 @@ module RokuBuilder
         called = true
         assert_equal path, "/external/channels/#{channel}/versions"
         assert_equal token_path, "/external/channels/#{channel}/versions"
-        assert_equal "Published", params["channelState"]
+        assert_equal "Published", params["state"]
         assert_kind_of File, package
       end
       api.stub(:api_post, post_proc) do

data/test/roku_builder/test_helper.rb

@@ -143,7 +143,8 @@ def api_versions
       "channelId" => 722085,
       "version" => "1.4",
       "minFirmwareVersion" => 0,
-      "minimumFirmwareVersionTextShort" => "v2.5 b388"
+      "minimumFirmwareVersionTextShort" => "v2.5 b388",
+      "createdDate" => DateTime.now.to_s
     }
   ]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.29.1
+  version: 4.29.4
 platform: ruby
 authors:
 - greeneca
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-25 00:00:00.000000000 Z
+date: 2024-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip