fastlane-plugin-create_simulator_devices 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53aed494d69e050f8014a9b188cf5dd2fb3475c5d8e44b7d22e21eb8949d66aa
-  data.tar.gz: 315fe5620703cde142b5ae0aff18cc90989398e96e2587dab89f1030bcf0ece1
+  metadata.gz: a77a05dbf6d484a920978945f9e5941b67ec86f549dfeaa7d9add45d1e778174
+  data.tar.gz: '00961903381d91b9170c63bc51ebb2bbea55111511856eea951c854834d77b37'
 SHA512:
-  metadata.gz: 68539faced67b76306b818ccb1cc3172c00245e903e234085852c22db09c683907bc94f024238c73a31c1edd869d481df7b6a174a2cf996817fa4acc598b9010
-  data.tar.gz: ba14fdf8693f60557079f96eead7e46cf5730f6e0cc86f7d72477185b0acbd4367851562789b0d095336104d4bc3b1dee2547fb9863cbcac041b2d650ec277e7
+  metadata.gz: be42b6fb3d60074b6b24c738c53cba15516c599b7f7ac80dce53a0a8dc7e845c2855de0ed9175487daae482c237af90a0b1d93954a4eded31387e4ea0359ed39
+  data.tar.gz: c0c89fe57b0992f5d2b1dbae8821e64f3719836500c01c7eaf5442c6bf5b5feba4c99ce59ef4d0b89b9950d2c44fd25a0e24d2db33f29f86e3de22dc2044558c

data/lib/fastlane/plugin/create_simulator_devices/actions/create_simulator_devices_action.rb

@@ -25,7 +25,7 @@ module Fastlane
         required_devices = params[:devices]
         UI.user_error!('No devices specified') if required_devices.nil? || required_devices.empty?
 
-        shell_helper = CreateSimulatorDevices::ShellHelper.new(verbose:, action_context: self)
+        shell_helper = CreateSimulatorDevices::ShellHelper.new(print_command: params[:print_command], print_command_output: params[:print_command_output], action_context: self)
         runtime_helper = CreateSimulatorDevices::RuntimeHelper.new(cache_dir: params[:cache_dir], shell_helper:, verbose:)
 
         runner = CreateSimulatorDevices::Runner.new(
@@ -69,16 +69,26 @@ module Fastlane
                                          default_value: 'iPhone 16'),
           ::FastlaneCore::ConfigItem.new(key: :cache_dir,
                                          description: 'The directory to cache the simulator runtimes',
-                                         is_string: true,
+                                         type: String,
                                          optional: true,
                                          default_value: "#{Dir.home}/.cache/create_simulator_devices"),
           ::FastlaneCore::ConfigItem.new(key: :verbose,
                                          env_name: 'VERBOSE',
                                          description: 'Verbose output',
-                                         is_string: false,
+                                         type: Boolean,
                                          optional: true,
                                          default_value: ::FastlaneCore::Globals.verbose?,
-                                         default_value_dynamic: true)
+                                         default_value_dynamic: true),
+          ::FastlaneCore::ConfigItem.new(key: :print_command,
+                                         description: 'Print xcrun simctl commands',
+                                         type: Boolean,
+                                         optional: true,
+                                         default_value: false),
+          ::FastlaneCore::ConfigItem.new(key: :print_command_output,
+                                         description: 'Print xcrun simctl commands output',
+                                         type: Boolean,
+                                         optional: true,
+                                         default_value: false)
         ]
       end
 

data/lib/fastlane/plugin/create_simulator_devices/helpers/create_simulator_devices/models/apple_build_version.rb

@@ -58,7 +58,12 @@ module Fastlane
 
         return self == other unless lhs_is_beta && rhs_is_beta && lhs_build_version.length == rhs_build_version.length
 
-        lhs_build_version.chop == rhs_build_version.chop
+        # Take only leading chars up to the first letter included e.g. 22C146 -> 22C
+        lhs_build_version.minor_version == rhs_build_version.minor_version
+      end
+
+      def minor_version
+        AppleBuildVersion.new(@build_version.match(/^[0-9]+[A-Z]+/)[0])
       end
 
       def <(other)

data/lib/fastlane/plugin/create_simulator_devices/helpers/create_simulator_devices/runner.rb

@@ -18,6 +18,8 @@ module Fastlane
       end
 
       def run(devices)
+        UI.message("Simulator devices to create: #{devices.join(', ')}")
+
         shell_helper.stop_core_simulator_services
 
         # Delete unusable runtimes and unavailable devices.
@@ -29,6 +31,11 @@ module Fastlane
           .filter_map { |device| required_device_for_device(device) }
           .uniq { |required_device| [required_device.device_type.name, required_device.required_runtime.product_version] }
 
+        if verbose
+          UI.message('Unique required devices:')
+          UI.message("  #{required_devices.map(&:description).join("\n  ")}")
+        end
+
         # Install missing runtimes if needed.
         runtime_helper.install_missing_runtimes(required_devices)
 
@@ -39,12 +46,7 @@ module Fastlane
         matched_devices = required_devices
           .reject { |required_device| required_device.available_device.nil? }
 
-        if verbose
-          UI.message('Matched devices:')
-          matched_devices.each do |matched_device|
-            UI.message("\n\t#{matched_device.description}: #{matched_device.available_device.description}")
-          end
-        end
+        log_matched_devices
 
         matched_devices.map!(&:description)
 
@@ -53,6 +55,18 @@ module Fastlane
         matched_devices
       end
 
+      def log_matched_devices
+        UI.message('Matched devices:')
+        matched_devices.each do |matched_device|
+          device_info = ''
+          if verbose
+            device_info = shell_helper.device_info_by_udid(matched_device.available_device.udid)
+            device_info = "\n#{device_info}"
+          end
+          UI.message("  #{matched_device.description}: #{matched_device.available_device.description}#{device_info}")
+        end
+      end
+
       def delete_unavailable_devices
         return unless shell_helper.available_devices_for_runtimes.values.flatten.any?(&:available?)
 
@@ -68,7 +82,12 @@ module Fastlane
 
         return [] if available_devices.nil?
 
-        available_devices.detect { |device| device.device_type_identifier == required_device.device_type.identifier }
+        # Find the device with the same name as the required device.
+        devices_with_same_type = available_devices
+          .select { |available_device| available_device.device_type_identifier == required_device.device_type.identifier }
+
+        devices_with_same_type
+          .detect { |available_device| available_device.name == required_device.device_type.name }
       end
 
       def create_missing_devices(required_devices)
@@ -77,12 +96,15 @@ module Fastlane
         missing_devices = required_devices
           .select { |required_device| required_device.available_device.nil? }
 
-        return if missing_devices.empty?
+        if missing_devices.empty?
+          UI.message('All required devices are present. Skipping device creation...') if verbose
+          return
+        end
 
         UI.message('Creating missing devices')
         missing_devices.each do |missing_device|
           shell_helper.create_device(
-            missing_device.description,
+            missing_device.device_type.name,
             missing_device.device_type.identifier,
             missing_device.available_runtime.identifier
           )
@@ -113,9 +135,11 @@ module Fastlane
       def required_device_for_device(device)
         available_device_types = shell_helper.available_device_types
 
+        device_os_version = device[/ \(([\d.]*?)\)$/, 1]
+        device_name = device.delete_suffix(" (#{device_os_version})").strip unless device_os_version.nil?
+
         device_type = available_device_types.detect do |available_device_type|
-          # Avoid matching "iPhone 16" for the "iPhone 16e" device.
-          "#{device} ".start_with?("#{available_device_type.name} ")
+          device_name == available_device_type.name
         end
 
         unless device_type
@@ -126,8 +150,6 @@ module Fastlane
         product_family = device_type.product_family
 
         os_name = PRODUCT_FAMILY_TO_OS_NAME[product_family]
-        device_os_version = device.delete_prefix(device_type.name).strip
-        device_os_version = device_os_version[/\(([\d.]*?)\)/, 1]
 
         runtime_version = nil
         unless device_os_version.nil? || device_os_version.empty?

data/lib/fastlane/plugin/create_simulator_devices/helpers/create_simulator_devices/runtime_helper.rb

@@ -43,7 +43,10 @@ module Fastlane
 
         missing_runtimes = missing_runtimes(needed_runtimes)
 
-        return if missing_runtimes.empty?
+        if missing_runtimes.empty?
+          UI.message('All required runtimes are present. Skipping runtime installation...') if verbose
+          return
+        end
 
         missing_runtimes.each do |missing_runtime|
           download_and_install_missing_runtime(missing_runtime)
@@ -74,8 +77,24 @@ module Fastlane
       def available_runtime_matching_needed_runtime?(needed_runtime)
         matching_runtimes = shell_helper.available_runtimes
           .select do |available_runtime|
-            next false if needed_runtime.os_name != available_runtime.platform ||
-                          needed_runtime.product_version != available_runtime.version
+            next false if needed_runtime.os_name != available_runtime.platform
+
+            # If the product version is not equal, check if the first two segments are equal.
+            is_product_version_equal = if needed_runtime.product_version == available_runtime.version
+                                         true
+                                       else
+                                         lhs_segments = needed_runtime.product_version.segments
+                                         rhs_segments = available_runtime.version.segments
+                                         if rhs_segments.size == 3
+                                           lhs_segments[0] == rhs_segments[0] && lhs_segments[1] == rhs_segments[1]
+                                         else
+                                           false
+                                         end
+                                       end
+            next false unless is_product_version_equal
+
+            # If the product version is not equal, use the available runtime version.
+            needed_runtime.product_version = available_runtime.version
 
             needed_runtime.product_build_version = [needed_runtime.product_build_version, available_runtime.build_version].compact.max
 
@@ -108,17 +127,6 @@ module Fastlane
         available_runtime
       end
 
-      def install_missing_runtime(missing_runtime, cached_runtime_file)
-        runtime_name = missing_runtime.runtime_name
-
-        if missing_runtime.product_build_version.nil?
-          UI.important("Failed to find runtime build version for #{runtime_name}")
-          return
-        end
-
-        shell_helper.import_runtime(cached_runtime_file, runtime_name)
-      end
-
       def download_and_install_missing_runtime(missing_runtime)
         UI.message("Attempting to install #{missing_runtime.runtime_name} runtime.")
 
@@ -152,9 +160,15 @@ module Fastlane
         # shipped with Xcode betas and use the same product version.
         # E.g. Xcode 26.0 Beta 3 has iOS 26.0 (23A5287e) SDK, but
         # xcodebuild downloads iphonesimulator_26.0_23A5287g.dmg as latest.
-        runtime_dmg_search_pattern += missing_runtime.product_build_version.to_s.chop if missing_runtime.product_build_version
+        runtime_dmg_search_pattern += missing_runtime.product_build_version.minor_version.to_s if missing_runtime.product_build_version
         runtime_dmg_search_pattern += '*.dmg'
 
+        if verbose
+          UI.message("Searching for #{missing_runtime.runtime_name} runtime image in #{cache_dir} with pattern: #{runtime_dmg_search_pattern}")
+          UI.message("Available dmg files: #{Dir.glob("#{cache_dir}/*.dmg")}")
+          UI.message("Available files with pattern: #{Dir.glob(runtime_dmg_search_pattern)}")
+        end
+
         runtime_file = Dir
           .glob(runtime_dmg_search_pattern)
           .max_by { |filename| runtime_build_version_for_filename(filename) }

data/lib/fastlane/plugin/create_simulator_devices/helpers/create_simulator_devices/shell_helper.rb

@@ -10,16 +10,17 @@ module Fastlane
       UI = ::Fastlane::UI unless defined?(UI)
 
       # Proprty verbose
-      attr_accessor :verbose, :action_context
+      attr_accessor :print_command, :print_command_output, :action_context
 
-      def initialize(verbose: false, action_context: nil)
-        self.verbose = verbose
+      def initialize(print_command: false, print_command_output: false, action_context: nil)
+        self.print_command = print_command
+        self.print_command_output = print_command_output
         self.action_context = action_context
       end
 
-      def sh(command:, print_command: verbose, print_command_output: verbose)
+      def sh(command:, print_command: self.print_command, print_command_output: self.print_command_output)
         if action_context
-          action_context.sh(command, print_command:, print_command_output:)
+          action_context.sh(command, print_command: print_command, print_command_output: print_command_output)
         else
           # Fallback for testing or direct usage
           require 'open3'
@@ -148,11 +149,8 @@ module Fastlane
           missing_runtime.os_name.shellescape
         ]
 
-        unless missing_runtime.latest?
-          command << '-buildVersion'
-          # Prefer the build version if available, otherwise use the product version.
-          command << (missing_runtime.product_build_version || missing_runtime.product_version.to_s).shellescape
-        end
+        command << '-buildVersion'
+        command << missing_runtime.product_version.to_s.shellescape
 
         sh(command: command.join(' '), print_command: true, print_command_output: true)
       end
@@ -167,15 +165,13 @@ module Fastlane
         end
       end
 
-      # def add_runtime(runtime_dmg_filename, runtime_name)
-      #   UI.message("Adding runtime #{runtime_name}...")
-      #   add_runtime_command = "xcrun simctl runtime add #{runtime_dmg_filename.shellescape}"
-      #   begin
-      #     sh(command: add_runtime_command)
-      #   rescue StandardError => e
-      #     UI.important("Failed to add runtime #{runtime_name} with '#{add_runtime_command}':\n#{e}")
-      #   end
-      # end
+      def device_info_by_udid(udid)
+        sh(
+          command: "xcrun simctl list devices --json | jq '.devices | to_entries[].value[] | select(.udid==\"#{udid.shellescape}\")'",
+          print_command: false,
+          print_command_output: false
+        )
+      end
     end
   end
 end

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

@@ -2,6 +2,6 @@
 
 module Fastlane
   module CreateSimulatorDevices
-    VERSION = '0.0.4'
+    VERSION = '0.0.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-create_simulator_devices
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Vitalii Budnik
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-17 00:00:00.000000000 Z
+date: 2025-08-29 00:00:00.000000000 Z
 dependencies: []
 description:
 email: developers@setapp.com