calabash-cucumber 0.9.153 → 0.9.154

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0013596c606dae1ae15bdd511ff80df2828f5cd1
-  data.tar.gz: e7b227e7ed17db7c74590184fa245204510bf503
+  metadata.gz: a8d4190812e9ee519cd240f3a022f14e5ff4aec1
+  data.tar.gz: 681b90198c5794c0a663143f1b86d5d27b420d42
 SHA512:
-  metadata.gz: ed9bb7e55df24f89f862bb87e62fd8ed29ca3bc2160e674e60ba7330b1b7f57d235b60e9051e69d55738acf56d24ae7388e0e86f05d4e1af56530233b0df4db9
-  data.tar.gz: e5b448303482fece80fc706b37e292624aab14b09e4589a41e4f120388ed2639aad59b9bcf0ad0a8a31609af69821a73a41036e934b1a0babcc23fe4f63be936
+  metadata.gz: 01a12bf0c3718f03541bc32a1046e217bb51767cb00a6fc23146ae3fcdbbb719e3f5bc8022384fd23cd3311c8b86e8c87e0abf7ba651d27f5ba28e598159d571
+  data.tar.gz: 4cdae234964c454a05c590198af2049e733ef89b4ce868571e15de1cee9c03461505a5389ec5363b09bccd08f1f823ef0f059a3e0831c992968a4a01492e8880

data/lib/calabash-cucumber/core.rb

@@ -98,6 +98,7 @@ module Calabash
       end
 
       def swipe(dir, options={})
+        dir = dir.to_sym
         if ios7?
           swipe_ios7(options.merge(:direction => dir))
         else
@@ -230,11 +231,12 @@ module Calabash
       end
 
       def pinch(in_out, options={})
+        in_out = in_out.to_sym
         if ios7?
           pinch_ios7(in_out.to_sym, options)
         else
           file = "pinch_in"
-          if in_out.to_sym==:out
+          if in_out==:out
             file = "pinch_out"
           end
           playback(file, options)

data/lib/calabash-cucumber/ios7_operations.rb

@@ -9,7 +9,7 @@ module Calabash
 
       def ios7?
         launcher = @calabash_launcher || Calabash::Cucumber::Launcher.launcher_if_used
-        ENV['OS']=='ios7' || (launcher && launcher.device.ios7?)
+        ENV['OS']=='ios7' || (launcher && launcher.device && launcher.device.ios7?)
       end
 
       def touch_ios7(options)

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.153'
+    VERSION = '0.9.154'
     FRAMEWORK_VERSION = '0.9.153'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.153
+  version: 0.9.154
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber