RubyGems - fastlane-plugin-wpmreleasetoolkit - Versions diffs - 1.3.0 → 2.1.0 - Mend

fastlane-plugin-wpmreleasetoolkit 1.3.0 → 2.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (28) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee442d259b9c2e9f6ade7505aa2a7cf4a87d01e13ae68abc6d93d1b45b67b931
-  data.tar.gz: caca4af2ab1e2d1b973c199a8a2bf2907f21403fa862e1439047b3740471a8da
+  metadata.gz: ccdaad31840825f4e31a868d02be5bd94a50b8dfe08905b75a07d9c2de187158
+  data.tar.gz: 679d9fe6250aeadd808ddbd2d5baf23ce8ff0f920dd52a99cabf1b751ec74fc2
 SHA512:
-  metadata.gz: e0a43dc1b67ce99bb8afb213bf0826fa51c6241ebc4ab406c885d37dcfb5821b6a4fd7d0b23dcb2005d42efd14f07af59b4cc6401738b5de10e1b0bc8cce0d56
-  data.tar.gz: 3acc819e9b7cc00eb406fbae062910d638bdc799fbc26e53f20d6c07b51bdd1a20ddaa41b83dcc20b323bc3cd333ea93e5f365494792e8ec7f47a8abdf852f22
+  metadata.gz: f972a9987b33dad7bf2eee79e378fb40ba5ed174c4885b983dccd1ee86ddb1ca3cdc998c50c3ce0d7dddaec5d0c4508d4baab3a81ef62f5e3e6759b70f68954f
+  data.tar.gz: bf06d3515cd1994574d4b0e0d01b67c4554106c342d86cf87dd7e72d572b5b1e6129cc7757a7d64b42adaab0c791185b9d3544f244cf338bf77cb10de0ac99da

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_betabuild_prechecks.rb CHANGED Viewed

@@ -11,13 +11,11 @@ module Fastlane
         # Checkout develop and update
         Fastlane::Helper::GitHelper.checkout_and_pull('develop')
-        app = params[:app]
         # Check versions
-        release_version = Fastlane::Helper::Android::VersionHelper.get_release_version(app)
-        message = "[#{app}] The following current version has been detected: #{release_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}\n"
-        alpha_release_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version(app)
-        message << "[#{app}] The following Alpha version has been detected: #{alpha_release_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}\n" unless alpha_release_version.nil?
+        release_version = Fastlane::Helper::Android::VersionHelper.get_release_version
+        message = "The following current version has been detected: #{release_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}\n"
+        alpha_release_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version
+        message << "The following Alpha version has been detected: #{alpha_release_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}\n" unless alpha_release_version.nil?
         # Check branch
         app_version = Fastlane::Helper::Android::VersionHelper.get_public_version
@@ -25,7 +23,7 @@ module Fastlane
         # Check user overwrite
         unless params[:base_version].nil?
-          overwrite_version = get_user_build_version(params[:base_version], message)
+          overwrite_version = get_user_build_version(version: params[:base_version], message: message)
           release_version = overwrite_version[0]
           alpha_release_version = overwrite_version[1]
         end
@@ -49,10 +47,10 @@ module Fastlane
         [next_beta_version, next_alpha_version]
       end
-      def self.get_user_build_version(version, message)
-        UI.user_error!("[#{app}] Release branch for version #{version} doesn't exist. Abort.") unless Fastlane::Helper::GitHelper.checkout_and_pull(release: version)
+      def self.get_user_build_version(version:, message:)
+        UI.user_error!("Release branch for version #{version} doesn't exist. Abort.") unless Fastlane::Helper::GitHelper.checkout_and_pull(release: version)
         release_version = Fastlane::Helper::Android::VersionHelper.get_release_version
-        message << "#{app}] Looking at branch release/#{version} as requested by user. Detected version: #{release_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}.\n"
+        message << "Looking at branch release/#{version} as requested by user. Detected version: #{release_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}.\n"
         alpha_release_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version
         message << "and Alpha Version: #{alpha_release_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}\n" unless alpha_release_version.nil?
         [release_version, alpha_release_version]
@@ -82,10 +80,6 @@ module Fastlane
                                        description: 'Skips confirmation',
                                        is_string: false, # true: verifies the input is a string, false: every kind of value
                                        default_value: false), # the default value if the user didn't provide one
-          FastlaneCore::ConfigItem.new(key: :app,
-                                       env_name: 'PROJECT_NAME',
-                                       description: 'The name of the app to get the release version for',
-                                       is_string: true), # true: verifies the input is a string, false: every kind of value
         ]
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_build_prechecks.rb CHANGED Viewed

@@ -9,16 +9,15 @@ module Fastlane
         Fastlane::Helper::GitHelper.ensure_on_branch!('release') unless other_action.is_ci()
-        app = params[:app]
         message = ''
-        beta_version = Fastlane::Helper::Android::VersionHelper.get_release_version(app) unless !params[:beta] && !params[:final]
-        alpha_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version(app) if params[:alpha]
+        beta_version = Fastlane::Helper::Android::VersionHelper.get_release_version unless !params[:beta] && !params[:final]
+        alpha_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version if params[:alpha]
         UI.user_error!("Can't build a final release out of this branch because it's configured as a beta release!") if params[:final] && Fastlane::Helper::Android::VersionHelper.is_beta_version?(beta_version)
-        message << "[#{app}] Building version #{beta_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}(#{beta_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}) (for upload to Release Channel)\n" if params[:final]
-        message << "[#{app}] Building version #{beta_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}(#{beta_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}) (for upload to Beta Channel)\n" if params[:beta]
-        message << "[#{app}] Building version #{alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}(#{alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}) (for upload to Alpha Channel)\n" if params[:alpha]
+        message << "Building version #{beta_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}(#{beta_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}) (for upload to Release Channel)\n" if params[:final]
+        message << "Building version #{beta_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}(#{beta_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}) (for upload to Beta Channel)\n" if params[:beta]
+        message << "Building version #{alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}(#{alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}) (for upload to Alpha Channel)\n" if params[:alpha]
         if params[:skip_confirm]
           UI.message(message)
@@ -64,10 +63,6 @@ module Fastlane
                                        description: 'True if this is for a final build',
                                        is_string: false,
                                        default_value: false),
-          FastlaneCore::ConfigItem.new(key: :app,
-                                       env_name: 'PROJECT_NAME',
-                                       description: 'The name of the app to get the release version for',
-                                       is_string: true), # true: verifies the input is a string, false: every kind of value
         ]
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_beta.rb CHANGED Viewed

@@ -8,22 +8,21 @@ module Fastlane
         require_relative '../../helper/android/android_version_helper'
         Fastlane::Helper::GitHelper.ensure_on_branch!('release')
-        app = params[:app]
-        current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(product_name: app)
-        current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version(app)
+        current_version = Fastlane::Helper::Android::VersionHelper.get_release_version
+        current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version
         new_version_beta = Fastlane::Helper::Android::VersionHelper.calc_next_beta_version(current_version, current_version_alpha)
         new_version_alpha = current_version_alpha.nil? ? nil : Fastlane::Helper::Android::VersionHelper.calc_next_alpha_version(new_version_beta, current_version_alpha)
         vname = Fastlane::Helper::Android::VersionHelper::VERSION_NAME
         vcode = Fastlane::Helper::Android::VersionHelper::VERSION_CODE
-        UI.message("Current version[#{app}]: #{current_version[vname]}(#{current_version[vcode]})")
-        UI.message("Current alpha version[#{app}]: #{current_version_alpha[vname]}(#{current_version_alpha[vcode]})") unless current_version_alpha.nil?
-        UI.message("New beta version[#{app}]: #{new_version_beta[vname]}(#{new_version_beta[vcode]})")
-        UI.message("New alpha version[#{app}]: #{new_version_alpha[vname]}(#{new_version_alpha[vcode]})") unless current_version_alpha.nil?
+        UI.message("Current version: #{current_version[vname]}(#{current_version[vcode]})")
+        UI.message("Current alpha version: #{current_version_alpha[vname]}(#{current_version_alpha[vcode]})") unless current_version_alpha.nil?
+        UI.message("New beta version: #{new_version_beta[vname]}(#{new_version_beta[vcode]})")
+        UI.message("New alpha version: #{new_version_alpha[vname]}(#{new_version_alpha[vcode]})") unless current_version_alpha.nil?
         UI.message 'Updating app version...'
-        Fastlane::Helper::Android::VersionHelper.update_versions(app, new_version_beta, new_version_alpha)
+        Fastlane::Helper::Android::VersionHelper.update_versions(new_version_beta, new_version_alpha)
         UI.message 'Done!'
         Fastlane::Helper::Android::GitHelper.commit_version_bump()
@@ -34,21 +33,15 @@ module Fastlane
       #####################################################
       def self.description
-        'Bumps the version of the app for a new beta. Requires the `updateVersionProperties` gradle task to update the keys if you are using a `version.properties` file.'
+        'Bumps the version of the app for a new beta.'
       end
       def self.details
-        'Bumps the version of the app for a new beta. Requires the `updateVersionProperties` gradle task to update the keys if you are using a `version.properties` file.'
+        'Bumps the version of the app for a new beta.'
       end
       def self.available_options
         # Define all options your action supports.
-        [
-          FastlaneCore::ConfigItem.new(key: :app,
-                                       env_name: 'PROJECT_NAME',
-                                       description: 'The name of the app to get the release version for',
-                                       is_string: true), # true: verifies the input is a string, false: every kind of value
-        ]
       end
       def self.output

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_final_release.rb CHANGED Viewed

@@ -8,20 +8,19 @@ module Fastlane
         require_relative '../../helper/android/android_version_helper'
         Fastlane::Helper::GitHelper.ensure_on_branch!('release')
-        app = params[:app]
-        current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(product_name: app)
-        current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version(app)
+        current_version = Fastlane::Helper::Android::VersionHelper.get_release_version
+        current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version
         final_version = Fastlane::Helper::Android::VersionHelper.calc_final_release_version(current_version, current_version_alpha)
         vname = Fastlane::Helper::Android::VersionHelper::VERSION_NAME
         vcode = Fastlane::Helper::Android::VersionHelper::VERSION_CODE
-        UI.message("Current version[#{app}]: #{current_version[vname]}(#{current_version[vcode]})")
-        UI.message("Current alpha version[#{app}]: #{current_version_alpha[vname]}(#{current_version_alpha[vcode]})") unless current_version_alpha.nil?
-        UI.message("New release version[#{app}]: #{final_version[vname]}(#{final_version[vcode]})")
+        UI.message("Current version: #{current_version[vname]}(#{current_version[vcode]})")
+        UI.message("Current alpha version: #{current_version_alpha[vname]}(#{current_version_alpha[vcode]})") unless current_version_alpha.nil?
+        UI.message("New release version: #{final_version[vname]}(#{final_version[vcode]})")
         UI.message 'Updating app version...'
-        Fastlane::Helper::Android::VersionHelper.update_versions(app, final_version, current_version_alpha)
+        Fastlane::Helper::Android::VersionHelper.update_versions(final_version, current_version_alpha)
         UI.message 'Done!'
         Fastlane::Helper::Android::GitHelper.commit_version_bump()
@@ -32,21 +31,15 @@ module Fastlane
       #####################################################
       def self.description
-        'Bumps the version of the app for a new beta. Requires the `updateVersionProperties` gradle task to update the keys if you are using a `version.properties` file.'
+        'Bumps the version of the app for a new beta.'
       end
       def self.details
-        'Bumps the version of the app for a new beta. Requires the `updateVersionProperties` gradle task to update the keys if you are using a `version.properties` file.'
+        'Bumps the version of the app for a new beta.'
       end
       def self.available_options
         # Define all options your action supports.
-        [
-          FastlaneCore::ConfigItem.new(key: :app,
-                                       env_name: 'PROJECT_NAME',
-                                       description: 'The name of the app to get the release version for',
-                                       is_string: true), # true: verifies the input is a string, false: every kind of value
-        ]
       end
       def self.authors

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_hotfix.rb CHANGED Viewed

@@ -7,20 +7,18 @@ module Fastlane
         require_relative '../../helper/android/android_git_helper'
         Fastlane::Helper::GitHelper.create_branch("release/#{params[:version_name]}", from: params[:previous_version_name])
-        app = params[:app]
+        current_version = Fastlane::Helper::Android::VersionHelper.get_release_version
+        new_version = Fastlane::Helper::Android::VersionHelper.calc_next_hotfix_version(params[:version_name], params[:version_code]) # NOTE: this just puts the name/code values in a tuple, unchanged (no actual calc/bumping)
+        new_release_branch = "release/#{params[:version_name]}"
-        current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(product_name: app)
-        current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version(app)
-        new_version = Fastlane::Helper::Android::VersionHelper.calc_next_hotfix_version(params[:version_name], params[:version_code])
-        new_short_version = new_version_name
-        new_release_branch = "release/#{new_short_version}"
-        UI.message("Current version[#{app}]: #{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}(#{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]})")
-        UI.message("New hotfix version[#{app}]: #{new_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}(#{new_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]})")
+        name_key = Fastlane::Helper::Android::VersionHelper::VERSION_NAME
+        code_key = Fastlane::Helper::Android::VersionHelper::VERSION_CODE
+        UI.message("Current version: #{current_version[name_key]} (#{current_version[code_key]})")
+        UI.message("New hotfix version: #{new_version[name_key]} (#{new_version[code_key]})")
         UI.message("Release branch: #{new_release_branch}")
         UI.message 'Updating app version...'
-        Fastlane::Helper::Android::VersionHelper.update_versions(app, new_version, current_version_alpha)
+        Fastlane::Helper::Android::VersionHelper.update_versions(new_version, nil)
         UI.message 'Done!'
         Fastlane::Helper::Android::GitHelper.commit_version_bump()
@@ -33,33 +31,26 @@ module Fastlane
       #####################################################
       def self.description
-        'Bumps the version of the app for a new beta. Requires the `updateVersionProperties` gradle task to update the keys if you are using a `version.properties` file.'
+        'Bumps the version of the app for a new beta.'
       end
       def self.details
-        'Bumps the version of the app for a new beta. Requires the `updateVersionProperties` gradle task to update the keys if you are using a `version.properties` file.'
+        'Bumps the version of the app for a new beta.'
       end
       def self.available_options
-        # Define all options your action supports.
-        # Below a few examples
         [
           FastlaneCore::ConfigItem.new(key: :version_name,
                                        env_name: 'FL_ANDROID_BUMP_VERSION_HOTFIX_VERSION',
-                                       description: 'The version of the hotfix',
+                                       description: 'The version name for the hotfix',
                                        is_string: true),
           FastlaneCore::ConfigItem.new(key: :version_code,
                                        env_name: 'FL_ANDROID_BUMP_VERSION_HOTFIX_CODE',
-                                       description: 'The version of the hotfix'),
+                                       description: 'The version code for the hotfix'),
           FastlaneCore::ConfigItem.new(key: :previous_version_name,
                                        env_name: 'FL_ANDROID_BUMP_VERSION_HOTFIX_PREVIOUS_VERSION',
                                        description: 'The version to branch from',
-                                       is_string: true), # the default value if the user didn't provide one
-          FastlaneCore::ConfigItem.new(key: :app,
-                                       env_name: 'PROJECT_NAME',
-                                       description: 'The name of the app to get the release version for',
-                                       is_string: true), # true: verifies the input is a string, false: every kind of value
+                                       is_string: true),
         ]
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_release.rb CHANGED Viewed

@@ -11,22 +11,21 @@ module Fastlane
         other_action.ensure_git_branch(branch: 'develop')
         # Create new configuration
-        app = params[:app]
-        new_short_version = Fastlane::Helper::Android::VersionHelper.bump_version_release(app)
+        new_short_version = Fastlane::Helper::Android::VersionHelper.bump_version_release
-        current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(product_name: app)
-        current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version(app)
+        current_version = Fastlane::Helper::Android::VersionHelper.get_release_version
+        current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version
         new_version_beta = Fastlane::Helper::Android::VersionHelper.calc_next_release_version(current_version, current_version_alpha)
         new_version_alpha = current_version_alpha.nil? ? nil : Fastlane::Helper::Android::VersionHelper.calc_next_alpha_version(new_version_beta, current_version_alpha)
         new_release_branch = "release/#{new_short_version}"
         vname = Fastlane::Helper::Android::VersionHelper::VERSION_NAME
         vcode = Fastlane::Helper::Android::VersionHelper::VERSION_CODE
-        UI.message("Current version[#{app}]: #{current_version[vname]}(#{current_version[vcode]})")
-        UI.message("Current alpha version[#{app}]: #{current_version_alpha[vname]}(#{current_version_alpha[vcode]})") unless current_version_alpha.nil?
-        UI.message("New beta version[#{app}]: #{new_version_beta[vname]}(#{new_version_beta[vcode]})")
-        UI.message("New alpha version[#{app}]: #{new_version_alpha[vname]}(#{new_version_alpha[vcode]})") unless current_version_alpha.nil?
-        UI.message("New version[#{app}]: #{new_short_version}")
+        UI.message("Current version: #{current_version[vname]}(#{current_version[vcode]})")
+        UI.message("Current alpha version: #{current_version_alpha[vname]}(#{current_version_alpha[vcode]})") unless current_version_alpha.nil?
+        UI.message("New beta version: #{new_version_beta[vname]}(#{new_version_beta[vcode]})")
+        UI.message("New alpha version: #{new_version_alpha[vname]}(#{new_version_alpha[vcode]})") unless current_version_alpha.nil?
+        UI.message("New version: #{new_short_version}")
         UI.message("Release branch: #{new_release_branch}")
         # Update local develop and branch
@@ -35,7 +34,7 @@ module Fastlane
         UI.message 'Done!'
         UI.message 'Updating app version...'
-        Fastlane::Helper::Android::VersionHelper.update_versions(app, new_version_beta, new_version_alpha)
+        Fastlane::Helper::Android::VersionHelper.update_versions(new_version_beta, new_version_alpha)
         Fastlane::Helper::Android::GitHelper.commit_version_bump()
         UI.message 'Done.'
       end
@@ -45,21 +44,15 @@ module Fastlane
       #####################################################
       def self.description
-        'Bumps the version of the app for a new beta. Requires the `updateVersionProperties` gradle task to update the keys if you are using a `version.properties` file.'
+        'Bumps the version of the app for a new beta.'
       end
       def self.details
-        'Bumps the version of the app for a new beta. Requires the `updateVersionProperties` gradle task to update the keys if you are using a `version.properties` file.'
+        'Bumps the version of the app for a new beta.'
       end
       def self.available_options
         # Define all options your action supports.
-        [
-          FastlaneCore::ConfigItem.new(key: :app,
-                                       env_name: 'PROJECT_NAME',
-                                       description: 'The name of the app to get the release version for',
-                                       is_string: true), # true: verifies the input is a string, false: every kind of value
-        ]
       end
       def self.output

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_codefreeze_prechecks.rb CHANGED Viewed

@@ -14,18 +14,16 @@ module Fastlane
         # Checkout develop and update
         Fastlane::Helper::GitHelper.checkout_and_pull('develop')
-        app = params[:app]
         # Create versions
-        current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(product_name: app)
-        current_alpha_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version(app)
+        current_version = Fastlane::Helper::Android::VersionHelper.get_release_version
+        current_alpha_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version
         next_version = Fastlane::Helper::Android::VersionHelper.calc_next_release_version(current_version, current_alpha_version)
         next_alpha_version = current_alpha_version.nil? ? nil : Fastlane::Helper::Android::VersionHelper.calc_next_alpha_version(next_version, current_alpha_version)
         no_alpha_version_message = "No alpha version configured. If you wish to configure an alpha version please update version.properties to include an alpha key for this app\n"
         # Ask user confirmation
         unless params[:skip_confirm]
-          confirm_message = "[#{app}]Building a new release branch starting from develop.\nCurrent version is #{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
+          confirm_message = "Building a new release branch starting from develop.\nCurrent version is #{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
           confirm_message += current_alpha_version.nil? ? no_alpha_version_message : "Current Alpha version is #{current_alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{current_alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
           confirm_message += "After codefreeze the new version will be: #{next_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{next_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
           confirm_message += current_alpha_version.nil? ? '' : "After codefreeze the new Alpha will be: #{next_alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{next_alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
@@ -37,7 +35,7 @@ module Fastlane
         other_action.ensure_git_status_clean()
         # Return the current version
-        Fastlane::Helper::Android::VersionHelper.get_public_version(app)
+        Fastlane::Helper::Android::VersionHelper.get_public_version
       end
       #####################################################
@@ -60,10 +58,6 @@ module Fastlane
                                        description: 'Skips confirmation before codefreeze',
                                        is_string: false, # true: verifies the input is a string, false: every kind of value
                                        default_value: false), # the default value if the user didn't provide one
-          FastlaneCore::ConfigItem.new(key: :app,
-                                       env_name: 'PROJECT_NAME',
-                                       description: 'The name of the app to get the release version for',
-                                       is_string: true), # true: verifies the input is a string, false: every kind of value
         ]
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_completecodefreeze_prechecks.rb CHANGED Viewed

@@ -9,10 +9,8 @@ module Fastlane
         UI.user_error!('This is not a release branch. Abort.') unless other_action.git_branch.start_with?('release/')
-        app = params[:app]
-        version = Fastlane::Helper::Android::VersionHelper.get_public_version(app)
-        message = "Completing code freeze for: [#{app}]#{version}\n"
+        version = Fastlane::Helper::Android::VersionHelper.get_public_version
+        message = "Completing code freeze for: #{version}\n"
         unless params[:skip_confirm]
           UI.user_error!('Aborted by user request') unless UI.confirm("#{message}Do you want to continue?")
         else
@@ -44,10 +42,6 @@ module Fastlane
                                        description: 'Skips confirmation',
                                        is_string: false, # true: verifies the input is a string, false: every kind of value
                                        default_value: false), # the default value if the user didn't provide one
-          FastlaneCore::ConfigItem.new(key: :app,
-                                       env_name: 'PROJECT_NAME',
-                                       description: 'The name of the app to get the release version for',
-                                       is_string: true), # true: verifies the input is a string, false: every kind of value
         ]
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_current_branch_is_hotfix.rb CHANGED Viewed

@@ -7,7 +7,7 @@ module Fastlane
     class AndroidCurrentBranchIsHotfixAction < Action
       def self.run(params)
         require_relative '../../helper/android/android_version_helper'
-        version = Fastlane::Helper::Android::VersionHelper.get_release_version(product_name: params[:app])
+        version = Fastlane::Helper::Android::VersionHelper.get_release_version
         Fastlane::Helper::Android::VersionHelper.is_hotfix?(version)
       end
@@ -25,12 +25,6 @@ module Fastlane
       def self.available_options
         # Define all options your action supports.
-        [
-          FastlaneCore::ConfigItem.new(key: :app,
-                                       env_name: 'PROJECT_NAME',
-                                       description: 'The name of the app to get the release version for',
-                                       is_string: true), # true: verifies the input is a string, false: every kind of value
-        ]
       end
       def self.output

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_download_file_by_version.rb CHANGED Viewed

@@ -27,7 +27,7 @@ module Fastlane
       def self.details
         'This action extracts the version of the library which is imported by the client app' \
-        'and downloads the request file from the relevant GitHub release'
+          'and downloads the request file from the relevant GitHub release'
       end
       def self.available_options

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_finalize_prechecks.rb CHANGED Viewed

@@ -13,7 +13,7 @@ module Fastlane
         UI.user_error!('This is not a release branch. Abort.') unless other_action.git_branch.start_with?('release/')
-        version = Fastlane::Helper::Android::VersionHelper.get_public_version(params[:app])
+        version = Fastlane::Helper::Android::VersionHelper.get_public_version
         message = "Finalizing release: #{version}\n"
         if params[:skip_confirm]
           UI.message(message)
@@ -49,10 +49,6 @@ module Fastlane
                                        description: 'Skips confirmation',
                                        is_string: false, # true: verifies the input is a string, false: every kind of value
                                        default_value: false), # the default value if the user didn't provide one
-          FastlaneCore::ConfigItem.new(key: :app,
-                                       env_name: 'PROJECT_NAME',
-                                       description: 'The name of the app to get the release version for',
-                                       is_string: true), # true: verifies the input is a string, false: every kind of value
         ]
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_get_alpha_version.rb CHANGED Viewed

@@ -3,7 +3,7 @@ module Fastlane
     class AndroidGetAlphaVersionAction < Action
       def self.run(params)
         require_relative '../../helper/android/android_version_helper'
-        Fastlane::Helper::Android::VersionHelper.get_alpha_version(params[:app])
+        Fastlane::Helper::Android::VersionHelper.get_alpha_version
       end
       #####################################################
@@ -20,12 +20,6 @@ module Fastlane
       def self.available_options
         # Define all options your action supports.
-        [
-          FastlaneCore::ConfigItem.new(key: :app,
-                                       env_name: 'PROJECT_NAME',
-                                       description: 'The name of the app to get the release version for',
-                                       is_string: true), # true: verifies the input is a string, false: every kind of value
-        ]
       end
       def self.output

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_get_app_version.rb CHANGED Viewed

@@ -3,7 +3,7 @@ module Fastlane
     class AndroidGetAppVersionAction < Action
       def self.run(params)
         require_relative '../../helper/android/android_version_helper'
-        Fastlane::Helper::Android::VersionHelper.get_public_version(params[:app])
+        Fastlane::Helper::Android::VersionHelper.get_public_version
       end
       #####################################################
@@ -20,12 +20,6 @@ module Fastlane
       def self.available_options
         # Define all options your action supports.
-        [
-          FastlaneCore::ConfigItem.new(key: :app,
-                                       env_name: 'PROJECT_NAME',
-                                       description: 'The name of the app to get the release version for',
-                                       is_string: true), # true: verifies the input is a string, false: every kind of value
-        ]
       end
       def self.output

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_get_release_version.rb CHANGED Viewed

@@ -3,7 +3,7 @@ module Fastlane
     class AndroidGetReleaseVersionAction < Action
       def self.run(params)
         require_relative '../../helper/android/android_version_helper'
-        Fastlane::Helper::Android::VersionHelper.get_release_version(product_name: params[:app])
+        Fastlane::Helper::Android::VersionHelper.get_release_version
       end
       #####################################################
@@ -20,12 +20,6 @@ module Fastlane
       def self.available_options
         # Define all options your action supports.
-        [
-          FastlaneCore::ConfigItem.new(key: :app,
-                                       env_name: 'PROJECT_NAME',
-                                       description: 'The name of the app to get the release version for',
-                                       is_string: true), # true: verifies the input is a string, false: every kind of value
-        ]
       end
       def self.output

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_hotifx_prechecks.rb CHANGED Viewed

@@ -14,7 +14,7 @@ module Fastlane
         # Confirm
         message = "Requested Hotfix version: #{new_ver}\n"
-        message << "Branching from: #{prev_ver}\n"
+        message << "Branching from tag: #{prev_ver}\n"
         if params[:skip_confirm]
           UI.message(message)
@@ -50,13 +50,13 @@ module Fastlane
         [
           FastlaneCore::ConfigItem.new(key: :version_name,
                                        env_name: 'FL_ANDROID_HOTFIX_PRECHECKS_VERSION',
-                                       description: 'The version to work on', # a short description of this parameter
+                                       description: 'The hotfix version number to create',
                                        is_string: true),
           FastlaneCore::ConfigItem.new(key: :skip_confirm,
                                        env_name: 'FL_ANDROID_HOTFIX_PRECHECKS_SKIPCONFIRM',
                                        description: 'Skips confirmation',
-                                       is_string: false, # true: verifies the input is a string, false: every kind of value
-                                       default_value: false), # the default value if the user didn't provide one
+                                       is_string: false, # Boolean
+                                       default_value: false),
         ]
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_tag_build.rb CHANGED Viewed

@@ -5,10 +5,8 @@ module Fastlane
         require_relative '../../helper/android/android_version_helper'
         require_relative '../../helper/android/android_git_helper'
-        app = ENV['PROJECT_NAME'].nil? ? params[:app] : ENV['PROJECT_NAME']
-        release_ver = Fastlane::Helper::Android::VersionHelper.get_release_version(app)
-        alpha_ver = Fastlane::Helper::Android::VersionHelper.get_alpha_version(app)
+        release_ver = Fastlane::Helper::Android::VersionHelper.get_release_version
+        alpha_ver = Fastlane::Helper::Android::VersionHelper.get_alpha_version
         Fastlane::Helper::GitHelper.create_tag(release_ver[Fastlane::Helper::Android::VersionHelper::VERSION_NAME])
         Fastlane::Helper::GitHelper.create_tag(alpha_ver[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]) unless alpha_ver.nil? || (params[:tag_alpha] == false)
       end
@@ -32,10 +30,6 @@ module Fastlane
                                        description: 'True to skip tagging the alpha version',
                                        is_string: false,
                                        default_value: true),
-          FastlaneCore::ConfigItem.new(key: :app,
-                                       env_name: 'PROJECT_NAME',
-                                       description: 'The name of the app to get the release version for',
-                                       is_string: true), # true: verifies the input is a string, false: every kind of value
         ]
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/check_translation_progress.rb CHANGED Viewed

@@ -98,7 +98,7 @@ module Fastlane
       def self.details
         'This actions checks the current status of the translations on GlotPress ' \
-        'and raises an error if it\'s below the provided threshold'
+          'and raises an error if it\'s below the provided threshold'
       end
       def self.available_options

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/create_release_action.rb CHANGED Viewed

@@ -10,7 +10,7 @@ module Fastlane
         repository = params[:repository]
         version = params[:version]
         assets = params[:release_assets]
-        release_notes = params[:release_notes_file_path].nil? ? '' : IO.read(params[:release_notes_file_path])
+        release_notes = params[:release_notes_file_path].nil? ? '' : File.read(params[:release_notes_file_path])
         prerelease = params[:prerelease]
         UI.message("Creating draft release #{version} in #{repository}.")

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_bump_version_hotfix.rb CHANGED Viewed

@@ -9,14 +9,18 @@ module Fastlane
         create_config(params[:previous_version], params[:version])
         show_config()
-        UI.message 'Updating Fastlane deliver file...'
-        Fastlane::Helper::Ios::VersionHelper.update_fastlane_deliver(@new_short_version)
-        UI.message 'Done!'
+        update_deliverfile = params[:skip_deliver] == false
+        if update_deliverfile
+          UI.message 'Updating Fastlane deliver file...'
+          Fastlane::Helper::Ios::VersionHelper.update_fastlane_deliver(@new_short_version)
+          UI.message 'Done!'
+        end
         UI.message 'Updating XcConfig...'
         Fastlane::Helper::Ios::VersionHelper.update_xc_configs(@new_version, @new_short_version, @new_version_internal)
         UI.message 'Done!'
-        Fastlane::Helper::Ios::GitHelper.commit_version_bump(include_deliverfile: true, include_metadata: false)
+        Fastlane::Helper::Ios::GitHelper.commit_version_bump(include_deliverfile: update_deliverfile, include_metadata: false)
         UI.message 'Done.'
       end
@@ -34,18 +38,29 @@ module Fastlane
       end
       def self.available_options
-        # Define all options your action supports.
-        # Below a few examples
         [
-          FastlaneCore::ConfigItem.new(key: :version,
-                                       env_name: 'FL_IOS_BUMP_VERSION_HOTFIX_VERSION',
-                                       description: 'The version of the hotfix',
-                                       is_string: true),
-          FastlaneCore::ConfigItem.new(key: :previous_version,
-                                       env_name: 'FL_IOS_BUMP_VERSION_HOTFIX_PREVIOUS_VERSION',
-                                       description: 'The version to branch from',
-                                       is_string: true), # the default value if the user didn't provide one
+          FastlaneCore::ConfigItem.new(
+            key: :version,
+            env_name: 'FL_IOS_BUMP_VERSION_HOTFIX_VERSION',
+            description: 'The version of the hotfix',
+            is_string: true
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :previous_version,
+            env_name: 'FL_IOS_BUMP_VERSION_HOTFIX_PREVIOUS_VERSION',
+            description: 'The version to branch from',
+            is_string: true
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :skip_deliver,
+            env_name: 'FL_IOS_BUMP_VERSION_HOTFIX_SKIP_DELIVER',
+            description: 'Skips Deliverfile key update',
+            is_string: false, # Boolean parameter
+            optional: true,
+            # Don't skip the Deliverfile by default. At the time of writing, 2 out of 3 consumers
+            # still have a Deliverfile.
+            default_value: false
+          ),
         ]
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/an_metadata_update_helper.rb CHANGED Viewed

@@ -50,7 +50,7 @@ module Fastlane
         if line_count <= 1
           # Single line output
-          fw.puts("msgid \"#{File.open(@content_file_path, 'r').read}\"")
+          fw.puts("msgid \"#{File.open(@content_file_path, 'r').read.rstrip}\"")
         else
           # Multiple line output
           fw.puts('msgid ""')

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_git_helper.rb CHANGED Viewed

@@ -13,7 +13,7 @@ module Fastlane
         #
         def self.commit_version_bump
           require_relative './android_version_helper'
-          if Fastlane::Helper::Android::VersionHelper.properties_file_exists
+          if File.exist?(Fastlane::Helper::Android::VersionHelper.version_properties_file)
             Fastlane::Helper::GitHelper.commit(
               message: 'Bump version number',
               files: File.join(ENV['PROJECT_ROOT_FOLDER'], 'version.properties'),

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_version_helper.rb CHANGED Viewed

@@ -26,14 +26,12 @@ module Fastlane
         #    "1.2" # Assuming build.gradle contains versionName "1.2.0"
         #    "1.2.3" # Assuming build.gradle contains versionName "1.2.3"
         #
-        # @param [String] app The name of the app to be used for beta and alpha version update
-        #
         # @return [String] The public-facing version number, extracted from the `versionName` of the `build.gradle` file.
         #         - If this version is a hotfix (more than 2 parts and 3rd part is non-zero), returns the "X.Y.Z" formatted string
         #         - Otherwise (not a hotfix / 3rd part of version is 0), returns "X.Y" formatted version number
         #
-        def self.get_public_version(app)
-          version = get_release_version(product_name: app)
+        def self.get_public_version
+          version = get_release_version
           vp = get_version_parts(version[VERSION_NAME])
           return "#{vp[MAJOR_NUMBER]}.#{vp[MINOR_NUMBER]}" unless is_hotfix?(version)
@@ -42,12 +40,10 @@ module Fastlane
         # Extract the version name and code from the release version of the app from `version.properties file`
         #
-        # @param [String] app The name of the app to be used for beta and alpha version update
-        #
         # @return [Hash] A hash with 2 keys "name" and "code" containing the extracted version name and code, respectively
         #
-        def self.get_release_version(product_name:)
-          return get_version_from_properties(product_name: product_name) if properties_file_exists
+        def self.get_release_version
+          return get_version_from_properties() if File.exist?(version_properties_file)
           section = ENV['HAS_ALPHA_VERSION'].nil? ? 'defaultConfig' : 'vanilla {'
           gradle_path = self.gradle_path
@@ -56,49 +52,36 @@ module Fastlane
           return { VERSION_NAME => name, VERSION_CODE => code }
         end
-        def self.properties_file_exists
-          properties_file_path = File.join(ENV['PROJECT_ROOT_FOLDER'] || '.', 'version.properties')
-          return File.exist?(properties_file_path)
+        def self.version_properties_file
+          File.join(ENV['PROJECT_ROOT_FOLDER'] || '.', 'version.properties')
         end
         # Extract the version name and code from the `version.properties` file in the project root
         #
-        # @param [String] product_name The name of the app to extract the version from e.g. wordpress, simplenote
         # @param [Boolean] is_alpha true if the alpha version should be returned, false otherwise
         #
         # @return [Hash] A hash with 2 keys "name" and "code" containing the extracted version name and code, respectively
         #
-        def self.get_version_from_properties(product_name:, is_alpha: false)
-          version_name_key = "#{product_name}.#{is_alpha ? 'alpha.' : ''}versionName"
-          version_code_key = "#{product_name}.#{is_alpha ? 'alpha.' : ''}versionCode"
-          properties_file_path = File.join(ENV['PROJECT_ROOT_FOLDER'] || '.', 'version.properties')
-          return nil unless File.exist?(properties_file_path)
-          File.open(properties_file_path, 'r') do |f|
-            text = f.read
-            name = text.match(/#{version_name_key}=(\S*)/m)&.captures&.first
-            code = text.match(/#{version_code_key}=(\S*)/m)&.captures&.first
+        def self.get_version_from_properties(is_alpha: false)
+          return nil unless File.exist?(version_properties_file)
-            f.close
+          version_name_key = is_alpha ? 'alpha.versionName' : 'versionName'
+          version_code_key = is_alpha ? 'alpha.versionCode' : 'versionCode'
-            return nil if name.nil? || code.nil?
+          text = File.read(version_properties_file)
+          name = text.match(/#{version_name_key}=(\S*)/m)&.captures&.first
+          code = text.match(/#{version_code_key}=(\S*)/m)&.captures&.first
-            return { VERSION_NAME => name, VERSION_CODE => code.to_i }
-          end
+          return name.nil? || code.nil? ? nil : { VERSION_NAME => name, VERSION_CODE => code.to_i }
         end
         # Extract the version name and code from the `version.properties` file in the project root
         #
-        # @param [String] app The name of the app to be used for beta and alpha version update
-        #
         # @return [Hash] A hash with 2 keys `"name"` and `"code"` containing the extracted version name and code, respectively,
         #                or `nil` if `$HAS_ALPHA_VERSION` is not defined.
         #
-        def self.get_alpha_version(app)
-          return get_version_from_properties(product_name: app, is_alpha: true) if properties_file_exists
+        def self.get_alpha_version
+          return get_version_from_properties(is_alpha: true) if File.exist?(version_properties_file)
           return nil if ENV['HAS_ALPHA_VERSION'].nil?
@@ -295,12 +278,11 @@ module Fastlane
         # Prints the current and next release version names to stdout, then returns the next release version
         #
-        # @param [String] app The name of the app to be used for beta and alpha version update
         # @return [String] The next release version name to use after bumping the currently used release version.
         #
-        def self.bump_version_release(app)
+        def self.bump_version_release
           # Bump release
-          current_version = get_release_version(product_name: app)
+          current_version = self.get_release_version
           UI.message("Current version: #{current_version[VERSION_NAME]}")
           new_version = calc_next_release_base_version(current_version)
           UI.message("New version: #{new_version[VERSION_NAME]}")
@@ -311,25 +293,28 @@ module Fastlane
         # Update the `version.properties` file with new `versionName` and `versionCode` values
         #
-        # @param [String] app The name of the app to be used for beta and alpha version update
         # @param [Hash] new_version_beta The version hash for the beta, containing values for keys "name" and "code"
         # @param [Hash] new_version_alpha The version hash for the alpha , containing values for keys "name" and "code"
         #
-        def self.update_versions(app, new_version_beta, new_version_alpha)
-          if properties_file_exists
-            new_version_name_beta_key = "#{app}.versionName"
-            new_version_code_beta_key = "#{app}.versionCode"
-            new_version_name_alpha_key = "#{app}.alpha.versionName"
-            new_version_code_alpha_key = "#{app}.alpha.versionCode"
-            Action.sh('./gradlew', 'updateVersionProperties', "-Pkey=#{new_version_name_beta_key}", "-Pvalue=#{new_version_beta[VERSION_NAME]}")
-            Action.sh('./gradlew', 'updateVersionProperties', "-Pkey=#{new_version_code_beta_key}", "-Pvalue=#{new_version_beta[VERSION_CODE]}")
-            Action.sh('./gradlew', 'updateVersionProperties', "-Pkey=#{new_version_name_alpha_key}", "-Pvalue=#{new_version_alpha[VERSION_NAME]}") unless new_version_alpha.nil?
-            Action.sh('./gradlew', 'updateVersionProperties', "-Pkey=#{new_version_code_alpha_key}", "-Pvalue=#{new_version_alpha[VERSION_CODE]}") unless new_version_alpha.nil?
-            return
+        def self.update_versions(new_version_beta, new_version_alpha)
+          if File.exist?(version_properties_file)
+            replacements = {
+              versionName: (new_version_beta || {})[VERSION_NAME],
+              versionCode: (new_version_beta || {})[VERSION_CODE],
+              'alpha.versionName': (new_version_alpha || {})[VERSION_NAME],
+              'alpha.versionCode': (new_version_alpha || {})[VERSION_CODE]
+            }
+            content = File.read(version_properties_file)
+            content.gsub!(/^(.*) ?=.*$/) do |line|
+              key = Regexp.last_match(1).to_sym
+              value = replacements[key]
+              value.nil? ? line : "#{key}=#{value}"
+            end
+            File.write(version_properties_file, content)
+          else
+            self.update_version(new_version_beta, ENV['HAS_ALPHA_VERSION'].nil? ? 'defaultConfig' : 'vanilla {')
+            self.update_version(new_version_alpha, 'defaultConfig') unless new_version_alpha.nil?
           end
-          self.update_version(new_version_beta, ENV['HAS_ALPHA_VERSION'].nil? ? 'defaultConfig' : 'vanilla {')
-          self.update_version(new_version_alpha, 'defaultConfig') unless new_version_alpha.nil?
         end
         # Compute the name of the previous hotfix version.
@@ -414,7 +399,7 @@ module Fastlane
         #
         # @return [Bool] true if the string is representing an integer value, false if not
         #
-        def self.is_int? string
+        def self.is_int?(string)
           true if Integer(string) rescue false
         end

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/filesystem_helper.rb CHANGED Viewed

@@ -36,7 +36,9 @@ module Fastlane
         while continue
           child_filenames = dir.children.map! { |x| File.basename(x) }
-          if child_filenames.include? 'fastlane-plugin-wpmreleasetoolkit.gemspec'
+          # The first case is for development – where the `.gemspec` is present in the project root
+          # The second case is for production – where there's no `.gemspec`, but the root dir of the plugin is named `fastlane-plugin-wpmreleasetoolkit-{version}`.
+          if child_filenames.include?('fastlane-plugin-wpmreleasetoolkit.gemspec') || File.basename(dir).start_with?('fastlane-plugin-wpmreleasetoolkit-')
             continue = false
           else
             dir = dir.parent

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/glotpress_helper.rb CHANGED Viewed

@@ -26,12 +26,35 @@ module Fastlane
       # @return [Integer] The percentage of the translated strings.
       #
       def self.get_translation_status(data:, language_code:)
-        current = extract_value_from_translation_info_data(data: data, language_code: language_code, status: 'current')
-        fuzzy = extract_value_from_translation_info_data(data: data, language_code: language_code, status: 'fuzzy')
-        untranslated = extract_value_from_translation_info_data(data: data, language_code: language_code, status: 'untranslated')
-        waiting = extract_value_from_translation_info_data(data: data, language_code: language_code, status: 'waiting')
+        # The status is parsed from the GlotPress project page.
+        # The row can be identified by the language code and the progress is in the column identified by the class "stats percent".
+        # When the progress is above 90%, a special badge is added.
+        # Because of the way the HTML is organized, this regex matches content spawned on three or four lines
+        # Regex:
+        # ^           : start of a line
+        # \s*         : any space
+        # <strong><a href=".*\/#{language_code}\/default\/"> : This link contains the language code of that line in the HTML table, so it's a reliable match
+        # .*          : any character. The language name should be here, but it can be less reliable than the language code as a match
+        # <\/strong>  : tag closure
+        # \n          : new line
+        # (?:         : match the following. This starts the "morethan90" special badge, which we expect to exist zero or one times (see the closure of this part of the regex).
+        #       \s*         : any space
+        #       <span class="bubble morethan90"> : Start of the special badge
+        #       \d\d\d?%    : 2 or 3 digits and the percentage char
+        #       <\/span>\n  : Special badge closure and new line
+        # )?          : end of the "morethan90" special badge section. Expect this zero or one times.
+        # \s*<\/td>\n : column closure tag. Any space before of it are ok. Expect new line after it.
+        # \s*         : any space
+        # <td class="stats percent"> : This is the tag which can be used to extract the progress
+        # ([0-9]+)    : progress is the first group
+        # %<\/td>     : tag closure
+        regex = "^\\s*<strong><a href=\".*\\/#{language_code}\\/default\\/\">.*<\\/strong>\\n"
+        regex += '(?:\s*<span class="bubble morethan90">\d\d\d?%<\/span>\n)?\s*<\/td>\n\s*<td class="stats percent">([0-9]+)%<\/td>$'
-        (current * 100 / (current + fuzzy + untranslated + waiting)).round
+        # 1. Merge the array into a single string.
+        # 2. Match the info and extract the value in group 1.
+        # 3. Convert to integer.
+        data.join("\n").match(/#{regex}/)[1].to_i
       end
       # Extract the number of strings which are in the given status.

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/interactive_prompt_reminder.rb ADDED Viewed

@@ -0,0 +1,93 @@
+require 'fastlane_core'
+# The features in this file are controlled by the following ENV vars:
+#
+# @env `FASTLANE_PROMPT_REMINDER_DISABLE_AUTO_PATCH`
+#     If this variable is set, it will disable the auto-application of the monkey patch. In such case,
+#     `UI.input`, `UI.confirm`, `UI.select` and `UI.password` methods won't be automatically patched
+#     unless you explicitly call `monkey_patch_interactive_prompts_with_reminder` yourself.
+#
+# @env `FASTLANE_PROMPT_REMINDER_MESSAGE`
+#     - If not set, then while auto-patching the `UI.…` methods, it will NOT make the patched methods
+#       speak any vocal message – and instead will only emit a beep and make your Terminal icon jump in the Dock.
+#     - If set to `default`, `true`, `yes` or `1`, then while auto-patching the `UI.…` methods, it will
+#       make the patched methods announce the default message.
+#     - If set to any other string, it will make the patched methods use that string as the message to announce
+#       during the reminders
+#     - NOTE: This env var only has an effect if the other `FASTLANE_PROMPT_REMINDER_DISABLE_AUTO_PATCH` env var
+#       is _not_ set (and thus the `UI.…` methods _are_ auto-patched), because it only affects how auto-patching is done.
+#
+# @env `FASTLANE_PROMPT_REMINDER_DELAYS`
+#     The delays (in seconds) to use when monkey-patching the `UI.…` methods to wrap them around `with_reminder`,
+#     separated by a comma (e.g. `60,300,900`). If unset, will use the default delays of `30,180,600`.
+module FastlaneCore
+  # NOTE: FastlaneCore::UI delegates to the FastlaneCore::Shell implementation when output is the terminal
+  class Shell
+    DEFAULT_PROMPT_REMINDER_MESSAGE = 'An interactive prompt is waiting for you in the Terminal!'.freeze
+    DEFAULT_PROMPT_REMINDER_DELAYS = [30, 180, 600].freeze
+    # Calls the block given and remind the user with a vocal message if the block does not return after specific delays.
+    #
+    # Especially useful when using a block which calls methods that are interactive, in order to remind the user
+    # to answer the interactive prompt if they forgot about it after some delays.
+    #
+    # Example usage:
+    #
+    #       text = with_reminder do
+    #         puts "Enter some text:"
+    #         $stdout.getch
+    #       end
+    #
+    # @param [Double,Array<Double>] after
+    #        Delay or list of delays to wait for before pronouncing the reminder message.
+    #        If an array of values is passed, the message will be pronounced multiple times, after having waited for the subsequent delays in turn.
+    #        Defaults to reminding after 30s, then 3mn, then 10mn.
+    # @param [String] message
+    #        The message to pronounce out loud after the delay has passed, if the block hasn't returned beforehand.
+    # @return The same value that the blocks might return
+    #
+    def self.with_reminder(after: DEFAULT_PROMPT_REMINDER_DELAYS, message: DEFAULT_PROMPT_REMINDER_MESSAGE)
+      delays_list = Array(after.dup)
+      thread = Thread.new do
+        until delays_list.empty?
+          sleep(delays_list.shift)
+          $stdout.beep
+          system('say', message) unless message.nil?
+        end
+      end
+      # execute the interactive code
+      res = yield
+      # if we replied before the timeout, kill the thread so message won't be triggered
+      thread.kill
+      # If the block given returned a value, pass it
+      return res
+    end
+    # Monkey-Patch fastlane's `UI.input`, `UI.confirm`, `UI.select` and `UI.password` interactive methods
+    # (which delegate to `FastlaneCore::Shell` when output is the terminal)
+    #
+    # Once you call this method, any invocation of `UI.input`, `UI.confirm`, `UI.select` or `UI.password`
+    # anywhere in Fastlane (by your Fastfile, an action, …) will be wrapped in a call to with_reminder automatically.
+    #
+    def self.monkey_patch_interactive_prompts_with_reminder(after: DEFAULT_PROMPT_REMINDER_DELAYS, message: DEFAULT_PROMPT_REMINDER_MESSAGE)
+      %i[input confirm select password].each do |method_name|
+        old_method = instance_method(method_name)
+        define_method(method_name) do |*args|
+          FastlaneCore::Shell.with_reminder(after: after, message: message) { old_method.bind(self).call(*args) }
+        end
+      end
+    end
+  end
+end
+# Apply Monkey patch
+unless ENV['FASTLANE_PROMPT_REMINDER_DISABLE_AUTO_PATCH']
+  message = ENV['FASTLANE_PROMPT_REMINDER_MESSAGE']
+  message = FastlaneCore::Shell::DEFAULT_PROMPT_REMINDER_MESSAGE if %w[default true yes 1].include?(message&.downcase)
+  delays = ENV['FASTLANE_PROMPT_REMINDER_DELAYS']&.split(',')&.map(&:to_i) || FastlaneCore::Shell::DEFAULT_PROMPT_REMINDER_DELAYS
+  FastlaneCore::UI.verbose("Monkey-patching the UI interactive methods to add a reminder (#{delays.inspect}, #{message.inspect})")
+  FastlaneCore::Shell.monkey_patch_interactive_prompts_with_reminder(after: delays, message: message)
+end

data/lib/fastlane/plugin/wpmreleasetoolkit/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Fastlane
   module Wpmreleasetoolkit
-    VERSION = '1.3.0'
+    VERSION = '2.1.0'
   end
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-wpmreleasetoolkit
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Lorenzo Mattei
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -84,16 +84,22 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +324,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: cocoapods
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
 description:
 email: lore.mattei@gmail.com
 executables:
@@ -442,6 +462,7 @@ files:
 - lib/fastlane/plugin/wpmreleasetoolkit/helper/git_helper.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/helper/github_helper.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/helper/glotpress_helper.rb
+- lib/fastlane/plugin/wpmreleasetoolkit/helper/interactive_prompt_reminder.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/helper/ios/ios_adc_app_sizes_helper.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/helper/ios/ios_git_helper.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/helper/ios/ios_l10n_helper.rb