roku_builder 4.21.3 → 4.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a91edfcf033f846e9d9e1e3f0fc37afe4cfc3c58ec4b2062275dbfd683744fb
-  data.tar.gz: bc90febc52b08f211ef0d48346a4652798a433b2532af98d801d41cf505e2989
+  metadata.gz: 4e254e28ba3fddc22a7578a793813f98038f8f6436c44f909900ea71028f233e
+  data.tar.gz: 40b2d0b27529a797a34b567354a859d870d496e3fe63b17612c5af1d38342347
 SHA512:
-  metadata.gz: a77a6044775302eca3b344497cfe2815d3b550dad7d289c629d04e0c2193bf4d4c6563ec9b28a4158712fdbbef8e354ca48747266499fdd5e9fd6028f3a63a59
-  data.tar.gz: 741fee309f4e65e99757b1ddfb964f39f1a9391b56abd1f42d09507c1255ef040bd8ae990e821edf4b0453870065c11cfa6c99f60c9f48eabcae0a2b53904ab4
+  metadata.gz: 15a804bfc305022817923fcd6dcb643a2d6d080a8d39d1697ceb51f559669d443255d82c9d187cf17603b7a4083d430612870b70de8e42c052c0a3ec0999ca49
+  data.tar.gz: 36bef8ba56d9a908ea4e01e6202f7f5d5b734321cf4b640f52c3c1e129b1e1b85067359a5a8e353932f6c51298a7296a02e18a2094c835581dca20b8a5efb2a5

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - "2.4.1"
+  - "2.6.0"
 before_install:
     - gem install bundler

data/lib/roku_builder.rb

@@ -200,7 +200,7 @@ module RokuBuilder
           stager.stage
         end
         instance = plugin.new(config: @@config)
-        instance.send(@@options.command, {options: @@options})
+        instance.send(@@options.command, **{options: @@options})
         stager.unstage if stager
       end
     end
@@ -224,7 +224,7 @@ module RokuBuilder
   def self.process_hook(hook:, params:)
     @@plugins.each do |plugin|
       if plugin.respond_to?("#{hook}_hook".to_sym)
-        plugin.send("#{hook}_hook", params)
+        plugin.send("#{hook}_hook", **params)
       end
     end
   end

data/lib/roku_builder/config_validator.rb

@@ -89,7 +89,7 @@ module RokuBuilder
       attrs = {}
       attrs[section_singular] = content
       method = "validate_#{section_singular}".to_sym
-      send(method, attrs)
+      send(method, **attrs)
     end
 
     def singularize(section:)

data/lib/roku_builder/plugins/analyzer.rb

@@ -30,6 +30,7 @@ module RokuBuilder
     def analyze(options:, quiet: false)
       @options = options
       @warnings = []
+      @sca_warning = {}
       performance_config = get_config("performance_config.json")
       linter_config = get_config(".roku_builder_linter.json", true)
       linter_config ||= {is_ssai: false}

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

@@ -7,7 +7,7 @@ module RokuBuilder
     extend Plugin
 
     def init
-      @warningFileSize = 250 * 1024
+      @warningFileSize = 500 * 1024
     end
 
     def self.commands
@@ -37,6 +37,9 @@ module RokuBuilder
       parser.on("-x", "--exclude", "Apply exclude config to sideload") do
         options[:exclude] = true
       end
+      parser.on("--remote-debug", "Sideload will enable remote debug") do
+        options[:remoteDebug] = true
+      end
     end
 
     def self.dependencies
@@ -52,7 +55,7 @@ module RokuBuilder
         build(options: options)
       end
       keep_build_file = is_build_command(options) and options[:out]
-      upload
+      upload(options)
       # Cleanup
       File.delete(file_path(:in)) if did_build and not keep_build_file
     end
@@ -99,11 +102,12 @@ module RokuBuilder
       [:sideload, :build].include? options.command
     end
 
-    def upload
+    def upload(options)
       payload =  {
         mysubmit: "Replace",
-        archive: Faraday::UploadIO.new(file_path(:in), 'application/zip')
+        archive: Faraday::UploadIO.new(file_path(:in), 'application/zip'),
       }
+      payload["remotedebug"] = "1" if options[:remoteDebug]
       response = multipart_connection.post "/plugin_install", payload
       @logger.debug("Status: #{response.status}, Body: #{response.body}")
       if response.status==200 and response.body=~/Identical to previous version/

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.3"
+  VERSION = "4.22.1"
 end

data/test/roku_builder/plugins/test_analyzer.rb

@@ -106,7 +106,7 @@ module RokuBuilder
       warnings = test_file(text: "function test() as String 'IGNORE-WARNING\n? \"test\"\nend function")
       assert_equal 0, warnings.count
     end
-    def test_performance_for_loop_title_case
+    def test_performance_for_each_loop_title_case
       warnings = test_file(text: "For each button in buttons\n ? button\nEND FOR")
       assert_equal 0, warnings.count
     end
@@ -148,6 +148,7 @@ module RokuBuilder
       end
 
       logger.verify
+      warnings
     end
 
     def test(quiet=true)

data/test/roku_builder/plugins/test_profiler.rb

@@ -32,7 +32,8 @@ module RokuBuilder
       end
       count = 0
       read_stub = Proc.new do |size|
-        raise SystemExit if count = 2
+        shouldExit = (count = 2)
+        raise SystemExit if shouldExit
         count += 1
       end
       connection = Minitest::Mock.new

data/test/roku_builder/test_options.rb

@@ -32,14 +32,13 @@ module RokuBuilder
     end
     def test_options_parse
       parser = Minitest::Mock.new()
-      options_hash = {}
       options = Options.allocate
       parser.expect(:banner=, nil, [String])
       parser.expect(:parse!, nil)
       OptionParser.stub(:new, parser) do
         options.stub(:add_plugin_options, nil) do
           options.stub(:validate_parser, nil) do
-            options_hash = options.send(:parse)
+            options.send(:parse)
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.21.3
+  version: 4.22.1
 platform: ruby
 authors:
 - greeneca
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2021-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -616,7 +616,7 @@ homepage: ''
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -631,8 +631,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.1
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Build Tool for Roku Apps
 test_files: