calabash-android 0.4.0.pre17 → 0.4.0.pre18

data/features-skeleton/support/app_life_cycle_hooks.rb

@@ -1,6 +1,5 @@
 require 'calabash-android/management/adb'
 require 'calabash-android/operations'
-include Calabash::Android::Operations
 
 Before do |scenario|
   start_test_server_in_background

data/irbrc

@@ -15,7 +15,7 @@ IRB.conf[:SAVE_HISTORY] = 50
 IRB.conf[:HISTORY_FILE] = ".irb-history"
 
 require 'calabash-android/operations'
-include Calabash::Android::Operations
+extend Calabash::Android::Operations
 
 def embed(*args)
   puts "Embed is a Cucumber method and is not available in this console."

data/lib/calabash-android/operations.rb

@@ -7,6 +7,7 @@ require 'socket'
 require 'timeout'
 require 'calabash-android/helpers'
 require 'calabash-android/wait_helpers'
+require 'calabash-android/touch_helpers'
 require 'calabash-android/version'
 require 'retriable'
 require 'cucumber'
@@ -16,15 +17,12 @@ module Calabash module Android
 
 module Operations
   include Calabash::Android::WaitHelpers
+  include Calabash::Android::TouchHelpers
 
   def log(message)
     $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} - #{message}" if (ARGV.include? "-v" or ARGV.include? "--verbose")
   end
 
-  def take_screenshot
-    default_device.take_screenshot
-  end
-
   def macro(txt)
     if self.respond_to?(:step)
       step(txt)
@@ -90,6 +88,10 @@ module Operations
     default_device.screenshot(options)
   end
 
+  def fail(msg="Error. Check log for details.", options={:prefix => nil, :name => nil, :label => nil})
+   screenshot_and_raise(msg, options)
+  end
+
   def set_gps_coordinates_from_location(location)
     default_device.set_gps_coordinates_from_location(location)
   end
@@ -98,20 +100,6 @@ module Operations
     default_device.set_gps_coordinates(latitude, longitude)
   end
 
-  #def wait_for(timeout, &block)
-  #  value = nil
-  #  begin
-  #    Timeout::timeout(timeout) do
-  #      until (value = block.call)
-  #        sleep 0.3
-  #      end
-  #    end
-  #  rescue Exception => e
-  #    raise e
-  #  end
-  #  value
-  #end
-
   def query(uiquery, *args)
     converted_args = []
     args.each do |arg|
@@ -253,25 +241,6 @@ module Operations
       end
     end
 
-    def take_screenshot
-      puts "take_screenshot is deprecated. Use screenshot_embed instead."
-      path = ENV["SCREENSHOT_PATH_PREFIX"] || "results"
-      FileUtils.mkdir_p path unless File.exist? path
-      filename_prefix = FeatureNameMemory.feature_name.gsub(/\s+/, '_').downcase
-      begin
-        Timeout.timeout(30) do
-          file_name = "#{path}/#{filename_prefix}_#{FeatureNameMemory.invocation}_#{StepCounter.step_line}.png"
-          image = http("/screenshot")
-          open(file_name ,"wb") { |file|
-            file.write(image)
-          }
-          log "Screenshot stored in: #{file_name}!!!"
-        end
-      rescue Timeout::Error
-        raise Exception, "take_screenshot timed out"
-      end
-    end
-
     def screenshot(options={:prefix => nil, :name => nil})
       prefix = options[:prefix] || ENV['SCREENSHOT_PATH'] || ""
       name = options[:name]

data/lib/calabash-android/touch_helpers.rb

@@ -0,0 +1,9 @@
+module Calabash
+  module Android
+    module TouchHelpers
+      def tap(mark, *args)
+        touch("* marked:'#{mark}'", *args)
+      end
+    end
+  end
+end

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.0.pre17"
+    VERSION = "0.4.0.pre18"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre17
+  version: 0.4.0.pre18
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -169,6 +169,7 @@ files:
 - lib/calabash-android/steps/search_steps.rb
 - lib/calabash-android/steps/spinner_steps.rb
 - lib/calabash-android/steps/time_picker_steps.rb
+- lib/calabash-android/touch_helpers.rb
 - lib/calabash-android/version.rb
 - lib/calabash-android/wait_helpers.rb
 - test-server/AndroidManifest.xml
@@ -848,7 +849,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Client for calabash-android for automated functional testing on Android