calabash-cucumber 0.9.105 → 0.9.106

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    calabash-cucumber (0.9.105)
+    calabash-cucumber (0.9.106)
       CFPropertyList
       bundler (~> 1.1)
       cucumber
       httpclient (~> 2.2.7)
       json
       location-one (~> 0.0.6)
-      sim_launcher (= 0.3.8)
+      sim_launcher (>= 0.4.5)
       slowhandcuke
 
 GEM
@@ -34,7 +34,7 @@ GEM
     rack (1.4.1)
     rack-protection (1.2.0)
       rack
-    sim_launcher (0.3.8)
+    sim_launcher (0.4.5)
       sinatra
     sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)

data/calabash-cucumber.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency( "cucumber" )
   s.add_dependency( "json" )
   s.add_dependency( "CFPropertyList" )
-  s.add_dependency( "sim_launcher", "0.3.8") #Recommended by Pete for now
+  s.add_dependency( "sim_launcher", ">= 0.4.5")
   s.add_dependency( "slowhandcuke" )
   s.add_dependency( "location-one", "~>0.0.6")
   s.add_dependency( "httpclient","~> 2.2.7")

data/lib/calabash-cucumber/launch/simulator_helper.rb

@@ -1,4 +1,6 @@
 require 'sim_launcher'
+require 'json'
+require 'net/http'
 require 'CFPropertyList'
 
 module Calabash
@@ -68,7 +70,7 @@ module Calabash
               File.basename(xc_proj).downcase.start_with?(xcode_workspace_name)
             end
           end
-          
+
           if (build_dirs.count == 0)
             msg = ["Unable to find your built app."]
             msg << "This means that Calabash can't automatically launch iOS simulator."
@@ -175,7 +177,25 @@ module Calabash
               num_pings = 0
               until connected or (num_pings == max_ping)
                 begin
-                    connected = (ping_app == '405')
+                  connected = (ping_app == '405')
+                  post_connect_sleep = (ENV['POST_START_BREAK'] || "2").to_f
+                  sleep(post_connect_sleep) unless post_connect_sleep <= 0
+                  server_version = get_version
+                  if server_version
+                    unless version_check(server_version)
+                      msgs = ["You're running an older version of Calabash server with a newer client",
+                                                                           "Client:#{Calabash::Cucumber::VERSION}",
+                                                                           "Server:#{server_version}",
+                                                                           "Minimum server version #{Calabash::Cucumber::FRAMEWORK_VERSION}",
+                                                                           "Update recommended:",
+                                                                           "https://github.com/calabash/calabash-ios/wiki/B1-Updating-your-Calabash-iOS-version"
+                                                            ]
+
+                      raise msgs.join("\n")
+                    end
+                  else
+                    connected = false
+                  end
                 rescue Exception => e
                   p e if num_pings > 2
                 ensure
@@ -216,6 +236,25 @@ module Calabash
         end
         status
       end
+
+      def self.get_version
+        endpoint = ENV['DEVICE_ENDPOINT']|| "http://localhost:37265"
+        endpoint += "/" unless endpoint.end_with?"/"
+        url = URI.parse("#{endpoint}version")
+
+        puts "Fetch version #{url}..."
+        begin
+          body = Net::HTTP.get_response(url).body
+          return JSON.parse(body)
+        rescue
+        end
+        nil
+      end
+
+      def self.version_check(version)
+        server_version = version["version"]
+        Calabash::Cucumber::FRAMEWORK_VERSION == server_version
+      end
     end
 
   end

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.105"
+    VERSION = "0.9.106"
     FRAMEWORK_VERSION = "0.9.103"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.105
+  version: 0.9.106
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-22 00:00:00.000000000 Z
+date: 2012-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -64,17 +64,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: slowhandcuke
   requirement: !ruby/object:Gem::Requirement