rename module Helpers -> Helper

wordpress-mobile · Feb 1, 2021 · 2426336 · 2426336
1 parent e52ec0d
commit 2426336
Show file tree

Hide file tree

Showing 45 changed files with 151 additions and 151 deletions.
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_betabuild_prechecks.rb b/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_betabuild_prechecks.rb
@@ -9,17 +9,17 @@ def self.run(params)
         require_relative '../../helper/android/android_git_helper.rb'
 
         # Checkout develop and update
-        Fastlane::Helpers::AndroidGitHelper::git_checkout_and_pull("develop")
+        Fastlane::Helper::AndroidGitHelper::git_checkout_and_pull("develop")
 
         # Check versions
-        release_version = Fastlane::Helpers::AndroidVersionHelper::get_release_version
-        message = "The following current version has been detected: #{release_version[Fastlane::Helpers::AndroidVersionHelper::VERSION_NAME]}\n"
-        alpha_release_version = Fastlane::Helpers::AndroidVersionHelper::get_alpha_version
-        message << "The following Alpha version has been detected: #{alpha_release_version[Fastlane::Helpers::AndroidVersionHelper::VERSION_NAME]}\n" unless alpha_release_version.nil?
+        release_version = Fastlane::Helper::AndroidVersionHelper::get_release_version
+        message = "The following current version has been detected: #{release_version[Fastlane::Helper::AndroidVersionHelper::VERSION_NAME]}\n"
+        alpha_release_version = Fastlane::Helper::AndroidVersionHelper::get_alpha_version
+        message << "The following Alpha version has been detected: #{alpha_release_version[Fastlane::Helper::AndroidVersionHelper::VERSION_NAME]}\n" unless alpha_release_version.nil?
 
         # Check branch
-        app_version = Fastlane::Helpers::AndroidVersionHelper::get_public_version
-        UI.user_error!("#{message}Release branch for version #{app_version} doesn't exist. Abort.") unless (!params[:base_version].nil? || Fastlane::Helpers::AndroidGitHelper::git_checkout_and_pull_release_branch_for(app_version))
+        app_version = Fastlane::Helper::AndroidVersionHelper::get_public_version
+        UI.user_error!("#{message}Release branch for version #{app_version} doesn't exist. Abort.") unless (!params[:base_version].nil? || Fastlane::Helper::AndroidGitHelper::git_checkout_and_pull_release_branch_for(app_version))
 
         # Check user overwrite
         if (!params[:base_version].nil?)
@@ -28,12 +28,12 @@ def self.run(params)
           alpha_release_version = overwrite_version[1]
         end
 
-        next_beta_version = Fastlane::Helpers::AndroidVersionHelper::calc_next_beta_version(release_version, alpha_release_version)
-        next_alpha_version = Fastlane::Helpers::AndroidVersionHelper::calc_next_alpha_version(next_beta_version, alpha_release_version) unless alpha_release_version.nil?
+        next_beta_version = Fastlane::Helper::AndroidVersionHelper::calc_next_beta_version(release_version, alpha_release_version)
+        next_alpha_version = Fastlane::Helper::AndroidVersionHelper::calc_next_alpha_version(next_beta_version, alpha_release_version) unless alpha_release_version.nil?
 
         # Verify
-        message << "Updating branch to version: #{next_beta_version[Fastlane::Helpers::AndroidVersionHelper::VERSION_NAME]}(#{next_beta_version[Fastlane::Helpers::AndroidVersionHelper::VERSION_CODE]}) "
-        message << "and #{next_alpha_version[Fastlane::Helpers::AndroidVersionHelper::VERSION_NAME]}(#{next_alpha_version[Fastlane::Helpers::AndroidVersionHelper::VERSION_CODE]}).\n" unless alpha_release_version.nil?
+        message << "Updating branch to version: #{next_beta_version[Fastlane::Helper::AndroidVersionHelper::VERSION_NAME]}(#{next_beta_version[Fastlane::Helper::AndroidVersionHelper::VERSION_CODE]}) "
+        message << "and #{next_alpha_version[Fastlane::Helper::AndroidVersionHelper::VERSION_NAME]}(#{next_alpha_version[Fastlane::Helper::AndroidVersionHelper::VERSION_CODE]}).\n" unless alpha_release_version.nil?
         if (!params[:skip_confirm])
           if (!UI.confirm("#{message}Do you want to continue?"))
             UI.user_error!("Aborted by user request")
@@ -50,11 +50,11 @@ def self.run(params)
       end
 
       def self.get_user_build_version(version, message)
-        UI.user_error!("Release branch for version #{version} doesn't exist. Abort.") unless Fastlane::Helpers::AndroidGitHelper::git_checkout_and_pull_release_branch_for(version)
-        release_version = Fastlane::Helpers::AndroidVersionHelper::get_release_version
-        message << "Looking at branch release/#{version} as requested by user. Detected version: #{release_version[Fastlane::Helpers::AndroidVersionHelper::VERSION_NAME]}.\n"
-        alpha_release_version = Fastlane::Helpers::AndroidVersionHelper::get_alpha_version
-        message << "and Alpha Version: #{alpha_release_version[Fastlane::Helpers::AndroidVersionHelper::VERSION_NAME]}\n" unless alpha_release_version.nil?
+        UI.user_error!("Release branch for version #{version} doesn't exist. Abort.") unless Fastlane::Helper::AndroidGitHelper::git_checkout_and_pull_release_branch_for(version)
+        release_version = Fastlane::Helper::AndroidVersionHelper::get_release_version
+        message << "Looking at branch release/#{version} as requested by user. Detected version: #{release_version[Fastlane::Helper::AndroidVersionHelper::VERSION_NAME]}.\n"
+        alpha_release_version = Fastlane::Helper::AndroidVersionHelper::get_alpha_version
+        message << "and Alpha Version: #{alpha_release_version[Fastlane::Helper::AndroidVersionHelper::VERSION_NAME]}\n" unless alpha_release_version.nil?
         [release_version, alpha_release_version]
       end
 

diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_build_prechecks.rb b/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_build_prechecks.rb
@@ -8,19 +8,19 @@ def self.run(params)
           UI.user_error!("Can't build beta and final at the same time!")
         end
 
-        Fastlane::Helpers::AndroidGitHelper.check_on_branch("release") unless other_action.is_ci()
+        Fastlane::Helper::AndroidGitHelper.check_on_branch("release") unless other_action.is_ci()
 
         message = ""
-        beta_version = Fastlane::Helpers::AndroidVersionHelper.get_release_version() unless !params[:beta] and !params[:final]
-        alpha_version = Fastlane::Helpers::AndroidVersionHelper.get_alpha_version() unless !params[:alpha]
+        beta_version = Fastlane::Helper::AndroidVersionHelper.get_release_version() unless !params[:beta] and !params[:final]
+        alpha_version = Fastlane::Helper::AndroidVersionHelper.get_alpha_version() unless !params[:alpha]
 
-        if (params[:final] and Fastlane::Helpers::AndroidVersionHelper.is_beta_version?(beta_version))
+        if (params[:final] and Fastlane::Helper::AndroidVersionHelper.is_beta_version?(beta_version))
           UI.user_error!("Can't build a final release out of this branch because it's configured as a beta release!")
         end
 
-        message << "Building version #{beta_version[Fastlane::Helpers::AndroidVersionHelper::VERSION_NAME]}(#{beta_version[Fastlane::Helpers::AndroidVersionHelper::VERSION_CODE]}) (for upload to Release Channel)\n" unless !params[:final]
-        message << "Building version #{beta_version[Fastlane::Helpers::AndroidVersionHelper::VERSION_NAME]}(#{beta_version[Fastlane::Helpers::AndroidVersionHelper::VERSION_CODE]}) (for upload to Beta Channel)\n" unless !params[:beta] 
-        message << "Building version #{alpha_version[Fastlane::Helpers::AndroidVersionHelper::VERSION_NAME]}(#{alpha_version[Fastlane::Helpers::AndroidVersionHelper::VERSION_CODE]}) (for upload to Alpha Channel)\n" unless !params[:alpha]
+        message << "Building version #{beta_version[Fastlane::Helper::AndroidVersionHelper::VERSION_NAME]}(#{beta_version[Fastlane::Helper::AndroidVersionHelper::VERSION_CODE]}) (for upload to Release Channel)\n" unless !params[:final]
+        message << "Building version #{beta_version[Fastlane::Helper::AndroidVersionHelper::VERSION_NAME]}(#{beta_version[Fastlane::Helper::AndroidVersionHelper::VERSION_CODE]}) (for upload to Beta Channel)\n" unless !params[:beta] 
+        message << "Building version #{alpha_version[Fastlane::Helper::AndroidVersionHelper::VERSION_NAME]}(#{alpha_version[Fastlane::Helper::AndroidVersionHelper::VERSION_CODE]}) (for upload to Alpha Channel)\n" unless !params[:alpha]
 
         if (!params[:skip_confirm])
           if (!UI.confirm("#{message}Do you want to continue?"))

diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_beta.rb b/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_beta.rb
@@ -7,15 +7,15 @@ def self.run(params)
         require_relative '../../helper/android/android_git_helper.rb'
         require_relative '../../helper/android/android_version_helper.rb'
 
-        Fastlane::Helpers::AndroidGitHelper.check_on_branch("release")
+        Fastlane::Helper::AndroidGitHelper.check_on_branch("release")
         create_config()
         show_config()
 
         UI.message "Updating build.gradle..."
-        Fastlane::Helpers::AndroidVersionHelper.update_versions(@new_version_beta, @new_version_alpha)  
+        Fastlane::Helper::AndroidVersionHelper.update_versions(@new_version_beta, @new_version_alpha)  
         UI.message "Done!"
 
-        Fastlane::Helpers::AndroidGitHelper.bump_version_beta()        
+        Fastlane::Helper::AndroidGitHelper.bump_version_beta()        
       end
 
       #####################################################
@@ -52,15 +52,15 @@ def self.is_supported?(platform)
 
       private 
       def self.create_config()
-        @current_version = Fastlane::Helpers::AndroidVersionHelper.get_release_version()
-        @current_version_alpha = Fastlane::Helpers::AndroidVersionHelper.get_alpha_version()
-        @new_version_beta = Fastlane::Helpers::AndroidVersionHelper.calc_next_beta_version(@current_version, @current_version_alpha)
-        @new_version_alpha = ENV["HAS_ALPHA_VERSION"].nil? ? nil : Fastlane::Helpers::AndroidVersionHelper.calc_next_alpha_version(@new_version_beta, @current_version_alpha)
+        @current_version = Fastlane::Helper::AndroidVersionHelper.get_release_version()
+        @current_version_alpha = Fastlane::Helper::AndroidVersionHelper.get_alpha_version()
+        @new_version_beta = Fastlane::Helper::AndroidVersionHelper.calc_next_beta_version(@current_version, @current_version_alpha)
+        @new_version_alpha = ENV["HAS_ALPHA_VERSION"].nil? ? nil : Fastlane::Helper::AndroidVersionHelper.calc_next_alpha_version(@new_version_beta, @current_version_alpha)
       end
 
       def self.show_config()
-        vname = Fastlane::Helpers::AndroidVersionHelper::VERSION_NAME
-        vcode = Fastlane::Helpers::AndroidVersionHelper::VERSION_CODE
+        vname = Fastlane::Helper::AndroidVersionHelper::VERSION_NAME
+        vcode = Fastlane::Helper::AndroidVersionHelper::VERSION_CODE
         UI.message("Current version: #{@current_version[vname]}(#{@current_version[vcode]})")
         UI.message("Current alpha version: #{@current_version_alpha[vname]}(#{@current_version_alpha[vcode]})") unless ENV["HAS_ALPHA_VERSION"].nil?
         UI.message("New beta version: #{@new_version_beta[vname]}(#{@new_version_beta[vcode]})")

diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_final_release.rb b/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_final_release.rb
@@ -7,15 +7,15 @@ def self.run(params)
         require_relative '../../helper/android/android_git_helper.rb'
         require_relative '../../helper/android/android_version_helper.rb'
 
-        Fastlane::Helpers::AndroidGitHelper.check_on_branch("release")
+        Fastlane::Helper::AndroidGitHelper.check_on_branch("release")
         create_config()
         show_config()
 
         UI.message "Updating gradle.properties..."
-        Fastlane::Helpers::AndroidVersionHelper.update_versions(@final_version, @current_version_alpha)  
+        Fastlane::Helper::AndroidVersionHelper.update_versions(@final_version, @current_version_alpha)  
         UI.message "Done!"
 
-        Fastlane::Helpers::AndroidGitHelper.bump_version_final()        
+        Fastlane::Helper::AndroidGitHelper.bump_version_final()        
       end
 
       #####################################################
@@ -40,14 +40,14 @@ def self.is_supported?(platform)
 
       private 
       def self.create_config()
-        @current_version = Fastlane::Helpers::AndroidVersionHelper.get_release_version()
-        @current_version_alpha = Fastlane::Helpers::AndroidVersionHelper.get_alpha_version()
-        @final_version = Fastlane::Helpers::AndroidVersionHelper.calc_final_release_version(@current_version, @current_version_alpha)
+        @current_version = Fastlane::Helper::AndroidVersionHelper.get_release_version()
+        @current_version_alpha = Fastlane::Helper::AndroidVersionHelper.get_alpha_version()
+        @final_version = Fastlane::Helper::AndroidVersionHelper.calc_final_release_version(@current_version, @current_version_alpha)
       end
 
       def self.show_config()
-        vname = Fastlane::Helpers::AndroidVersionHelper::VERSION_NAME
-        vcode = Fastlane::Helpers::AndroidVersionHelper::VERSION_CODE
+        vname = Fastlane::Helper::AndroidVersionHelper::VERSION_NAME
+        vcode = Fastlane::Helper::AndroidVersionHelper::VERSION_CODE
         UI.message("Current version: #{@current_version[vname]}(#{@current_version[vcode]})")
         UI.message("Current alpha version: #{@current_version_alpha[vname]}(#{@current_version_alpha[vcode]})") unless ENV["HAS_ALPHA_VERSION"].nil?
         UI.message("New release version: #{@final_version[vname]}(#{@final_version[vcode]})")

diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_hotfix.rb b/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_hotfix.rb
@@ -5,15 +5,15 @@ def self.run(params)
         UI.message "Bumping app release version for hotfix..."
 
         require_relative '../../helper/android/android_git_helper.rb'
-        Fastlane::Helpers::AndroidGitHelper.branch_for_hotfix(params[:previous_version_name], params[:version_name])
+        Fastlane::Helper::AndroidGitHelper.branch_for_hotfix(params[:previous_version_name], params[:version_name])
         create_config(params[:previous_version_name], params[:version_name], params[:version_code])
         show_config()
 
         UI.message "Updating build.gradle..."
-        Fastlane::Helpers::AndroidVersionHelper.update_versions(@new_version, @current_version_alpha) 
+        Fastlane::Helper::AndroidVersionHelper.update_versions(@new_version, @current_version_alpha) 
         UI.message "Done!"
 
-        Fastlane::Helpers::AndroidGitHelper.bump_version_hotfix(params[:version_name])
+        Fastlane::Helper::AndroidGitHelper.bump_version_hotfix(params[:version_name])
 
         UI.message "Done."
       end
@@ -59,16 +59,16 @@ def self.is_supported?(platform)
 
       private 
       def self.create_config(previous_version, new_version_name, new_version_code)
-        @current_version = Fastlane::Helpers::AndroidVersionHelper.get_release_version()
-        @current_version_alpha = Fastlane::Helpers::AndroidVersionHelper.get_alpha_version()
-        @new_version = Fastlane::Helpers::AndroidVersionHelper.calc_next_hotfix_version(new_version_name, new_version_code)
+        @current_version = Fastlane::Helper::AndroidVersionHelper.get_release_version()
+        @current_version_alpha = Fastlane::Helper::AndroidVersionHelper.get_alpha_version()
+        @new_version = Fastlane::Helper::AndroidVersionHelper.calc_next_hotfix_version(new_version_name, new_version_code)
         @new_short_version = new_version_name
         @new_release_branch = "release/#{@new_short_version}"
       end
 
       def self.show_config()
-        UI.message("Current version: #{@current_version[Fastlane::Helpers::AndroidVersionHelper::VERSION_NAME]}(#{@current_version[Fastlane::Helpers::AndroidVersionHelper::VERSION_CODE]})")
-        UI.message("New hotfix version: #{@new_version[Fastlane::Helpers::AndroidVersionHelper::VERSION_NAME]}(#{@new_version[Fastlane::Helpers::AndroidVersionHelper::VERSION_CODE]})")
+        UI.message("Current version: #{@current_version[Fastlane::Helper::AndroidVersionHelper::VERSION_NAME]}(#{@current_version[Fastlane::Helper::AndroidVersionHelper::VERSION_CODE]})")
+        UI.message("New hotfix version: #{@new_version[Fastlane::Helper::AndroidVersionHelper::VERSION_NAME]}(#{@new_version[Fastlane::Helper::AndroidVersionHelper::VERSION_CODE]})")
         UI.message("Release branch: #{@new_release_branch}")
       end
     end

diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_release.rb b/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_release.rb
@@ -11,18 +11,18 @@ def self.run(params)
           other_action.ensure_git_branch(branch: "develop")
 
           # Create new configuration
-          @new_short_version = Fastlane::Helpers::AndroidVersionHelper.bump_version_release()
+          @new_short_version = Fastlane::Helper::AndroidVersionHelper.bump_version_release()
           create_config()
           show_config()
 
           # Update local develop and branch
           UI.message "Creating new branch..."
-          Fastlane::Helpers::AndroidGitHelper.do_release_branch(@new_release_branch)
+          Fastlane::Helper::AndroidGitHelper.do_release_branch(@new_release_branch)
           UI.message "Done!"
 
           UI.message "Updating versions..."
-          Fastlane::Helpers::AndroidVersionHelper.update_versions(@new_version_beta, @new_version_alpha) 
-          Fastlane::Helpers::AndroidGitHelper.bump_version_release()         
+          Fastlane::Helper::AndroidVersionHelper.update_versions(@new_version_beta, @new_version_alpha) 
+          Fastlane::Helper::AndroidGitHelper.bump_version_release()         
           UI.message "Done."
         end
 
@@ -61,16 +61,16 @@ def self.is_supported?(platform)
 
         private
         def self.create_config()
-          @current_version = Fastlane::Helpers::AndroidVersionHelper.get_release_version()
-          @current_version_alpha = Fastlane::Helpers::AndroidVersionHelper.get_alpha_version()
-          @new_version_beta = Fastlane::Helpers::AndroidVersionHelper.calc_next_release_version(@current_version, @current_version_alpha)
-          @new_version_alpha = ENV["HAS_ALPHA_VERSION"].nil? ? nil : Fastlane::Helpers::AndroidVersionHelper.calc_next_alpha_version(@new_version_beta, @current_version_alpha)
+          @current_version = Fastlane::Helper::AndroidVersionHelper.get_release_version()
+          @current_version_alpha = Fastlane::Helper::AndroidVersionHelper.get_alpha_version()
+          @new_version_beta = Fastlane::Helper::AndroidVersionHelper.calc_next_release_version(@current_version, @current_version_alpha)
+          @new_version_alpha = ENV["HAS_ALPHA_VERSION"].nil? ? nil : Fastlane::Helper::AndroidVersionHelper.calc_next_alpha_version(@new_version_beta, @current_version_alpha)
           @new_release_branch = "release/#{@new_short_version}"
         end
 
         def self.show_config()
-          vname = Fastlane::Helpers::AndroidVersionHelper::VERSION_NAME
-          vcode = Fastlane::Helpers::AndroidVersionHelper::VERSION_CODE
+          vname = Fastlane::Helper::AndroidVersionHelper::VERSION_NAME
+          vcode = Fastlane::Helper::AndroidVersionHelper::VERSION_CODE
           UI.message("Current version: #{@current_version[vname]}(#{@current_version[vcode]})")
           UI.message("Current alpha version: #{@current_version_alpha[vname]}(#{@current_version_alpha[vcode]})") unless ENV["HAS_ALPHA_VERSION"].nil?
           UI.message("New beta version: #{@new_version_beta[vname]}(#{@new_version_beta[vcode]})")