fastlane-plugin-maestro_orchestration 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16bca8a824864e18e5022ff562fb194076093be36b157665c8a9b35badbe047e
-  data.tar.gz: 32fe2d534c4d295245009d6672750f748adfdfce4dcd6ca8864a60e989d19936
+  metadata.gz: 8a7c5dbca859567bb493407556a8f57fdcfa6c7ed7adb62283fab7b4eae6d9d2
+  data.tar.gz: 92419becfc82aabadf3086bc016937b3562c775e55d93c2af90d4641d6156a66
 SHA512:
-  metadata.gz: 8f5c55f53f32f13711091ebb0e989b7475b133e64739ff839966a62239eef3fd8a53d555ee1c64da888c1ba810bed487b9316f61786f56cc4d8564fdcfe03a5c
-  data.tar.gz: e923fa4cae04e21f78111f8d1dc0083b88a616f3c60a5d1570750087349014608eff5926dec3cc9d9cb734fa7963b13e46cbec082ff4022149e20f4a373bdb0b
+  metadata.gz: fea7514fa69e381fb3c7e2498bc317a26f109357b55ba6fabcb80af3fc2205064709665fedbba0661a5d82c1ab9eff6d5d5d1b3db10850ebd3d37e026cfa0a7c
+  data.tar.gz: 2b0a06c1410d717711657dccfed51f982dc25e4012ce13afe098673b32427fbfe70b8eb3c68d0f663acef6874d67fefc4129a97bb665ed97ea738fff51f29c0d

data/README.md

@@ -1,6 +1,6 @@
 # maestro_orchestration plugin
 
-[![fastlane Plugin Badge](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-maestro_orchestration)
+[![Gem Version](https://badge.fury.io/rb/fastlane-plugin-maestro_orchestration.svg)](https://badge.fury.io/rb/fastlane-plugin-maestro_orchestration)
 
 ## Getting Started
 

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

@@ -17,7 +17,8 @@ module Fastlane
           raise "Missing required parameters: #{missing_params.join(', ')}"
         end
 
-        UI.message("--------------\n\nSDK DIR: #{params[:sdk_dir]}\n\n--------------")
+        Helper::MaestroOrchestrationHelper.clear_maestro_logs if params[:clear_maestro_logs]
+
         adb = Helper::AdbHelper.new
 
         setup_emulator(params)
@@ -67,6 +68,17 @@ module Fastlane
         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])
 
@@ -80,8 +92,23 @@ module Fastlane
         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. Retrying boot process...")
+          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]}")
@@ -90,7 +117,7 @@ module Fastlane
         if booted
           UI.success("Emulator is online and fully booted!")
         else
-          UI.error("Emulator failed to boot even after restarting ADB server.")
+          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
@@ -185,6 +212,14 @@ module Fastlane
             description: "The path to the Maestro flow YAML file",
             optional: false,
             type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :clear_maestro_logs,
+            env_name: "MAESTRO_CLEAR_LOGS",
+            description: "If true, clears all previous Maestro logs before running tests",
+            type: Boolean,
+            default_value: true,
+            optional: true
           )
         ]
       end

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

@@ -16,6 +16,8 @@ module Fastlane
           raise "Missing required parameters: #{missing_params.join(', ')}"
         end
 
+        Helper::MaestroOrchestrationHelper.clear_maestro_logs if params[:clear_maestro_logs]
+
         boot_ios_simulator(params)
         demo_mode(params)
         build_and_install_ios_app(params)
@@ -154,6 +156,14 @@ module Fastlane
             description: "The path to the Maestro flows YAML file",
             optional: false,
             type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :clear_maestro_logs,
+            env_name: "MAESTRO_CLEAR_LOGS",
+            description: "If true, clears all previous Maestro logs before running tests",
+            type: Boolean,
+            default_value: true,
+            optional: true
           )
         ]
       end

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

@@ -40,6 +40,50 @@ module Fastlane
 
         booted
       end
+
+      def self.clear_maestro_logs
+        logs_path = File.expand_path("~/.maestro/tests")
+
+        unless Dir.exist?(logs_path)
+          UI.message("No Maestro logs directory found.")
+          return
+        end
+
+        UI.message("Clearing previous Maestro logs using")
+
+        # Handle file and directory removal separately
+        Dir.glob(File.join(logs_path, "*")).each do |path|
+          if File.directory?(path)
+            clear_directory(path)
+          else
+            delete_file(path)
+          end
+        end
+
+        UI.success("Previous Maestro logs cleared.")
+      end
+
+      def self.clear_directory(directory_path)
+        Dir.glob(File.join(directory_path, "**", "*")).reverse_each do |subpath|
+          if File.directory?(subpath)
+            Dir.rmdir(subpath)
+          else
+            File.delete(subpath)
+          end
+        rescue StandardError => e
+          UI.error("Error removing #{subpath}: #{e.message}")
+        end
+
+        Dir.rmdir(directory_path)
+      rescue StandardError => e
+        UI.error("Error removing directory #{directory_path}: #{e.message}")
+      end
+
+      def self.delete_file(file_path)
+        File.delete(file_path)
+      rescue StandardError => e
+        UI.error("Error removing file #{file_path}: #{e.message}")
+      end
     end
 
     class AvdHelper
@@ -87,6 +131,18 @@ module Fastlane
 
         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

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

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-maestro_orchestration
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Nemanja Risteski
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-31 00:00:00.000000000 Z
+date: 2025-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane-plugin-android_emulator
@@ -30,7 +29,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.1
-description:
 email: nemanja.risteski@sourcetoad.com
 executables: []
 extensions: []
@@ -50,7 +48,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -65,8 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Plugin for maestro testing framework.
 test_files: []