roku_builder 4.25.6 → 4.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b926c96062054e546bb423d2031bc48446a3c716c2488c6756882a6218d22e2
-  data.tar.gz: 6748df137a4374f34b2c91aebac0a4e1c77129753c835f86d1ac61c9b3999f9b
+  metadata.gz: 8cef81268ceb5755dd1f33511fb33d40231b82f148b1cab085674a640a84422f
+  data.tar.gz: b76b0aec49eb4a465793cbe2db2e504aaef61c6ca5e0202e4365521c5f665ab3
 SHA512:
-  metadata.gz: 42ff1860aded5097863dd4bd6b721d78f24e1e99888b365cb2a84dd98878c74599efc4be91c56d6b6f50b706d2eb3ce73bc75ab25ded7829a4a3325ece71a023
-  data.tar.gz: 7b531741d6cab2f47739892edb54aeae709fe53fa44b18dcaa97a22dc112767bd323644289be3041eac1de56b12f002b562e06714a5d116b6c45510cdd1a62ce
+  metadata.gz: 9d85a36f9aa407e5b7cb5927f98ffca2d0c3ec67ca3282b3371c75abe41ea0378fef06fe06917d85c00e248f64aa6af4265850a15bf4bd9bd47ba22c208b8ef3
+  data.tar.gz: 24573d389ea6c02a025512e6ec0092adbe3934d0b0322a9ca8a0aef47b2cc6f311ee8b3b945c9b63201a7eaed2532a925f0243971d069341aa16ddc6cd69352c

data/lib/roku_builder/plugins/line_inspector.rb

@@ -47,17 +47,38 @@ module RokuBuilder
             match  = nil
             start = 0
             loop do
+              stop = to_check.length-1
+              pass_match = nil
+              if line_inspector[:pass_if_match]
+                if line_inspector[:case_sensitive]
+                  pass_match = /#{line_inspector[:pass_test_regexp]}/.match(to_check[start..stop])
+                else
+                  pass_match = /#{line_inspector[:pass_test_regexp]}/i.match(to_check[start..stop])
+                end
+                break unless pass_match
+                stop = to_check.index("\n", start)
+                stop ||= to_check.length-1
+              end
               if line_inspector[:case_sensitive]
-                match = /#{line_inspector[:regex]}/.match(to_check, start)
+                match = /#{line_inspector[:regex]}/.match(to_check[start..stop])
               else
-                match = /#{line_inspector[:regex]}/i.match(to_check, start)
+                match = /#{line_inspector[:regex]}/i.match(to_check[start..stop])
               end
-              if match
-                start = match.end(0)
-                line_number = to_check[0..match.begin(0)].split("\n", -1).count - 1
+              if (not line_inspector[:pass_if_match] and match) or (line_inspector[:pass_if_match] and not match)
+                error_match = match
+                if match
+                  start = match.end(0)
+                  line_number = to_check[0..match.begin(0)].split("\n", -1).count - 1
+                else
+                  error_match = pass_match
+                  line_number = to_check[0..start].split("\n", -1).count - 1
+                  start = stop
+                end
                 unless lines_to_ignore.include?(line_number)
-                  add_warning(inspector: line_inspector, file: file_path, line: line_number, match: match)
+                  add_warning(inspector: line_inspector, file: file_path, line: line_number, match: error_match)
                 end
+              elsif line_inspector[:pass_if_match]
+                start = stop +1
               else
                 break
               end

data/lib/roku_builder/version.rb

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

data/test/roku_builder/plugins/test_analyzer.rb

@@ -26,6 +26,8 @@ module RokuBuilder
     def teardown
       manifest = File.join(@root_dir, "manifest")
       FileUtils.rm(manifest) if File.exist?(manifest)
+      linter_config = File.join(@root_dir, ".roku_builder_linter.json")
+      FileUtils.rm(linter_config) if File.exist?(linter_config)
       @request_stubs.each {|req| remove_request_stub(req)}
     end
     def test_analyzer_parse_commands
@@ -100,10 +102,27 @@ module RokuBuilder
       warnings = test_file(text: "For each button in buttons\n ? button\nEND FOR")
       assert_equal 0, warnings.count
     end
+    def test_linter_checks
+      set_linter_config("dont_use_hello_world.json")
+      warnings = test_file(text: "hello world")
+      assert_equal 1, warnings.count
+    end
+    def test_linter_positive_match
+      set_linter_config("linter_positive_match.json")
+      warnings = test_file(text: "hello world\nhello moon")
+      assert_equal 1, warnings.count
+      assert_equal 1, warnings.first[:line]
+    end
 
 
     private
 
+    def set_linter_config(config_file = nil)
+      if config_file
+        FileUtils.cp(File.join(@root_dir, config_file), File.join(@root_dir, ".roku_builder_linter.json"))
+      end
+    end
+
     def test_manifest(manifest_file = nil)
       if manifest_file
         use_manifest(manifest_file)

data/test/roku_builder/test_files/analyzer_test/dont_use_hello_world.json

@@ -0,0 +1,11 @@
+{
+  "is_ssai": true,
+  "rules": [
+    {
+      "regex": "hello world",
+      "case_sensitive": true,
+      "severity": "warning",
+      "message": "dont use hello world"
+    }
+  ]
+}

data/test/roku_builder/test_files/analyzer_test/linter_positive_match.json

@@ -0,0 +1,13 @@
+{
+  "is_ssai": true,
+  "rules": [
+    {
+      "pass_if_match": true,
+      "pass_test_regexp": "hello",
+      "regex": "hello world",
+      "case_sensitive": true,
+      "severity": "warning",
+      "message": "dont use hello world"
+    }
+  ]
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.25.6
+  version: 4.26.0
 platform: ruby
 authors:
 - greeneca
@@ -543,6 +543,7 @@ files:
 - test/roku_builder/test_config_validator.rb
 - test/roku_builder/test_device_manager.rb
 - test/roku_builder/test_files/analyzer_test/analyzer_config.json
+- test/roku_builder/test_files/analyzer_test/dont_use_hello_world.json
 - test/roku_builder/test_files/analyzer_test/images/focus.png
 - test/roku_builder/test_files/analyzer_test/images/focus_hd.png
 - test/roku_builder/test_files/analyzer_test/images/focus_sd.png
@@ -550,6 +551,7 @@ files:
 - test/roku_builder/test_files/analyzer_test/images/splash_hd.png
 - test/roku_builder/test_files/analyzer_test/images/splash_sd.png
 - test/roku_builder/test_files/analyzer_test/images/too_small.png
+- test/roku_builder/test_files/analyzer_test/linter_positive_match.json
 - test/roku_builder/test_files/analyzer_test/manifest_depricated_attribute
 - test/roku_builder/test_files/analyzer_test/manifest_duplicate_attribute
 - test/roku_builder/test_files/analyzer_test/manifest_empty_value
@@ -672,6 +674,7 @@ test_files:
 - test/roku_builder/test_config_validator.rb
 - test/roku_builder/test_device_manager.rb
 - test/roku_builder/test_files/analyzer_test/analyzer_config.json
+- test/roku_builder/test_files/analyzer_test/dont_use_hello_world.json
 - test/roku_builder/test_files/analyzer_test/images/focus.png
 - test/roku_builder/test_files/analyzer_test/images/focus_hd.png
 - test/roku_builder/test_files/analyzer_test/images/focus_sd.png
@@ -679,6 +682,7 @@ test_files:
 - test/roku_builder/test_files/analyzer_test/images/splash_hd.png
 - test/roku_builder/test_files/analyzer_test/images/splash_sd.png
 - test/roku_builder/test_files/analyzer_test/images/too_small.png
+- test/roku_builder/test_files/analyzer_test/linter_positive_match.json
 - test/roku_builder/test_files/analyzer_test/manifest_depricated_attribute
 - test/roku_builder/test_files/analyzer_test/manifest_duplicate_attribute
 - test/roku_builder/test_files/analyzer_test/manifest_empty_value