calabash-cucumber 0.9.163.pre1 → 0.9.163.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb9435164c3c6e1fbb27d115c6ff95695103d92e
-  data.tar.gz: 6d2ee3912d659216fd6196d8746c5bf35d00aa1c
+  metadata.gz: d74a738566ae6afbbef306f650121183621ada97
+  data.tar.gz: 63ba438671209a80a5af7b1421ebe4026f9ed534
 SHA512:
-  metadata.gz: 14e98c7878f6cc256c2931e55f5bc19d58b91c33433a0aeb23771de5e59c28e0ec153b923dbeccd5560207bdd09c69271c422071afddcc9b78267c8c83e6ad8c
-  data.tar.gz: 9d271ee5d68b714bb05629b3b9a394c4df5d7b0869458f624d987212e03c8495a2a2cc9fcb8524bf029effbac942239efe93c62da5cf5e4f46dcc43bc45acd63
+  metadata.gz: f9035529252d31c95347db61c5f43476a58cd781c745f62190510392d083bfc01f201692455f724e91c4c0fe24776f9acf13879ab941a29e81bd10c17d914af2
+  data.tar.gz: 5d3360cee7f483c4a3bb8964c92f386faa9b20aa169ef894fc334a746015fc5b475c47c08e8a8e7ecfb4d13980a0c4e82ca516b5dcfaea56685c5572dfb9bfd5

data/calabash-cucumber.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency( "CFPropertyList" )
   s.add_dependency( "sim_launcher", "0.4.6")
   s.add_dependency( "slowhandcuke" )
-  s.add_dependency( "location-one", "~>0.0.10")
+  s.add_dependency( "geocoder", "~>1.1.8")
   s.add_dependency( "httpclient","~> 2.3.3")
   s.add_dependency( "bundler", "~> 1.1")
   s.add_dependency( "run_loop", "~> 0.1.0.pre1" )

data/lib/calabash-cucumber.rb

@@ -4,5 +4,5 @@ require 'calabash-cucumber/keyboard_helpers'
 require 'calabash-cucumber/wait_helpers'
 require 'calabash-cucumber/operations'
 require 'calabash-cucumber/version'
-require 'calabash-cucumber/location'
+require 'calabash-cucumber/uia'
 require 'calabash-cucumber/date_picker.rb'

data/lib/calabash-cucumber/core.rb

@@ -1,4 +1,5 @@
 require 'httpclient'
+require 'geocoder'
 require 'calabash-cucumber/launch/simulator_helper'
 require 'calabash-cucumber/uia'
 require 'calabash-cucumber/ios7_operations'
@@ -378,6 +379,47 @@ module Calabash
         uia_send_app_to_background(secs)
       end
 
+      def console_attach
+        Calabash::Cucumber::Launcher.attach
+      end
+
+      def set_location(options)
+        if Calabash::Cucumber::Launcher.instruments?
+          uia_set_location(options)
+        else
+          if options[:place]
+            res = location_for_place(options[:place])
+            lat = res.latitude
+            lon = res.longitude
+          else
+            lat = options[:latitude]
+            lon = options[:longitude]
+          end
+          body_data = {:action => :change_location,
+                       :latitude => lat,
+                       :longitude => lon}
+
+          body = http({:method => :post, :path => 'location'}, body_data)
+
+          res = JSON.parse(res)
+          if res['outcome'] != 'SUCCESS'
+            screenshot_and_raise "Set location change failed, for #{lat}, #{lon} (#{body})."
+          end
+          res['results']
+
+        end
+      end
+
+      def location_for_place(place)
+        search_results = locations_for_place(place)
+        raise "Got no results for #{place}" if search_results.empty?
+        search_results.first
+      end
+
+      def locations_for_place(place)
+        Geocoder.search(place)
+      end
+
       def move_wheel(opts={})
         q = opts[:query] || "pickerView"
         wheel = opts[:wheel] || 0
@@ -388,6 +430,8 @@ module Calabash
 
         if ENV['OS'] == "ios4"
           playback "wheel_#{dir}", :query => "#{q} pickerTable index:#{wheel}"
+        elsif ios7?
+          raise NotImplementedError
         else
           playback "wheel_#{dir}", :query => "#{q} pickerTableView index:#{wheel}"
         end

data/lib/calabash-cucumber/launcher.rb

@@ -27,8 +27,34 @@ class Calabash::Cucumber::Launcher
   class CalabashLauncherTimeoutErr < Timeout::Error
   end
 
+  def self.attach
+    l = launcher
+    return l if l && l.active?
+    l.attach
+
+  end
+
+  def attach
+    pids_str = `ps x -o pid,command | grep -v grep | grep "instruments" | awk '{printf "%s,", $1}'`
+    pids = pids_str.split(',').map { |pid| pid.to_i }
+    pid = pids.first
+    rl = {}
+    rl[:pid] = pid if pid
+
+    self.run_loop= rl
+    ensure_connectivity
+
+    self
+  end
+
+  def self.instruments?
+    l = launcher_if_used
+    return false unless l
+    l.active?
+  end
+
   def self.launcher
-    @@launcher ||= Launcher.new
+    @@launcher ||= Calabash::Cucumber::Launcher.new
   end
 
   def self.launcher_if_used
@@ -357,7 +383,7 @@ class Calabash::Cucumber::Launcher
   end
 
   def run_with_instruments?(args)
-    args[:launch_method] == :instruments
+    args && args[:launch_method] == :instruments
   end
 
   def active?
@@ -365,7 +391,7 @@ class Calabash::Cucumber::Launcher
   end
 
   def inspect
-    msg = ["#{self.class}: Launch Method #{launch_args[:launch_method]}"]
+    msg = ["#{self.class}: Launch Method #{launch_args && launch_args[:launch_method]}"]
     if run_with_instruments?(self.launch_args) && self.run_loop
       msg << "Log file: #{self.run_loop[:log_file]}"
     end

data/lib/calabash-cucumber/operations.rb

@@ -2,7 +2,6 @@ require 'calabash-cucumber/core'
 require 'calabash-cucumber/tests_helpers'
 require 'calabash-cucumber/keyboard_helpers'
 require 'calabash-cucumber/wait_helpers'
-require 'calabash-cucumber/location'
 require 'calabash-cucumber/launcher'
 require 'net/http'
 require 'test/unit/assertions'
@@ -26,7 +25,6 @@ module Calabash
       include Calabash::Cucumber::TestsHelpers
       include Calabash::Cucumber::WaitHelpers
       include Calabash::Cucumber::KeyboardHelpers
-      include Calabash::Cucumber::Location
       include Calabash::Cucumber::DatePicker
 
       def page(clz,*args)

data/lib/calabash-cucumber/uia.rb

@@ -1,24 +1,22 @@
 require 'edn'
-require 'location-one'
 
 module Calabash
   module Cucumber
     module UIA
 
-      def send_uia_command(opts ={})
-        #launcher = @calabash_launcher || Calabash::Cucumber::Launcher.launcher_if_used
-        #run_loop = opts[:run_loop] || (launcher && launcher.active? && launcher.run_loop)
-        command = opts[:command]
-        #raise ArgumentError, 'please supply :run_loop or instance var @calabash_launcher' unless run_loop
-        #raise ArgumentError, 'please supply :command' unless command
-        #RunLoop.send_command(run_loop, opts[:command])
-        res = http({:method => :post, :path => 'uia'}, {command:command})
+      def uia(command,options={})
+        res = http({:method => :post, :path => 'uia'}, {command:command}.merge(options))
         res = JSON.parse(res)
         if res['outcome'] != 'SUCCESS'
           screenshot_and_raise "uia send failed because: #{res['reason']}\n#{res['details']}"
         end
         res['results'].first
+      end
 
+      def send_uia_command(opts ={})
+        #deprecated, poor method signature
+        #use uia("uia-js...",options)
+        uia(opts[:command], opts)
       end
 
       def uia_query(*queryparts)
@@ -87,16 +85,20 @@ module Calabash
         uia_handle_command(:typeString, string)
       end
 
-      def uia_enter()
+      def uia_enter
         uia_handle_command(:enter)
       end
 
-      def uia_set_location(place)
-        if place.is_a?(String)
-          loc = LocationOne::Client.location_by_place(place)
-          loc_data = {"latitude"=>loc.latitude, "longitude"=>loc.longitude}
-        else
-          loc_data = place
+      def uia_set_location(options)
+        validate_hash_is_location!(options)
+        if options[:place]
+          place = options[:place]
+          search_results = Geocoder.search(place)
+          raise "Got no results for #{place}" if search_results.empty?
+          loc = search_results.first
+          loc_data = {'latitude'=>loc.latitude, 'longitude'=>loc.longitude}
+        elsif options.is_a?(Hash)
+          loc_data = options
         end
         uia_handle_command(:setLocation, loc_data)
       end
@@ -118,7 +120,7 @@ module Calabash
           puts "Sending UIA command"
           puts command
         end
-        s=send_uia_command :command => command
+        s = uia(command)
         if ENV['DEBUG'] == '1'
           puts "Result"
           p s
@@ -135,6 +137,18 @@ module Calabash
         escape_quotes string
       end
 
+      private
+      def validate_hash_is_location!(options)
+        return if options[:latitude] and options[:longitude]
+        if (options[:latitude] and not options[:longitude]) ||
+            (options[:longitude] and not options[:latitude])
+          raise 'Both latitude and longitude must be specified if either is.'
+        elsif not options[:place]
+            raise 'Either :place or :latitude and :longitude must be specified.'
+        end
+      end
+
+
     end
   end
 end

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.163.pre1'
-    FRAMEWORK_VERSION = '0.9.163.pre1'
+    VERSION = '0.9.163.pre2'
+    FRAMEWORK_VERSION = '0.9.163.pre2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.163.pre1
+  version: 0.9.163.pre2
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -109,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: location-one
+  name: geocoder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 1.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 1.1.8
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -236,7 +236,6 @@ files:
 - lib/calabash-cucumber/keyboard_helpers.rb
 - lib/calabash-cucumber/launch/simulator_helper.rb
 - lib/calabash-cucumber/launcher.rb
-- lib/calabash-cucumber/location.rb
 - lib/calabash-cucumber/operations.rb
 - lib/calabash-cucumber/resources/cell_swipe_ios4_ipad.base64
 - lib/calabash-cucumber/resources/cell_swipe_ios4_iphone.base64

data/lib/calabash-cucumber/location.rb

@@ -1,26 +0,0 @@
-require 'location-one'
-require 'geocoder'
-
-module Calabash
-  module Cucumber
-    module Location
-      include Calabash::Cucumber::Core
-
-      def set_location(options)
-        uri = url_for('uia')
-        client = LocationOne::Client.new({:host => uri.host, :port => uri.port, :path => '/uia'}, @http)
-        res = client.change_location(options)
-        res = JSON.parse(res)
-        if res['outcome'] != 'SUCCESS'
-          screenshot_and_raise "set_location #{options}, failed because: #{res['reason']}\n#{res['details']}"
-        end
-        res['results']
-      end
-
-      def location_for_place(place)
-         LocationOne::Client.location_by_place place
-      end
-
-    end
-  end
-end