fastlane-plugin-fivethree_ionic 0.2.7 → 0.2.8

data/lib/fastlane/plugin/fivethree_ionic/actions/fiv_sign_android.rb

@@ -4,40 +4,68 @@ module Fastlane
       def self.run(params)
         keystore_path = Fastlane::Actions::FivAndroidKeystoreAction.run(params)
 
-        keychain_entry = CredentialsManager::AccountManager.new(user: "#{params[:keystore_name]}_android_keystore_storepass")
+        keychain_entry =
+          CredentialsManager::AccountManager.new(
+            user: "#{params[:keystore_name]}_android_keystore_storepass"
+          )
         keystore_storepass = keychain_entry.password
 
-        keychain_entry = CredentialsManager::AccountManager.new(user: "#{params[:keystore_name]}_android_keystore_keypass")
+        keychain_entry =
+          CredentialsManager::AccountManager.new(
+            user: "#{params[:keystore_name]}_android_keystore_keypass"
+          )
         keystore_keypass = keychain_entry.password
 
         puts "You can delete the password if they are wrong stored in the keychain: 'fastlane fastlane-credentials remove --username android_keystore_storepass' and 'fastlane fastlane-credentials remove --username android_keystore_keypass'"
 
-        android_build_tool_path = "#{params[:android_sdk_path]}/build-tools/#{params[:android_build_tool_version]}"
+        android_build_tool_path =
+          "#{params[:android_sdk_path]}/build-tools/#{
+            params[:android_build_tool_version]
+          }"
+
+        zipalign_apk_file = params[:apk_zipalign_target]
+        if (File.file?(zipalign_apk_file))
+          remove_zipalign = "rm -Rf #{zipalign_apk_file}"
+          sh remove_zipalign
+        end
 
         # zipalign APK
-        remove_zipalign = "rm -Rf ../platforms/android/app/build/outputs/apk/release/app-release-unsigned-zipalign.apk"
-        sh remove_zipalign
-        zipalign = "#{android_build_tool_path}/zipalign -v 4 \
-          ../platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk \
-          ../platforms/android/app/build/outputs/apk/release/app-release-unsigned-zipalign.apk"
+        zipalign =
+          "#{android_build_tool_path}/zipalign -v 4 \
+          #{
+            params[:apk_source]
+          } \
+          #{zipalign_apk_file}"
         sh zipalign
 
-        if(!File.directory?(params[:apk_output_dir]))
-          Dir.mkdir params[:apk_output_dir]
+        if (!File.directory?(params[:apk_signed_target]))
+          Dir.mkdir params[:apk_signed_target]
         end
-        output_path = "#{params[:apk_output_dir]}/app-release-#{params[:app_version]}-#{params[:app_build_no]}.apk"
-        
-        sign = "#{android_build_tool_path}/apksigner sign \
-          --ks #{keystore_path} \
-          --ks-key-alias #{params[:key_alias]} \
+
+        output_path =
+          "#{params[:apk_signed_target]}/app-release-#{params[:app_version]}-#{
+            params[:app_build_no]
+          }.apk"
+
+        sign =
+          "#{android_build_tool_path}/apksigner sign \
+          --ks #{
+            keystore_path
+          } \
+          --ks-key-alias #{
+            params[:key_alias]
+          } \
           --ks-pass pass:#{keystore_keypass} \
-          --out #{output_path} \
-          ../platforms/android/app/build/outputs/apk/release/app-release-unsigned-zipalign.apk"
-        self.run_shell_script(sign, params[:silent])
+          --out #{
+            output_path
+          } \
+          #{zipalign_apk_file}"
+        self.run_shell_script(sign)
+
+        verify =
+          ("#{android_build_tool_path}/apksigner verify -v #{output_path}")
+        self.run_shell_script(verify)
 
-        verify = ("#{android_build_tool_path}/apksigner verify -v #{output_path}")
-        self.run_shell_script(verify, params[:silent])
-    
         return output_path
       end
 
@@ -46,80 +74,96 @@ module Fastlane
       #####################################################
 
       def self.description
-        "Zipalign, sign and verify android apk"
+        'Zipalign, sign and verify android apk'
       end
 
-      def self.run_shell_script(command, silent)
-        Fastlane::Actions::sh(command, log: silent)
+      def self.run_shell_script(command)
+        Fastlane::Actions.sh(command)
       end
 
       def self.details
         # Optional:
         # this is your chance to provide a more detailed description of this action
-        "You can use this action to do cool things..."
+        'You can use this action to do cool things...'
       end
 
       def self.available_options
-        # Define all options your action supports. 
-        
+        # Define all options your action supports.
+
         # Below a few examples
         [
           FastlaneCore::ConfigItem.new(
             key: :keystore_path,
-            env_name: "FIV_KEYSTORE_PATH",
-            description: "Path to android keystore",
+            env_name: 'FIV_KEYSTORE_PATH',
+            description: 'Path to android keystore',
             is_string: true,
-            default_value: "./fastlane/android"),
+            default_value: './fastlane/android'
+          ),
           FastlaneCore::ConfigItem.new(
             key: :keystore_name,
-            env_name: "FIV_KEYSTORE_NAME",
-            description: "Name of the keystore",
+            env_name: 'FIV_KEYSTORE_NAME',
+            description: 'Name of the keystore',
             is_string: true,
-            optional: false),
+            optional: false
+          ),
           FastlaneCore::ConfigItem.new(
             key: :android_sdk_path,
-            env_name: "FIV_ANDROID_SDK_PATH",
-            description: "Path to your installed Android SDK",
+            env_name: 'FIV_ANDROID_SDK_PATH',
+            description: 'Path to your installed Android SDK',
             is_string: true,
-            default_value: "~/Library/Android/sdk"),
+            default_value: '~/Library/Android/sdk'
+          ),
           FastlaneCore::ConfigItem.new(
             key: :android_build_tool_version,
-            env_name: "FIV_ANDROID_SDK_BUILD_TOOL_VERSION",
-            description: "Android Build Tool version used for `zipalign`, `sign` and `verify`",
+            env_name: 'FIV_ANDROID_SDK_BUILD_TOOL_VERSION',
+            description:
+              'Android Build Tool version used for `zipalign`, `sign` and `verify`',
             is_string: true,
-            default_value: "28.0.3"),
+            default_value: '28.0.3'
+          ),
           FastlaneCore::ConfigItem.new(
-            key: :apk_output_dir,
-            env_name: "FIV_APK_OUTPUT_DIR",
-            description: "Output path of the signed apk",
+            key: :apk_source,
+            env_name: 'FIV_APK_SOURCE',
+            description: 'Source path to the apk file',
             is_string: true,
-            default_value: "../platforms/android/app/build/outputs/apk/release"),
+            default_value:
+              './platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk'
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :apk_zipalign_target,
+            env_name: 'FIV_APK_ZIPALIGN_TARGET',
+            description: 'Target path for the zipaligned apk',
+            is_string: true,
+            default_value:
+              './platforms/android/app/build/outputs/apk/release/app-release-unsigned-zipalign.apk'
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :apk_signed_target,
+            env_name: 'FIV_APK_SIGNED_TARGET',
+            description: 'Tarket path of the signed apk',
+            is_string: true,
+            default_value: './platforms/android/app/build/outputs/apk/release'
+          ),
           FastlaneCore::ConfigItem.new(
             key: :key_alias,
-            env_name: "FIV_ANDROID_KEYSTORE_ALIAS",
-            description: "Key alias of the keystore",
+            env_name: 'FIV_ANDROID_KEYSTORE_ALIAS',
+            description: 'Key alias of the keystore',
             is_string: true,
-            optional: false),
+            optional: false
+          ),
           FastlaneCore::ConfigItem.new(
             key: :app_version,
-            env_name: "FIV_APP_VERSION",
-            description: "App version",
+            env_name: 'FIV_APP_VERSION',
+            description: 'App version',
             is_string: true,
             default_value: ''
           ),
           FastlaneCore::ConfigItem.new(
             key: :app_build_no,
-            env_name: "FIV_APP_BUILD_NO",
-            description: "App build number",
+            env_name: 'FIV_APP_BUILD_NO',
+            description: 'App build number',
             is_string: true,
             default_value: ''
-          ),
-          FastlaneCore::ConfigItem.new(
-            key: :silent,
-            env_name: "FIV_SIGN_ANDROID_SILENT",
-            description: "Wether to sign android silently",
-            is_string: false,
-            default_value: true
           )
         ]
       end
@@ -128,7 +172,10 @@ module Fastlane
         # Define the shared values you are going to provide
         # Example
         [
-          ['FIV_BUILD_IONIC_ANDROID_CUSTOM_VALUE', 'A description of what this value contains']
+          [
+            'FIV_BUILD_IONIC_ANDROID_CUSTOM_VALUE',
+            'A description of what this value contains'
+          ]
         ]
       end
 
@@ -138,11 +185,11 @@ module Fastlane
 
       def self.authors
         # So no one will ever forget your contribution to fastlane :) You are awesome btw!
-        ["marcjulian"]
+        %w[marcjulian]
       end
 
       def self.is_supported?(platform)
-       platform == :android
+        platform == :android
       end
     end
   end

data/lib/fastlane/plugin/fivethree_ionic/actions/fiv_take_screenshots.rb

@@ -1,15 +1,18 @@
 module Fastlane
   module Actions
     module SharedValues
-      FIV_BUILD_IONIC_ANDROID_CUSTOM_VALUE = :FIV_BUILD_IONIC_ANDROID_CUSTOM_VALUE
+      FIV_BUILD_IONIC_ANDROID_CUSTOM_VALUE =
+        :FIV_BUILD_IONIC_ANDROID_CUSTOM_VALUE
     end
 
     class FivTakeScreenshotsAction < Action
       def self.run(params)
-        UI.header "Taking Screenshots..."
-          
-        sh "ionic cordova run browser --prod && #{params[:cypress]} run -s #{params[:spec]} -b chrome"
-        UI.success "Successfully finished taking screenshots"
+        UI.header 'Taking Screenshots...'
+
+        sh "ionic cordova run browser --prod && #{params[:cypress]} run -s #{
+             params[:spec]
+           } -b chrome"
+        UI.success 'Successfully finished taking screenshots'
       end
 
       #####################################################
@@ -17,30 +20,34 @@ module Fastlane
       #####################################################
 
       def self.description
-        "A short description with <= 80 characters of what this action does"
+        'A short description with <= 80 characters of what this action does'
       end
 
       def self.details
         # Optional:
         # this is your chance to provide a more detailed description of this action
-        "You can use this action to do cool things..."
+        'You can use this action to do cool things...'
       end
 
       def self.available_options
-        # Define all options your action supports. 
-        
+        # Define all options your action supports.
+
         # Below a few examples
         [
-          FastlaneCore::ConfigItem.new(key: :cypress,
-                                       env_name: "FIV_BUILD_IONIC_ANDROID_IS_PROD",
-                                       description: "Dev or Prod build",
-                                       optional: false,
-                                       type: String),
-          FastlaneCore::ConfigItem.new(key: :spec,
-                                       env_name: "FIV_BUILD_IONIC_ANDROID_IS_PROD",
-                                       description: "Dev or Prod build",
-                                       optional: false,
-                                       type: String)
+          FastlaneCore::ConfigItem.new(
+            key: :cypress,
+            env_name: 'FIV_BUILD_IONIC_ANDROID_IS_PROD',
+            description: 'Dev or Prod build',
+            optional: false,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :spec,
+            env_name: 'FIV_BUILD_IONIC_ANDROID_IS_PROD',
+            description: 'Dev or Prod build',
+            optional: false,
+            type: String
+          )
         ]
       end
 
@@ -48,7 +55,10 @@ module Fastlane
         # Define the shared values you are going to provide
         # Example
         [
-          ['FIV_BUILD_IONIC_ANDROID_CUSTOM_VALUE', 'A description of what this value contains']
+          [
+            'FIV_BUILD_IONIC_ANDROID_CUSTOM_VALUE',
+            'A description of what this value contains'
+          ]
         ]
       end
 
@@ -58,11 +68,11 @@ module Fastlane
 
       def self.authors
         # So no one will ever forget your contribution to fastlane :) You are awesome btw!
-        ["Your GitHub/Twitter Name"]
+        ['Your GitHub/Twitter Name']
       end
 
       def self.is_supported?(platform)
-       platform == :android
+        platform == :android
       end
     end
   end

data/lib/fastlane/plugin/fivethree_ionic/actions/fiv_update_version.rb

@@ -7,31 +7,36 @@ module Fastlane
     class FivUpdateVersionAction < Action
       def self.run(params)
         # fastlane will take care of reading in the parameter and fetching the environment variable:
-        old_version = sh "echo \"cat //*[local-name()='widget']/@version\" | xmllint --shell #{params[:pathToConfigXML]}|  awk -F'[=\"]' '!/>/{print $(NF-1)}'"
+        old_version =
+          sh "echo \"cat //*[local-name()='widget']/@version\" | xmllint --shell #{
+               params[:pathToConfigXML]
+             }|  awk -F'[=\"]' '!/>/{print $(NF-1)}'"
         old_version = old_version.delete!("\n")
         puts "current version: #{old_version}"
 
-        puts "Insert new version number, current version in config.xml is '#{old_version}' (Leave empty and press enter to skip this step): "
+        puts "Insert new version number, current version in config.xml is '#{
+               old_version
+             }' (Leave empty and press enter to skip this step): "
         new_version_number = STDIN.gets.strip
         puts "new version: #{new_version_number}"
 
         if new_version_number.length > 0
-          puts "take new version number"
+          puts 'take new version number'
           version = new_version_number
         else
-          puts "take old version number"
+          puts 'take old version number'
           version = old_version
         end
 
         text = File.read(params[:pathToConfigXML])
 
-        new_contents = text
-                     .gsub(/version="[0-9.]*"/, "version=\"#{version}\"")
-        
-        File.open(params[:pathToConfigXML], "w") {|file| file.puts new_contents}
+        new_contents = text.gsub(/version="[0-9.]*"/, "version=\"#{version}\"")
 
-        return version
+        File.open(params[:pathToConfigXML], 'w') do |file|
+          file.puts new_contents
+        end
 
+        return version
       end
 
       #####################################################
@@ -39,27 +44,34 @@ module Fastlane
       #####################################################
 
       def self.description
-        "A short description with <= 80 characters of what this action does"
+        'A short description with <= 80 characters of what this action does'
       end
 
       def self.details
         # Optional:
         # this is your chance to provide a more detailed description of this action
-        "You can use this action to do cool things..."
+        'You can use this action to do cool things...'
       end
 
       def self.available_options
-        # Define all options your action supports. 
-        
+        # Define all options your action supports.
+
         [
-          FastlaneCore::ConfigItem.new(key: :pathToConfigXML,
-                                  env_name: "FIV_INCREMENT_BUILD_CONFIG",
-                               description: "---",
-                                  optional: false,
-                                  verify_block: proc do | value |
-                                    UI.user_error!("Couldnt find config.xml! Please change your path.") unless File.exist?(value)
-                                  end  ,
-                                      type: String)
+          FastlaneCore::ConfigItem.new(
+            key: :pathToConfigXML,
+            env_name: 'FIV_INCREMENT_BUILD_CONFIG',
+            description: '---',
+            optional: false,
+            verify_block:
+              proc do |value|
+                unless File.exist?(value)
+                  UI.user_error!(
+                    'Couldnt find config.xml! Please change your path.'
+                  )
+                end
+              end,
+            type: String
+          )
         ]
       end
 
@@ -67,28 +79,31 @@ module Fastlane
         # Define the shared values you are going to provide
         # Example
         [
-          ['FIV_UPDATE_VERSION_CUSTOM_VALUE', 'A description of what this value contains']
+          [
+            'FIV_UPDATE_VERSION_CUSTOM_VALUE',
+            'A description of what this value contains'
+          ]
         ]
       end
 
       def self.return_value
-        "returns the new version specified in config.xml"
+        'returns the new version specified in config.xml'
       end
 
       def self.authors
         # So no one will ever forget your contribution to fastlane :) You are awesome btw!
-        ["Your GitHub/Twitter Name"]
+        ['Your GitHub/Twitter Name']
       end
 
       def self.is_supported?(platform)
         # you can do things like
-        # 
+        #
         #  true
-        # 
+        #
         #  platform == :ios
-        # 
+        #
         #  [:ios, :mac].include?(platform)
-        # 
+        #
 
         platform == :ios
       end