calabash-cucumber 0.9.132 → 0.9.133

data/.gitignore

@@ -1,4 +1,6 @@
 pkg
 Markdown.pl
 .idea
-Gemfile.lock
+Gemfile.lock
+staticlib
+libcalabash

data/bin/calabash-ios

@@ -15,6 +15,7 @@ require File.join(File.dirname(__FILE__),"calabash-ios-build")
 @features_dir = File.join(FileUtils.pwd, "features")
 @source_dir = File.join(File.dirname(__FILE__), '..', 'features-skeleton')
 @script_dir = File.join(File.dirname(__FILE__), '..', 'scripts')
+@framework_dir = File.join(File.dirname(__FILE__), '..', 'staticlib')
 
 if (ARGV.length == 0)
   print_usage

data/bin/calabash-ios-setup.rb

@@ -94,47 +94,9 @@ def download_calabash(project_path)
   ##Download calabash.framework
   if not File.directory?(File.join(project_path, file))
     msg("Info") do
-      zip_file = "calabash.framework-#{ENV['FRAMEWORK_VERSION']||Calabash::Cucumber::FRAMEWORK_VERSION}.zip"
-      puts "Did not find calabash.framework. I'll download it...'"
-      puts "http://cloud.github.com/downloads/calabash/calabash-ios/#{zip_file}"
-      require 'uri'
-
-      uri = URI.parse "http://cloud.github.com/downloads/calabash/calabash-ios/#{zip_file}"
-      success = false
-      if has_proxy?
-        proxy_url = proxy
-        connection = Net::HTTP::Proxy(proxy_url[0], proxy_url[1])
-      else
-        connection = Net::HTTP
-      end
-      begin
-      connection.start(uri.host, uri.port) do |http|
-        request = Net::HTTP::Get.new uri.request_uri
-
-        http.request request do |response|
-          if response.code == '200'
-            open zip_file, 'wb' do |io|
-              response.read_body do |chunk|
-                print "."
-                io.write chunk
-              end
-            end
-            success = true
-          else
-             puts "Got bad response code #{response.code}."
-             puts "Aborting..."
-          end
-        end
-      end
-      rescue SocketError => e
-        msg("Error") do
-          puts "Exception: #{e}"
-          puts "Unable to download Calabash. Please check connection."
-        end
-        exit 1
-      end
-      if success
-        puts "\nDownload done: #{file}. Unzipping..."
+      zip_file = File.join(@framework_dir,"calabash.framework.zip")
+
+      if File.exist?(zip_file)
         if not system("unzip -C -K -o -q -d #{project_path} #{zip_file} -x __MACOSX/* calabash.framework/.DS_Store")
           msg("Error") do
             puts "Unable to unzip file: #{zip_file}"
@@ -142,8 +104,8 @@ def download_calabash(project_path)
           end
           exit 1
         end
-        FileUtils.rm(zip_file)
       else
+        puts "Inconsistent gem state: Cannot find framework: #{zip_file}"
         exit 0
       end
     end
@@ -174,28 +136,25 @@ def setup_project(project_name, project_path, path)
     exit 1
   end
 
-  pwd = FileUtils.pwd
-  FileUtils.cd project_path
-  ##Backup
-  if File.exists? "#{proj_file}.bak"
-    msg("Error") do
-      puts "Backup file already exists. #{proj_file}.bak"
-      puts "For safety, I won't overwrite this file."
-      puts "You must manually move this file, if you want to"
-      puts "Run calabash-ios setup again."
+  FileUtils.cd project_path do
+    ##Backup
+    if File.exists? "#{proj_file}.bak"
+      msg("Error") do
+        puts "Backup file already exists. #{proj_file}.bak"
+        puts "For safety, I won't overwrite this file."
+        puts "You must manually move this file, if you want to"
+        puts "Run calabash-ios setup again."
+      end
+      exit 1
     end
-    exit 1
   end
 
-  file = download_calabash(project_path)
+  download_calabash(project_path)
 
   msg("Info") do
     puts "Setting up project file for calabash-ios."
   end
 
-
-  FileUtils.cd pwd
-
   ##Backup
   msg("Info") do
     puts "Making backup of project file: #{proj_file}"

data/calabash-cucumber.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://calaba.sh"
   s.summary     = %q{Client for calabash-ios-server for automated functional testing on iOS}
   s.description = %q{calabash-cucumber drives tests for native iOS apps. You must link your app with calabash-ios-server framework to execute tests.}
-  s.files         = `git ls-files`.split("\n")
+  s.files         = `git ls-files`.split("\n").concat(["staticlib/calabash.framework.zip"])
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = "calabash-ios"
   s.require_paths = ["lib"]

data/lib/calabash-cucumber/core.rb

@@ -45,14 +45,42 @@ module Calabash
             args = args[0]
           end
         end
-        map(q, :query_all, *args)
+        map(q, :query, *args)
       end
 
       def query_all(uiquery, *args)
-        map(uiquery, :query_all, *args)
+        puts "query_all is deprecated. Use the new all/visible feature."
+        puts "see: https://github.com/calabash/calabash-ios/wiki/05-Query-syntax"
+        map("all #{uiquery}", :query, *args)
       end
 
       def touch(uiquery, options={})
+        if (uiquery.is_a?(Array))
+          raise "No elements to touch in array" if uiquery.empty?
+          uiquery = uiquery.first
+        end
+        if (uiquery.is_a?(Hash))
+          offset_x = 0
+          offset_y = 0
+          if options[:offset]
+            offset_x += options[:offset][:x] || 0
+            offset_y += options[:offset][:y] || 0
+          end
+          x = offset_x
+          y = offset_y
+          rect = uiquery["rect"] || uiquery[:rect]
+          if rect
+            x += rect['center_x'] || rect[:center_x] || rect[:x] || 0
+            y += rect['center_y'] || rect[:center_y] || rect[:y] || 0
+          else
+            x += uiquery['center_x'] || uiquery[:center_x] || uiquery[:x] || 0
+            y += uiquery['center_y'] || uiquery[:center_y] || uiquery[:y] || 0
+          end
+
+          options[:offset] = {:x => x, :y => y}
+          return touch(nil, options)
+        end
+
         options[:query] = uiquery
         views_touched = playback("touch", options)
         unless uiquery.nil?
@@ -278,7 +306,7 @@ module Calabash
       end
 
 
-      def load_recording(recording,rec_dir)
+      def load_recording(recording, rec_dir)
         data = nil
         if (File.exists?(recording))
           data = File.read(recording)
@@ -315,13 +343,13 @@ EOF
         rec_dir = ENV['PLAYBACK_DIR'] || "#{Dir.pwd}/playback"
 
         recording = recording_name_for(recording_name, os, device)
-        data = load_recording(recording,rec_dir)
+        data = load_recording(recording, rec_dir)
 
         if data.nil? and os=="ios6"
           recording = recording_name_for(recording_name, "ios5", device)
         end
 
-        data = load_recording(recording,rec_dir)
+        data = load_recording(recording, rec_dir)
 
         if data.nil?
           screenshot_and_raise "Playback not found: #{recording} (searched for #{recording} in #{Dir.pwd}, #{rec_dir}, #{DATA_PATH}/resources"
@@ -450,7 +478,7 @@ EOF
         end
         app_bundle_path = Calabash::Cucumber::SimulatorHelper.app_bundle_or_raise(path)
 
-        @ios_device  = RunLoop.run(:app => app_bundle_path)
+        @ios_device = RunLoop.run(:app => app_bundle_path)
       end
 
       def send_uia_command(opts ={})
@@ -464,7 +492,6 @@ EOF
       end
 
 
-
       def http(options, data=nil)
         options[:uri] = url_for(options[:path])
         options[:method] = options[:method] || :get

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.132"
-    FRAMEWORK_VERSION = "0.9.126"
+    VERSION = "0.9.133"
+    FRAMEWORK_VERSION = "0.9.133"
   end
 end

data/lib/calabash-cucumber/wait_helpers.rb

@@ -32,7 +32,9 @@ module Calabash
           retry_frequency = options_or_timeout[:retry_frequency] || 0.2
           post_timeout = options_or_timeout[:post_timeout] || 0.1
           timeout_message = options_or_timeout[:timeout_message]
-          screenshot_on_error = options_or_timeout[:screenshot_on_error] || true
+          if options_or_timeout.key?(:screenshot_on_error)
+            screenshot_on_error = options_or_timeout[:screenshot_on_error]
+          end
         end
 
         begin

data/scripts/.irbrc

@@ -18,7 +18,7 @@ require 'calabash-cucumber/operations'
 require 'calabash-cucumber/launch/simulator_helper'
 SIM=Calabash::Cucumber::SimulatorHelper
 
-include Calabash::Cucumber::Operations
+extend Calabash::Cucumber::Operations
 
 def embed(x,y=nil,z=nil)
    puts "Screenshot at #{x}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.132
+  version: 0.9.133
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -298,6 +298,7 @@ files:
 - scripts/data/clients.plist
 - scripts/data/com.apple.Accessibility.plist
 - scripts/reset_simulator.scpt
+- staticlib/calabash.framework.zip
 homepage: http://calaba.sh
 licenses: []
 post_install_message: 
@@ -324,3 +325,4 @@ specification_version: 3
 summary: Client for calabash-ios-server for automated functional testing on iOS
 test_files:
 - features/step_definitions/calabash_steps.rb
+has_rdoc: