fastlane-plugin-bundletool 1.0.8 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0df0a840288a7028a5052aba0ab6beede179d3c7f8c8151c89ee5f6223779924
-  data.tar.gz: 472c240a4018e1a22a91f14379944c8ecb764cf65c27792d7e30b966fb083943
+  metadata.gz: 22cb77c485e131d1f8b9128d298c5effc344d634469d710072927fee0be584ef
+  data.tar.gz: f78e42917e33f53a843f40bad59e3fc981f32ee29363701fd2cf7559f191e0ab
 SHA512:
-  metadata.gz: 4640820cc8011541892f8979ccc870de5751d4f067d5ed74cfe6219317c09565b85f94b680dbc04b6e7952ef1b908f23792f7d9c04ba023ff2248293965a090d
-  data.tar.gz: 5f9e32338638c28d7210bfbdc2ed100cac55f7ec7d66f6283c8d75e370e005b18bb1d2ad1e0e9d07b2272ce1592c3d038a43fc26822d4a3dd1a72bdabb444c31
+  metadata.gz: eb1f99005373b99554168e34d71331bcf6c4ae6461357ae7b90766df85139fb128d04f6de58e97aac58ebcf85149fec03d7f3e2c1b62d9d4dce08ff3ed07b3a0
+  data.tar.gz: e66c62ba7e0b16a3b773479f39a445615beb5502312b634108a6c9949000efc8b4a18dadad06a4bf30e12000621ea578a51e79d0c79d178964076a954dfe2fb1

data/README.md

@@ -44,6 +44,24 @@ bundletool(
 
 This will output the universal `.apk` in the output path you set.
 
+## Options
+
+| Key                   | Description                                             | Env Var(s)                      | Default |
+|-----------------------|---------------------------------------------------------|---------------------------------|---------|
+| ks_path               | Path to .jks file                                       | FL_BUNDLETOOL_KEYSTORE_FILE     |         |
+| ks_password           | .jks password                                           | FL_BUNDLETOOL_KEYSTORE_PASSWORD |         |
+| ks_key_alias          | Alias for jks                                           | FL_BUNDLETOOL_KEY_ALIAS         |         |
+| ks_key_alias_password | Alias password for .jks                                 | FL_BUNDLETOOL_KEY_PASSWORD      |         |
+| bundletool_version    | Version of bundletool to use, by default 0.11.0 will    | FL_BUNDLETOOL_VERSION           | 0.11.0  |
+|                       | be used                                                 |                                 |         |
+| download_url          | Url to download bundletool from, should point to a jar  | FL_BUNDLETOOL_DOWNLOAD_URL      |         |
+|                       | file                                                    |                                 |         |
+| aab_path              | Path where the aab file is                              | FL_BUNDLETOOL_AAB_PATH          |         |
+| apk_output_path       | Path where the apk file is going to be placed           | FL_BUNDLETOOL_APK_OUTPUT_PATH   | .       |
+| verbose               | Show every messages of the action                       | FL_BUNDLETOOL_VERBOSE           | false   |
+| cache_path            | Cache downloaded bundletool binary into the cache path  | FL_BUNDLETOOL_CACHE_PATH        |         |
+|-----------------------|---------------------------------------------------------|---------------------------------|---------|
+
 ## Use case
 
 Here you can find a post I did explaining why I have to create this action.

data/lib/fastlane/plugin/bundletool/actions/bundletool_action.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'fastlane/action'
+require 'shellwords'
 require_relative '../helper/bundletool_helper'
 
 module Fastlane
@@ -93,7 +94,10 @@ module Fastlane
         keystore_params = ''
 
         unless keystore_info.empty?
-          keystore_params = "--ks='#{keystore_info[:keystore_path]}' --ks-pass='pass:#{keystore_info[:keystore_password]}' --ks-key-alias='#{keystore_info[:alias]}' --key-pass='pass:#{keystore_info[:alias_password]}'"
+          key_alias_password = Shellwords.shellescape("pass:#{keystore_info[:alias_password]}")
+          key_store_password = Shellwords.shellescape("pass:#{keystore_info[:keystore_password]}")
+          key_alias = Shellwords.shellescape(keystore_info[:alias])
+          keystore_params = "--ks=#{keystore_info[:keystore_path]} --ks-pass=#{key_store_password} --ks-key-alias=#{key_alias} --key-pass=#{key_alias_password}"
         end
 
         cmd = "java -jar #{installation_path}/#{bundletool_filename} build-apks --bundle=\"#{aab_path}\" --output=\"#{output_path}\" --mode=universal #{keystore_params}"
@@ -158,30 +162,37 @@ module Fastlane
       def self.available_options
         [
           FastlaneCore::ConfigItem.new(key: :ks_path,
+                                       env_name: 'FL_BUNDLETOOL_KEYSTORE_FILE',
                                        description: 'Path to .jks file',
                                        is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :ks_password,
+                                       env_name: 'FL_BUNDLETOOL_KEYSTORE_PASSWORD',
                                        description: '.jks password',
                                        is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :ks_key_alias,
+                                       env_name: 'FL_BUNDLETOOL_KEY_ALIAS',
                                        description: 'Alias for jks',
                                        is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :ks_key_alias_password,
+                                       env_name: 'FL_BUNDLETOOL_KEY_PASSWORD',
                                        description: 'Alias password for .jks',
                                        is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :bundletool_version,
+                                       env_name: 'FL_BUNDLETOOL_VERSION',
                                        description: 'Version of bundletool to use, by default 0.11.0 will be used',
                                        is_string: true,
                                        default_value: '0.11.0'),
           FastlaneCore::ConfigItem.new(key: :download_url,
+                                       env_name: 'FL_BUNDLETOOL_DOWNLOAD_URL',
                                        description: 'Url to download bundletool from, should point to a jar file',
                                        is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :aab_path,
+                                       env_name: 'FL_BUNDLETOOL_AAB_PATH',
                                        description: 'Path where the aab file is',
                                        is_string: true,
                                        optional: false,
@@ -191,21 +202,23 @@ module Fastlane
                                          end
                                        end),
           FastlaneCore::ConfigItem.new(key: :apk_output_path,
+                                       env_name: 'FL_BUNDLETOOL_APK_OUTPUT_PATH',
                                        description: 'Path where the apk file is going to be placed',
                                        is_string: true,
                                        optional: true,
                                        default_value: '.'),
           FastlaneCore::ConfigItem.new(key: :verbose,
+                                       env_name: 'FL_BUNDLETOOL_VERBOSE',
                                        description: 'Show every messages of the action',
                                        is_string: false,
                                        type: Boolean,
                                        optional: true,
                                        default_value: false),
-            FastlaneCore::ConfigItem.new(key: :cache_path,
+          FastlaneCore::ConfigItem.new(key: :cache_path,
+                                       env_name: 'FL_BUNDLETOOL_CACHE_PATH',
                                        description: 'Cache downloaded bundletool binary into the cache path specified',
-                                       is_string: true,                                       
+                                       is_string: true,
                                        optional: true)
-
         ]
       end
 
@@ -239,7 +252,7 @@ module Fastlane
           puts_message("Using binary cached at #{installation_path}/#{bundletool_filename}")
           return
         end
-        
+
         puts_message("Downloading bundletool from #{download_url}")
 
         URI.open(download_url) do |bundletool|

data/lib/fastlane/plugin/bundletool/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Bundletool
-    VERSION = "1.0.8"
+    VERSION = "1.0.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-bundletool
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.10
 platform: ruby
 authors:
 - Martin Gonzalez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2024-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.137.0
+- !ruby/object:Gem::Dependency
+  name: shellwords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: 
 email: gonzalez.martin90@gmail.com
 executables: []
@@ -168,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Extracts a universal apk from an .aab file