lib/snapshot/reset_simulators.rb in snapshot-0.4.13 vs lib/snapshot/reset_simulators.rb in snapshot-0.5.0

@@ -13,15 +13,19 @@
       raise "User cancelled action" unless sure
        
       device_types_output = `xcrun simctl list devicetypes`
       device_types = device_types_output.scan /(.*) \((.*)\)/
        
-      devices_output = `xcrun simctl list devices`
-      devices = devices_output.scan /\s\s\s\s(.*) \(([^)]+)\) (.*)/
+      devices_output = `xcrun simctl list devices`.split("\n")
 
-      devices.each do |device|
-        puts "Removing device #{device[0]} (#{device[1]})"
-        `xcrun simctl delete #{device[1]}`
+      devices_output.each do |line|
+        device = line.match(/\s+([\w\s]+)\(([\w\-]+)\)/)
+        if device and device.length == 3
+          name = device[1].strip
+          id = device[2]
+          puts "Removing device #{name} (#{id})"
+          `xcrun simctl delete #{id}`
+        end
       end
 
       device_types.each do |device_type|
         puts "Creating #{device_type} for iOS version #{ios_version}"
         command = "xcrun simctl create '#{device_type[0]}' #{device_type[1]} #{ios_version}"
\ No newline at end of file