Android: Extract some code in helper method to make it more readable

Author: AliSoftware

lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_send_app_size_metrics.rb

@@ -39,19 +39,9 @@ def self.run(params)
         # Add optimized file and download sizes for each split `.apk` metrics to the payload if a `:include_split_sizes` is enabled
         if params[:include_split_sizes]
           unless params[:aab_path].nil?
-            check_bundletool_installed!
-            UI.message("[App Size Metrics] Generating the various APK splits from #{params[:aab_path]}...")
-            Dir.mktmpdir('release-toolkit-android-app-size-metrics') do |tmp_dir|
-              Action.sh('bundletool', 'build-apks', '--bundle', params[:aab_path], '--output-format', 'DIRECTORY', '--output', tmp_dir)
-              apks = Dir.glob('splits/*.apk', base: tmp_dir).map { |f| File.join(tmp_dir, f) }
-              UI.message("[App Size Metrics] Generated #{apks.length} APKs.")
-
-              apks.each do |apk|
-                split_name = File.basename(apk, '.apk')
-                add_apk_size_metrics(helper: metrics_helper, apk: apk, split_name: split_name)
-              end
-
-              UI.message('[App Size Metrics] Done computing splits sizes.')
+            generate_split_apks(aab_path: params[:aab_path]) do |apk|
+              split_name = File.basename(apk, '.apk')
+              add_apk_size_metrics(helper: metrics_helper, apk: apk, split_name: split_name)
             end
           end
           unless params[:universal_apk_path].nil?
@@ -67,29 +57,46 @@ def self.run(params)
         )
       end
 
-      def self.check_bundletool_installed!
-        Action.sh('command', '-v', 'bundletool', print_command: false, print_command_output: false)
-      rescue StandardError
-        UI.user_error!('bundletool is required to build the split APKs. Install it with `brew install bundletool`')
-        raise
-      end
+      # @!group Small helper methods
+      class << self
+        def check_bundletool_installed!
+          Action.sh('command', '-v', 'bundletool', print_command: false, print_command_output: false)
+        rescue StandardError
+          UI.user_error!('bundletool is required to build the split APKs. Install it with `brew install bundletool`')
+          raise
+        end
 
-      def self.apkanalyzer_binary!
-        Action.sh('command', '-v', 'apkanalyzer')
-      rescue StandardError
-        sdk_root = ENV['ANDROID_SDK_ROOT'] || ENV['ANDROID_HOME']
-        UI.user_error!('Unable to find ANDROID_SDK_ROOT / ANDROID_HOME') if sdk_root.nil?
-        apkanalyzer_bin = File.join(sdk_root, 'cmdline-tools', 'latest', 'bin', 'apkanalyzer')
-        UI.user_error!('Unable to find `apkanalyzer` executable. Make sure you installed the Android SDK Command-line Tools') unless File.executable?(apkanalyzer_bin)
-        apkanalyzer_bin
-      end
+        def apkanalyzer_binary!
+          @apkanalyzer_binary ||= begin
+            Action.sh('command', '-v', 'apkanalyzer')
+          rescue StandardError
+            sdk_root = ENV['ANDROID_SDK_ROOT'] || ENV['ANDROID_HOME']
+            UI.user_error!('Unable to find ANDROID_SDK_ROOT / ANDROID_HOME') if sdk_root.nil?
+            apkanalyzer_bin = File.join(sdk_root, 'cmdline-tools', 'latest', 'bin', 'apkanalyzer')
+            UI.user_error!('Unable to find `apkanalyzer` executable. Make sure you installed the Android SDK Command-line Tools') unless File.executable?(apkanalyzer_bin)
+            apkanalyzer_bin
+          end
+        end
 
-      def self.add_apk_size_metrics(helper:, apk:, split_name:)
-        UI.message("[App Size Metrics] Computing file and download size of #{File.basename(apk)}...")
-        file_size = Action.sh(apkanalyzer_binary!, 'apk', 'file-size', apk, print_command: false, print_command_output: false).chomp.to_i
-        download_size = Action.sh(apkanalyzer_binary!, 'apk', 'download-size', apk, print_command: false, print_command_output: false).chomp.to_i
-        helper.add_metric(name: APK_OPTIMIZED_FILE_SIZE_KEY, value: file_size, metadata: { split: split_name })
-        helper.add_metric(name: APK_OPTIMIZED_DOWNLOAD_SIZE_KEY, value: download_size, metadata: { split: split_name })
+        def generate_split_apks(aab_path:, &block)
+          check_bundletool_installed!
+          UI.message("[App Size Metrics] Generating the various APK splits from #{aab_path}...")
+          Dir.mktmpdir('release-toolkit-android-app-size-metrics') do |tmp_dir|
+            Action.sh('bundletool', 'build-apks', '--bundle', aab_path, '--output-format', 'DIRECTORY', '--output', tmp_dir)
+            apks = Dir.glob('splits/*.apk', base: tmp_dir).map { |f| File.join(tmp_dir, f) }
+            UI.message("[App Size Metrics] Generated #{apks.length} APKs.")
+            apks.each(&block)
+            UI.message('[App Size Metrics] Done computing splits sizes.')
+          end
+        end
+
+        def add_apk_size_metrics(helper:, apk:, split_name:)
+          UI.message("[App Size Metrics] Computing file and download size of #{File.basename(apk)}...")
+          file_size = Action.sh(apkanalyzer_binary!, 'apk', 'file-size', apk, print_command: false, print_command_output: false).chomp.to_i
+          download_size = Action.sh(apkanalyzer_binary!, 'apk', 'download-size', apk, print_command: false, print_command_output: false).chomp.to_i
+          helper.add_metric(name: APK_OPTIMIZED_FILE_SIZE_KEY, value: file_size, metadata: { split: split_name })
+          helper.add_metric(name: APK_OPTIMIZED_DOWNLOAD_SIZE_KEY, value: download_size, metadata: { split: split_name })
+        end
       end
 
       #####################################################