roku_builder 4.26.1 → 4.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26fe47ba62ff48e37fe3bd5dda06ff687b79c30dc67bd7dd216747363cf6efbd
-  data.tar.gz: cc5480949806270e823d1a177219a48f541abbdde571c949022d9ae16a3cf11a
+  metadata.gz: 0b5e9ad1de8e6092b56c393b1f854d0209d4e9fe44a744447f59e63b99a172d2
+  data.tar.gz: c41fc8a97026d51cb5d573a5e9f7c78c2fbe97a4d38f2a6048e34a0809c82681
 SHA512:
-  metadata.gz: 7dd09cf68f00832afb02e2797643d6babcb81c6cb943523c883b77b0f2d361bb03fe642c8fe54f685e9565dea175d23974fd1fa9f4ccbbb79be53e559471eb5a
-  data.tar.gz: b847c41f764a41db7421c0cba806e7ed264695ec0283f8af28a0a8dad1fdeda731c66c6757bb67faa5ef74e19a45488c33c61f97e3df837d5b9eb1903be12fe3
+  metadata.gz: f67847df29de9d54b7620b3676b1f164efa498974918356bd967564e9aac3dbaf1d2f8b7a450f77cb8106718d625e1d7392991da290619346d8c2ce0763a1419
+  data.tar.gz: '05589ffd1e88e5dda68a0378cfb695c7d1de22ae11ece61ff22d07aeca7cb60470c28d40c14434ee9a596a3b06cf47ea2be2211f2b54694faf2fad5536b83e2e'

data/lib/roku_builder/config_parser.rb

@@ -83,24 +83,30 @@ module RokuBuilder
     def setup_in_out_file
       [:in, :out].each do |type|
         @parsed[type] = {file: nil, folder: nil}
-        if @options[type]
+        if user_file(type)
           if file_defined?(type)
             setup_file_and_folder(type)
-          elsif @options[type]
-            @parsed[type][:folder] = File.expand_path(@options[type])
+          elsif user_file(type)
+            @parsed[type][:folder] = File.expand_path(user_file(type))
           end
         end
       end
       set_default_outfile
     end
 
+    def user_file(type)
+      file = @options[type]
+      file ||= @config[type]
+      file
+    end
+
     def file_defined?(type)
-      @options[type].end_with?(".zip") or @options[type].end_with?(".pkg") or @options[type].end_with?(".jpg")
+      user_file(type).end_with?(".zip") or user_file(type).end_with?(".pkg") or user_file(type).end_with?(".jpg")
     end
 
     def setup_file_and_folder(type)
-      @parsed[type][:folder], @parsed[type][:file] = Pathname.new(@options[type]).split.map{|p| p.to_s}
-      if @parsed[type][:folder] == "." and not @options[type].start_with?(".")
+      @parsed[type][:folder], @parsed[type][:file] = Pathname.new(user_file(type)).split.map{|p| p.to_s}
+      if @parsed[type][:folder] == "." and not user_file(type).start_with?(".")
         @parsed[type][:folder] = nil
       else
         @parsed[type][:folder] = File.expand_path(@parsed[type][:folder])

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

@@ -67,8 +67,8 @@ module RokuBuilder
               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
+                  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
@@ -78,7 +78,7 @@ module RokuBuilder
                   add_warning(inspector: line_inspector, file: file_path, line: line_number, match: error_match)
                 end
               elsif line_inspector[:pass_if_match]
-                start = stop +1
+                start = stop + 1
               else
                 break
               end

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.26.1"
+  VERSION = "4.27.0"
 end

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_config_parser.rb

@@ -345,5 +345,39 @@ module RokuBuilder
       assert_equal tmp_folder, parsed[:out][:folder]
       assert_equal "file.jpg", parsed[:out][:file]
     end
+    def test_outfile_config_config_out
+      config = good_config(ConfigParserTest)
+      config[:out] = "/home/user"
+      options = build_options({validate: true, working: true, out: nil})
+      parsed = ConfigParser.parse(options: options, config: config)
+
+      refute_nil parsed[:out]
+      refute_nil parsed[:out][:folder]
+      assert_nil parsed[:out][:file]
+      assert_equal "/home/user", parsed[:out][:folder]
+    end
+    def test_outfile_config_config_out_file
+      config = good_config(ConfigParserTest)
+      config[:out] = "/home/user/file.pkg"
+      options = build_options({validate: true, working: true, out: nil})
+      parsed = ConfigParser.parse(options: options, config: config)
+
+      refute_nil parsed[:out]
+      refute_nil parsed[:out][:folder]
+      refute_nil parsed[:out][:file]
+      assert_equal "/home/user", parsed[:out][:folder]
+      assert_equal "file.pkg", parsed[:out][:file]
+    end
+    def test_outfile_config_config_and_option_out
+      config = good_config(ConfigParserTest)
+      config[:out] = "/home/user"
+      options = build_options({validate: true, working: true, out: "/home/user2"})
+      parsed = ConfigParser.parse(options: options, config: config)
+
+      refute_nil parsed[:out]
+      refute_nil parsed[:out][:folder]
+      assert_nil parsed[:out][:file]
+      assert_equal "/home/user2", parsed[:out][:folder]
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.26.1
+  version: 4.27.0
 platform: ruby
 authors:
 - greeneca
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-19 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -653,7 +653,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Build Tool for Roku Apps