roku_builder 4.29.9 → 4.30.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f556d2bdac60b5a1c852aff402451f8db62724ef9f70d2f2c69bb044ba84d90
-  data.tar.gz: b29aa27d5d0868b61772f7413998f800693b3c7410795e12264a5f866b10ecbf
+  metadata.gz: d871e3265c4e99eb44d7e898cac907db092436392aaa2122e9604f6ef1dc9d97
+  data.tar.gz: 9f71d6ac3de1adbc170600f73aa5c51a01d75a96e66f131f4a60ebced26bff3f
 SHA512:
-  metadata.gz: 54afc02cb2f2e28601ae6a9da3695f572a34bf0aab27330cfff5d41b93fc402982c20eeefa0c115e8548b7e70303a4011b7282cfbfce4b9650cbf8f8d61cf7ec
-  data.tar.gz: 738ba6cf30630263c2901c16e5b0a034449703cf311d839a9abbffb5e908199961cd30f5b6a8f6a2c3c8dcf500f54beaf05ff4fb76e95ee4b60e6c8fce5e791f
+  metadata.gz: 1c9181918890fbc93df02698d7b7f317d765485b368029ac344d299d1f66919ca5822426b94899c3eea7ce28eea5060db24816491ef47722324a6c1c197b85f5
+  data.tar.gz: 0352cc27c7bb4f728d4c66674b7b2032a5ac3cac0fddb1829c243e3cc645620c7428d2df6187bf2d8e385ef6e19d9088d5eb55b897682dbb100393fb654e8737

data/lib/roku_builder/config_parser.rb

@@ -125,6 +125,9 @@ module RokuBuilder
       unless @parsed[:out][:folder]
         @parsed[:out][:folder] = Dir.tmpdir
       end
+      if @config[:default_file]
+        @parsed[:out][:default_file] = @config[:default_file]
+      end
     end
 
     def setup_project_config

data/lib/roku_builder/plugins/analyzer.rb

@@ -18,11 +18,14 @@ module RokuBuilder
         options[:analyze] = true
       end
       parser.separator "Options:"
-      parser.on("--inclide-libraries", "Include libraries in analyze") do
+      parser.on("--include-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
+      parser.on("--include-libraries-sca", "Include libraries in roku Static Code Aanlysis") do
+        options[:include_libraries_sca] = true
+      end
+      parser.on("--skip-sca", "Skip Roku Static Code Analysis") do |command|
+        options[:skip_sca] = command
       end
     end
 
@@ -40,7 +43,7 @@ module RokuBuilder
       loader = Loader.new(config: @config)
       Dir.mktmpdir do |dir|
         loader.copy(options: options, path: dir)
-        run_sca_tool(path: dir, linter_config: linter_config)
+        run_sca_tool(path: dir, linter_config: linter_config) unless options[:skip_sca]
         libraries = @config.project[:libraries]
         libraries ||= []
         Dir.glob(File.join(dir, "**", "*")).each do |file_path|
@@ -104,7 +107,7 @@ module RokuBuilder
         end
         libraries = @config.project[:libraries]
         libraries ||= []
-        if @sca_warning[:path] and libraries.any_is_start?(@sca_warning[:path].gsub(/pkg:/, "")) and not @options[:include_libraries] and not linter_config[:sca_libraries]
+        if @sca_warning[:path] and libraries.any_is_start?(@sca_warning[:path].gsub(/pkg:/, "")) and not @options[:include_libraries_sca] and not linter_config[:sca_libraries]
           return false
         end
         if linter_config[:ignore_warnings]

data/lib/roku_builder/plugins/loader.rb

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

data/lib/roku_builder/plugins/navigator.rb

@@ -81,6 +81,7 @@ module RokuBuilder
             path = "/keypress/#{@commands[command]}"
             @logger.debug("Send Command: "+path)
             response = conn.post path
+            puts response.body
             raise ExecutionError, "Navigation Failed" unless response.success?
           end
         end

data/lib/roku_builder/plugins/packager.rb

@@ -28,6 +28,13 @@ module RokuBuilder
       parser.on("--inspect-package", "Inspect package after packaging") do
         options[:inspect_package] = true
       end
+      parser.on("--password PASSWORD", "Password of the current key") do |password|
+        options[:package_password] = password
+      end
+      parser.on("--dev-id DEV_ID", "Dev ID of the current key") do |dev_id|
+        options[:package_dev_id] = dev_id
+      end
+
     end
 
     def self.dependencies
@@ -55,7 +62,11 @@ module RokuBuilder
     end
 
     def genkey(options:)
-      password, dev_id = generate_new_key()
+      password = options[:package_password]
+      dev_id = options[:package_dev_id]
+      unless password and dev_id
+        password, dev_id = generate_new_key()
+      end
       @logger.unknown("Password: "+password)
       @logger.info("DevID: "+dev_id)
 

data/lib/roku_builder/plugins/rokuapi.rb

@@ -35,7 +35,10 @@ module RokuBuilder
       end
       parser.on("--no-publish", 'Prevent the channel from being automatically published when submitted') do
         options[:no_publish] = true
-      end 
+      end
+      parser.on("--minimum-firmware-version VERSION", 'The minimum firmware version to use for the channel') do |version|
+        options[:minimum_firmware_version] = version
+      end
     end
 
     def self.dependencies
@@ -44,6 +47,9 @@ module RokuBuilder
 
     def submit(options:)
       raise RokuBuilder::InvalidOptions, "Missing channel id" unless options[:channel_id]
+      raise RokuBuilder::InvalidOptions, "Missing api key" unless options[:api_key]
+      raise RokuBuilder::InvalidOptions, "Missing package" unless options[:in]
+      raise RokuBuilder::InvalidOptions, "Missing minimum firmware version" unless options[:minimum_firmware_version]
       @logger.info "Submit to channel #{options[:channel_id]}"
       @api_key = options[:api_key]
       @no_publish = !!options[:no_publish]
@@ -51,7 +57,7 @@ module RokuBuilder
       if response.first["channelState"] == "Unpublished"
         response = update_channel_version(options[:channel_id], get_package(options), response.last["id"])
       else
-        response = create_channel_version(options[:channel_id], get_package(options))
+        response = create_channel_version(options[:channel_id], get_package(options), options[:minimum_firmware_version])
       end
       raise RokuBuilder::ExecutionError, "Request failed: #{response.reason_phrase}" unless response.success?
       JSON.parse(response.body)
@@ -59,6 +65,7 @@ module RokuBuilder
 
     def publish(options:)
       raise RokuBuilder::InvalidOptions, "Missing channel id" unless options[:channel_id]
+      raise RokuBuilder::INvalidOptions, "Missing api key" unless options[:api_key]
       @logger.info "Publish to channel #{options[:channel_id]}"
       @api_key = options[:api_key]
       response = get_channel_versions(options[:channel_id])
@@ -90,14 +97,15 @@ module RokuBuilder
       end
       sorted
     end
-    
-    def create_channel_version(channel, package)
+
+    def create_channel_version(channel, package, version)
       path = "/external/channels/#{channel}/versions"
+      body = {"minimumFirmwareVersionTextShort" => version}
       params = nil
       unless @no_publish
         params = {"state" => "Published"}
       end
-      api_post(path, path, package, params)
+      api_post(path, path, package, params, body)
     end
 
     def update_channel_version(channel, package, version)
@@ -117,13 +125,14 @@ module RokuBuilder
       connection('GET', path, nil).get(api_path+path)
     end
 
-    def api_post(path, token_path, package=nil, params = nil)
-      body = {}.to_json
+    def api_post(path, token_path, package=nil, params = nil, body = nil)
+      body ||= {}
       if package
-        body = {
+        body.merge!({
           "appFileBase64Encoded" => Base64.encode64(package.read)
-        }.to_json
+        })
       end
+      body = body.to_json
       connection('POST', token_path, body, params).post(api_path+path) do |request|
         if params
           request.params = params
@@ -141,6 +150,7 @@ module RokuBuilder
       response = connection('PATCH', token_path, body).patch(api_path+path) do |request|
         request.body = body
       end
+      response
     end
 
     def connection(method, path, body, params = nil)
@@ -152,6 +162,7 @@ module RokuBuilder
       }) do |f|
         f.adapter Faraday.default_adapter
       end
+      connection
     end
 
     def get_jwt_token(api_key, service_urn, method, path, body = nil, params = nil)

data/lib/roku_builder/plugins/sca-cmd/README.md

@@ -33,7 +33,7 @@ Example:
 
 Available `SEVERITY_LEVEL` values are: `info`, `warning` and `error`:
 
-- `info` - print all of the logs
+- `info` - print all the logs
 - `warning` - print warnings and errors
 - `error` - print errors only
 

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

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}.." && pwd -P ) || exit
-
-APP_NAME="sca-cmd"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and SCA_CMD_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}.." > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,7 +112,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-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
+CLASSPATH=$APP_HOME/lib/sca-cmd.jar:$APP_HOME/lib/sca-library.jar:$APP_HOME/lib/utils-6.1.0.jar:$APP_HOME/lib/configuration-6.1.0.jar:$APP_HOME/lib/compress-6.2.0.jar:$APP_HOME/lib/imaging-6.1.0.jar:$APP_HOME/lib/manifest-6.2.2.jar:$APP_HOME/lib/io-6.1.0.jar:$APP_HOME/lib/commons-cli-1.8.0.jar:$APP_HOME/lib/java-jwt-4.4.0.jar:$APP_HOME/lib/jackson-databind-2.17.1.jar:$APP_HOME/lib/jackson-core-2.17.1.jar:$APP_HOME/lib/jackson-annotations-2.17.1.jar:$APP_HOME/lib/jackson-dataformat-xml-2.17.1.jar:$APP_HOME/lib/commons-compress-1.26.2.jar:$APP_HOME/lib/commons-codec-1.17.0.jar:$APP_HOME/lib/commons-lang3-3.14.0.jar:$APP_HOME/lib/jelf-0.9.0.jar:$APP_HOME/lib/woodstox-core-6.6.2.jar:$APP_HOME/lib/stax2-api-4.2.2.jar:$APP_HOME/lib/commons-io-2.16.1.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,17 +198,27 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $SCA_CMD_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and SCA_CMD_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         -classpath "$CLASSPATH" \
         com.roku.sca.cmd.CommandLineInterface \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

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

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  sca-cmd startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%..
 
@@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,18 +57,18 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 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-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
+set CLASSPATH=%APP_HOME%\lib\sca-cmd.jar;%APP_HOME%\lib\sca-library.jar;%APP_HOME%\lib\utils-6.1.0.jar;%APP_HOME%\lib\configuration-6.1.0.jar;%APP_HOME%\lib\compress-6.2.0.jar;%APP_HOME%\lib\imaging-6.1.0.jar;%APP_HOME%\lib\manifest-6.2.2.jar;%APP_HOME%\lib\io-6.1.0.jar;%APP_HOME%\lib\commons-cli-1.8.0.jar;%APP_HOME%\lib\java-jwt-4.4.0.jar;%APP_HOME%\lib\jackson-databind-2.17.1.jar;%APP_HOME%\lib\jackson-core-2.17.1.jar;%APP_HOME%\lib\jackson-annotations-2.17.1.jar;%APP_HOME%\lib\jackson-dataformat-xml-2.17.1.jar;%APP_HOME%\lib\commons-compress-1.26.2.jar;%APP_HOME%\lib\commons-codec-1.17.0.jar;%APP_HOME%\lib\commons-lang3-3.14.0.jar;%APP_HOME%\lib\jelf-0.9.0.jar;%APP_HOME%\lib\woodstox-core-6.6.2.jar;%APP_HOME%\lib\stax2-api-4.2.2.jar;%APP_HOME%\lib\commons-io-2.16.1.jar
 
 
 @rem Execute sca-cmd
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\lib\sca-cmd.jar;%APP_HOME%\lib\sca-library.jar;%APP_HOM
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable SCA_CMD_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%SCA_CMD_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%SCA_CMD_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

data/lib/roku_builder/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.29.9
+  version: 4.30.2
 platform: ruby
 authors:
 - greeneca
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-21 00:00:00.000000000 Z
+date: 2025-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip