roku_builder 4.21.5 → 4.21.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a3ef1eb871ea4979ed73ece95c1211b2435f6651e118add52434b163268c5a8
-  data.tar.gz: af458ef520e7d7cfb1a93a7d2df1df4c6b885aebc338ddd624100afe8c90aca1
+  metadata.gz: bcd83884e0acc2164d90915b4949c8a8b8334ee072ed45ca3c82e1f823b77d3f
+  data.tar.gz: 8f48403dd9bba7982c0cde10a2667f85d3da88244401fa17fd4b1d8675cb4709
 SHA512:
-  metadata.gz: c3ba492b2dcb170dba88e48e77022b537cd1b36c5d98da91788fb4f6d8e8dfce92b706bf57197bc1639f5501c617750b8ba541796b456252c3f8133c645b69ad
-  data.tar.gz: 8ee571d3ee816221ba12c9a2b2e59456f420a6ab09c7de5de6e9ab8ac70ca0e431dba3d7be13b8d21db492cf4876a25599605fa1547c11844c3330e6d864a072
+  metadata.gz: e5397243a045a1d8bac3dbc06381513e7a34b5e74bdb00d7e8cfd2eaf4bb89f520e8b01c1c25bae531551d1cce2a1273dec0b7d84f5877b2b61741e54e59f1a8
+  data.tar.gz: d368e046903392039969c8a3ba0b339755fd6a707126f792403143c8b2d835dfa4156f8464d19bf733e6ff76241ccf4b1efe695a85bd745f2126bfa1abf54af5

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|
           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
           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]
-            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
+          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/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.5"
+  VERSION = "4.21.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.21.5
+  version: 4.21.6
 platform: ruby
 authors:
 - greeneca
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-27 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip