roku_builder 4.21.0 → 4.21.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ce5f56708c07ff3b1690b2125647bba2ef48c9f7c3d04b8ee04c73e2ae0f88e
-  data.tar.gz: 0c7ef6e883ef6f4c83e0fb9d72f5337e4e8151624eda7504cc8fc89e0635586e
+  metadata.gz: 3a3ef1eb871ea4979ed73ece95c1211b2435f6651e118add52434b163268c5a8
+  data.tar.gz: af458ef520e7d7cfb1a93a7d2df1df4c6b885aebc338ddd624100afe8c90aca1
 SHA512:
-  metadata.gz: 1bbc6bcd38b8c8b473acde3883b8bc2b10bfa3b6608cf12d3b225edfcf0ace7093d2763617e2cb4a1db80f73a46334a289733b16cd4077800fa12292a3816d0d
-  data.tar.gz: c26c9d1586391b35fdda16290d3ca98218f9dc78ee84ba974033f3b4ad1ad349ba9b753e415c3628e18160366af3baa1bd6ca0f03fec07255abb216a74d00745
+  metadata.gz: c3ba492b2dcb170dba88e48e77022b537cd1b36c5d98da91788fb4f6d8e8dfce92b706bf57197bc1639f5501c617750b8ba541796b456252c3f8133c645b69ad
+  data.tar.gz: 8ee571d3ee816221ba12c9a2b2e59456f420a6ab09c7de5de6e9ab8ac70ca0e431dba3d7be13b8d21db492cf4876a25599605fa1547c11844c3330e6d864a072

data/.travis.yml

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

data/CHANGELOG

@@ -1,3 +1,19 @@
+ = 4.21.3 =
+
+ - 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 =
 
  - Add file size warning

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 == 191 and @path.ends_with?("EpisodeGuide.animation.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"
+      unless line =~ regexp or line == "\n" or line =~ /\'indent-ignore/ or comment
         add_warning(line: number)
       end
       @prev_line = line
@@ -37,33 +37,37 @@ module RokuBuilder
           end
         end
       when :brs
-        if @prev_line
-          if @prev_line =~ /^\'/
-            # Don't change indentation
-          elsif @prev_line =~ /[\{\[\(:]$/
-            @ind += @count
-          elsif @prev_line =~ /:\s*\bfunction\b|:\s*\bsub\b/i
-            @ind += @count
-          elsif @prev_line =~ /^\s*\bfunction\b|^\s*\bsub\b/i
-            @ind += @count
-          elsif @prev_line =~ /^\s*#?if\b|^\s*#?else\b/i
-            unless @prev_line =~ /\bthen\b[ \t ]*[^' \r\n']+.*$/i or @prev_line =~ /\breturn\b/i
+        if line =~ /'indent-reset/
+          @ind = line.index(/[^#{@character}]/)
+        else
+          if @prev_line
+            if @prev_line =~ /^\'/ or @prev_line =~ /\'indent-ignore/
+              # Don't change indentation
+            elsif @prev_line =~ /[\{\[\(:]$/
+              @ind += @count
+            elsif @prev_line =~ /:\s*\bfunction\b|:\s*\bsub\b/i
+              @ind += @count
+            elsif @prev_line =~ /^\s*\bfunction\b|^\s*\bsub\b/i
+              @ind += @count
+            elsif @prev_line =~ /^\s*#?if\b|^\s*#?else\b/i
+              unless @prev_line =~ /\bthen\b[ \t ]*[^' \r\n']+.*$/i or @prev_line =~ /\breturn\b/i
+                @ind += @count
+              end
+            elsif @prev_line =~ /^\s*\bfor\b|^\s*\bwhile\b/i
               @ind += @count
             end
-          elsif @prev_line =~ /^\s*\bfor\b|^\s*\bwhile\b/i
-            @ind += @count
           end
-        end
-        if line =~ /^\'/
-          # Don't change indentation
-        elsif line =~ /^\s*[\}\]\)]/
-          @ind -= @count
-        elsif line =~ /^\s*\bfunction\b|^\s*\bsub\b/i
-          @ind -= 0
-        elsif line =~ /^\s*:?\s*#?end\b|^\s*#?endif\b|^\s*endfor\b|^\s*\bnext\b/i
-          @ind -= @count
-        elsif line =~ /^\s*#?else\b|^\s*elseif\b/i
-          @ind -= @count
+          if line =~ /^\'/ or line =~ /\'indent-ignore/
+            # Don't change indentation
+          elsif line =~ /^\s*[\}\]\)]/
+            @ind -= @count
+          elsif line =~ /^\s*\bfunction\b|^\s*\bsub\b/i
+            @ind -= 0
+          elsif line =~ /^\s*:?\s*#?end\b|^\s*#?endif\b|^\s*endfor\b|^\s*\bnext\b/i
+            @ind -= @count
+          elsif line =~ /^\s*#?else\b|^\s*elseif\b/i
+            @ind -= @count
+          end
         end
       end
     end

data/lib/roku_builder/plugins/line_inspector.rb

@@ -14,7 +14,6 @@ module RokuBuilder
         in_xml_comment = false
         indent_inspector = IndentationInspector.new(rules: @indent_config, path: file_path) if @indent_config
         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")
           if file_path.end_with?(".xml")
@@ -28,6 +27,7 @@ module RokuBuilder
             line.gsub!(/<!--.*-->/, "")
             in_xml_comment = true if line.gsub!(/<!--.*/, "")
           end
+          indent_inspector.check_line(line: full_line, number: line_number, comment: in_xml_comment) if indent_inspector
           @inspector_config.each do |line_inspector|
             line_to_check = line
             line_to_check = full_line if line_inspector[:include_comments]

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/version.rb

@@ -2,5 +2,5 @@
 
 module RokuBuilder
   # Version of the RokuBuilder Gem
-  VERSION = "4.21.0"
+  VERSION = "4.21.5"
 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.0
+  version: 4.21.5
 platform: ruby
 authors:
 - greeneca
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-01 00:00:00.000000000 Z
+date: 2020-11-27 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: