roku_builder 4.21.1 → 4.21.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14e0e8c8c442ff787f466072df4d0ada2940af2211b912fc34483de1a4240dd2
-  data.tar.gz: 3a080babe3d406b62aace4a74ae296f017f46ce43e9eb39d33c8ccaf0fdb16e1
+  metadata.gz: bcd83884e0acc2164d90915b4949c8a8b8334ee072ed45ca3c82e1f823b77d3f
+  data.tar.gz: 8f48403dd9bba7982c0cde10a2667f85d3da88244401fa17fd4b1d8675cb4709
 SHA512:
-  metadata.gz: ec5169d5a364464d2c5497af55220501d467625fd89e0bd87af25db03d00ff3c61f6571782ea6267089218e5f57404a33df63fb2bb49d5b8538ee95a24d79c16
-  data.tar.gz: 7a99072769cf9433d2223b88ed4443ce0be2018a90b5b8c4e38ca37ef93629f926551c00ce99408caf7e014e8fff45c2d08de3df838a1a0e4c58bbdc06914883
+  metadata.gz: e5397243a045a1d8bac3dbc06381513e7a34b5e74bdb00d7e8cfd2eaf4bb89f520e8b01c1c25bae531551d1cce2a1273dec0b7d84f5877b2b61741e54e59f1a8
+  data.tar.gz: d368e046903392039969c8a3ba0b339755fd6a707126f792403143c8b2d835dfa4156f8464d19bf733e6ff76241ccf4b1efe695a85bd745f2126bfa1abf54af5

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - "2.4.1"
+  - "2.6.0"
 before_install:
     - gem install bundler

data/CHANGELOG

@@ -1,6 +1,18 @@
- = 4.20.1 =
+ = 4.21.3 =
 
- -Add indent-ignore and indent-reset comment processing to analyzer
+ - Ignore indentation in multi-line xml comments
+
+ = 4.21.2 =
+
+ - Fix bundler load paths for later versions of ruby
+
+ = 4.21.1 =
+
+ - Add indent-ignore and indent-reset comment processing to analyzer
+
+ = 4.21.0 =
+
+ - Add post stage/unstage hooks
 
  = 4.20.0 =
 

data/bin/roku

@@ -4,6 +4,8 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
 #require "byebug"
+require "rubygems"
+require "bundler/setup"
 require "roku_builder"
 
 RokuBuilder.run()

data/lib/roku_builder.rb

@@ -4,7 +4,6 @@ require "logger"
 require "faraday"
 require "faraday/digestauth"
 require "pathname"
-require "rubygems"
 require "optparse"
 require "pathname"
 require "net/ping"
@@ -201,7 +200,7 @@ module RokuBuilder
           stager.stage
         end
         instance = plugin.new(config: @@config)
-        instance.send(@@options.command, {options: @@options})
+        instance.send(@@options.command, **{options: @@options})
         stager.unstage if stager
       end
     end
@@ -225,7 +224,7 @@ module RokuBuilder
   def self.process_hook(hook:, params:)
     @@plugins.each do |plugin|
       if plugin.respond_to?("#{hook}_hook".to_sym)
-        plugin.send("#{hook}_hook", params)
+        plugin.send("#{hook}_hook", **params)
       end
     end
   end

data/lib/roku_builder/config_validator.rb

@@ -89,7 +89,7 @@ module RokuBuilder
       attrs = {}
       attrs[section_singular] = content
       method = "validate_#{section_singular}".to_sym
-      send(method, attrs)
+      send(method, **attrs)
     end
 
     def singularize(section:)

data/lib/roku_builder/plugins/analyzer.rb

@@ -30,6 +30,7 @@ module RokuBuilder
     def analyze(options:, quiet: false)
       @options = options
       @warnings = []
+      @sca_warning = {}
       performance_config = get_config("performance_config.json")
       linter_config = get_config(".roku_builder_linter.json", true)
       linter_config ||= {is_ssai: false}

data/lib/roku_builder/plugins/indentation_inspector.rb

@@ -13,11 +13,11 @@ module RokuBuilder
       @ind = 0
     end
 
-    def check_line(line:, number:)
-      #byebug if number == 43 and @path.ends_with?("keyEvents.brs")
+    def check_line(line:, number:, comment:)
+      #byebug if number == 10 and @path.ends_with?(".brs")
       set_indentation(line: line)
       regexp = /^#{@character}{#{@ind}}[^#{@character}]/
-      unless line =~ regexp or line == "\n" or line =~ /\'indent-ignore/
+      unless line =~ regexp or line == "\n" or line =~ /\'indent-ignore/ or comment
         add_warning(line: number)
       end
       @prev_line = line

data/lib/roku_builder/plugins/line_inspector.rb

@@ -13,38 +13,49 @@ module RokuBuilder
       File.open(file_path) do |file|
         in_xml_comment = false
         indent_inspector = IndentationInspector.new(rules: @indent_config, path: file_path) if @indent_config
+        full_file = []
+        file_no_comments = []
+        lines_to_ignore = []
         file.readlines.each_with_index do |line, line_number|
-          indent_inspector.check_line(line: line, number: line_number) if indent_inspector
           full_line = line.dup
-          line = line.partition("'").first if file_path.end_with?(".brs")
+          line.gsub!(/'.*/, "") if file_path.end_with?(".brs")
           if file_path.end_with?(".xml")
             if in_xml_comment
               if line.gsub!(/.*-->/, "")
                 in_xml_comment = false
               else
-                line = ""
+                line = "\n"
               end
             end
             line.gsub!(/<!--.*-->/, "")
             in_xml_comment = true if line.gsub!(/<!--.*/, "")
           end
-          @inspector_config.each do |line_inspector|
-            line_to_check = line
-            line_to_check = full_line if line_inspector[:include_comments]
-            match  = nil
-            if line_inspector[:case_sensitive]
-              match = /#{line_inspector[:regex]}/.match(line_to_check)
-            else
-              match = /#{line_inspector[:regex]}/i.match(line_to_check)
-            end
-            if match
-              unless /'.*ignore-warning/i.match(full_line)
-                add_warning(inspector: line_inspector, file: file_path, line: line_number, match: match)
-              end
-            end
+          indent_inspector.check_line(line: full_line, number: line_number, comment: in_xml_comment) if indent_inspector
+          if  /'.*ignore-warning/i.match(full_line)
+            lines_to_ignore.push line_number
           end
+          full_file.push(full_line)
+          file_no_comments.push(line)
         end
         @warnings += indent_inspector.warnings if indent_inspector
+        no_comments = file_no_comments.join("")
+        file = full_file.join("")
+        @inspector_config.each do |line_inspector|
+          to_check = no_comments
+          to_check = file if line_inspector[:include_comments]
+          match  = nil
+          if line_inspector[:case_sensitive]
+            match = /#{line_inspector[:regex]}/.match(to_check)
+          else
+            match = /#{line_inspector[:regex]}/i.match(to_check)
+          end
+          if match
+            line_number = to_check[0..match.begin(0)].split("\n", -1).count - 1
+            unless lines_to_ignore.include?(line_number)
+              add_warning(inspector: line_inspector, file: file_path, line: line_number, match: match)
+            end
+          end
+        end
       end
       @warnings
     end

data/lib/roku_builder/plugins/loader.rb

@@ -7,7 +7,7 @@ module RokuBuilder
     extend Plugin
 
     def init
-      @warningFileSize = 250 * 1024
+      @warningFileSize = 500 * 1024
     end
 
     def self.commands
@@ -37,6 +37,9 @@ module RokuBuilder
       parser.on("-x", "--exclude", "Apply exclude config to sideload") do
         options[:exclude] = true
       end
+      parser.on("--remote-debug", "Sideload will enable remote debug") do
+        options[:remoteDebug] = true
+      end
     end
 
     def self.dependencies
@@ -52,7 +55,7 @@ module RokuBuilder
         build(options: options)
       end
       keep_build_file = is_build_command(options) and options[:out]
-      upload
+      upload(options)
       # Cleanup
       File.delete(file_path(:in)) if did_build and not keep_build_file
     end
@@ -99,11 +102,12 @@ module RokuBuilder
       [:sideload, :build].include? options.command
     end
 
-    def upload
+    def upload(options)
       payload =  {
         mysubmit: "Replace",
-        archive: Faraday::UploadIO.new(file_path(:in), 'application/zip')
+        archive: Faraday::UploadIO.new(file_path(:in), 'application/zip'),
       }
+      payload["remotedebug"] = "1" if options[:remoteDebug]
       response = multipart_connection.post "/plugin_install", payload
       @logger.debug("Status: #{response.status}, Body: #{response.body}")
       if response.status==200 and response.body=~/Identical to previous version/

data/lib/roku_builder/plugins/performance_config.json

@@ -10,7 +10,7 @@
     "message": "Found DoesExist check. Try using invalid check on dot reference"
   },
   {
-    "regex": "[^\\s]+\\[\"[^\"]+\"\\]",
+    "regex": "\\w+\\[\"[^\"]+\"\\]",
     "severity": "warning",
     "message": "Found AA String reference. Try switching to dot reference"
   },

data/lib/roku_builder/version.rb

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

data/test/roku_builder/plugins/test_analyzer.rb

@@ -106,7 +106,7 @@ module RokuBuilder
       warnings = test_file(text: "function test() as String 'IGNORE-WARNING\n? \"test\"\nend function")
       assert_equal 0, warnings.count
     end
-    def test_performance_for_loop_title_case
+    def test_performance_for_each_loop_title_case
       warnings = test_file(text: "For each button in buttons\n ? button\nEND FOR")
       assert_equal 0, warnings.count
     end
@@ -148,6 +148,7 @@ module RokuBuilder
       end
 
       logger.verify
+      warnings
     end
 
     def test(quiet=true)

data/test/roku_builder/plugins/test_profiler.rb

@@ -32,7 +32,8 @@ module RokuBuilder
       end
       count = 0
       read_stub = Proc.new do |size|
-        raise SystemExit if count = 2
+        shouldExit = (count = 2)
+        raise SystemExit if shouldExit
         count += 1
       end
       connection = Minitest::Mock.new

data/test/roku_builder/test_options.rb

@@ -32,14 +32,13 @@ module RokuBuilder
     end
     def test_options_parse
       parser = Minitest::Mock.new()
-      options_hash = {}
       options = Options.allocate
       parser.expect(:banner=, nil, [String])
       parser.expect(:parse!, nil)
       OptionParser.stub(:new, parser) do
         options.stub(:add_plugin_options, nil) do
           options.stub(:validate_parser, nil) do
-            options_hash = options.send(:parse)
+            options.send(:parse)
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.21.1
+  version: 4.21.6
 platform: ruby
 authors:
 - greeneca
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-19 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -616,7 +616,7 @@ homepage: ''
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -631,9 +631,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Build Tool for Roku Apps
 test_files: