fastlane-plugin-bundletool 1.0.3 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ff6a7f211427f253c72806e89c9b3452fa65220f93c5e10ce821698287b027f
-  data.tar.gz: dd0cbb37dd0e57fe7ae560eef1f1e4bfd7dd042efe5444f6327b94f0ad5ff0ee
+  metadata.gz: 767f07f7ad832c2f3fbd48a0042b61164401e17cb7036ec5443d3bf661b84398
+  data.tar.gz: 8471216a1e08a0d07ce357557b304cdf19cc2e50a19514bdb22bc6dc494102c3
 SHA512:
-  metadata.gz: fbdeca04c44e500ae18f83704dc2305061663873199e2e054f21bdfe5d107d343b2cfd3416e66ea4d9300c2b18f569422141a5191faa505ae6037edd4a03deeb
-  data.tar.gz: 052ac2bc4d209d0fc40582b2e1e8859004475a1f464ea4693af732808a1936f62afd2f2f684c6362a8f8be026a311bce238e19192b0c82608126c46bfa64a640
+  metadata.gz: 409b0158b1983b047670cc77ab5da427536d15ccc3073148a685f72b25ec19685913acc1a0aeef7c7caaba0878827e3c6e981e4a145140a6d884c1cd0aa653b3
+  data.tar.gz: 0d8e1689a07e0369579619d65b0ddaf11f20aa2121bef104990aa2fc4053fea9582eabd396d6131ce6380dfd0300305cf62fd2a9ea4437ae8d39aea9cbfea571

data/README.md

@@ -13,7 +13,7 @@ fastlane add_plugin bundletool
 or in your Pluginfile under fastlane folder write the following line and run `bundle install`.
 
 ```
-gem 'fastlane-plugin-bundletool', '1.0.2'
+gem 'fastlane-plugin-bundletool', '1.0.4'
 ```
 
 ## About bundletool

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

@@ -20,12 +20,13 @@ module Fastlane
         end
 
         bundletool_version = params[:bundletool_version]
+        download_url = params[:download_url]
         aab_path = params[:aab_path]
         output_path = params[:apk_output_path] || '.'
 
         return unless validate_aab!(aab_path)
 
-        return unless download_bundletool(bundletool_version)
+        return unless download_bundletool(bundletool_version, download_url)
 
         extract_universal_apk_from(aab_path, output_path, keystore_info)
       end
@@ -39,20 +40,22 @@ module Fastlane
         puts_success('Checking if .aab file exists')
       end
 
-      def self.download_bundletool(version)
-        puts_message("Downloading bundletool (#{version}) from https://github.com/google/bundletool/releases/download/#{version}/bundletool-all-#{version}.jar...")
-        Dir.mkdir "#{@project_root}/bundletool_temp"        
-        Kernel.open("https://github.com/google/bundletool/releases/download/#{version}/bundletool-all-#{version}.jar") do |bundletool|
-          File.open("#{@bundletool_temp_path}/bundletool.jar", 'wb') do |file|
-            file.write(bundletool.read)
-          end
+      def self.download_bundletool(version, download_url)
+        Dir.mkdir "#{@project_root}/bundletool_temp"
+
+        unless download_url.nil?          
+          puts_message("Downloading bundletool from #{download_url}")
+          download_and_write_bundletool(download_url)
+        else
+          puts_message("Downloading bundletool (#{version}) from https://github.com/google/bundletool/releases/download/#{version}/bundletool-all-#{version}.jar...")
+          download_and_write_bundletool("https://github.com/google/bundletool/releases/download/#{version}/bundletool-all-#{version}.jar")
         end
-        puts_success('Downloading bundletool')
-      rescue StandardError => e
+        puts_success('Downloaded bundletool')
+      rescue OpenURI::HTTPError => e
         clean_temp!
-        puts_error!("Something went wrong when downloading bundletool version #{version}. \nError message\n #{e.message}")        
-        false
-      end
+        puts_error!("Something went wrong when downloading bundletool version #{version}" + ". \nError message\n #{e.message}")
+        false        
+      end      
 
       def self.extract_universal_apk_from(aab_path, apk_output_path, keystore_info)
         aab_absolute_path = Pathname.new(File.expand_path(aab_path)).to_s
@@ -71,7 +74,7 @@ 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]}\""
+          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]}'"
         end
 
         cmd = "java -jar #{@bundletool_temp_path}/bundletool.jar build-apks --bundle=\"#{aab_path}\" --output=\"#{output_path}\" --mode=universal #{keystore_params}"
@@ -155,15 +158,19 @@ module Fastlane
                                        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,
+                                       description: 'Url to download bundletool from, should point to a jar file',
+                                       is_string: true,
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :aab_path,
                                        description: 'Path where the aab file is',
                                        is_string: true,
                                        optional: false,
                                        verify_block: proc do |value|
-                                                       unless value && !value.empty?
-                                                         UI.user_error!('You must set aab_path.')
-                                                       end
-                                                     end),
+                                         unless value && !value.empty?
+                                           UI.user_error!('You must set aab_path.')
+                                         end
+                                       end),
           FastlaneCore::ConfigItem.new(key: :apk_output_path,
                                        description: 'Path where the apk file is going to be placed',
                                        is_string: true,
@@ -201,6 +208,16 @@ module Fastlane
       def self.is_supported?(platform)
         [:android].include?(platform)
       end
+
+      private
+
+      def self.download_and_write_bundletool(download_url)
+        URI.open(download_url) do |bundletool|
+          File.open("#{@bundletool_temp_path}/bundletool.jar", 'wb') do |file|
+            file.write(bundletool.read)
+          end
+        end
+      end
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Bundletool
-    VERSION = "1.0.3"
+    VERSION = "1.0.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-bundletool
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.6
 platform: ruby
 authors:
 - Martin Gonzalez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2022-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Extracts a universal apk from an .aab file