roku_builder 4.22.3 → 4.22.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe82e43712c05c593d5627cdd0b87140186311e278aeae2c08658c6135451ba3
-  data.tar.gz: 43acac9b51f9ece09cc3c6989a0dae36ab8a5ab2d1ef996b37697c373ee1cdcb
+  metadata.gz: '095541972d5f6044a4ce8f7764a2001fdc20e0095fc00823a59b046c2543a6cc'
+  data.tar.gz: 04fe333f5912595ac824c18e4af9fb0d4d1e00224b87473be666a897cbc0b1a8
 SHA512:
-  metadata.gz: e53e522610ddbc4d54d0d03a7b608e6453f4baba8b5dc0c75ab450c13da02792e597310d9ee057d59b5e0544abad8b829a0ca3b27dae3f4ee4da0676f6faa2aa
-  data.tar.gz: 34629a36e098629e19c4e986c5edf86dc1c432a9ad61b61cc1fa08536ce18092d2d7f271aebf6ac8099eaeb9d10ee895f8839a50cbfc76211e9398664a92309a
+  metadata.gz: 6eb9b8667f9eb6ab5568955d2033a859c34ed6b9da1a5291db531eceb72d6404d39db09fef702f5b50d5871d5e9838f6b69278ab0dd3a9f0507d1f794f6a73ed
+  data.tar.gz: a20fee6d540ad890bcb224370f303ec3b0571e01c241b277e4d5965ebe4297f3505e662ed6a79f5a615d60652921b239289cd5b4a2885b595904034698114ad4

data/lib/roku_builder/plugins/analyzer.rb

@@ -64,11 +64,12 @@ module RokuBuilder
 
     def run_sca_tool(path:, ssai:)
       if OS.unix?
-         command = File.join(File.dirname(__FILE__), "sca-cmd", "bin", "sca-cmd")
+        command = File.join(File.dirname(__FILE__), "sca-cmd", "bin", "sca-cmd")
       else
         command = File.join(File.dirname(__FILE__), "sca-cmd", "bin", "sca-cmd.bat")
       end
-      results = `#{@options[:sca_precommand]} #{command} #{path}`.split("\n")
+      @logger.debug("Command: '#{command}'")
+      results = `#{command} #{path}`.split("\n")
       process_sca_results(results, ssai)
     end
 
@@ -95,6 +96,11 @@ module RokuBuilder
         if ssai and /SetAdUrl\(\) method is missing/.match(@sca_warning[:message])
           return false
         end
+        libraries = @config.project[:libraries]
+        libraries ||= []
+        if libraries.any_is_start?(@sca_warning[:path].gsub(/pkg:/, "")) and not @options[:include_libraries]
+          return false
+        end
         return true
       end
       return false

data/lib/roku_builder/plugins/indentation_inspector.rb

@@ -55,6 +55,8 @@ module RokuBuilder
               end
             elsif @prev_line =~ /^\s*\bfor\b|^\s*\bwhile\b/i
               @ind += @count
+            elsif @prev_line =~ /^\s*\btry\b|^\s*\bcatch\b/i
+              @ind += @count
             end
           end
           if line =~ /^\'/ or line =~ /\'indent-ignore/
@@ -62,11 +64,13 @@ module RokuBuilder
           elsif line =~ /^\s*[\}\]\)]/
             @ind -= @count
           elsif line =~ /^\s*\bfunction\b|^\s*\bsub\b/i
-            @ind -= 0
+            # Don't change indentation
           elsif line =~ /^\s*:?\s*#?end\b|^\s*#?endif\b|^\s*endfor\b|^\s*\bnext\b/i
             @ind -= @count
           elsif line =~ /^\s*#?else\b|^\s*elseif\b/i
             @ind -= @count
+          elsif line =~ /^\s*#?catch\b/i
+            @ind -= @count
           end
         end
       end

data/lib/roku_builder/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.22.3
+  version: 4.22.8
 platform: ruby
 authors:
 - greeneca
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-04 00:00:00.000000000 Z
+date: 2021-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip