calabash-android 0.4.3.pre7 → 0.4.3.pre8

data/lib/calabash-android/operations.rb

@@ -267,12 +267,7 @@ module Operations
       @@screenshot_count ||= 0
       path = "#{prefix}#{name}_#{@@screenshot_count}.png"
 
-      if ENV["SCREENSHOT_VIA_USB"] == "true"
-        device_args = "-s #{@serial}" if @serial
-        screenshot_cmd = "java -jar #{File.join(File.dirname(__FILE__), 'lib', 'screenShotTaker.jar')} #{path} #{device_args}"
-        log screenshot_cmd
-        raise "Could not take screenshot" unless system(screenshot_cmd)
-      else
+      if ENV["SCREENSHOT_VIA_USB"] == "false"
         begin
           res = http("/screenshot")
         rescue EOFError
@@ -281,9 +276,13 @@ module Operations
         File.open(path, 'wb') do |f|
           f.write res
         end
+      else
+        device_args = "-s #{@serial}" if @serial
+        screenshot_cmd = "java -jar #{File.join(File.dirname(__FILE__), 'lib', 'screenShotTaker.jar')} #{path} #{device_args}"
+        log screenshot_cmd
+        raise "Could not take screenshot" unless system(screenshot_cmd)
       end
 
-
       @@screenshot_count += 1
       path
     end

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.3.pre7"
+    VERSION = "0.4.3.pre8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.3.pre7
+  version: 0.4.3.pre8
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber