roku_builder 4.26.2 → 4.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f9b82cc8cd8d2da493f330d4b41d35eb26a1efb89a3e5546e427a9c1381cb36
-  data.tar.gz: 66cc47ae8975cb4dcfc5271d2d1cdb12e5813c37297679e96e64bedb64707108
+  metadata.gz: f004d2edb610a728667cd7f9e64cb8ff2274a7592c192127b844f34323acbd39
+  data.tar.gz: 8d5fa5f02a5b15e15ca1f4e02ee14be1cea8536902b8e8736ef99137baff7235
 SHA512:
-  metadata.gz: 41712b6228bf1fca02ededce8d0baee62cdec83ec8c0d39abbd4a6e187c496d62d723e67a1918cea8a01b55b15f0e16f295dfae0a725783d68c052cb37b34a02
-  data.tar.gz: 803f81014a8319163a9b95445f5902a4b027299194f8df53cda8fb6d52bfd4a770601f305c6b9ee277d4498c993975cce05cdbe1132151c09d748ec84a661a84
+  metadata.gz: feebd2677a569000a4d9d2ff3467d873c3d207491cbbdd62c76de3388752f245b57c026d8b1a949c31414f602f613cdf9e8c7f03b4189f0b8f3c9fd201e34af6
+  data.tar.gz: 9fc9f42ef0eefbc4674b0f3e48ae21037480a416f1994e65eca6a309f0ea8f580ba70c045089609396950f1a3803503d61b3e73af0b7a2e12f517c5e22aff1dc

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

@@ -87,7 +87,8 @@ module RokuBuilder
           @sca_warning[:severity] = data[1].gsub(/(\[|\])/, "").downcase
           @sca_warning[:message] = data[2]
         elsif data = /^\s*Path: ([^ ]*) Line: (\d*)./.match(result_line)
-          @sca_warning[:path] = data[1]+":"+data[2]
+          @sca_warning[:path] = data[1]
+          @sca_warning[:line] = data[2].to_i
         elsif @sca_warning and  @sca_warning[:message]
           @sca_warning[:message] += " " + result_line
         end

data/lib/roku_builder/plugins/line_inspector.rb

@@ -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/version.rb

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

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.2
+  version: 4.27.1
 platform: ruby
 authors:
 - greeneca
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2022-12-13 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