sim_launcher 0.2.0 → 0.3.0

data/bin/sim_launcher

@@ -13,9 +13,7 @@ set :port, (ARGV[0] || 8881)
 set :run, true
 
   
-IPHONESIM_PATH = File.join( File.dirname(__FILE__), '..', 'native', 'iphonesim' )
-
-shared_simulator = SimLauncher::Simulator.new( IPHONESIM_PATH )
+shared_simulator = SimLauncher::Simulator.new
 
 get '/' do
   <<EOS

data/lib/sim_launcher/client.rb

@@ -26,17 +26,44 @@ module SimLauncher
     end
 
     def launch
-      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)
-      puts "requesting #{full_request_uri}"
+      full_request_uri = launch_uri 
+      puts "requesting #{full_request_uri}" if $DEBUG
       response = Net::HTTP.get( full_request_uri )
-      puts "iphonesim server reponded with:\n#{response}"
+      puts "iphonesim server reponded with:\n#{response}" if $DEBUG
     end
 
     def relaunch
       launch
     end
 
+    # check that there appears to be a server ready for us to send commands to
+    def ping
+      # our good-enough solution is just request the list of available iOS sdks and
+      # check that we get a 200 response 
+      begin
+        uri = list_sdks_uri
+        Net::HTTP.start( uri.host, uri.port) do |http|
+          response = http.head(uri.path)
+          return response.is_a? Net::HTTPOK
+        end
+      rescue
+        return false
+      end
+    end
+
+    private
+
+    def launch_uri
+      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
+    end
+
+    def list_sdks_uri
+      full_request_uri = @server_uri.dup
+      full_request_uri.path = "/showsdks"
+      full_request_uri
+    end
   end
 end

data/lib/sim_launcher/direct_client.rb

@@ -0,0 +1,25 @@
+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 = '4.2' )
+      self.new( app_path, sdk, 'ipad' )
+    end
+
+    def self.for_iphone_app( app_path, sdk = '4.2' )
+      self.new( app_path, sdk, 'iphone' )
+    end
+
+    def launch
+      SimLauncher::Simulator.new.launch_ios_app( @app_path, @sdk, @family ) 
+    end
+
+    def relaunch
+      launch
+    end
+  end
+end

data/lib/sim_launcher/simulator.rb

@@ -1,8 +1,8 @@
 module SimLauncher
 class Simulator
 
-  def initialize( iphonesim_path )
-    @iphonesim_path = iphonesim_path 
+  def initialize( iphonesim_path = nil )
+    @iphonesim_path = iphonesim_path || File.join( File.dirname(__FILE__), '..', '..', 'native', 'iphonesim' )
   end
 
   def showsdks
@@ -25,7 +25,7 @@ class Simulator
 
   def run_synchronous_command( *args )
     cmd = cmd_line_with_args( args )
-    puts "executing #{cmd}"
+    puts "executing #{cmd}" if $DEBUG
     `#{cmd}`
   end
 

data/lib/sim_launcher/version.rb

@@ -1,3 +1,3 @@
 module SimLauncher
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/sim_launcher.rb

@@ -0,0 +1,3 @@
+require 'sim_launcher/client'
+require 'sim_launcher/direct_client'
+require 'sim_launcher/simulator'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Pete Hodgson
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-04 00:00:00 -08:00
+date: 2011-03-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,7 +44,9 @@ files:
 - Gemfile
 - Rakefile
 - bin/sim_launcher
+- lib/sim_launcher.rb
 - lib/sim_launcher/client.rb
+- lib/sim_launcher/direct_client.rb
 - lib/sim_launcher/simulator.rb
 - lib/sim_launcher/version.rb
 - native/iphonesim