fastlane-plugin-maestro_orchestration 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a7c5dbca859567bb493407556a8f57fdcfa6c7ed7adb62283fab7b4eae6d9d2
-  data.tar.gz: 92419becfc82aabadf3086bc016937b3562c775e55d93c2af90d4641d6156a66
+  metadata.gz: 31054bd007a386794670905de05851f52f08ec754a2ace35738005dcafc761f5
+  data.tar.gz: f34f027a6eceed37ba8c6de14a5fb5f06c59dce196cdc59e5b6944147820772e
 SHA512:
-  metadata.gz: fea7514fa69e381fb3c7e2498bc317a26f109357b55ba6fabcb80af3fc2205064709665fedbba0661a5d82c1ab9eff6d5d5d1b3db10850ebd3d37e026cfa0a7c
-  data.tar.gz: 2b0a06c1410d717711657dccfed51f982dc25e4012ce13afe098673b32427fbfe70b8eb3c68d0f663acef6874d67fefc4129a97bb665ed97ea738fff51f29c0d
+  metadata.gz: 542ab46c6d2b8f30f77b6a5800829443a96d1427c5db632c399bacbc3f1dec302421de6f81d7768b7c82e90047ec7892c33a2c02e2052a878d34f84934dbf4d7
+  data.tar.gz: 2c2e163734d8e63bc4177ed4f86edbb20a05503ef8af892f159f047eceb13114df54424d18585ad678304f903e41e396062a9ed8f6ff4a82d113c2dcfad9ecaf

data/README.md

@@ -28,15 +28,12 @@ Executes Maestro test suites within your Fastlane lanes, facilitating automated
 | `device_type`       | `MAESTRO_IOS_DEVICE`         | The iOS simulator device type for new simulator (e.g., iPhone #, iPad, etc...). <br> **Default value:** 'com.apple.CoreSimulator.SimDeviceType.iPhone-15'|
 
 ## Parameters `Android`
-
+For Android, we utilize the [Android Emulator Runner](https://github.com/ReactiveCircus/android-emulator-runner
+) by ReactiveCircus, which efficiently manages the setup and initialization of the emulator.
 | Parameter           | Env Name                           | Notes                                                                                                                                  |
 | ------------------- | ---------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- |
 | `sdk_dir`           | `MAESTRO_ANDROID_SDK_DIR`          | Path to the Android SDK DIR. <br> **Required**              `ENV["ANDROID_HOME"]`, `ENV["ANDROID_SDK_ROOT"]`, `~/Library/Android/sdk`  |
 | `maestro_flow_file` | `MAESTRO_IOS_FLOW_FILE`            | The path to the Maestro flows YAML file.  <br> **Required**                                                                            |
-| `emulator_name`     | `MAESTRO_AVD_NAME`                 | Name of the AVD. <br>  **Default value:**    'Maestro\_Android\_Emulator'                                                              |
-| `emulator_package`  | `MAESTRO_AVD_PACKAGE`              | The selected system image of the emulator. <br> **Default value:** 'system-images;android-35;google_apis_playstore;arm64-v8a'          |
-| `emulator_device`   | `MAESTRO_AVD_DEVICE`               | Type of android device. <br> **Default value:** 'pixel_7_pro'                                                                          |
-| `emulator_port`     | `MAESTRO_AVD_PORT`                 | Port of the emulator. <br>  **Default value:** 5554                                                                                    |
 
 ### 2. `maestro_orchestartion_s3_upload`
 Uploads a folder of files (such as screenshots) to an S3 bucket, organizing them based on the app version, theme, and device type.

data/lib/fastlane/plugin/maestro_orchestration/actions/maestro_orchestration_android_action.rb

@@ -7,7 +7,7 @@ module Fastlane
   module Actions
     class MaestroOrchestrationAndroidAction < Action
       def self.run(params)
-        required_params = [:emulator_package, :emulator_device, :maestro_flow_file]
+        required_params = [:maestro_flow_file]
         missing_params = required_params.select { |param| params[param].nil? }
 
         if missing_params.any?
@@ -21,8 +21,7 @@ module Fastlane
 
         adb = Helper::AdbHelper.new
 
-        setup_emulator(params)
-        sleep(5)
+        sleep(5) # Give time emulator to boot
         demo_mode(params)
         install_android_app(params)
 
@@ -46,82 +45,6 @@ module Fastlane
         UI.success("Android emulator killed. Process finished.")
       end
 
-      def self.setup_emulator(params)
-        emulator = Helper::EmulatorHelper.new
-        adb = Helper::AdbHelper.new
-        avdmanager = Helper::AvdHelper.new
-
-        UI.message("Stop all running emulators...")
-        devices = adb.load_all_devices
-        UI.success("Devices: #{devices}")
-
-        if devices.empty?
-          UI.message("No running emulators found.")
-        else
-          devices.each do |device|
-            UI.message("Stopping emulator: #{device.serial}")
-            adb.trigger(command: "emu kill", serial: device.serial)
-            sleep(10)
-            system("Stopped emulator: #{device.serial}")
-          end
-        end
-        UI.message("Waiting for all emulators to stop...")
-        sleep(10)
-
-        # Check if there is an AVD with this name, if so, delete it
-        UI.message("Checking if AVD exists with name: #{params[:emulator_name]}...")
-        avd_exists = `#{avdmanager.avdmanager_path} list avd`.include?(params[:emulator_name])
-
-        if avd_exists
-          UI.message("AVD found, deleting existing AVD: #{params[:emulator_name]}...")
-          avdmanager.delete_avd(name: params[:emulator_name])
-        else
-          UI.message("No existing AVD found with that name.")
-        end
-
-        UI.message("Setting up new Android emulator...")
-        avdmanager.create_avd(name: params[:emulator_name], package: params[:emulator_package], device: params[:emulator_device])
-
-        UI.message("Starting Android emulator...")
-        emulator.start_emulator(name: params[:emulator_name], port: params[:emulator_port])
-        adb.trigger(command: "wait-for-device", serial: "emulator-#{params[:emulator_port]}")
-
-        max_retries = 10
-        booted = Helper::MaestroOrchestrationHelper.wait_for_emulator_to_boot(adb, max_retries, "emulator-#{params[:emulator_port]}")
-
-        unless booted
-          UI.error("Emulator failed to boot after #{max_retries} attempts. Restarting ADB server...")
-          adb.trigger(command: "kill-server")
-
-          # Shut down the current emulator, delete it, create a new one, and restart ADB server
-          UI.message("Shutting down current emulator and deleting the AVD...")
-          adb.trigger(command: "emu kill", serial: "emulator-#{params[:emulator_port]}")
-          sleep(5) # Ensure the emulator is killed
-          avdmanager.delete_avd(name: params[:emulator_name])
-
-          UI.message("Creating new AVD...")
-          avdmanager.create_avd(name: params[:emulator_name], package: params[:emulator_package], device: params[:emulator_device])
-
-          UI.message("Restarting ADB server...")
-          adb.trigger(command: "start-server")
-          UI.message("ADB server restarted. Starting new emulator...")
-
-          # Start the newly created emulator
-          emulator.start_emulator(name: params[:emulator_name], port: params[:emulator_port])
-          adb.trigger(command: "wait-for-device", serial: "emulator-#{params[:emulator_port]}")
-
-          # Retry boot process after restarting ADB server
-          booted = Helper::MaestroOrchestrationHelper.wait_for_emulator_to_boot(adb, max_retries, "emulator-#{params[:emulator_port]}")
-        end
-
-        if booted
-          UI.success("Emulator is online and fully booted!")
-        else
-          UI.error("Emulator failed to boot even after restarting AVD and ADB server.")
-          raise "Failed to boot emulator. Please check emulator logs and configuration."
-        end
-      end
-
       def self.demo_mode(params)
         adb = Helper::AdbHelper.new
         adb.load_all_devices
@@ -144,10 +67,14 @@ module Fastlane
         adb.load_all_devices
         serial = adb.devices.first.serial
 
+        UI.message("Generating 'assembleRelease' build...")
+        # Trigger the 'assembleRelease' build
+        system("./gradlew assembleRelease")
+        # After building, try to find the APK file in the release output directory
         apk_path = Dir["app/build/outputs/apk/release/*.apk"].first
-
+        # If still not found after building, raise an error
         if apk_path.nil?
-          UI.user_error!("Error: APK file not found in build outputs.")
+          UI.user_error!("Error: APK file not found in build outputs even after running assembleRelease.")
         end
 
         UI.message("Found APK file at: #{apk_path}")
@@ -171,41 +98,6 @@ module Fastlane
               UI.user_error!("No ANDROID_SDK_DIR given, pass using `sdk_dir: 'sdk_dir'`") unless value && !value.empty?
             end
           ),
-          FastlaneCore::ConfigItem.new(
-            key: :emulator_name,
-            env_name: "MAESTRO_AVD_NAME",
-            description: "Name of the AVD",
-            default_value: "Maestro_Android_Emulator",
-            optional: true
-          ),
-          FastlaneCore::ConfigItem.new(
-            key: :emulator_package,
-            env_name: "MAESTRO_AVD_PACKAGE",
-            description: "The selected system image of the emulator",
-            default_value: "system-images;android-35;google_apis_playstore;arm64-v8a",
-            optional: true
-          ),
-          FastlaneCore::ConfigItem.new(
-            key: :emulator_device,
-            env_name: "MAESTRO_AVD_DEVICE",
-            description: "Device",
-            default_value: "pixel_7_pro",
-            optional: true
-          ),
-          FastlaneCore::ConfigItem.new(
-            key: :location,
-            env_name: "MAESTRO_AVD_LOCATION",
-            description: "Set location of the emulator '<longitude> <latitude>'",
-            default_value: "28.0362979, -82.4930012",
-            optional: true
-          ),
-          FastlaneCore::ConfigItem.new(
-            key: :emulator_port,
-            env_name: "MAESTRO_AVD_PORT",
-            description: "Port of the emulator",
-            default_value: "5554",
-            optional: true
-          ),
           FastlaneCore::ConfigItem.new(
             key: :maestro_flow_file,
             env_name: "MAESTRO_ANDROID_FLOW_FILE",

data/lib/fastlane/plugin/maestro_orchestration/helper/maestro_orchestration_helper.rb

@@ -10,8 +10,35 @@ module Fastlane
       # class methods that you define here become available in your action
       # as `Helper::MaestroOrchestrationHelper.your_method`
       #
-      def self.show_message
-        UI.message("Hello from the maestro_orchestration plugin helper!")
+      def self.stop_all_emulators(adb)
+        UI.message("Stop all running emulators...")
+        devices = adb.load_all_devices
+        UI.success("Devices: #{devices}")
+
+        devices.each do |device|
+          UI.message("Stopping emulator: #{device.serial}")
+          adb.trigger(command: "emu kill", serial: device.serial)
+          sleep(10)
+        end
+        UI.message("Waiting for all emulators to stop...")
+        sleep(10)
+      end
+
+      def self.handle_boot_failure(params, avdmanager, adb, emulator)
+        adb.trigger(command: "kill-server")
+        adb.trigger(command: "emu kill", serial: "emulator-#{params[:emulator_port]}")
+        sleep(5)
+        avdmanager.delete_avd(name: params[:emulator_name])
+
+        UI.message("Creating new AVD...")
+        avdmanager.create_avd(name: params[:emulator_name], package: params[:emulator_package], device: params[:emulator_device])
+
+        UI.message("Restarting ADB server...")
+        adb.trigger(command: "start-server")
+        UI.message("ADB server restarted. Starting new emulator...")
+
+        emulator.start_emulator(name: params[:emulator_name], port: params[:emulator_port])
+        adb.trigger(command: "wait-for-device", serial: "emulator-#{params[:emulator_port]}")
       end
 
       def self.wait_for_emulator_to_boot(adb, max_retries, serial)
@@ -85,104 +112,5 @@ module Fastlane
         UI.error("Error removing file #{file_path}: #{e.message}")
       end
     end
-
-    class AvdHelper
-      # Path to the avd binary
-      attr_accessor :avdmanager_path
-      # Available AVDs
-      attr_accessor :avds
-
-      def initialize(avdmanager_path: nil)
-        android_home = ENV.fetch('ANDROID_HOME', nil) || ENV.fetch('ANDROID_SDK_ROOT', nil)
-        if (avdmanager_path.nil? || avdmanager_path == "avdmanager") && android_home
-          # First search for cmdline-tools dir
-          cmdline_tools_path = File.join(android_home, "cmdline-tools")
-
-          # Find the first available 'bin' folder within cmdline-tools
-          available_path = Dir.glob(File.join(cmdline_tools_path, "*", "bin")).first
-          raise "No valid bin path found in #{cmdline_tools_path}" unless available_path
-
-          avdmanager_path = File.join(available_path, "avdmanager")
-        end
-
-        self.avdmanager_path = Helper.get_executable_path(File.expand_path(avdmanager_path))
-      end
-
-      def trigger(command: nil)
-        raise "avdmanager_path is not set" unless avdmanager_path
-
-        # Build and execute the command
-        command = [avdmanager_path.shellescape, command].compact.join(" ").strip
-        Action.sh(command)
-      end
-
-      # Create a new AVD
-      def create_avd(name:, package:, device: "pixel_7_pro")
-        raise "AVD name is required" if name.nil? || name.empty?
-        raise "System image package is required" if package.nil? || package.empty?
-
-        command = [
-          "create avd",
-          "-n #{name.shellescape}",
-          "-f",
-          "-k \"#{package}\"",
-          "-d #{device.shellescape}"
-        ].join(" ")
-
-        trigger(command: command)
-      end
-
-      # Delete an existing AVD
-      def delete_avd(name:)
-        raise "AVD name is required" if name.nil? || name.empty?
-
-        command = [
-          "delete avd",
-          "-n #{name.shellescape}"
-        ].join(" ")
-
-        trigger(command: command)
-      end
-    end
-
-    class EmulatorHelper
-      attr_accessor :emulator_path
-
-      def initialize(emulator_path: nil)
-        android_home = ENV.fetch('ANDROID_HOME', nil) || ENV.fetch('ANDROID_SDK_ROOT', nil)
-        if (emulator_path.nil? || emulator_path == "avdmanager") && android_home
-          emulator_path = File.join(android_home, "emulator", "emulator")
-        end
-
-        self.emulator_path = Helper.get_executable_path(File.expand_path(emulator_path))
-      end
-
-      def trigger(command: nil)
-        raise "emulator_path is not set" unless emulator_path
-
-        # Build and execute the command
-        command = [emulator_path.shellescape, command].compact.join(" ").strip
-        Action.sh(command)
-      end
-
-      # Start an emulator instance
-      def start_emulator(name:, port:)
-        raise "Emulator name is required" if name.nil? || name.empty?
-        raise "Port is required" if port.nil? || port.to_s.empty?
-
-        command = [
-          "-avd #{name.shellescape}",
-          "-port #{port.shellescape}",
-          "-wipe-data",
-          "-no-boot-anim",
-          "-no-snapshot",
-          "-no-audio",
-          "> /dev/null 2>&1 &"
-        ].join(" ")
-
-        UI.message("Starting emulator #{name} on port #{port}...")
-        trigger(command: command)
-      end
-    end
   end
 end

data/lib/fastlane/plugin/maestro_orchestration/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module MaestroOrchestration
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-maestro_orchestration
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Nemanja Risteski
 bindir: bin
 cert_chain: []
-date: 2025-02-04 00:00:00.000000000 Z
+date: 2025-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane-plugin-android_emulator