calabash-cucumber 0.9.163.pre3 → 0.9.163.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ba4c13954fdbb5e3b318dc013b01afebf0ffc0d
-  data.tar.gz: a6ca296b723ead0f965a37ccc8fb3bb1662bb105
+  metadata.gz: 92fe46c72cf7c198d794ddba2a518ecda59757d9
+  data.tar.gz: d0fc8270c277166fcda42080a6d05adf6b3e1a02
 SHA512:
-  metadata.gz: 992d859db98cbb905fa69c8e31e700fe8a2db9829a0278be0a53078557992419e59f8d0ae587940dac2b78a53ad81e93389efe86f854189837ae393401d11cca
-  data.tar.gz: 037196a5aea4b6422ae3bf1fc844419fbf634235df38565d40c38c4c889ae97f3b7cd2ed00d27e162cef25d1c8d8ae42cd8492d26fea4f06fc9a6dc126bfbcc7
+  metadata.gz: 7fd73184e610036cebeb6f8a842f258f7cd49b6fd6dbe6edb68e7c5c4f868f4b0c564d868c12523c9301f132e7c92f515ccfc572e5f7bc84b4f206e658f8addf
+  data.tar.gz: 01361b87b9afebba12e99e53d05c808ed093238ead4f5413249a227af14adf32d631664119f5b12127ea135818c03ec7b78670848a60a959cf4118c0b78fd4e8

data/lib/calabash-cucumber/core.rb

@@ -738,6 +738,11 @@ EOF
         end
       end
 
+      def shutdown_test_server
+        # Compat with Calabash Android
+        stop_test_server
+      end
+
       def default_device
         @calabash_launcher && @calabash_launcher.device
       end

data/lib/calabash-cucumber/launcher.rb

@@ -132,7 +132,21 @@ class Calabash::Cucumber::Launcher
   end
 
   def detect_connected_device?
+    if ENV['DETECT_CONNECTED_DEVICE'] == '1'
+      return true
+    end
+
+    if ENV['BUNDLE_ID'].nil? && ENV['DETECT_CONNECTED_DEVICE'].nil?
+      return false
+    end
+    if ENV['BUNDLE_ID'] && ENV['DETECT_CONNECTED_DEVICE'].nil?
+      return true
+    end
+    if ENV['DETECT_CONNECTED_DEVICE']
       return ENV['DETECT_CONNECTED_DEVICE'] != '0'
+    end
+
+    return false
   end
 
   def default_launch_method

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.163.pre3'
+    VERSION = '0.9.163.pre4'
     FRAMEWORK_VERSION = '0.9.163.pre3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.163.pre3
+  version: 0.9.163.pre4
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber