fastlane-plugin-match_keystore 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e26b0b531512693d08eedc46159379bded6984aa802a32f6d6296d94a0116c3
-  data.tar.gz: ae4ba30e68e58c3c85bfa15a6a57ec0ab93fd98fc90bf23c597124e57235d4c5
+  metadata.gz: cac1a24c49a6233b5fdd03dd8990957f72d394fadbeee931e88a58d0da45db3e
+  data.tar.gz: 69b75bd951e729c83b16410381553046983438d9bc3d4501598c74b9bdf78370
 SHA512:
-  metadata.gz: 8c5983fd39c9d8d92b9981d153e59e21121eb992bb52f04d882b99918e199d1a6edf96588a8a905d3f17b26856a3aa66da7f8f63a587be4d969c29370fbbc3a5
-  data.tar.gz: 961c71d337aed1417bf10cbe1b682974fb2c262a830ff04efa99f9a063f32c7ad15345b5a8344a170cded7bdd53eb1ae56839a43e3f571b59a273f385feeec18
+  metadata.gz: 0f1f4143bd748ca19d6e48ef5fdbe38ba2f3069731abe810849cf0704ed999d66bc01846ad8cb919d6c6758460b7e54d51286471d43d9e53a6319b25559b93fa
+  data.tar.gz: ba9f612f57265b7724f88674ee6d187b5b3ddb87758a513b02b172b4372626f7989e5acedde6a288a6d59b9f68596af66c8684cc8b53151260b0a17f5fa5f260

data/lib/fastlane/plugin/match_keystore/actions/match_keystore_action.rb

@@ -55,7 +55,7 @@ module Fastlane
 
       def self.get_build_tools
         android_home = self.get_android_home()
-        build_tools_root = android_home + '/build-tools'
+        build_tools_root = File.join(android_home, '/build-tools')
 
         sub_dirs = Dir.glob(File.join(build_tools_root, '*', ''))
         build_tools_last_version = ''
@@ -75,18 +75,18 @@ module Fastlane
       end
 
       def self.gen_key(key_path, password)
-        `rm -f #{key_path}`
-        `echo "#{password}" | openssl dgst -sha512 | awk '{print $2}' | cut -c1-128 > #{key_path}`
+        `rm -f '#{key_path}'`
+        `echo "#{password}" | openssl dgst -sha512 | awk '{print $2}' | cut -c1-128 > '#{key_path}'`
       end
 
       def self.encrypt_file(clear_file, encrypt_file, key_path)
-        `rm -f #{encrypt_file}`
-        `openssl enc -aes-256-cbc -salt -pbkdf2 -in #{clear_file} -out #{encrypt_file} -pass file:#{key_path}`
+        `rm -f '#{encrypt_file}'`
+        `openssl enc -aes-256-cbc -salt -pbkdf2 -in '#{clear_file}' -out '#{encrypt_file}' -pass file:'#{key_path}'`
       end
 
       def self.decrypt_file(encrypt_file, clear_file, key_path)
-        `rm -f #{clear_file}`
-        `openssl enc -d -aes-256-cbc -pbkdf2 -in #{encrypt_file} -out #{clear_file} -pass file:#{key_path}`
+        `rm -f '#{clear_file}'`
+        `openssl enc -d -aes-256-cbc -pbkdf2 -in '#{encrypt_file}' -out '#{clear_file}' -pass file:'#{key_path}'`
       end
 
       def self.sign_apk(apk_path, keystore_path, key_password, alias_name, alias_password, zip_align)
@@ -96,8 +96,8 @@ module Fastlane
         # https://developer.android.com/studio/command-line/zipalign
         if zip_align == true
           apk_path_aligned = apk_path.gsub(".apk", "-aligned.apk")
-          `rm -f #{apk_path_aligned}`
-          `#{build_tools_path}zipalign 4 #{apk_path} #{apk_path_aligned}`
+          `rm -f '#{apk_path_aligned}'`
+          `#{build_tools_path}zipalign 4 '#{apk_path}' '#{apk_path_aligned}'`
         else
           apk_path_aligned = apk_path
         end
@@ -106,11 +106,11 @@ module Fastlane
         apk_path_signed = apk_path_signed.gsub("--", "-")
 
         # https://developer.android.com/studio/command-line/apksigner
-        `rm -f #{apk_path_signed}`
-        `#{build_tools_path}apksigner sign --ks #{keystore_path} --ks-key-alias '#{alias_name}' --ks-pass pass:'#{key_password}' --key-pass pass:'#{alias_password}' --v1-signing-enabled true --v2-signing-enabled true --out #{apk_path_signed} #{apk_path_aligned}`
+        `rm -f '#{apk_path_signed}'`
+        `#{build_tools_path}apksigner sign --ks '#{keystore_path}' --ks-key-alias '#{alias_name}' --ks-pass pass:'#{key_password}' --key-pass pass:'#{alias_password}' --v1-signing-enabled true --v2-signing-enabled true --out '#{apk_path_signed}' '#{apk_path_aligned}'`
         
-        `#{build_tools_path}apksigner verify #{apk_path_signed}`
-        `rm -f #{apk_path_aligned}`
+        `#{build_tools_path}apksigner verify '#{apk_path_signed}'`
+        `rm -f '#{apk_path_aligned}'`
 
         apk_path_signed
       end
@@ -228,7 +228,7 @@ module Fastlane
         end
 
         # Cloning GIT remote repository:
-        gitDir = repo_dir + '/.git'
+        gitDir = File.join(repo_dir, '/.git')
         unless File.directory?(gitDir)
           UI.message("Cloning remote Keystores repository...")
           puts ''
@@ -240,15 +240,15 @@ module Fastlane
         if package_name.to_s.strip.empty?
           raise "Package name is not defined!"
         end
-        keystoreAppDir = repo_dir + '/' + package_name
+        keystoreAppDir = File.join(repo_dir, package_name)
         unless File.directory?(keystoreAppDir)
           UI.message("Creating '#{package_name}' keystore directory...")
           FileUtils.mkdir_p(keystoreAppDir)
         end
 
-        keystore_path = keystoreAppDir + '/' + keystore_name
-        properties_path = keystoreAppDir + '/' + properties_name
-        properties_encrypt_path = keystoreAppDir + '/' + properties_encrypt_name
+        keystore_path = File.join(keystoreAppDir, keystore_name)
+        properties_path = File.join(keystoreAppDir, properties_name)
+        properties_encrypt_path = File.join(keystoreAppDir, properties_encrypt_name)
 
         # Load parameters from JSON for CI or Unit Tests:
         if keystore_data != nil && File.file?(keystore_data)
@@ -298,11 +298,11 @@ module Fastlane
             
             keytool_parts = [
               "keytool -genkey -v",
-              "-keystore #{keystore_path}",
-              "-alias #{alias_name}",
+              "-keystore '#{keystore_path}'",
+              "-alias '#{alias_name}'",
               "-keyalg RSA -keysize 2048 -validity 10000",
-              "-storepass #{alias_password} ",
-              "-keypass #{key_password}",
+              "-storepass '#{alias_password}'",
+              "-keypass '#{key_password}'",
               "-dname \"CN=#{full_name}, OU=#{org_unit}, O=#{org}, L=#{city_locality}, S=#{state_province}, C=#{country}\"",
             ]
             sh keytool_parts.join(" ")
@@ -317,6 +317,7 @@ module Fastlane
             FileUtils.remove_dir(properties_path)
           end
         
+          # Build URL:
           store_file = git_url + '/' + package_name + '/' + keystore_name
 
           out_file = File.new(properties_path, "w")
@@ -330,14 +331,14 @@ module Fastlane
           File.delete(properties_path)
 
           # Print Keystore data in repo:
-          keystore_info_path = keystoreAppDir + '/' + keystore_info_name
-          `yes "" | keytool -list -v -keystore #{keystore_path} -storepass #{key_password} > #{keystore_info_path}`
+          keystore_info_path = File.join(keystoreAppDir, keystore_info_name)
+          `yes "" | keytool -list -v -keystore '#{keystore_path}' -storepass '#{key_password}' > '#{keystore_info_path}'`
           
           UI.message("Upload new Keystore to remote repository...")
           puts ''
-          `cd #{repo_dir} && git add .`
-          `cd #{repo_dir} && git commit -m "[ADD] Keystore for app '#{package_name}'."`
-          `cd #{repo_dir} && git push`
+          `cd '#{repo_dir}' && git add .`
+          `cd '#{repo_dir}' && git commit -m "[ADD] Keystore for app '#{package_name}'."`
+          `cd '#{repo_dir}' && git push`
           puts ''
 
         else  

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

@@ -1,5 +1,5 @@
 module Fastlane
   module MatchKeystore
-    VERSION = "0.1.10"
+    VERSION = "0.1.11"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-match_keystore
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Christopher NEY