roku_builder 3.12.2 → 3.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fb178e01cea210f0293002bfda3f18dfa08c525
-  data.tar.gz: e18dfb21ea5fb2d3c4fdb646b50446a4adc3ed08
+  metadata.gz: a6465e57b5cb5dad5fb1606d51f9469d6334c39a
+  data.tar.gz: 8e0fbdbef24e1dd4d283b82a54313a8e6605aac8
 SHA512:
-  metadata.gz: f5115c01940757881bf4a18ddbecae18fb6da21e727d698be7defad2ab4fd73f76c14e5fa88bc7f8580958aa9cec707cb0a6b35d188690b362c9fd47d15d23ea
-  data.tar.gz: cecd6468a8e1b2e2c5b386555370175191d977b1141180373643911b769563d2b97c4c77269f65fbaca92ac224e3ddd50d5a7ab97da5eb0263539e28bbe347e1
+  metadata.gz: c3c26fb3b92fa5e9ef0e5655049a68aa3811f22a8807bb76087d70f355f299be662356340512deca359b0fdd04208ed6d9f7c495e729811ceb56dc3fa276a3dc
+  data.tar.gz: 1ed8966ed21dec4b74eccd1236649c375336977b8d422d35296059157bb4bb3adcb2d785018faac535d06f41fc855d3af2975c0dba95ad972e90e5d2de699a64

data/CHANGELOG

@@ -1,3 +1,12 @@
+ = 3.12.4 =
+
+  - Add regexp option for filtering monitor logs
+
+ = 3.12.3 =
+
+  - Fix Monitor draw order on commands
+  - Dependancies update
+
  = 3.12.2 =
 
   - Fix bug with monitor not exiting

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roku_builder (3.12.2)
+    roku_builder (3.12.4)
       faraday (~> 0.11)
       faraday-digestauth (~> 0.2)
       git (~> 1.3)
@@ -30,7 +30,7 @@ GEM
     ffi (1.9.17)
     formatador (0.2.5)
     git (1.3.0)
-    guard (2.14.0)
+    guard (2.14.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (~> 1.0)
@@ -49,6 +49,9 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.11)
+    m (1.5.0)
+      method_source (>= 0.6.7)
+      rake (>= 0.9.2.2)
     method_source (0.8.2)
     mini_portile2 (2.1.0)
     minitest (5.10.1)
@@ -58,7 +61,7 @@ GEM
       minitest (~> 5.0)
     multipart-post (2.0.0)
     nenv (0.3.0)
-    net-http-digest_auth (1.4)
+    net-http-digest_auth (1.4.1)
     net-ping (2.0.1)
     net-telnet (0.1.1)
     nokogiri (1.7.0.1)
@@ -75,7 +78,7 @@ GEM
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
     ruby_dep (1.5.0)
-    rubyzip (1.2.0)
+    rubyzip (1.2.1)
     shellany (0.0.1)
     simplecov (0.12.0)
       docile (~> 1.1.0)
@@ -86,7 +89,7 @@ GEM
     term-ansicolor (1.4.0)
       tins (~> 1.0)
     thor (0.19.4)
-    tins (1.13.0)
+    tins (1.13.2)
     yard (0.9.8)
 
 PLATFORMS
@@ -98,6 +101,7 @@ DEPENDENCIES
   coveralls (~> 0.8)
   guard (~> 2.14)
   guard-minitest (~> 2.4)
+  m (~> 1.5)
   minitest (~> 5.10)
   minitest-autotest (~> 1.0)
   minitest-server (~> 1.0)

data/bin/roku

@@ -170,6 +170,10 @@ parser = OptionParser.new do |opts|
     options[:in] = i
   end
 
+  opts.on("-r", "--regexp REGEXP", "A regular expression used to filter monitor logs") do |r|
+    options[:regexp] = r
+  end
+
   opts.on("-x", "--exclude", "Apply exclude config to sideload") do
     options[:exclude] = true
   end

data/lib/roku_builder/config_manager.rb

@@ -46,18 +46,8 @@ module RokuBuilder
     # @return [Hash] roku config object
     def self.get_config(config:, logger:)
       begin
-        config = {parent_config: config}
-        depth = 1
-        while config[:parent_config]
-          config_parent = JSON.parse(File.open(config[:parent_config]).read, {symbolize_names: true})
-          config.delete(:parent_config)
-          config.merge!(config_parent) {|key, v1, v2| v1}
-          depth += 1
-          if depth > 10
-            logger.fatal "Parent configs too deep."
-            return nil
-          end
-        end
+        config = build_config(config: config, logger: logger)
+        return nil unless config
         config[:devices][:default] = config[:devices][:default].to_sym
         config[:projects][:default] = config[:projects][:default].to_sym
         config[:projects].each_pair do |key,value|
@@ -83,6 +73,22 @@ module RokuBuilder
       end
     end
 
+    def self.build_config(config:, logger:)
+      config = {parent_config: config}
+      depth = 1
+      while config[:parent_config]
+        config_parent = JSON.parse(File.open(config[:parent_config]).read, {symbolize_names: true})
+        config.delete(:parent_config)
+        config.merge!(config_parent) {|_key, v1, _v2| v1}
+        depth += 1
+        if depth > 10
+          logger.fatal "Parent configs too deep."
+          return nil
+        end
+      end
+      config
+    end
+
 
     # Edit the roku config
     # @param config [String] path for the roku config

data/lib/roku_builder/config_parser.rb

@@ -227,6 +227,9 @@ module RokuBuilder
       # Create Monitor Config
       if options[:monitor]
         configs[:monitor_config] = {type: options[:monitor].to_sym}
+        if options[:regexp]
+          configs[:monitor_config][:regexp] = /#{options[:regexp]}/
+        end
       end
       # Create Navigate Config
       mappings = {}

data/lib/roku_builder/config_validator.rb

@@ -36,28 +36,21 @@ module RokuBuilder
     def self.validate_config(config:)
       codes = []
       validate_structure(codes: codes, config: config)
-      if config[:devices]
-        config[:devices].each {|device, device_config|
-          next if device == :default
-          validate_device(codes: codes, device: device_config)
-        }
-      end
-      if config[:projects]
-        config[:projects].each {|project,project_config|
-          next if project == :default or project == :project_dir
-          validate_project(codes: codes, project: project_config)
-          if project_config[:stages]
-            project_config[:stages].each {|_stage, stage_config|
-              validate_stage(codes: codes, stage: stage_config, project: project_config, config: config)
-            }
+      [:projects, :devices, :keys].each do |type|
+        if config[type]
+          config[type].each do |key, value|
+            next if [:default, :key_dir, :project_dir].include?(key)
+            method = "validate_#{type.to_s[0..-2]}".to_sym
+            attrs = {codes: codes}
+            attrs[type.to_s[0..-2].to_sym] = value
+            send(method, attrs)
+            if value[:stages]
+              value[:stages].each {|_stage, stage_config|
+                validate_stage(codes: codes, stage: stage_config, project: value, config: config)
+              }
+            end
           end
-        }
-      end
-      if config[:keys]
-        config[:keys].each {|key,key_config|
-          next if key == :key_dir
-          validate_key(codes: codes, key: key_config)
-        }
+        end
       end
       if config[:input_mapping]
         config[:input_mapping].each_value {|info| validate_mapping(codes: codes, mapping: info) }

data/lib/roku_builder/monitor.rb

@@ -21,7 +21,8 @@ module RokuBuilder
 
     # Monitor a development log on the Roku device
     # @param type [Symbol] The log type to monitor
-    def monitor(type:)
+    # @param regexp [Regexp] regular expression to filter text on
+    def monitor(type:, regexp: nil)
       telnet_config = { 'Host' => @roku_ip_address, 'Port' => @ports[type] }
       waitfor_config = { 'Match' => /./, 'Timeout' => false }
 
@@ -32,7 +33,7 @@ module RokuBuilder
         all_text = ""
         while true
           connection.waitfor(waitfor) do |txt|
-            all_text = manage_text(all_text: all_text, txt: txt)
+            all_text = manage_text(all_text: all_text, txt: txt, regexp: regexp)
           end
         end
       }
@@ -87,6 +88,7 @@ module RokuBuilder
             running = false
           else
             thread[:connection].puts(command)
+            sleep(0.1)
           end
         rescue SystemExit, Interrupt
           thread[:connection].puts("\C-c")
@@ -97,11 +99,14 @@ module RokuBuilder
     # Handle text from telnet
     #  @param all_text [String] remaining partial line text
     #  @param txt [String] current string from telnet
+    #  @param regexp [Regexp] regular expression to filter text on
     #  @return [String] remaining partial line text
-    def manage_text(all_text:, txt:)
+    def manage_text(all_text:, txt:, regexp: nil)
       all_text += txt
       while line = all_text.slice!(/^.*\n/) do
-        puts line if !line.strip.empty?
+        if !line.strip.empty?
+          puts line if regexp.nil? or regexp.match(line)
+        end
       end
 
       if all_text.downcase == "BrightScript Debugger> ".downcase

data/lib/roku_builder/version.rb

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

data/roku_builder.gemspec

@@ -39,4 +39,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "yard",              "~> 0.9"
   spec.add_development_dependency "guard",             "~> 2.14"
   spec.add_development_dependency "guard-minitest",    "~> 2.4"
+  spec.add_development_dependency "m",                 "~> 1.5"
 end

data/test/roku_builder/test_config_parser.rb

@@ -195,6 +195,17 @@ class ConfigParserTest < Minitest::Test
     RokuBuilder::ConfigParser.send(:setup_simple_configs, **args)
   end
 
+  def test_monitor_config
+    args = {
+      config: {},
+      configs: {project_config: {directory: "dir"}, init_params: {}, out: {}},
+      options: {monitor: "main", regexp: "^A$"},
+    }
+    RokuBuilder::ConfigParser.send(:setup_active_configs, **args)
+    refute_nil args[:configs][:monitor_config][:regexp]
+    assert args[:configs][:monitor_config][:regexp].match("A")
+  end
+
   def test_outfile_config
     configs = {}
     args = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 3.12.2
+  version: 3.12.4
 platform: ruby
 authors:
 - greeneca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -262,6 +262,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 description: Allows the user to easily sideload, package, deeplink, test, roku apps.
 email:
 - charles.greene@redspace.com