roku_builder 4.21.0 → 4.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ce5f56708c07ff3b1690b2125647bba2ef48c9f7c3d04b8ee04c73e2ae0f88e
-  data.tar.gz: 0c7ef6e883ef6f4c83e0fb9d72f5337e4e8151624eda7504cc8fc89e0635586e
+  metadata.gz: 14e0e8c8c442ff787f466072df4d0ada2940af2211b912fc34483de1a4240dd2
+  data.tar.gz: 3a080babe3d406b62aace4a74ae296f017f46ce43e9eb39d33c8ccaf0fdb16e1
 SHA512:
-  metadata.gz: 1bbc6bcd38b8c8b473acde3883b8bc2b10bfa3b6608cf12d3b225edfcf0ace7093d2763617e2cb4a1db80f73a46334a289733b16cd4077800fa12292a3816d0d
-  data.tar.gz: c26c9d1586391b35fdda16290d3ca98218f9dc78ee84ba974033f3b4ad1ad349ba9b753e415c3628e18160366af3baa1bd6ca0f03fec07255abb216a74d00745
+  metadata.gz: ec5169d5a364464d2c5497af55220501d467625fd89e0bd87af25db03d00ff3c61f6571782ea6267089218e5f57404a33df63fb2bb49d5b8538ee95a24d79c16
+  data.tar.gz: 7a99072769cf9433d2223b88ed4443ce0be2018a90b5b8c4e38ca37ef93629f926551c00ce99408caf7e014e8fff45c2d08de3df838a1a0e4c58bbdc06914883

data/CHANGELOG

@@ -1,3 +1,7 @@
+ = 4.20.1 =
+
+ -Add indent-ignore and indent-reset comment processing to analyzer
+
  = 4.20.0 =
 
  - Add file size warning

data/lib/roku_builder/plugins/indentation_inspector.rb

@@ -14,10 +14,10 @@ module RokuBuilder
     end
 
     def check_line(line:, number:)
-      #byebug if number == 191 and @path.ends_with?("EpisodeGuide.animation.brs")
+      #byebug if number == 43 and @path.ends_with?("keyEvents.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/
         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/version.rb

@@ -2,5 +2,5 @@
 
 module RokuBuilder
   # Version of the RokuBuilder Gem
-  VERSION = "4.21.0"
+  VERSION = "4.21.1"
 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.1
 platform: ruby
 authors:
 - greeneca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-01 00:00:00.000000000 Z
+date: 2019-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip