roku_builder 3.6.1 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fd419ef8714c1ee725684939cff69165e1daac9
-  data.tar.gz: 6fc59c0b8453ee8ea26f765b493892044faacf68
+  metadata.gz: cda87c8c79464c6cbaadc76552d553d1d4f992f8
+  data.tar.gz: b2f72f1595cb30bc54ba7fabde915ff1f5761454
 SHA512:
-  metadata.gz: 601f919047c348e2511456e37c5a5810df71f273fbc9005671cd1af815e251546ff4939334473e7a1010c84e2d23fce68ad4f0c7c5936584d15a95816e37772a
-  data.tar.gz: a015de3a94792cfa7d8051f305834cb3c99f1139f2be004ce519cdd6213e870cf51525233a99005cca4a1edf8026fb8bcb712cb1f47bb827a75ccb5d7c40eaff
+  metadata.gz: f4bc039de589e530c0424df8067bc0985d54ce37ef356cd212a7d668a4934391ca41490d83d5af0710b291edf7a274b7a7787fb080275b43350a47cdacf7e5a8
+  data.tar.gz: f7470fa07bb4bb460ffc011d71a58bc278414674b0718b286cc4b1844a9f93bee3a441dc00912cef2aa3fec905be71258eb4ed72da065f9d04924574fe1dee09

data/Gemfile.lock

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

data/bin/roku

@@ -83,6 +83,10 @@ OptionParser.new do |opts|
     options[:update] = true
   end
 
+  opts.on("-A", "--app-list", "Command: List currently installed apps") do
+    options[:applist] = true
+  end
+
   opts.on("-r", "--ref REF", "Git referance to use for sideloading") do |r|
     options[:ref] = r
   end
@@ -125,6 +129,10 @@ OptionParser.new do |opts|
     options[:project] = p
   end
 
+  opts.on("-a", "--app ID", "Send App id for deeplinking") do |a|
+    options[:app_id] = a
+  end
+
   opts.on("-O", "--out PATH", "Output file/folder. If PATH ends in .pkg/.zip/.jpg, file is assumed, otherwise folder is assumed") do |o|
     options[:out] = o
   end

data/lib/roku_builder/config_parser.rb

@@ -202,7 +202,10 @@ module RokuBuilder
         root_dir: configs[:project_config][:directory]
       }
       # Create Deeplink Config
-      configs[:deeplink_config] ={options: options[:deeplink]}
+      configs[:deeplink_config] = {options: options[:deeplink]}
+      if options[:app_id]
+        configs[:deeplink_config][:app_id] = options[:app_id]
+      end
       # Create Monitor Config
       if options[:monitor]
         configs[:monitor_config] = {type: options[:monitor].to_sym}

data/lib/roku_builder/controller.rb

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

data/lib/roku_builder/controller_commands.rb

@@ -20,7 +20,8 @@ module RokuBuilder
         text: { klass: Navigator, method: :type, config_key: :text_config },
         test: { klass: Tester, method: :run_tests, config_key: :test_config },
         screencapture: { klass: Inspector, method: :screencapture, config_key: :screencapture_config,
-          failure: FAILED_SCREENCAPTURE }
+          failure: FAILED_SCREENCAPTURE },
+        applist: {klass: Linker, method: :list}
       }
     end
     # Validate Config
@@ -139,7 +140,7 @@ module RokuBuilder
       end
 
       linker = Linker.new(configs[:device_config])
-      if linker.link(configs[:deeplink_config])
+      if linker.launch(configs[:deeplink_config])
         logger.info "Deeplinked into app"
         return SUCCESS
       else

data/lib/roku_builder/linker.rb

@@ -2,26 +2,46 @@ module RokuBuilder
 
   # Launch application, sending parameters
   class Linker < Util
-    # Deeplink to the currently sideloaded app
+    # Deeplink to an app
     # @param options [String] Options string
+    # @param app_id [String] Id of the app to launch (defaults to dev)
+    # @param logger [Logger] System Logger
     # @note Options string should be formated like the following: "<key>:<value>[, <key>:<value>]*"
     # @note Any options will be accepted and sent to the app
-    def link(options:)
-      path = "/launch/dev"
-      return false unless options
+    def launch(options: nil, app_id: "dev")
+      path = "/launch/#{app_id}"
       payload = Util.options_parse(options: options)
 
       unless payload.keys.count > 0
-        return false
+        @logger.warn "No options sent to launched app"
+      else
+        path = "#{path}?#{parameterize(payload)}"
       end
 
-      path = "#{path}?#{parameterize(payload)}"
       conn = multipart_connection(port: 8060)
 
       response = conn.post path
       return response.success?
     end
 
+    # List currently installed apps
+    # @param logger [Logger] System Logger
+    def list()
+      path = "/query/apps"
+      conn = multipart_connection(port: 8060)
+      response = conn.get path
+
+      if response.success?
+        regexp = /id="([^"]*)"\stype="([^"]*)"\sversion="([^"]*)">([^<]*)</
+        apps = response.body.scan(regexp)
+        printf("%30s | %10s | %10s | %10s\n", "title", "id", "type", "version")
+        printf("---------------------------------------------------------------------\n")
+        apps.each do |app|
+          printf("%30s | %10s | %10s | %10s\n", app[3], app[0], app[1], app[2])
+        end
+      end
+    end
+
     private
 
     # Parameterize options to be sent to the app

data/lib/roku_builder/version.rb

@@ -1,4 +1,4 @@
 module RokuBuilder
   # Version of the RokuBuilder Gem
-  VERSION = "3.6.1"
+  VERSION = "3.6.2"
 end

data/tests/roku_builder/controller_commands_test.rb

@@ -189,7 +189,7 @@ class ControllerCommandsTest < Minitest::Test
     options = {deeplink: true, stage: 'production', deeplink_options: "a:b", config: "~/.roku_config.json"}
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
-    mock.expect(:link, "true", [configs[:deeplink_config]])
+    mock.expect(:launch, "true", [configs[:deeplink_config]])
     RokuBuilder::Linker.stub(:new, mock) do
       code = RokuBuilder::Controller.send(:execute_commands, {options: options, config: config, configs: configs, logger: logger})
     end
@@ -208,7 +208,7 @@ class ControllerCommandsTest < Minitest::Test
     options = {deeplink: true, set_stage: true, stage: 'production', deeplink_options: "a:b", config: "~/.roku_config.json"}
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
-    mock.expect(:link, "true", [configs[:deeplink_config]])
+    mock.expect(:launch, "true", [configs[:deeplink_config]])
     RokuBuilder::Linker.stub(:new, mock) do
       RokuBuilder::ControllerCommands.stub(:sideload, sideload) do
         code = RokuBuilder::Controller.send(:execute_commands, {options: options, config: config, configs: configs, logger: logger})
@@ -226,7 +226,7 @@ class ControllerCommandsTest < Minitest::Test
     options = {deeplink: true, stage: 'production', deeplink_options: "a:b", config: "~/.roku_config.json"}
     config = good_config
     code, configs = RokuBuilder::ConfigParser.parse_config(options: options, config: config, logger: logger)
-    mock.expect(:link, false, [configs[:deeplink_config]])
+    mock.expect(:launch, false, [configs[:deeplink_config]])
     RokuBuilder::Linker.stub(:new, mock) do
       code = RokuBuilder::Controller.send(:execute_commands, {options: options, config: config, configs: configs, logger: logger})
     end

data/tests/roku_builder/linker_test.rb

@@ -26,7 +26,7 @@ class LinkerTest < Minitest::Test
     linker = RokuBuilder::Linker.new(**device_config)
     success = nil
     Faraday.stub(:new, connection, faraday) do
-      success = linker.link(options: options)
+      success = linker.launch(options: options)
     end
 
     assert success
@@ -36,18 +36,77 @@ class LinkerTest < Minitest::Test
     response.verify
   end
   def test_linker_link_nothing
+    logger = Minitest::Mock.new
+    connection = Minitest::Mock.new
+    faraday = Minitest::Mock.new
+    response = Minitest::Mock.new
+
     device_config = {
       ip: "111.222.333",
       user: "user",
       password: "password",
-      logger: Logger.new("/dev/null")
+      logger: logger
     }
+    path = "/launch/dev"
     options = ''
+    logger.expect(:warn, nil, ["No options sent to launched app"])
+    connection.expect(:post, response, [path])
+    faraday.expect(:headers, {})
+    faraday.expect(:request, nil, [:digest, device_config[:user], device_config[:password]])
+    faraday.expect(:request, nil, [:multipart])
+    faraday.expect(:request, nil, [:url_encoded])
+    faraday.expect(:adapter, nil, [Faraday.default_adapter])
+    response.expect(:success?, true)
     linker = RokuBuilder::Linker.new(**device_config)
     success = nil
-    success = linker.link(options: options)
+    Faraday.stub(:new, connection, faraday) do
+      success = linker.launch(options: options)
+    end
+
+    assert success
+    logger.verify
+    connection.verify
+    faraday.verify
+    response.verify
+  end
 
-    assert !success
+  def test_linker_list
+    connection = Minitest::Mock.new
+    faraday = Minitest::Mock.new
+    response = Minitest::Mock.new
+
+    device_config = {
+      ip: "111.222.333",
+      user: "user",
+      password: "password",
+      logger: Logger.new("/dev/null")
+    }
+    path = "/query/apps"
+    body = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n<apps>\n\t
+<app id=\"31012\" type=\"menu\" version=\"1.6.3\">Movie Store and TV Store</app>\n\t
+<app id=\"31863\" type=\"menu\" version=\"1.2.6\">Roku Home News</app>\n\t
+<app id=\"65066\" type=\"appl\" version=\"1.3.0\">Nick</app>\n\t
+<app id=\"68161\" type=\"appl\" version=\"1.3.0\">Nick</app>\n\t
+</apps>\n"
+    connection.expect(:get, response, [path])
+    faraday.expect(:headers, {})
+    faraday.expect(:request, nil, [:digest, device_config[:user], device_config[:password]])
+    faraday.expect(:request, nil, [:multipart])
+    faraday.expect(:request, nil, [:url_encoded])
+    faraday.expect(:adapter, nil, [Faraday.default_adapter])
+    response.expect(:success?, true)
+    response.expect(:body, body)
+    linker = RokuBuilder::Linker.new(**device_config)
+
+    print_count = 0
+    did_print = Proc.new { |msg| print_count+=1 }
+
+    Faraday.stub(:new, connection, faraday) do
+      linker.stub(:printf, did_print) do
+        linker.list
+      end
+    end
 
+    assert_equal 6, print_count
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.2
 platform: ruby
 authors:
 - greeneca