refactoring launching when using Xcode 6 device type identifiers

Author: Daniel Prows

lib/sim_launcher/direct_client.rb

@@ -1,39 +1,45 @@
 module SimLauncher
-  class DirectClient
-    def initialize( app_path, sdk, family )
-      @app_path = File.expand_path( app_path )
-      @sdk = sdk
-      @family = family
-    end
-
-    def self.for_ipad_app( app_path, sdk = nil )
-      self.new( app_path, sdk, 'ipad' )
-    end
-
-    def self.for_iphone_app( app_path, sdk = nil )
-      self.new( app_path, sdk, 'iphone' )
-    end
-
-    def launch
-      SimLauncher::Simulator.new.launch_ios_app( @app_path, @sdk, @family ) 
-    end
-
-    def rotate_left
-      simulator = SimLauncher::Simulator.new
-      simulator.rotate_left
-    end
-    
-    def rotate_right
-      simulator = SimLauncher::Simulator.new
-      simulator.rotate_right
-    end
-
-
-
-    def relaunch
-      simulator = SimLauncher::Simulator.new
-      simulator.quit_simulator
-      simulator.launch_ios_app( @app_path, @sdk, @family )
-    end
-  end
+	class DirectClient
+		def initialize( app_path, sdk, options ={} )
+			@app_path = File.expand_path( app_path )
+			@sdk = sdk
+			@family = options[:family]
+			@device_type_identifier = options[:device_type_identifier]
+		end
+
+		def self.for_ipad_app( app_path, sdk = nil )
+			self.new( app_path, sdk, 'ipad' )
+		end
+
+		def self.for_iphone_app( app_path, sdk = nil )
+			self.new( app_path, sdk, 'iphone' )
+		end
+
+		def launch
+			if @device_type_identifier.to_s != ''
+				SimLauncher::Simulator.new.launch_ios_app_with_device_identifier(@app_path, @sdk, @device_type_identifier)
+			else
+				SimLauncher::Simulator.new.launch_ios_app( @app_path, @sdk, @family, @device_type_identifier)
+			end
+
+		end
+
+		def rotate_left
+			simulator = SimLauncher::Simulator.new
+			simulator.rotate_left
+		end
+
+		def rotate_right
+			simulator = SimLauncher::Simulator.new
+			simulator.rotate_right
+		end
+
+
+
+		def relaunch
+			simulator = SimLauncher::Simulator.new
+			simulator.quit_simulator
+			launch
+		end
+	end
 end

lib/sim_launcher/simulator.rb

@@ -45,13 +45,29 @@ def reset(sdks=nil)
 
   end
 
+  def launch_ios_app_with_device_identifier(app_path, sdk_version, device_identifier, app_args=nil)
+	  if problem = SimLauncher.check_app_path(app_path)
+		  bangs = '!'*80
+		  raise "\n#{bangs}\nENCOUNTERED A PROBLEM WITH THE SPECIFIED APP PATH:\n\n#{problem}\n#{bangs}"
+	  end
+
+	  sdk_version ||= SdkDetector.new(self).latest_sdk_version
+
+	  args = ["--args"] + app_args.flatten if app_args
+
+	  run_synchronous_command( :launch, app_path, '--sdk', sdk_version, '--devicetypeid', device_identifier, '--exit', *args )
+  end
+
   def launch_ios_app(app_path, sdk_version, device_family, app_args = nil)
-    if problem = SimLauncher.check_app_path( app_path )
-      bangs = '!'*80
-      raise "\n#{bangs}\nENCOUNTERED A PROBLEM WITH THE SPECIFIED APP PATH:\n\n#{problem}\n#{bangs}"
-    end
-    sdk_version ||= SdkDetector.new(self).latest_sdk_version
+	  if problem = SimLauncher.check_app_path(app_path)
+		  bangs = '!'*80
+		  raise "\n#{bangs}\nENCOUNTERED A PROBLEM WITH THE SPECIFIED APP PATH:\n\n#{problem}\n#{bangs}"
+	  end
+
+	  sdk_version ||= SdkDetector.new(self).latest_sdk_version
+
     args = ["--args"] + app_args.flatten if app_args
+
     run_synchronous_command( :launch, app_path, '--sdk', sdk_version, '--family', device_family, '--exit', *args )
   end
 

lib/sim_launcher/version.rb

@@ -1,3 +1,3 @@
 module SimLauncher
-  VERSION = "0.4.11"
+  VERSION = "0.4.12"
 end