fastlane-plugin-match_keystore 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46a421823a54191491c99165bfb40ca29e0232b57bac26bbaa28d6a2cec3176c
-  data.tar.gz: bad930d84f304fea0eb753cd67ea2e02085fd66ea4047f85f3e87bed626c11e2
+  metadata.gz: ebd9b1458de12f0fbb8b468d79442ee341944409847c9f216cb04209930d9b15
+  data.tar.gz: 7539e1e186f06a3a43343a17cd7a584e0471ae3e812f75b9b53563bd7c8e8763
 SHA512:
-  metadata.gz: d48f56c4ee2ad3464c0b6d79dc72f7a66e065a5640d8db95d3b93afcff253728f223421c1e91d9e00c4868ba48107fc8f42fbcb4f87c10b6c4da5933142f1341
-  data.tar.gz: e0369425848c3284c7fa3901f810dd5ec7a6fd33ce73ce8277d46669a19c1e5c1017aa218dfd04f594c897bf70b95f2d8fd16282a298396673872a00a27d47fb
+  metadata.gz: 705abd50aa3502788519a81b51df38a6b6859b33cf2e4939f155eebda99ae1126e5be0f21426f158895cd19983d25dc017d499cf755a765de7abb3368b3b8ff6
+  data.tar.gz: a86e82117bcdf635a6a9253cdd6f89f1cfe223e57f95d43f816c200ff4a9b5b2c6e91396526dc1b9d08f30f8c35e9f8f9a4f3dfba432a787f20fb51c0a3da2f0

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

@@ -6,9 +6,8 @@ module Fastlane
   module Actions
     module SharedValues
       MATCH_KEYSTORE_PATH = :MATCH_KEYSTORE_PATH
-      MATCH_KEYSTORE_PASSWORD = :MATCH_KEYSTORE_PASSWORD
       MATCH_KEYSTORE_ALIAS_NAME = :MATCH_KEYSTORE_ALIAS_NAME
-      MATCH_KEYSTORE_ALIAS_PASSWORD = :MATCH_KEYSTORE_ALIAS_PASSWORD
+      MATCH_KEYSTORE_APK_SIGNED = :MATCH_KEYSTORE_APK_SIGNED
     end
 
     class MatchKeystoreAction < Action
@@ -32,11 +31,11 @@ module Fastlane
       end
 
       def self.get_android_home
-        puts `rm -f android_home.txt`
-        puts `echo $ANDROID_HOME > android_home.txt`
+        `rm -f android_home.txt`
+        `echo $ANDROID_HOME > android_home.txt`
         data = File.read("android_home.txt")
         android_home = data.strip
-        puts `rm -f android_home.txt`
+        `rm -f android_home.txt`
         android_home
       end
 
@@ -54,18 +53,18 @@ module Fastlane
       end
 
       def self.gen_key(key_path, password)
-        puts `rm -f #{key_path}`
-        puts `echo "#{password}" | openssl dgst -sha512 | cut -c1-128 > #{key_path}`
+        `rm -f #{key_path}`
+        `echo "#{password}" | openssl dgst -sha512 | cut -c1-128 > #{key_path}`
       end
 
       def self.encrypt_file(clear_file, encrypt_file, key_path)
-        puts `rm -f #{encrypt_file}`
-        puts `openssl enc -aes-256-cbc -salt -in #{clear_file} -out #{encrypt_file} -pass file:#{key_path}`
+        `rm -f #{encrypt_file}`
+        `openssl enc -aes-256-cbc -salt -in #{clear_file} -out #{encrypt_file} -pass file:#{key_path}`
       end
 
       def self.decrypt_file(encrypt_file, clear_file, key_path)
-        puts `rm -f #{clear_file}`
-        puts `openssl enc -d -aes-256-cbc -in #{encrypt_file} -out #{clear_file} -pass file:#{key_path}`
+        `rm -f #{clear_file}`
+        `openssl enc -d -aes-256-cbc -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)
@@ -75,23 +74,28 @@ module Fastlane
         # https://developer.android.com/studio/command-line/zipalign
         if zip_align == true
           apk_path_aligned = apk_path.gsub(".apk", "-aligned.apk")
-          puts `rm -f #{apk_path_aligned}`
-          puts `#{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
 
         # https://developer.android.com/studio/command-line/apksigner
         apk_path_signed = apk_path.gsub(".apk", "-signed.apk")
-        puts `rm -f #{apk_path_signed}`
-        puts `#{build_tools_path}apksigner sign --ks #{keystore_path} --ks-key-alias '#{alias_name}' --ks-pass pass:'#{alias_password}' --key-pass pass:'#{key_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:'#{alias_password}' --key-pass pass:'#{key_password}' --v1-signing-enabled true --v2-signing-enabled true --out #{apk_path_signed} #{apk_path_aligned}`
     
-        puts `#{build_tools_path}apksigner verify #{apk_path_signed}`
-        puts `rm -f #{apk_path_aligned}`
+        `#{build_tools_path}apksigner verify #{apk_path_signed}`
+        `rm -f #{apk_path_aligned}`
 
         apk_path_signed
       end
 
+      def self.get_file_content(file_path)
+        data = File.read(file_path)
+        data
+      end
+
       def self.resolve_apk_path(apk_path)
 
         if !apk_path.to_s.end_with?(".apk") 
@@ -132,6 +136,7 @@ module Fastlane
 
         keystore_name = 'keystore.jks'
         properties_name = 'keystore.properties'
+        keystore_info_name = 'keystore.txt'
         properties_encrypt_name = 'keystore.properties.enc'
 
         # Check Android Home env:
@@ -154,19 +159,26 @@ module Fastlane
           else
             security_password = ci_password
           end
+          UI.message "Generating security key..."
           self.gen_key(key_path, security_password)
+        else
+          UI.message "Security key already exists"
         end
+        tmpkey = self.get_file_content(key_path).strip
+        UI.message "Key: '#{tmpkey}'"
 
         repo_dir = dir_name + '/repo'
         unless File.directory?(repo_dir)
-          UI.message("Creating repository directory...")
+          UI.message("Creating 'repo' directory...")
           FileUtils.mkdir_p(repo_dir)
         end
 
         gitDir = repo_dir + '/.git'
         unless File.directory?(gitDir)
           UI.message("Cloning remote Keystores repository...")
-          puts `git clone #{git_url} #{repo_dir}`
+          puts ''
+          `git clone #{git_url} #{repo_dir}`
+          puts ''
         end
 
         keystoreAppDir = repo_dir + '/' + package_name
@@ -214,7 +226,7 @@ module Fastlane
             sh keytool_parts.join(" ")
           else
             UI.message("Copy existing keystore to match_keystore repository...") 
-            puts `cp #{existing_keystore} #{keystore_path}`
+            `cp #{existing_keystore} #{keystore_path}`
           end
 
           UI.message("Generating Keystore properties...")
@@ -234,11 +246,15 @@ module Fastlane
 
           self.encrypt_file(properties_path, properties_encrypt_path, key_path)
           File.delete(properties_path)
+
+          # Print Keystore data in repo:
+          keystore_info_path = keystoreAppDir + '/' + keystore_info_name
+          `yes "" | keytool -list -v -keystore #{keystore_path} > #{keystore_info_path}`
           
           UI.message("Upload new Keystore to remote repository...")
-          puts `cd #{repo_dir} && git add .`
-          puts `cd #{repo_dir} && git commit -m "[ADD] Keystore for app '#{package_name}'."`
-          puts `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`
 
         else
           UI.message "Keystore file already exists, continue..."
@@ -254,12 +270,6 @@ module Fastlane
 
         end
 
-        UI.message("Preparing Keystore data context...")
-        Actions.lane_context[SharedValues::MATCH_KEYSTORE_PATH] = keystore_path
-        Actions.lane_context[SharedValues::MATCH_KEYSTORE_PASSWORD] = key_password
-        Actions.lane_context[SharedValues::MATCH_KEYSTORE_ALIAS_NAME] = alias_name
-        Actions.lane_context[SharedValues::MATCH_KEYSTORE_ALIAS_PASSWORD] = alias_password
-
         output_signed_apk = ''
         apk_path = self.resolve_apk_path(apk_path)
 
@@ -282,6 +292,10 @@ module Fastlane
           UI.message("No APK file found to sign!")
         end
 
+        Actions.lane_context[SharedValues::MATCH_KEYSTORE_PATH] = keystore_path
+        Actions.lane_context[SharedValues::MATCH_KEYSTORE_ALIAS_NAME] = alias_name
+        Actions.lane_context[SharedValues::MATCH_KEYSTORE_APK_SIGNED] = output_signed_apk
+
         output_signed_apk
 
       end
@@ -301,9 +315,7 @@ module Fastlane
       def self.output
         [
           ['MATCH_KEYSTORE_PATH', 'File path of the Keystore fot the App.'],
-          ['MATCH_KEYSTORE_PASSWORD', 'Keystore password.'],
-          ['MATCH_KEYSTORE_ALIAS_NAME', 'Keystore Alias Name.'],
-          ['MATCH_KEYSTORE_ALIAS_PASSWORD', 'Keystore Alias Password.']
+          ['MATCH_KEYSTORE_ALIAS_NAME', 'Keystore Alias Name.']
         ]
       end
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module MatchKeystore
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

metadata

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