fastlane-plugin-create_simulator_devices 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53aed494d69e050f8014a9b188cf5dd2fb3475c5d8e44b7d22e21eb8949d66aa
-  data.tar.gz: 315fe5620703cde142b5ae0aff18cc90989398e96e2587dab89f1030bcf0ece1
+  metadata.gz: 2fc01352add3412905b44f8168d0ce72b330e44ade2e34ff1040976d56ca3ee9
+  data.tar.gz: 9195a8c5a3edcd6391b38b16407ad0e41d8a9e6b4ed05b20da069f6e55944e05
 SHA512:
-  metadata.gz: 68539faced67b76306b818ccb1cc3172c00245e903e234085852c22db09c683907bc94f024238c73a31c1edd869d481df7b6a174a2cf996817fa4acc598b9010
-  data.tar.gz: ba14fdf8693f60557079f96eead7e46cf5730f6e0cc86f7d72477185b0acbd4367851562789b0d095336104d4bc3b1dee2547fb9863cbcac041b2d650ec277e7
+  metadata.gz: bc7bcbf613ac9e4839cf14993a53b9606d50ff39d6f9656bb03a3230814ecb78350d16655179e9836ca8fdf0ba1069212130b3f087589d19c1a93f850958607a
+  data.tar.gz: 98860ea4b0a943ae9a734503c694181e04656e4b20bed4eb6c3ecde2144e63a90e1c5fd3389c960c912d8e46c996c86ef3d55d110374d027d6805cd31d3b1fe2

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

@@ -42,7 +42,7 @@ module Fastlane
         if verbose
           UI.message('Matched devices:')
           matched_devices.each do |matched_device|
-            UI.message("\n\t#{matched_device.description}: #{matched_device.available_device.description}")
+            UI.message("\t#{matched_device.description}: #{matched_device.available_device.description}")
           end
         end
 
@@ -68,7 +68,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)
@@ -82,7 +87,7 @@ module Fastlane
         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
           )

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

@@ -74,8 +74,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 +124,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 +157,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

@@ -148,11 +148,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
@@ -166,16 +163,6 @@ module Fastlane
           UI.important("Failed to import runtime #{runtime_name} with '#{import_platform_command}' :\n#{e}")
         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
     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.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-create_simulator_devices
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Vitalii Budnik