calabash-android 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ec647f9c577d97b9a1432d89d51fed63406de7d
-  data.tar.gz: 032a9fd2df25729235077f01c728d1745fd8eddf
+  metadata.gz: aa3663285a474865b4f6a21abb902e14bdeb3d5b
+  data.tar.gz: faa0ec4e08a8eaf54c938d2f027907d68f2e5e22
 SHA512:
-  metadata.gz: 033eb8012e03ee8d32d7672c94cf9095d19044ea94dee803975343e4c1822398db1705ec50ab8230c88fdd86bcf04f58d4ba14e1048994bad0542992364aecef
-  data.tar.gz: d2d2739435aa413485e3c2f93d06a9945636e24c15bd46c85b60cba5a65c6c41e400c1a1decdc7f7d6d490380babbc96ac75ed3b982fea7ac847aa48dd8c1d0a
+  metadata.gz: 1039f2886af768ea0b55bc33e5d1fdd3783ca240877b372d87cfdf6e3c83e1409d735aecba923f532755af303c3027e07ed75f0be07996957f17f0f6859e3f56
+  data.tar.gz: f84eba70004f291a111f985e8322d1204a8f9831723c24d3cab357787aa86804e05fd2d7314aa646ff56f828460b705c527abf5175aa8a4ed29c580087b1eaa5

data/lib/calabash-android/dependencies.rb

@@ -398,7 +398,12 @@ module Calabash
                 if File.exist?('~/Library/Developer/Xamarin/android-sdk-macosx/')
                     return '~/Library/Developer/Xamarin/android-sdk-macosx/'
                 end
-
+                
+                # Default location when installing with Android Studio
+                if File.exist?('~/Library/Android/sdk/')
+                    return '~/Library/Android/sdk/'
+                end
+                
                 if File.exist?('C:\\Android\\android-sdk')
                     return 'C:\\Android\\android-sdk'
                 end

data/lib/calabash-android/operations.rb

@@ -749,7 +749,11 @@ module Calabash module Android
       end
 
       def start_application(intent)
-        result = JSON.parse(http("/start-application", {intent: intent}))
+        begin
+          result = JSON.parse(http("/start-application", {intent: intent}, {read_timeout: 60}))
+        rescue HTTPClient::ReceiveTimeoutError => e
+          raise "Failed to start application. Starting took more than 60 seconds: #{e.class} - #{e.message}"
+        end
 
         if result['outcome'] != 'SUCCESS'
           raise result['detail']

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.8.1"
+    VERSION = "0.8.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber