fastlane-plugin-wpmreleasetoolkit 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee442d259b9c2e9f6ade7505aa2a7cf4a87d01e13ae68abc6d93d1b45b67b931
-  data.tar.gz: caca4af2ab1e2d1b973c199a8a2bf2907f21403fa862e1439047b3740471a8da
+  metadata.gz: b71ab5451b2a1bee74b6dd874e20e478d03501fe4ed86124bb4f4d0ffe6a07eb
+  data.tar.gz: c2cd6dd78f92ac8ff85d54f0f778461213eab8aa748a0654290385bc99989544
 SHA512:
-  metadata.gz: e0a43dc1b67ce99bb8afb213bf0826fa51c6241ebc4ab406c885d37dcfb5821b6a4fd7d0b23dcb2005d42efd14f07af59b4cc6401738b5de10e1b0bc8cce0d56
-  data.tar.gz: 3acc819e9b7cc00eb406fbae062910d638bdc799fbc26e53f20d6c07b51bdd1a20ddaa41b83dcc20b323bc3cd333ea93e5f365494792e8ec7f47a8abdf852f22
+  metadata.gz: eb16735f4f4f54835ce9873cd11f7f62f04f6dfd194474ab78c5f5e6408281306367c90cb85fcc036bb6845a1ace13241cba07af56ded24d8fb50ed8d3debf17
+  data.tar.gz: 38fa14c33229c990a6e1f42062d644da704d89af6fd7dae2be5d3d2f749de684747f7ce56f976fad7514fc4940253ff66aec94ff09498e6a3eaf82f5f9aa49f6

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

@@ -14,18 +14,18 @@ module Fastlane
         app = params[:app]
 
         # Check versions
-        release_version = Fastlane::Helper::Android::VersionHelper.get_release_version(app)
+        release_version = Fastlane::Helper::Android::VersionHelper.get_release_version(product_name: 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?
 
         # Check branch
-        app_version = Fastlane::Helper::Android::VersionHelper.get_public_version
+        app_version = Fastlane::Helper::Android::VersionHelper.get_public_version(app)
         UI.user_error!("#{message}Release branch for version #{app_version} doesn't exist. Abort.") unless !params[:base_version].nil? || Fastlane::Helper::GitHelper.checkout_and_pull(release: app_version)
 
         # Check user overwrite
         unless params[:base_version].nil?
-          overwrite_version = get_user_build_version(params[:base_version], message)
+          overwrite_version = get_user_build_version(product_name: app, version: params[:base_version], message: message)
           release_version = overwrite_version[0]
           alpha_release_version = overwrite_version[1]
         end
@@ -49,11 +49,11 @@ module Fastlane
         [next_beta_version, next_alpha_version]
       end
 
-      def self.get_user_build_version(version, message)
+      def self.get_user_build_version(product_name:, version:, message:)
         UI.user_error!("[#{app}] 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
+        release_version = Fastlane::Helper::Android::VersionHelper.get_release_version(product_name: product_name)
         message << "#{app}] 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
+        alpha_release_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version(product_name)
         message << "and Alpha Version: #{alpha_release_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}\n" unless alpha_release_version.nil?
         [release_version, alpha_release_version]
       end

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

@@ -11,7 +11,7 @@ module Fastlane
 
         app = params[:app]
         message = ''
-        beta_version = Fastlane::Helper::Android::VersionHelper.get_release_version(app) unless !params[:beta] && !params[:final]
+        beta_version = Fastlane::Helper::Android::VersionHelper.get_release_version(product_name: app) unless !params[:beta] && !params[:final]
         alpha_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version(app) 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)

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

@@ -14,7 +14,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])
-        message = "Finalizing release: #{version}\n"
+        message = "Finalizing #{params[:app]} release: #{version}\n"
         if params[:skip_confirm]
           UI.message(message)
         else

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

@@ -7,7 +7,7 @@ module Fastlane
 
         app = ENV['PROJECT_NAME'].nil? ? params[:app] : ENV['PROJECT_NAME']
 
-        release_ver = Fastlane::Helper::Android::VersionHelper.get_release_version(app)
+        release_ver = Fastlane::Helper::Android::VersionHelper.get_release_version(product_name: app)
         alpha_ver = Fastlane::Helper::Android::VersionHelper.get_alpha_version(app)
         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)

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

@@ -42,7 +42,7 @@ 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
+        # @param [String] product_name 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
         #
@@ -70,8 +70,9 @@ module Fastlane
         # @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"
+          alpha_variant = is_alpha ? alpha_flavor_name : nil
+          version_name_key = [product_name, alpha_variant, 'versionName'].compact.join('.')
+          version_code_key = [product_name, alpha_variant, 'versionCode'].compact.join('.')
 
           properties_file_path = File.join(ENV['PROJECT_ROOT_FOLDER'] || '.', 'version.properties')
 
@@ -90,6 +91,22 @@ module Fastlane
           end
         end
 
+        # Returns the name of the flavor used for alpha builds
+        #
+        # @env HAS_ALPHA_VERSION Should contain the name of the flavor used for alpha
+        #
+        # @return [String] The flavor name as provided by the env var, defaulting to `zalpha` if the env var
+        #                  is not set or is set to '1' ('boolean' value used in legacy call sites)
+        def self.alpha_flavor_name
+          # TODO: Have each fastlane action which depends on this take the alpha flavor name as ConfigItem/parameter
+          #   explicitly instead (and get rid of the HAS_ALPHA_VERSION global / env var after that)
+
+          # For now we pass the alpha flavor name by reusing the HAS_ALPHA_VERSION env var.
+          return ENV['HAS_ALPHA_VERSION'] if ENV['HAS_ALPHA_VERSION'] && ENV['HAS_ALPHA_VERSION'] != '1'
+
+          'zalpha' # Default value if HAS_ALPHA_VERSION is not set or hasn't been updated at call site to the flavor name instead of '1'
+        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
@@ -319,17 +336,20 @@ module Fastlane
           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
-          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?
+            unless new_version_alpha.nil?
+              new_version_name_alpha_key = "#{app}.#{alpha_flavor_name}.versionName"
+              new_version_code_alpha_key = "#{app}.#{alpha_flavor_name}.versionCode"
+
+              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?
+            end
+          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
         end
 
         # Compute the name of the previous hotfix version.

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

@@ -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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-wpmreleasetoolkit
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Lorenzo Mattei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy