roku_builder 4.20.0 → 4.21.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ef52ed909a9cc810fa55beb4d154d59875801f76e3728c67f74293dfcb78808
-  data.tar.gz: 119c6d54e81b0a3a2aeb8d181638f62b0f123b1cb94327e91f689a72633ee870
+  metadata.gz: 893af4ba4855d2ea781043034af83671eff43a10c14ded1648e12e45377cd9aa
+  data.tar.gz: 4f9b84df19799dd6220718b2825d4a597327c63b8c3403432b3e5a9c53542652
 SHA512:
-  metadata.gz: 25444826c215fa90d046037bf13f71a8e04cd9f5022d545bedae812c826e94e7dc6bc9cf6e78b55642949a317189bbd2cbfc8938ea9fab8bf0df869c1b1aab9f
-  data.tar.gz: c64d613765174f9ff075502de653c709195520ed104419dd118660bb27f1ae4d8e1ed7bb05076caf023b5ee05857cdafaa86c9e18c05ce8a22bc0a733ab4eb94
+  metadata.gz: 13cdd1828544c0580c46507047ae9425a65054e3ade6d6f8ac2f5a149faac60cc59212929b64a9226c57494a80bf1fcfb36540e684ada73df7d1215e0fb68b9d
+  data.tar.gz: e3a7197fbafbf6138b0c5831c21e3640b47d9c4b219c2bde6c924678ff05379d1f7d09490dd4ae06753ef910b57b31816dc70933803784f1fe21fe39ec1ddc41

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"

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

@@ -53,6 +53,7 @@ module RokuBuilder
       when :plugin
         @plugin.stage(options: @options)
       end
+      RokuBuilder.process_hook(hook: "post_stage", params: {config: @config, options: @options})
       @stage_success
     end
 
@@ -87,6 +88,7 @@ module RokuBuilder
       when :plugin
         @plugin.unstage(options: @options)
       end
+      RokuBuilder.process_hook(hook: "post_unstage", params: {config: @config, options: @options})
       unstage_success
     end
 

data/lib/roku_builder/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.20.0
+  version: 4.21.4
 platform: ruby
 authors:
 - greeneca
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-30 00:00:00.000000000 Z
+date: 2020-07-08 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.1.2
+signing_key:
 specification_version: 4
 summary: Build Tool for Roku Apps
 test_files: