roku_builder 3.10.7 → 3.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 375387f31b52479dc262e78bc5f8d7e57efbb186
-  data.tar.gz: ba455138e37db3c4e69042f10cbdd2e908cb357d
+  metadata.gz: c6dbac3c0fec31e905833e19647dd92bb3d4864d
+  data.tar.gz: 321dd14fbb7e7f5e6a29112958e0c5c66834927d
 SHA512:
-  metadata.gz: b1b336f9b7798a53e52974dd28bd08ba13a5a4de4da99dfc759e627dd6dcd68647a721378d367e4260bf9f1fba3ff39e8f440325cb5fdb5b0f2f8328a47fccd7
-  data.tar.gz: 9df9712dd4c33de3dc47a06aeed09593da3b84ef8fd86fe173fc5b3ceb6b73bf073842c1332540458a044aa1e75afe9f8a475e7ee3ea375259bc145318be0ef3
+  metadata.gz: 55f1f1c4dd3b20aec47e227b28e4c69a028718c09adea8f068722129dc8ef03a3e467755c4f277cb7d5e6b8aa3c7d0fa081111fff9721fc72651600542fab1c5
+  data.tar.gz: d2d4f21e3ad6591a33bff630560b837086a385d5d882b1b060572ccc8af4515e4975c66906e82bef628302848934227549467ed513f1e405c9f13d1fbd68037c

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    roku_builder (3.10.6)
-      faraday (~> 0.9)
+    roku_builder (3.11.0)
+      faraday (~> 0.10)
       faraday-digestauth (~> 0.2)
       git (~> 1.3)
       net-ping (~> 2.0)
       net-telnet (~> 0.1)
-      nokogiri (~> 1.6)
+      nokogiri (~> 1.7)
       rubyzip (~> 1.2)
 
 GEM
@@ -15,18 +15,18 @@ GEM
   specs:
     byebug (9.0.6)
     coderay (1.1.1)
-    coveralls (0.8.15)
+    coveralls (0.8.17)
       json (>= 1.8, < 3)
       simplecov (~> 0.12.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-      tins (>= 1.6.0, < 2)
+      tins (~> 1.6)
     docile (1.1.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    eventmachine (1.2.0.1)
-    faraday (0.9.2)
+    eventmachine (1.2.1)
+    faraday (0.10.1)
       multipart-post (>= 1.2, < 3)
     faraday-digestauth (0.2.1)
       faraday (~> 0.7)
@@ -58,7 +58,7 @@ GEM
     lumberjack (1.0.10)
     method_source (0.8.2)
     mini_portile2 (2.1.0)
-    minitest (5.9.1)
+    minitest (5.10.1)
     minitest-autotest (1.0.3)
       minitest-server (~> 1.0)
     minitest-server (1.0.4)
@@ -69,7 +69,7 @@ GEM
     net-http-digest_auth (1.4)
     net-ping (2.0.1)
     net-telnet (0.1.1)
-    nokogiri (1.6.8.1)
+    nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -78,11 +78,11 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (11.3.0)
-    rb-fsevent (0.9.7)
+    rake (12.0.0)
+    rb-fsevent (0.9.8)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    ruby_dep (1.4.0)
+    ruby_dep (1.5.0)
     rubyzip (1.2.0)
     shellany (0.0.1)
     simplecov (0.12.0)
@@ -93,9 +93,9 @@ GEM
     slop (3.6.0)
     term-ansicolor (1.4.0)
       tins (~> 1.0)
-    thor (0.19.1)
-    tins (1.12.0)
-    yard (0.9.5)
+    thor (0.19.4)
+    tins (1.13.0)
+    yard (0.9.6)
 
 PLATFORMS
   ruby
@@ -105,10 +105,10 @@ DEPENDENCIES
   byebug (~> 9.0)
   coveralls (~> 0.8)
   guard-livereload (~> 2.5)
-  minitest (~> 5.9)
+  minitest (~> 5.10)
   minitest-autotest (~> 1.0)
   minitest-server (~> 1.0)
-  rake (~> 11.2)
+  rake (~> 12.0)
   roku_builder!
   simplecov (~> 0.12)
   yard (~> 0.9)

data/bin/roku

@@ -76,6 +76,10 @@ parser = OptionParser.new do |opts|
     options[:key] = true
   end
 
+  opts.on("--genkey", "Command: generate a new key") do
+    options[:genkey] = true
+  end
+
   opts.on("--print ATTRIBUTE", "Command: Print attribute for scripting") do |a|
     options[:print] = a
   end

data/lib/roku_builder.rb

@@ -20,6 +20,8 @@ require 'pstore'
 require 'nokogiri'
 #navigator
 require 'io/console'
+#monitor
+require 'readline'
 
 require "roku_builder/controller"
 require "roku_builder/controller_commands"

data/lib/roku_builder/config_parser.rb

@@ -257,6 +257,11 @@ module RokuBuilder
       if options[:profile]
         configs[:profiler_config] = {command: options[:profile].to_sym}
       end
+      #Create genkey config
+      configs[:genkey] = {}
+      if options[:out_file]
+        configs[:genkey][:out_file] = File.join(options[:out_folder], options[:out_file])
+      end
     end
     private_class_method :setup_simple_configs
   end

data/lib/roku_builder/controller.rb

@@ -162,7 +162,7 @@ module RokuBuilder
     def self.commands
       [:sideload, :package, :test, :deeplink,:configure, :validate, :delete,
         :navigate, :navigator, :text, :build, :monitor, :update, :screencapture,
-        :key, :screen, :screens, :applist, :print, :profile, :dostage,
+        :key, :genkey, :screen, :screens, :applist, :print, :profile, :dostage,
         :dounstage]
     end
 
@@ -194,7 +194,7 @@ module RokuBuilder
     # @return [Array<Symbol>] List of commands that require a device
     def self.device_commands
       [:sideload, :package, :test, :deeplink, :delete, :navigate, :navigator,
-        :text, :monitor, :screencapture, :applist, :profile ]
+        :text, :monitor, :screencapture, :applist, :profile, :key, :genkey ]
     end
 
 

data/lib/roku_builder/controller_commands.rb

@@ -19,6 +19,7 @@ module RokuBuilder
         screen: { klass: Navigator, method: :screen, config_key: :screen_config,
           failure: FAILED_NAVIGATING },
         key: { klass: Keyer, method: :rekey, config_key: :key },
+        genkey: { klass: Keyer, method: :genkey, config_key: :genkey },
         screens: { klass: Navigator, method: :screens },
         text: { klass: Navigator, method: :type, config_key: :text_config },
         test: { klass: Tester, method: :run_tests, config_key: :test_config },

data/lib/roku_builder/keyer.rb

@@ -5,6 +5,57 @@ module RokuBuilder
   # Change or get dev key
   class Keyer < Util
 
+    def genkey(out_file: nil)
+      telnet_config = {
+        'Host' => @roku_ip_address,
+        'Port' => 8080
+      }
+      connection = Net::Telnet.new(telnet_config)
+      connection.puts("genkey")
+      waitfor_config = {
+        'Match' => /./,
+        'Timeout' => false
+      }
+      password = nil
+      dev_id = nil
+      while password.nil? or dev_id.nil?
+        connection.waitfor(waitfor_config) do |txt|
+          while line = txt.slice!(/^.*\n/) do
+            words = line.split
+            if words[0] == "Password:"
+              password = words[1]
+            elsif words[0] == "DevID:"
+              dev_id = words[1]
+            end
+          end
+        end
+      end
+      connection.close
+      @logger.info("Password: "+password)
+      @logger.info("DevID: "+dev_id)
+
+      unless out_file
+        out_file = File.join("/tmp", "key_"+dev_id+".pkg")
+      end
+
+      Dir.mktmpdir { |dir|
+        ManifestManager.update_manifest({root_dir: dir, attributes: {}})
+        Dir.mkdir(File.join(dir, "source"))
+        File.open(File.join(dir, "source", "main.brs"), "w") do |io|
+          io.puts "sub main()"
+          io.puts "  print \"Load\""
+          io.puts "end sub"
+        end
+        @device_config[:init_params] = {root_dir: dir}
+        loader = Loader.new(**@device_config)
+        loader.sideload()
+        @device_config.delete(:init_params)
+        packager = Packager.new(**@device_config)
+        packager.package(app_name_version: "key_"+dev_id, out_file: out_file, password: password)
+        @logger.info("Keyed PKG: "+out_file)
+      }
+    end
+
     # Sets the key on the roku device
     # @param keyed_pkg [String] Path for a package signed with the desired key
     # @param password [String] Password for the package

data/lib/roku_builder/monitor.rb

@@ -16,6 +16,7 @@ module RokuBuilder
         taskX: 8093,
         profiler: 8080,
       }
+      @show_prompt = false
     end
 
     # Monitor a development log on the Roku device
@@ -41,19 +42,47 @@ module RokuBuilder
           end
         end
       }
+      # setup readline
+
+      libedit = false
+      begin
+        Readline.vi_editing_mode
+      rescue NotImplementedError
+        libedit = true
+      end
+
+      commands = [
+        "bsc", "bscs", "brkd", "bt", "classes", "cont", "cont", "down", "d",
+        "exit", "gc", "help", "last", "list", "next", "print", "p", "?", "step",
+        "s", "t", "over", "out", "up", "u", "var", "q"
+      ].sort
+      commands.collect { |i| i += ' '  } if libedit
+
+      comp = proc { |s| commands.grep( /^#{Regexp.escape(s)}/  )  }
+
+      Readline.completion_append_character = " "
+      Readline.completion_proc = comp
+
+
       running = true
       @logger.unknown "Q to exit"
       while running
         begin
-          command = gets.chomp
-          case command
-          when "q"
-            thread.exit
-            running = false
-          when "stop"
-            thread[:connection].puts("\C-c")
+          if @show_prompt
+            command = Readline.readline('BrightScript Debugger> ', true)
+            if command =~ /^\s*$/ or Readline::HISTORY.to_a[-2] == command
+              Readline::HISTORY.pop
+            end
+            case command
+            when "q"
+              thread.exit
+              running = false
+            else
+              @show_prompt = false
+              thread[:connection].puts(command)
+            end
           else
-            thread[:connection].puts(command)
+            sleep 0.01
           end
         rescue SystemExit, Interrupt
           thread[:connection].puts("\C-c")
@@ -73,7 +102,7 @@ module RokuBuilder
         puts line if !line.strip.empty?
       end
       if all_text.downcase == "BrightScript Debugger> ".downcase
-        print all_text
+        @show_prompt = true
         all_text = ""
       end
       all_text

data/lib/roku_builder/navigator.rb

@@ -131,11 +131,11 @@ module RokuBuilder
         if char == "\u0003"
           running = false
         else
-          Thread.new(char) {|char|
-            if @mappings[char.to_sym] != nil
-              nav(commands:[@mappings[char.to_sym][0].to_sym])
-            elsif char.inspect.force_encoding("UTF-8").ascii_only?
-              type(text: char)
+          Thread.new(char) {|character|
+            if @mappings[character.to_sym] != nil
+              nav(commands:[@mappings[character.to_sym][0].to_sym])
+            elsif character.inspect.force_encoding("UTF-8").ascii_only?
+              type(text: character)
             end
           }
         end

data/lib/roku_builder/version.rb

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

data/roku_builder.gemspec

@@ -21,17 +21,17 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = "~> 2.3"
 
   spec.add_dependency "rubyzip",             "~> 1.2"
-  spec.add_dependency "faraday",             "~> 0.9"
+  spec.add_dependency "faraday",             "~> 0.10"
   spec.add_dependency "faraday-digestauth",  "~> 0.2"
   spec.add_dependency "git",                 "~> 1.3"
   spec.add_dependency "net-ping",            "~> 2.0"
   spec.add_dependency "net-telnet",          "~> 0.1"
-  spec.add_dependency "nokogiri",            "~> 1.6"
+  spec.add_dependency "nokogiri",            "~> 1.7"
 
   spec.add_development_dependency "bundler",           "~> 1.7"
-  spec.add_development_dependency "rake",              "~> 11.2"
+  spec.add_development_dependency "rake",              "~> 12.0"
   spec.add_development_dependency "byebug",            "~> 9.0"
-  spec.add_development_dependency "minitest",          "~> 5.9"
+  spec.add_development_dependency "minitest",          "~> 5.10"
   spec.add_development_dependency "minitest-autotest", "~> 1.0"
   spec.add_development_dependency "minitest-server",   "~> 1.0"
   spec.add_development_dependency "simplecov",         "~> 0.12"

data/tests/roku_builder/monitor_test.rb

@@ -12,19 +12,22 @@ class MonitorTest < Minitest::Test
       logger: Logger.new("/dev/null")
     }
     monitor = RokuBuilder::Monitor.new(**device_config)
+    monitor.instance_variable_set(:@show_prompt, true)
 
     connection.expect(:waitfor, nil) do |config|
       assert_equal(/./, config['Match'])
       assert_equal(false, config['Timeout'])
     end
 
-    def monitor.gets
+    readline = proc {
       sleep(0.1)
       "q"
-    end
+    }
 
-    Net::Telnet.stub(:new, connection) do
-      monitor.monitor(type: :main)
+    Readline.stub(:readline, readline) do
+      Net::Telnet.stub(:new, connection) do
+        monitor.monitor(type: :main)
+      end
     end
 
     connection.verify
@@ -39,6 +42,7 @@ class MonitorTest < Minitest::Test
       logger: Logger.new("/dev/null")
     }
     monitor = RokuBuilder::Monitor.new(**device_config)
+    monitor.instance_variable_set(:@show_prompt, true)
 
     connection.expect(:waitfor, nil) do |config, &blk|
       assert_equal(/./, config['Match'])
@@ -47,14 +51,16 @@ class MonitorTest < Minitest::Test
       blk.call(txt) == ""
     end
 
-    def monitor.gets
+    readline = proc {
       sleep(0.1)
       "q"
-    end
+    }
 
-    Net::Telnet.stub(:new, connection) do
-      monitor.stub(:manage_text, "") do
-        monitor.monitor(type: :main)
+    Readline.stub(:readline, readline) do
+      Net::Telnet.stub(:new, connection) do
+        monitor.stub(:manage_text, "") do
+          monitor.monitor(type: :main)
+        end
       end
     end
 
@@ -70,14 +76,19 @@ class MonitorTest < Minitest::Test
       logger: Logger.new("/dev/null")
     }
     monitor = RokuBuilder::Monitor.new(**device_config)
+    monitor.instance_variable_set(:@show_prompt, true)
 
     connection.expect(:waitfor, nil) do |config|
       assert_equal(/./, config['Match'])
       assert_equal(false, config['Timeout'])
     end
-    connection.expect(:puts, nil, ["text"])
+    connection.expect(:puts, nil) do |text|
+      assert_equal("text", text)
+      monitor.instance_variable_set(:@show_prompt, true)
+    end
+
 
-    def monitor.gets
+    readline = proc {
       @count ||= 0
       sleep(0.1)
       case @count
@@ -87,10 +98,12 @@ class MonitorTest < Minitest::Test
       else
         "q"
       end
-    end
+    }
 
-    Net::Telnet.stub(:new, connection) do
-      monitor.monitor(type: :main)
+    Readline.stub(:readline, readline) do
+      Net::Telnet.stub(:new, connection) do
+        monitor.monitor(type: :main)
+      end
     end
 
     connection.verify
@@ -105,6 +118,7 @@ class MonitorTest < Minitest::Test
       logger: Logger.new("/dev/null")
     }
     monitor = RokuBuilder::Monitor.new(**device_config)
+    monitor.instance_variable_set(:@show_prompt, true)
     monitor.instance_variable_set(:@mock, mock)
 
     def monitor.puts(input)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 3.10.7
+  version: 3.11.0
 platform: ruby
 authors:
 - greeneca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: faraday-digestauth
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: minitest-autotest
   requirement: !ruby/object:Gem::Requirement