roku_builder 4.25.6 → 4.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b926c96062054e546bb423d2031bc48446a3c716c2488c6756882a6218d22e2
-  data.tar.gz: 6748df137a4374f34b2c91aebac0a4e1c77129753c835f86d1ac61c9b3999f9b
+  metadata.gz: 0f9b82cc8cd8d2da493f330d4b41d35eb26a1efb89a3e5546e427a9c1381cb36
+  data.tar.gz: 66cc47ae8975cb4dcfc5271d2d1cdb12e5813c37297679e96e64bedb64707108
 SHA512:
-  metadata.gz: 42ff1860aded5097863dd4bd6b721d78f24e1e99888b365cb2a84dd98878c74599efc4be91c56d6b6f50b706d2eb3ce73bc75ab25ded7829a4a3325ece71a023
-  data.tar.gz: 7b531741d6cab2f47739892edb54aeae709fe53fa44b18dcaa97a22dc112767bd323644289be3041eac1de56b12f002b562e06714a5d116b6c45510cdd1a62ce
+  metadata.gz: 41712b6228bf1fca02ededce8d0baee62cdec83ec8c0d39abbd4a6e187c496d62d723e67a1918cea8a01b55b15f0e16f295dfae0a725783d68c052cb37b34a02
+  data.tar.gz: 803f81014a8319163a9b95445f5902a4b027299194f8df53cda8fb6d52bfd4a770601f305c6b9ee277d4498c993975cce05cdbe1132151c09d748ec84a661a84

data/lib/roku_builder/plugins/analyzer.rb

@@ -40,7 +40,7 @@ module RokuBuilder
       loader = Loader.new(config: @config)
       Dir.mktmpdir do |dir|
         loader.copy(options: options, path: dir)
-        run_sca_tool(path: dir, ssai: linter_config[:is_ssai])
+        run_sca_tool(path: dir, linter_config: linter_config)
         libraries = @config.project[:libraries]
         libraries ||= []
         Dir.glob(File.join(dir, "**", "*")).each do |file_path|
@@ -63,7 +63,7 @@ module RokuBuilder
 
     private
 
-    def run_sca_tool(path:, ssai:)
+    def run_sca_tool(path:, linter_config:)
       if OS.unix?
         command = File.join(File.dirname(__FILE__), "sca-cmd", "bin", "sca-cmd")
         stderr = "/dev/null"
@@ -73,20 +73,20 @@ module RokuBuilder
       end
       @logger.debug("Command: '#{command}'")
       results = `#{command} #{path} 2>#{stderr}`.split("\n")
-      process_sca_results(results, ssai)
+      process_sca_results(results, linter_config)
     end
 
-    def process_sca_results(results, ssai)
+    def process_sca_results(results, linter_config)
       results.each do |result_line|
         if /-----+/.match(result_line) or /\*\*\*\*\*+/.match(result_line)
-          @warnings.push(@sca_warning) if add_warning?(ssai)
+          @warnings.push(@sca_warning) if add_warning?(linter_config)
           @sca_warning = {}
         elsif data = /^(\[WARNING\]|\[INFO\]|\[ERROR\])(.*)$/.match(result_line)
-          @warnings.push(@sca_warning) if add_warning?(ssai)
+          @warnings.push(@sca_warning) if add_warning?(linter_config)
           @sca_warning = {}
           @sca_warning[:severity] = data[1].gsub(/(\[|\])/, "").downcase
           @sca_warning[:message] = data[2]
-        elsif data = /^\sPath: ([^ ]*) Line: (\d*)./.match(result_line)
+        elsif data = /^\s*Path: ([^ ]*) Line: (\d*)./.match(result_line)
           @sca_warning[:path] = data[1]+":"+data[2]
         elsif @sca_warning and  @sca_warning[:message]
           @sca_warning[:message] += " " + result_line
@@ -94,9 +94,9 @@ module RokuBuilder
       end
     end
 
-    def add_warning?(ssai)
+    def add_warning?(linter_config)
       if @sca_warning and @sca_warning[:severity]
-        if ssai and /SetAdUrl\(\) method is missing/.match(@sca_warning[:message])
+        if linter_config[:ssai] and /SetAdUrl\(\) method is missing/.match(@sca_warning[:message])
           return false
         end
         libraries = @config.project[:libraries]
@@ -104,6 +104,11 @@ module RokuBuilder
         if @sca_warning[:path] and libraries.any_is_start?(@sca_warning[:path].gsub(/pkg:/, "")) and not @options[:include_libraries]
           return false
         end
+        if linter_config[:ignore_warnings]
+          linter_config[:ignore_warnings].each do |regexp|
+            return false if @sca_warning[:message] =~ /#{regexp}/
+          end
+        end
         return true
       end
       return false

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
+                  line_number = to_check[0..match.begin(0)+start].split("\n", -1).count - 1
+                  start = match.end(0) + start
+                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/plugins/loader.rb

@@ -103,7 +103,7 @@ module RokuBuilder
       multipart_connection(device: device) do |conn|
         response = conn.post "/plugin_install", payload
       end
-      unless response.status == 200 and response.body =~ /Conversion succeeded/ or ignoreFailure
+      unless response.status == 200 and response.body =~ /squashfs file in internal memory/ or ignoreFailure
         raise ExecutionError, "Failed Converting to Squashfs"
       end
     end
@@ -160,11 +160,13 @@ module RokuBuilder
     end
 
     def build_zip(content)
-      path = file_path(:out)
-      File.delete(path) if File.exist?(path)
-      io = Zip::File.open(path, Zip::File::CREATE)
+      tmp_path = File.join(build_dir, SecureRandom.uuid+".zip")
+      io = Zip::File.open(tmp_path, Zip::File::CREATE)
       writeEntries(build_dir, content[:source_files], "", content[:excludes], io)
       io.close()
+      path = file_path(:out)
+      File.delete(path) if File.exist?(path)
+      FileUtils.mv(tmp_path, path)
     end
 
     # Recursively write directory contents to a zip archive

data/lib/roku_builder/plugins/sca-cmd/bin/sca-cmd

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/lib/sca-cmd.jar:$APP_HOME/lib/sca-library.jar:$APP_HOME/lib/utils-2.3.0.jar:$APP_HOME/lib/configuration-2.0.0.jar:$APP_HOME/lib/compress-2.3.1.jar:$APP_HOME/lib/io-2.4.0.jar:$APP_HOME/lib/imaging-2.0.0.jar:$APP_HOME/lib/manifest-2.3.0.jar:$APP_HOME/lib/commons-cli-1.5.0.jar:$APP_HOME/lib/jackson-databind-2.13.1.jar:$APP_HOME/lib/jackson-core-2.13.1.jar:$APP_HOME/lib/jackson-annotations-2.13.1.jar:$APP_HOME/lib/jackson-dataformat-xml-2.13.1.jar:$APP_HOME/lib/commons-lang3-3.12.0.jar:$APP_HOME/lib/woodstox-core-6.2.7.jar:$APP_HOME/lib/stax2-api-4.2.1.jar:$APP_HOME/lib/commons-compress-1.21.jar:$APP_HOME/lib/commons-io-2.11.0.jar
+CLASSPATH=$APP_HOME/lib/sca-cmd.jar:$APP_HOME/lib/sca-library.jar:$APP_HOME/lib/utils-4.0.0.jar:$APP_HOME/lib/configuration-4.0.0.jar:$APP_HOME/lib/compress-4.0.0.jar:$APP_HOME/lib/io-4.0.0.jar:$APP_HOME/lib/imaging-4.0.0.jar:$APP_HOME/lib/manifest-4.0.0.jar:$APP_HOME/lib/commons-cli-1.5.0.jar:$APP_HOME/lib/jackson-databind-2.13.3.jar:$APP_HOME/lib/jackson-core-2.13.3.jar:$APP_HOME/lib/jackson-annotations-2.13.3.jar:$APP_HOME/lib/jackson-dataformat-xml-2.13.3.jar:$APP_HOME/lib/commons-lang3-3.12.0.jar:$APP_HOME/lib/woodstox-core-6.2.7.jar:$APP_HOME/lib/stax2-api-4.2.1.jar:$APP_HOME/lib/commons-compress-1.21.jar:$APP_HOME/lib/commons-io-2.11.0.jar
 
 
 # Determine the Java command to use to start the JVM.

data/lib/roku_builder/plugins/sca-cmd/bin/sca-cmd.bat

@@ -67,7 +67,7 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\lib\sca-cmd.jar;%APP_HOME%\lib\sca-library.jar;%APP_HOME%\lib\utils-2.3.0.jar;%APP_HOME%\lib\configuration-2.0.0.jar;%APP_HOME%\lib\compress-2.3.1.jar;%APP_HOME%\lib\io-2.4.0.jar;%APP_HOME%\lib\imaging-2.0.0.jar;%APP_HOME%\lib\manifest-2.3.0.jar;%APP_HOME%\lib\commons-cli-1.5.0.jar;%APP_HOME%\lib\jackson-databind-2.13.1.jar;%APP_HOME%\lib\jackson-core-2.13.1.jar;%APP_HOME%\lib\jackson-annotations-2.13.1.jar;%APP_HOME%\lib\jackson-dataformat-xml-2.13.1.jar;%APP_HOME%\lib\commons-lang3-3.12.0.jar;%APP_HOME%\lib\woodstox-core-6.2.7.jar;%APP_HOME%\lib\stax2-api-4.2.1.jar;%APP_HOME%\lib\commons-compress-1.21.jar;%APP_HOME%\lib\commons-io-2.11.0.jar
+set CLASSPATH=%APP_HOME%\lib\sca-cmd.jar;%APP_HOME%\lib\sca-library.jar;%APP_HOME%\lib\utils-4.0.0.jar;%APP_HOME%\lib\configuration-4.0.0.jar;%APP_HOME%\lib\compress-4.0.0.jar;%APP_HOME%\lib\io-4.0.0.jar;%APP_HOME%\lib\imaging-4.0.0.jar;%APP_HOME%\lib\manifest-4.0.0.jar;%APP_HOME%\lib\commons-cli-1.5.0.jar;%APP_HOME%\lib\jackson-databind-2.13.3.jar;%APP_HOME%\lib\jackson-core-2.13.3.jar;%APP_HOME%\lib\jackson-annotations-2.13.3.jar;%APP_HOME%\lib\jackson-dataformat-xml-2.13.3.jar;%APP_HOME%\lib\commons-lang3-3.12.0.jar;%APP_HOME%\lib\woodstox-core-6.2.7.jar;%APP_HOME%\lib\stax2-api-4.2.1.jar;%APP_HOME%\lib\commons-compress-1.21.jar;%APP_HOME%\lib\commons-io-2.11.0.jar
 
 
 @rem Execute sca-cmd

data/lib/roku_builder/version.rb

@@ -2,5 +2,5 @@
 
 module RokuBuilder
   # Version of the RokuBuilder Gem
-  VERSION = "4.25.6"
+  VERSION = "4.26.2"
 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/plugins/test_loader.rb

@@ -136,7 +136,7 @@ module RokuBuilder
     end
     def test_loader_squash
       @request_stubs.push(stub_request(:post, "http://#{@device_config[:ip]}/plugin_install").
-        to_return(status: 200, body: "Conversion succeeded", headers: {}))
+        to_return(status: 200, body: "squashfs file in internal memory", headers: {}))
       @device_manager.expect(:reserve_device, @device, no_lock: false)
       @device_manager.expect(:release_device, nil, [@device])
 

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": "only use hello world, no other hello"
+    }
+  ]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.25.6
+  version: 4.26.2
 platform: ruby
 authors:
 - greeneca
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -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