roku_builder 4.21.5 → 4.22.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a3ef1eb871ea4979ed73ece95c1211b2435f6651e118add52434b163268c5a8
-  data.tar.gz: af458ef520e7d7cfb1a93a7d2df1df4c6b885aebc338ddd624100afe8c90aca1
+  metadata.gz: f3c0986c25da1318af5605841dc34099f4005fa7432089eda56af33ae9252892
+  data.tar.gz: 6812743bbafd35695e04314709dbef85737699c12c17801bbcb9ae9f4b5875ff
 SHA512:
-  metadata.gz: c3ba492b2dcb170dba88e48e77022b537cd1b36c5d98da91788fb4f6d8e8dfce92b706bf57197bc1639f5501c617750b8ba541796b456252c3f8133c645b69ad
-  data.tar.gz: 8ee571d3ee816221ba12c9a2b2e59456f420a6ab09c7de5de6e9ab8ac70ca0e431dba3d7be13b8d21db492cf4876a25599605fa1547c11844c3330e6d864a072
+  metadata.gz: 1d34dee65bf8483a6780db3f9276207f5767479c99cd0c0b8a55cf995782891d1223c0d91e127fe4c6a6b9251ce6c7ee8522056aace321e5e6aa3de504f1df27
+  data.tar.gz: f179ef31ac2d81836bdea6b8f56504116175f8714755c7ffc6eec379aabf98bab6c76e57756443d05f965c07f7f27d617b9cad834823dcad036a71064d386de9

data/lib/roku_builder/plugins/analyzer.rb

@@ -21,6 +21,9 @@ module RokuBuilder
       parser.on("--inclide-libraries", "Include libraries in analyze") do
         options[:include_libraries] = true
       end
+      parser.on("--sca-precommand COMMAND", "Include libraries in analyze") do |command|
+        options[:sca_precommand] = command
+      end
     end
 
     def self.dependencies
@@ -61,10 +64,11 @@ 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", "export JAVA_HOME='JDK 11'; sca-cmd")
       else
         command = File.join(File.dirname(__FILE__), "sca-cmd", "bin", "sca-cmd.bat")
       end
+      @logger.debug("Command: '#{command}'")
       results = `#{command} #{path}`.split("\n")
       process_sca_results(results, ssai)
     end

data/lib/roku_builder/plugins/line_inspector.rb

@@ -13,38 +13,57 @@ module RokuBuilder
       File.open(file_path) do |file|
         in_xml_comment = false
         indent_inspector = IndentationInspector.new(rules: @indent_config, path: file_path) if @indent_config
+        full_file = []
+        file_no_comments = []
+        lines_to_ignore = []
         file.readlines.each_with_index do |line, line_number|
           full_line = line.dup
-          line = line.partition("'").first if file_path.end_with?(".brs")
+          line.gsub!(/'.*/, "") if file_path.end_with?(".brs")
           if file_path.end_with?(".xml")
             if in_xml_comment
               if line.gsub!(/.*-->/, "")
                 in_xml_comment = false
               else
-                line = ""
+                line = "\n"
               end
             end
             line.gsub!(/<!--.*-->/, "")
             in_xml_comment = true if line.gsub!(/<!--.*/, "")
           end
           indent_inspector.check_line(line: full_line, number: line_number, comment: in_xml_comment) if indent_inspector
-          @inspector_config.each do |line_inspector|
-            line_to_check = line
-            line_to_check = full_line if line_inspector[:include_comments]
+          if  /'.*ignore-warning/i.match(full_line)
+            lines_to_ignore.push line_number
+          end
+          full_file.push(full_line)
+          file_no_comments.push(line)
+        end
+        @warnings += indent_inspector.warnings if indent_inspector
+        no_comments = file_no_comments.join("")
+        file = full_file.join("")
+        @inspector_config.each do |line_inspector|
+          unless line_inspector[:disabled]
+            to_check = no_comments
+            to_check = file if line_inspector[:include_comments]
             match  = nil
-            if line_inspector[:case_sensitive]
-              match = /#{line_inspector[:regex]}/.match(line_to_check)
-            else
-              match = /#{line_inspector[:regex]}/i.match(line_to_check)
-            end
-            if match
-              unless /'.*ignore-warning/i.match(full_line)
-                add_warning(inspector: line_inspector, file: file_path, line: line_number, match: match)
+            start = 0
+            loop do
+              if line_inspector[:case_sensitive]
+                match = /#{line_inspector[:regex]}/.match(to_check, start)
+              else
+                match = /#{line_inspector[:regex]}/i.match(to_check, start)
+              end
+              if match
+                start = match.end(0)
+                line_number = to_check[0..match.begin(0)].split("\n", -1).count - 1
+                unless lines_to_ignore.include?(line_number)
+                  add_warning(inspector: line_inspector, file: file_path, line: line_number, match: match)
+                end
+              else
+                break
               end
             end
           end
         end
-        @warnings += indent_inspector.warnings if indent_inspector
       end
       @warnings
     end

data/lib/roku_builder/plugins/loader.rb

@@ -120,6 +120,7 @@ module RokuBuilder
     def file_path(type)
       file = @config.send(type)[:file]
       file ||= Manifest.new(config: @config).build_version
+      file ||= SecureRandom.uuid
       file = file+".zip" unless file.end_with?(".zip")
       File.join(@config.send(type)[:folder], file)
     end

data/lib/roku_builder/plugins/packager.rb

@@ -61,22 +61,15 @@ module RokuBuilder
       out[:file] ||= "key_"+dev_id+".pkg"
       @config.out = out
 
-      Dir.mktmpdir { |dir|
-        config_copy = @config.dup
-        config_copy.root_dir = dir
-        Manifest.generate({config: config_copy, attributes: {}})
-        Dir.mkdir(File.join(dir, "source"))
-        File.open(File.join(dir, "source", "main.brs"), "w") do |io|
-          io.puts "sub main()"
-          io.puts "  print \"Load\""
-          io.puts "end sub"
-        end
-        loader = Loader.new(config: config_copy)
-        options[:current] = true
-        loader.sideload(options: options)
-        sign_package(app_name_version: "key_"+dev_id, password: password, stage: options[:stage])
-        @logger.unknown("Keyed PKG: #{File.join(@config.out[:folder], @config.out[:file])}")
-      }
+      config_copy = @config.dup
+      config_copy.root_dir = ""
+      config_copy.in[:folder] = File.dirname(__FILE__)
+      config_copy.in[:file] = "key_template.zip"
+      loader = Loader.new(config: config_copy)
+      options[:in] = true
+      loader.sideload(options: options)
+      sign_package(app_name_version: "key_"+dev_id, password: password, stage: options[:stage])
+      @logger.unknown("Keyed PKG: #{File.join(@config.out[:folder], @config.out[:file])}")
     end
 
     # Sets the key on the roku device

data/lib/roku_builder/plugins/performance_config.json

@@ -10,7 +10,7 @@
     "message": "Found DoesExist check. Try using invalid check on dot reference"
   },
   {
-    "regex": "[^\\s]+\\[\"[^\"]+\"\\]",
+    "regex": "\\w+\\[\"[^\"]+\"\\]",
     "severity": "warning",
     "message": "Found AA String reference. Try switching to dot reference"
   },

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

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -80,7 +80,8 @@ case "`uname`" in
     ;;
 esac
 
-CLASSPATH=$APP_HOME/lib/sca-cmd.jar
+CLASSPATH=$APP_HOME/lib/sca-cmd.jar:$APP_HOME/lib/sca-library.jar:$APP_HOME/lib/commons-cli-1.4.jar:$APP_HOME/lib/jackson-module-jaxb-annotations-2.12.2.jar:$APP_HOME/lib/jackson-databind-2.12.2.jar:$APP_HOME/lib/jackson-annotations-2.12.2.jar:$APP_HOME/lib/jackson-core-2.12.2.jar:$APP_HOME/lib/jackson-dataformat-xml-2.12.2.jar:$APP_HOME/lib/commons-io-2.8.0.jar:$APP_HOME/lib/commons-lang3-3.12.0.jar:$APP_HOME/lib/commons-compress-1.20.jar:$APP_HOME/lib/woodstox-core-6.2.4.jar:$APP_HOME/lib/stax2-api-4.2.1.jar:$APP_HOME/lib/jakarta.xml.bind-api-2.3.2.jar:$APP_HOME/lib/jakarta.activation-api-1.2.1.jar
+
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
@@ -125,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $SCA_CMD_OPTS -classpath "\"$CLASSPATH\"" com.roku.sca.cmd.CommandLineInterface "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

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

@@ -5,7 +5,7 @@
 @rem you may not use this file except in compliance with the License.
 @rem You may obtain a copy of the License at
 @rem
-@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
 @rem
 @rem Unless required by applicable law or agreed to in writing, software
 @rem distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%..
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and SCA_CMD_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS=
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\lib\sca-cmd.jar
+set CLASSPATH=%APP_HOME%\lib\sca-cmd.jar;%APP_HOME%\lib\sca-library.jar;%APP_HOME%\lib\commons-cli-1.4.jar;%APP_HOME%\lib\jackson-module-jaxb-annotations-2.12.2.jar;%APP_HOME%\lib\jackson-databind-2.12.2.jar;%APP_HOME%\lib\jackson-annotations-2.12.2.jar;%APP_HOME%\lib\jackson-core-2.12.2.jar;%APP_HOME%\lib\jackson-dataformat-xml-2.12.2.jar;%APP_HOME%\lib\commons-io-2.8.0.jar;%APP_HOME%\lib\commons-lang3-3.12.0.jar;%APP_HOME%\lib\commons-compress-1.20.jar;%APP_HOME%\lib\woodstox-core-6.2.4.jar;%APP_HOME%\lib\stax2-api-4.2.1.jar;%APP_HOME%\lib\jakarta.xml.bind-api-2.3.2.jar;%APP_HOME%\lib\jakarta.activation-api-1.2.1.jar
+
 
 @rem Execute sca-cmd
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %SCA_CMD_OPTS%  -classpath "%CLASSPATH%" com.roku.sca.cmd.CommandLineInterface %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %SCA_CMD_OPTS%  -classpath "%CLASSPATH%" com.roku.sca.cmd.CommandLineInterface %*
 
 :end
 @rem End local scope for the variables with windows NT shell

data/lib/roku_builder/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.21.5
+  version: 4.22.4
 platform: ruby
 authors:
 - greeneca
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-27 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -490,6 +490,7 @@ files:
 - lib/roku_builder/plugins/indentation_inspector.rb
 - lib/roku_builder/plugins/inspector.rb
 - lib/roku_builder/plugins/inspector_config.json
+- lib/roku_builder/plugins/key_template.zip
 - lib/roku_builder/plugins/line_inspector.rb
 - lib/roku_builder/plugins/linker.rb
 - lib/roku_builder/plugins/loader.rb