sim_launcher 0.3.3 → 0.3.5

data/bin/sim_launcher

@@ -33,7 +33,9 @@ get '/launch_ipad_app' do
   raise 'no app_path provided' if app_path.nil?
 
   sdk = params[:sdk]
+  restart_requested = ("true" == params[:restart])
   
+  shared_simulator.quit_simulator if restart_requested
   shared_simulator.launch_ipad_app( app_path, sdk )
 end
 
@@ -42,6 +44,8 @@ get '/launch_iphone_app' do
   raise 'no app_path provided' if app_path.nil?
 
   sdk = params[:sdk]
+  restart_requested = ("true" == params[:restart])
 
+  shared_simulator.quit_simulator if restart_requested
   shared_simulator.launch_iphone_app( app_path, sdk )
 end

data/lib/sim_launcher/client.rb

@@ -25,15 +25,15 @@ module SimLauncher
       @server_uri = URI.parse( uri.to_s )
     end
 
-    def launch
-      full_request_uri = launch_uri 
+    def launch(restart=false)
+      full_request_uri = launch_uri(restart)
       puts "requesting #{full_request_uri}" if $DEBUG
       response = Net::HTTP.get( full_request_uri )
       puts "iphonesim server reponded with:\n#{response}" if $DEBUG
     end
 
     def relaunch
-      launch
+      launch(true)
     end
 
     # check that there appears to be a server ready for us to send commands to
@@ -53,10 +53,12 @@ module SimLauncher
 
     private
 
-    def launch_uri
+    def launch_uri(requesting_restart)
       full_request_uri = @server_uri.dup
       full_request_uri.path = "/launch_#{@family}_app"
-      full_request_uri.query = "app_path=" + CGI.escape( @app_path ) + "&sdk=" + CGI.escape(@sdk)
+      full_request_uri.query = "app_path=" + CGI.escape( @app_path )
+      full_request_uri.query += "&sdk=" + CGI.escape( @sdk ) unless @sdk.nil?
+      full_request_uri.query += "&restart=" + (!!requesting_restart).to_s
       full_request_uri
     end
 

data/lib/sim_launcher/direct_client.rb

@@ -19,7 +19,9 @@ module SimLauncher
     end
 
     def relaunch
-      launch
+      simulator = SimLauncher::Simulator.new
+      simulator.quit_simulator
+      simulator.launch_ios_app( @app_path, @sdk, @family )
     end
   end
 end

data/lib/sim_launcher/sdk_detector.rb

@@ -1,15 +1,18 @@
-require 'singleton'
-
 module SimLauncher
   class SdkDetector
-    include Singleton
+
+    def initialize(simulator = Simulator.new)
+      @simulator = simulator
+    end
+
+    def available_sdk_versions
+      @simulator.showsdks.split("\n").map { |sdk_line|
+        sdk_line[/\(([\d.]+)\)$/,1] # grab any "(x.x)" part at the end of the line
+      }.compact
+    end
 
     def latest_sdk_version
-      unless @latest_sdk_version
-        latest_iphone_sdk = `xcodebuild -showsdks | grep -o "iphonesimulator.*$"`.split.sort.last
-        @latest_sdk_version = latest_iphone_sdk[/iphonesimulator(.*)/,1]
-      end
-      @latest_sdk_version
+      available_sdk_versions.sort.last
     end
 
   end

data/lib/sim_launcher/simulator.rb

@@ -10,7 +10,7 @@ class Simulator
   end
 
   def launch_ios_app(app_path, sdk_version, device_family)
-    sdk_version ||= SdkDetector.instance.latest_sdk_version
+    sdk_version ||= SdkDetector.new(self).latest_sdk_version
   	run_synchronous_command( :launch, app_path, sdk_version, device_family )
   end
 
@@ -22,6 +22,10 @@ class Simulator
     launch_ios_app( app_path, sdk, 'iphone' )
   end
 
+  def quit_simulator
+    `echo 'application "iPhone Simulator" quit' | osascript`
+  end
+
   def run_synchronous_command( *args )
     cmd = cmd_line_with_args( args )
     puts "executing #{cmd}" if $DEBUG

data/lib/sim_launcher/version.rb

@@ -1,3 +1,3 @@
 module SimLauncher
-  VERSION = "0.3.3"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,44 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sim_launcher
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 3
-  version: 0.3.3
+version: !ruby/object:Gem::Version
+  version: 0.3.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Pete Hodgson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-22 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-14 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: &2160168080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *2160168080
 description: 
-email: 
+email:
 - rubygems@thepete.net
-executables: 
+executables:
 - sim_launcher
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .gitmodules
 - Gemfile
@@ -52,35 +43,28 @@ files:
 - lib/sim_launcher/version.rb
 - native/iphonesim
 - sim_launcher.gemspec
-has_rdoc: true
 homepage: http://rubygems.org/gems/sim_launcher
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: tiny HTTP server to launch an app in the iOS simulator
 test_files: []
-