fastlane-plugin-wpmreleasetoolkit 9.4.0 → 10.0.0

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/configure/configure_validate_action.rb

@@ -40,13 +40,12 @@ module Fastlane
         repo_branch_name = Fastlane::Helper::ConfigureHelper.repo_branch_name
         file_branch_name = Fastlane::Helper::ConfigureHelper.configure_file_branch_name
 
-        unless repo_branch_name == file_branch_name
+        return if repo_branch_name == file_branch_name
 
-          UI.user_error!([
-            'The branch specified in `.configure` is not the currently checked out branch in the secrets repository.',
-            "To fix this issue, switch back to the `#{file_branch_name}` branch in the mobile secrets repository.",
-          ].join("\n"))
-        end
+        UI.user_error!([
+          'The branch specified in `.configure` is not the currently checked out branch in the secrets repository.',
+          "To fix this issue, switch back to the `#{file_branch_name}` branch in the mobile secrets repository.",
+        ].join("\n"))
       end
 
       ### Validate that the pinned hash specified in .configure matches
@@ -55,13 +54,12 @@ module Fastlane
         repo_hash = Fastlane::Helper::ConfigureHelper.repo_commit_hash
         file_hash = Fastlane::Helper::ConfigureHelper.configure_file_commit_hash
 
-        unless repo_hash == file_hash
+        return if repo_hash == file_hash
 
-          UI.user_error!([
-            'The pinned_hash specified in `.configure` is not the currently checked out hash in the secrets repository.',
-            "To fix this issue, check out the `#{file_hash}` hash in the mobile secrets repository.",
-          ].join("\n"))
-        end
+        UI.user_error!([
+          'The pinned_hash specified in `.configure` is not the currently checked out hash in the secrets repository.',
+          "To fix this issue, check out the `#{file_hash}` hash in the mobile secrets repository.",
+        ].join("\n"))
       end
 
       ### Validate that based on the commit hash in the .configure file, no files have changed

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_betabuild_prechecks.rb

@@ -91,7 +91,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_build_prechecks.rb

@@ -67,7 +67,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_build_preflight.rb

@@ -11,7 +11,7 @@ module Fastlane
         # Internal Builds use it to generate the App Icon as part of the build process
         begin
           Action.sh('which convert')
-        rescue
+        rescue StandardError
           UI.user_error!("Couldn't find ImageMagick. Please install it by running `brew install imagemagick`")
           raise
         end
@@ -20,7 +20,7 @@ module Fastlane
         # Internal Builds use it to generate the App Icon as part of the build process
         begin
           Action.sh('which gs')
-        rescue
+        rescue StandardError
           UI.user_error!("Couldn't find Ghostscript. Please install it by running `brew install ghostscript`")
           raise
         end
@@ -28,7 +28,7 @@ module Fastlane
         # Check gems and pods are up to date. This will exit if it fails
         begin
           Action.sh('bundle check')
-        rescue
+        rescue StandardError
           UI.user_error!("You should run 'rake dependencies' to make sure gems are up to date")
           raise
         end
@@ -70,7 +70,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_bump_version_beta.rb

@@ -7,7 +7,8 @@ module Fastlane
         require_relative '../../helper/ios/ios_git_helper'
         require_relative '../../helper/ios/ios_version_helper'
 
-        Fastlane::Helper::GitHelper.ensure_on_branch!('release')
+        # Verify that the current branch is a release branch. Notice that `ensure_git_branch` expects a RegEx parameter
+        ensure_git_branch(branch: '^release/')
         create_config
         show_config
 
@@ -44,7 +45,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
 
       def self.create_config

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

@@ -58,7 +58,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
 
       def self.create_config(previous_version, new_short_version)

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_bump_version_release.rb

@@ -63,7 +63,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
 
       def self.create_config

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_check_beta_deps.rb

@@ -10,7 +10,7 @@ module Fastlane
           beta_pods << li if li.match('^\s*\t*pod.*beta')
         end
 
-        if beta_pods.count == 0
+        if beta_pods.count.zero?
           UI.message('No beta pods found. You can continue with the code freeze.')
         else
           message = "The following pods are still in beta:\n"
@@ -55,7 +55,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_codefreeze_prechecks.rb

@@ -69,7 +69,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_completecodefreeze_prechecks.rb

@@ -58,7 +58,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_current_branch_is_hotfix.rb

@@ -33,7 +33,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_download_strings_files_from_glotpress.rb

@@ -107,7 +107,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_extract_keys_from_strings_files.rb

@@ -59,7 +59,7 @@ module Fastlane
       # @param [String] with_lproj The new name of the `.lproj` parent folder to point to
       #
       def self.replace_lproj_in_path(path, with_lproj:)
-        File.join(File.dirname(File.dirname(path)), with_lproj, File.basename(path))
+        File.join(File.dirname(path, 2), with_lproj, File.basename(path))
       end
 
       #####################################################
@@ -108,7 +108,7 @@ module Fastlane
                                        type: Hash,
                                        verify_block: proc do |values|
                                          UI.user_error!('`target_original_files` must contain at least one path to an original `.strings` file.') if values.empty?
-                                         values.each do |path, _|
+                                         values.each_key do |path|
                                            UI.user_error!("Path `#{path}` (found in `target_original_files`) does not exist.") unless File.exist?(path)
                                            UI.user_error! "Expected `#{path}` (found in `target_original_files`) to be a path ending in a `*.lproj/*.strings`." unless File.extname(path) == '.strings' && File.extname(File.dirname(path)) == '.lproj'
                                          end
@@ -129,7 +129,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_finalize_prechecks.rb

@@ -59,7 +59,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_generate_strings_file_from_code.rb

@@ -108,7 +108,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_get_app_version.rb

@@ -47,7 +47,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_get_build_number.rb

@@ -47,7 +47,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_get_build_version.rb

@@ -53,7 +53,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_get_store_app_sizes.rb

@@ -27,7 +27,7 @@ module Fastlane
           end
         end
 
-        return app_sizes
+        app_sizes
       end
 
       #####################################################
@@ -114,7 +114,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_hotfix_prechecks.rb

@@ -71,7 +71,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_lint_localizations.rb

@@ -5,7 +5,7 @@ module Fastlane
         violations = nil
 
         loop do
-          violations = self.run_linter(params)
+          violations = run_linter(params)
           violations.default = [] # Set the default value for when querying a missing key
 
           if params[:check_duplicate_keys]
@@ -60,7 +60,7 @@ module Fastlane
           else
             UI.important <<~WRONG_FORMAT
               File `#{path}` is in #{file_type} format, while finding duplicate keys only make sense on files that are in ASCII-plist format.
-              Since your files are in #{file_type} format, you should probably disable the `check_duplicate_keys` option from this `#{self.action_name}` call.
+              Since your files are in #{file_type} format, you should probably disable the `check_duplicate_keys` option from this `#{action_name}` call.
             WRONG_FORMAT
           end
         end
@@ -201,7 +201,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_merge_strings_files.rb

@@ -72,7 +72,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include? platform
+        %i[ios mac].include? platform
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_send_app_size_metrics.rb

@@ -31,7 +31,7 @@ module Fastlane
         app_thinning_plist_path = params[:app_thinning_plist_path] || File.join(File.dirname(params[:ipa_path]), 'app-thinning.plist')
         if File.exist?(app_thinning_plist_path)
           plist = Plist.parse_xml(app_thinning_plist_path)
-          plist['variants'].each do |_key, variant|
+          plist['variants'].each_value do |variant|
             variant_descriptors = variant['variantDescriptors'] || [{ 'device' => 'Universal' }]
             variant_descriptors.each do |desc|
               variant_metadata = { device: desc['device'], 'OS Version': desc['os-version'] }

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_tag_build.rb

@@ -37,7 +37,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_update_metadata_source.rb

@@ -10,15 +10,15 @@ module Fastlane
                                                release_version: params[:release_version])
 
         Action.sh("git add #{params[:po_file_path]}")
-        params[:source_files].each do |_key, file|
+        params[:source_files].each_value do |file|
           Action.sh("git add #{file}")
         end
 
         repo_status = Actions.sh('git status --porcelain')
         repo_clean = repo_status.empty?
-        unless repo_clean
-          Action.sh('git commit -m "Update metadata strings"')
-        end
+        return if repo_clean
+
+        Action.sh('git commit -m "Update metadata strings"')
       end
 
       #####################################################
@@ -73,7 +73,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_update_release_notes.rb

@@ -8,8 +8,6 @@ module Fastlane
         require_relative '../../helper/release_notes_helper'
         require_relative '../../helper/git_helper'
 
-        UI.deprecated('The `PROJECT_ROOT_FOLDER` environment variable is deprecated and will be removed in a future release. Please pass a path to the `release_notes_file_path` param instead.') unless ENV['PROJECT_ROOT_FOLDER'].nil?
-
         path = params[:release_notes_file_path]
         next_version = Fastlane::Helper::Ios::VersionHelper.calc_next_release_version(params[:new_version])
 
@@ -41,7 +39,7 @@ module Fastlane
                                        env_name: 'FL_IOS_UPDATE_RELEASE_NOTES_FILE_PATH',
                                        description: 'The path to the release notes file to be updated',
                                        type: String,
-                                       default_value: File.join(ENV['PROJECT_ROOT_FOLDER'] || '.', 'RELEASE-NOTES.txt')),
+                                       default_value: 'RELEASE-NOTES.txt'),
         ]
       end
 
@@ -56,7 +54,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_validate_ci_build.rb

@@ -9,7 +9,7 @@ module Fastlane
         head_tags = Fastlane::Helper::GitHelper.list_tags_on_current_commit
         UI.user_error!('HEAD is not on tag. Aborting!') if head_tags.empty?
 
-        return head_tags.include?(version) # Current commit is tagged with "version" tag
+        head_tags.include?(version) # Current commit is tagged with "version" tag
       end
 
       #####################################################
@@ -39,7 +39,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        %i[ios mac].include?(platform)
       end
     end
   end

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

@@ -161,7 +161,7 @@ module Fastlane
 
           # Wait until all emulators are killed
           retry_loop(time_between_retries: SHUTDOWN_WAIT, timeout: SHUTDOWN_TIMEOUT, description: 'waiting for devices to shutdown') do
-            (emulators_list & running_emulators.map(&:serial)).empty?
+            !emulators_list.intersect?(running_emulators.map(&:serial))
           end
 
           UI.success('All emulators are now shut down.')

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

@@ -9,9 +9,6 @@ module Fastlane
         # This typically commits the `version.properties` inside root folder or `build.gradle` file
         # inside the project subfolder.
         #
-        # @env PROJECT_ROOT_FOLDER The path to the git root of the project
-        # @env PROJECT_NAME The name of the directory containing the project code (especially containing the `build.gradle` file)
-        #
         def self.commit_version_bump(build_gradle_path:, version_properties_path:)
           if File.exist?(version_properties_path)
             git_commit(

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

@@ -19,7 +19,7 @@ module Fastlane
             return true
           end
 
-          return false
+          false
         end
 
         # Checks if `string_name` is in the exclusion list
@@ -27,10 +27,10 @@ module Fastlane
           return false if library[:exclusions].nil?
 
           skip = library[:exclusions].include?(string_name)
-          if skip
-            UI.message " - Skipping #{string_name} string"
-            return true
-          end
+          return false unless skip
+
+          UI.message " - Skipping #{string_name} string"
+          true
         end
 
         # Adds the appropriate XML attributes to an XML `<string>` node according to library configuration
@@ -77,7 +77,7 @@ module Fastlane
           # String not found, or removed because needing update and not in the exclusion list: add to the main file
           add_xml_attributes!(lib_string_node, library)
           main_strings_xml.xpath('//string').last.add_next_sibling("\n#{' ' * 4}#{lib_string_node.to_xml.strip}")
-          return result
+          result
         end
 
         # Verify a string node from a library has properly been merged into the main one
@@ -149,21 +149,21 @@ module Fastlane
           end
 
           UI.message("Done (#{added_count} added, #{updated_count} updated, #{untouched_count} untouched, #{skipped_count} skipped).")
-          return (added_count + updated_count) != 0
+          (added_count + updated_count) != 0
         end
 
         def self.verify_diff(diff_string, main_strings, lib_strings, library)
-          if diff_string.start_with?('name=')
-            diff_string.slice!('name="')
+          return unless diff_string.start_with?('name=')
 
-            end_index = diff_string.index('"')
-            end_index ||= diff_string.length # Use the whole string if there's no '"'
+          diff_string.slice!('name="')
 
-            diff_string = diff_string.slice(0..(end_index - 1))
+          end_index = diff_string.index('"')
+          end_index ||= diff_string.length # Use the whole string if there's no '"'
 
-            lib_strings.xpath('//string').each do |string_node|
-              res = verify_string(main_strings, library, string_node) if string_node.attr('name') == diff_string
-            end
+          diff_string = diff_string.slice(0..(end_index - 1))
+
+          lib_strings.xpath('//string').each do |string_node|
+            verify_string(main_strings, library, string_node) if string_node.attr('name') == diff_string
           end
         end
 
@@ -290,7 +290,7 @@ module Fastlane
           rescue StandardError => e
             UI.error "Error downloading #{locale} - #{e.message}"
             retry if e.is_a?(OpenURI::HTTPError) && UI.confirm("Retry downloading `#{locale}`?")
-            return nil
+            nil
           end
         end
         private_class_method :download_glotpress_export_file
@@ -331,12 +331,12 @@ module Fastlane
           tag.content = tag.content.gsub('...', '…')
 
           # Typography en-dash
-          if tag.content.include?('-')
-            tag.content = tag.content.gsub(/(\d+\s*)-(\s*\d+)/) do |str|
-              match = Regexp.last_match # of type `MatchData`. match[0] == str == whole match, match[1] = 1st capture group (left part of the range), match[2] = second capture group (right part of the range)
-              is_negative_number = match[2][0] != ' ' && match[1][-1] == ' ' # if right part of range does not start with a space (e.g. `-3`), but left part of range does end with space, it's not a range after all but more likely a list containing negative numbers in it (e.g. `2 -3`)
-              is_negative_number ? str : "#{match[1]}\u{2013}#{match[2]}"
-            end
+          return unless tag.content.include?('-')
+
+          tag.content = tag.content.gsub(/(\d+\s*)-(\s*\d+)/) do |str|
+            match = Regexp.last_match # of type `MatchData`. match[0] == str == whole match, match[1] = 1st capture group (left part of the range), match[2] = second capture group (right part of the range)
+            is_negative_number = match[2][0] != ' ' && match[1][-1] == ' ' # if right part of range does not start with a space (e.g. `-3`), but left part of range does end with space, it's not a range after all but more likely a list containing negative numbers in it (e.g. `2 -3`)
+            is_negative_number ? str : "#{match[1]}\u{2013}#{match[2]}"
           end
         end
         private_class_method :apply_substitutions
@@ -347,9 +347,9 @@ module Fastlane
         # @param [String] lang The language we are currently processing. Used for providing context during logging / warning message
         #
         def self.quick_lint(string_tag, lang)
-          if string_tag['formatted'] == 'false' && string_tag.content.include?('%%')
-            UI.important "Warning: [#{lang}] translation for '#{string_tag['name']}' has attribute formatted=false, but still contains escaped '%%' in translation."
-          end
+          return unless string_tag['formatted'] == 'false' && string_tag.content.include?('%%')
+
+          UI.important "Warning: [#{lang}] translation for '#{string_tag['name']}' has attribute formatted=false, but still contains escaped '%%' in translation."
         end
         private_class_method :quick_lint
 
@@ -377,8 +377,8 @@ module Nokogiri
         oa = other.attributes
         return false unless sa.length == oa.length
 
-        sa = sa.sort.map { |n, a| [n, a.value, a.namespace && a.namespace.href] }
-        oa = oa.sort.map { |n, a| [n, a.value, a.namespace && a.namespace.href] }
+        sa = sa.sort.map { |n, a| [n, a.value, a.namespace&.href] }
+        oa = oa.sort.map { |n, a| [n, a.value, a.namespace&.href] }
         return false unless sa == oa
 
         skids = children