iCuke 0.4.7 → 0.4.8

data/History.txt

@@ -0,0 +1,27 @@
+== 0.4.8 (2010-04-22)
+
+=== Stability
+* Try quitting XCode and restarting it if we aren't able to load the simulator
+
+== 0.4.7 (2010-04-22)
+
+=== Bugfixes
+* Work around a bug in some Ruby 1.8.7.* Net::HTTP code which causes the simulator to raise NoMethodError (Rob Holland, Aslak Hellesøy)
+
+== 0.4.6 (2010-04-21)
+
+=== Bugfixes
+* Depend on cucumber and nokogiri
+* Escape values and labels in XML so we don't produce invalid markup
+
+== 0.4.5 (2010-04-21)
+
+=== Bugfixes
+* More reliable keyboard switching
+
+== 0.4.4 (2010-04-21)
+
+=== Bugfixes
+* Allow ' in xpath queries
+* Allow typing spaces in inputs
+* Correct swipe behaviour in all directions (Rob Holland, Dominic Baggott)

data/VERSION

@@ -1 +1 @@
-0.4.7
+0.4.8

data/iCuke.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{iCuke}
-  s.version = "0.4.7"
+  s.version = "0.4.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob Holland"]
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "History.txt",
      "LICENSE",
      "README.rdoc",
      "Rakefile",

data/lib/icuke/simulator.rb

@@ -6,6 +6,7 @@ require 'timeout'
 
 module ICuke
   class Simulator
+    include Timeout
     include HTTParty
     base_uri 'http://localhost:50000'
     
@@ -22,41 +23,67 @@ module ICuke
       simulator = Appscript.app('iPhone Simulator.app')
       simulator.quit if simulator.is_running?
       
-      xcode = Appscript.app('Xcode.app')
-      xcode.launch
-      xcode.open project_file
-      project = xcode.active_project_document.project
-      
-      initial_build_configuration_type = project.active_build_configuration_type.get
-      project.active_build_configuration_type.set project.build_configuration_types[options[:configuration]]
-      
-      if options[:target]
-        initial_target = project.active_target.get
-        project.active_target.set project.targets[options[:target]]
-      end
-      
-      executable = project.active_executable.get
-      options[:env].each_pair do |name, value|
-        executable.make :new => :environment_variable,
-                        :with_properties => { :name => name, :value => value, :active => true }
+      begin
+        project = open_project(project_file)
+        
+        settings = {
+          :active_build_configuration_type => project.build_configuration_types[options[:configuration]]
+        }
+        if options[:target]
+          settings[:active_target] = project.targets[options[:target]]
+        end
+        
+        with_settings(project, settings) do
+          executable = project.active_executable.get
+          options[:env].each_pair do |name, value|
+            executable.make :new => :environment_variable,
+                            :with_properties => { :name => name, :value => value, :active => true }
+          end
+          
+          project.launch_
+          
+          timeout(30) do
+            sleep(0.5) until simulator.is_running?
+          end
+        end
+      rescue Timeout::Error
+        xcode = Appscript.app('Xcode.app')
+        xcode.quit if xcode.is_running?
+        sleep(0.5) until !xcode.is_running?
+        retry
       end
-      project.launch_
       
-      Timeout::timeout(30) do
+      timeout(30) do
         begin
           view
         rescue Errno::ECONNREFUSED
-          sleep(0.1)
+          sleep(0.5)
           retry
         end
       end
-    ensure
-      # Restore the active build settings
-      if initial_build_configuration_type
-        project.active_build_configuration_type.set initial_build_configuration_type
+    end
+    
+    def open_project(project_file)
+      xcode = Appscript.app('Xcode.app')
+      unless xcode.active_project_document.get and xcode.active_project_document.project.path.get == project_file
+        xcode.launch
+        xcode.open project_file
+      end
+      xcode.active_project_document.project
+    end
+    
+    def with_settings(project, settings, &block)
+      initial_settings = {}
+      
+      settings.each_key { |setting| initial_settings[setting] = project.send(setting).get }
+      settings.each_pair do |setting, value|
+        project.send(setting).set value
       end
-      if initial_target
-        project.active_target.set initial_target
+      
+      yield
+    ensure
+      initial_settings.each_pair do |setting, value|
+        project.send(setting).set value
       end
     end
     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 7
-  version: 0.4.7
+  - 8
+  version: 0.4.8
 platform: ruby
 authors: 
 - Rob Holland
@@ -76,6 +76,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- History.txt
 - LICENSE
 - README.rdoc
 - Rakefile