calabash-cucumber 0.19.2 → 0.20.0

data/lib/calabash-cucumber/usage_tracker.rb

@@ -1,5 +1,7 @@
+
 module Calabash
   module Cucumber
+    # @!visibility private
     class UsageTracker
       require "calabash-cucumber/store/preferences"
       require "calabash-cucumber/logging"

data/lib/calabash-cucumber/version.rb

@@ -3,10 +3,10 @@ module Calabash
 
     # @!visibility public
     # The Calabash iOS gem version.
-    VERSION = "0.19.2"
+    VERSION = "0.20.0"
 
     # @!visibility public
     # The minimum required version of the Calabash embedded server.
-    MIN_SERVER_VERSION = "0.19.2"
+    MIN_SERVER_VERSION = "0.20.0"
   end
 end

data/lib/calabash-cucumber/wait_helpers.rb

@@ -7,6 +7,8 @@ module Calabash
 
     # A collection of methods that help you wait for things.
     module WaitHelpers
+
+      # TODO This should not include Core!!!  It should be included _by_ Core.
       include Calabash::Cucumber::Core
       include Calabash::Cucumber::TestsHelpers
 

data/lib/calabash/formatters/html.rb

@@ -2,9 +2,13 @@ require "cucumber/formatter/html"
 require "uri"
 require "pathname"
 
+# @!visibility private
 module Calabash
+  # @!visibility private
   module Formatters
+    # @!visibility private
     class Html < ::Cucumber::Formatter::Html
+      # @!visibility private
       def embed_image(src, label)
         if _output_relative? && _relative_uri?(src)
           output_dir = Pathname.new(File.dirname(@io.path))
@@ -16,13 +20,14 @@ module Calabash
         end
       end
 
+      # @!visibility private
       def _relative_uri?(src)
         uri = URI.parse(src)
         return false if uri.scheme
         not Pathname.new(src).absolute?
       end
 
-
+      # @!visibility private
       def _output_relative?
         if @io.is_a?(File)
           path = @io.path

data/lib/frank-calabash.rb

@@ -3,14 +3,15 @@ require 'calabash-cucumber/core'
 require 'calabash-cucumber/operations'
 require 'calabash-cucumber/launcher'
 
-# base module for Frank-Calabash
+# @!visibility private
 module Calabash
   module Cucumber
     module Map
+      # @!visibility private
       def raw_map(query, method_name, *method_args)
         operation_map = {
-            :method_name => method_name,
-            :arguments => method_args
+          :method_name => method_name,
+          :arguments => method_args
         }
         res = http({:method => :post, :path => 'cal_map'},
                    {:query => query, :operation => operation_map})
@@ -26,8 +27,11 @@ module Calabash
   end
 end
 
+# @!visibility private
 module Frank
+  # @!visibility private
   module Calabash
+    # @!visibility private
     def launch(options={})
       launcher = ::Calabash::Cucumber::Launcher.launcher
       #noinspection RubyResolve
@@ -37,17 +41,19 @@ module Frank
       launcher.relaunch(options)
     end
 
+    # @!visibility private
     def calabash_client
       Client.new
     end
 
+    # @!visibility private
     module Operations
       include ::Calabash::Cucumber::Operations
     end
 
+    # @!visibility private
     class Client
       include Operations
     end
-
   end
 end

data/scripts/.irbrc

@@ -84,5 +84,8 @@ def enable_usage_tracking(level="system_info")
   level
 end
 
+xcode = RunLoop::Xcode.new
+Calabash::Cucumber::UIA.redefine_instance_methods_if_necessary(xcode)
+
 puts_console_details
 puts_message_of_the_day

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.19.2
+  version: 0.20.0
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -132,7 +132,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -142,7 +142,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -401,7 +401,11 @@ files:
 - features-skeleton/support/patches/cucumber.rb
 - features/step_definitions/calabash_steps.rb
 - lib/calabash-cucumber.rb
-- lib/calabash-cucumber/actions/instruments_actions.rb
+- lib/calabash-cucumber/abstract.rb
+- lib/calabash-cucumber/automator/automator.rb
+- lib/calabash-cucumber/automator/coordinates.rb
+- lib/calabash-cucumber/automator/device_agent.rb
+- lib/calabash-cucumber/automator/instruments.rb
 - lib/calabash-cucumber/calabash_steps.rb
 - lib/calabash-cucumber/connection.rb
 - lib/calabash-cucumber/connection_helpers.rb
@@ -410,6 +414,7 @@ files:
 - lib/calabash-cucumber/cucumber.rb
 - lib/calabash-cucumber/date_picker.rb
 - lib/calabash-cucumber/device.rb
+- lib/calabash-cucumber/device_agent.rb
 - lib/calabash-cucumber/dot_dir.rb
 - lib/calabash-cucumber/dylibs.rb
 - lib/calabash-cucumber/environment.rb
@@ -422,6 +427,7 @@ files:
 - lib/calabash-cucumber/keyboard_helpers.rb
 - lib/calabash-cucumber/keychain_helpers.rb
 - lib/calabash-cucumber/launcher.rb
+- lib/calabash-cucumber/log_tailer.rb
 - lib/calabash-cucumber/logging.rb
 - lib/calabash-cucumber/map.rb
 - lib/calabash-cucumber/operations.rb
@@ -468,4 +474,3 @@ signing_key:
 specification_version: 4
 summary: Client for calabash-ios-server for automated functional testing on iOS
 test_files: []
-has_rdoc: 

data/lib/calabash-cucumber/actions/instruments_actions.rb

@@ -1,155 +0,0 @@
-require 'calabash-cucumber/uia'
-require 'calabash-cucumber/connection_helpers'
-require 'calabash-cucumber/query_helpers'
-
-# @!visibility private
-class Calabash::Cucumber::InstrumentsActions
-  include Calabash::Cucumber::UIA
-  include Calabash::Cucumber::ConnectionHelpers
-  include Calabash::Cucumber::QueryHelpers
-
-  require "calabash-cucumber/map"
-
-  # @!visibility private
-  def touch(options)
-    query_action(options, :uia_tap_offset)
-  end
-
-  # @!visibility private
-  def double_tap(options)
-    query_action(options, :uia_double_tap_offset)
-  end
-
-  # @!visibility private
-  def two_finger_tap(options)
-    query_action(options, :uia_two_finger_tap_offset)
-  end
-
-  # @!visibility private
-  def flick(options)
-    query_action(options) do |offset|
-      delta = {:offset => options[:delta] || {}}
-      uia_flick_offset(offset, point_from(offset, delta))
-    end
-  end
-
-  # @!visibility private
-  def touch_hold(options)
-    query_action(options) do |offset|
-      duration = options[:duration] || 3
-      uia_touch_hold_offset(duration, offset)
-    end
-  end
-
-  # @!visibility private
-  def swipe(dir, options={})
-    options = options.merge(:direction => dir)
-    query_action(options, :uia_swipe_offset, options)
-  end
-
-  # @!visibility private
-  def pan(from, to, options={})
-    query_action(:query => from) do |from_offset|
-      query_action(:query => to) do |to_offset|
-        uia_pan_offset(from_offset, to_offset, options)
-      end
-    end
-  end
-
-  # @!visibility private
-  def pinch(in_out, options)
-    query_action(options) do |offset|
-      options[:duration] = options[:duration] || 0.5
-      uia_pinch_offset(in_out, offset, options)
-    end
-  end
-
-  # @!visibility private
-  def send_app_to_background(secs)
-    uia_send_app_to_background(secs)
-  end
-
-  private
-
-  # @!visibility private
-  # Data interface
-  # options[:query] or options[:offset]
-  def query_action(options, action=nil, *args, &block)
-    ui_query = options[:query]
-    offset = options[:offset]
-    if ui_query
-      res = find_and_normalize(ui_query)
-      return res if res.empty?
-      el = res.first
-      final_offset = point_from(el, options)
-      if block_given?
-        yield final_offset
-      else
-        self.send(action, final_offset, *args)
-      end
-      [el]
-    else
-      ##implies offset
-      if block_given?
-        yield offset
-      else
-        self.send(action, offset, *args)
-      end
-    end
-  end
-
-  # @!visibility private
-  def find_and_normalize(ui_query)
-    raw_result = Calabash::Cucumber::Map.raw_map(ui_query, :query)
-    orientation = raw_result['status_bar_orientation']
-    res = raw_result['results']
-
-    return res if res.empty?
-
-    first_res = res.first
-    normalize_rect_for_orientation!(orientation, first_res['rect']) if first_res['rect']
-
-    res
-  end
-
-  # @!visibility private
-  def normalize_rect_for_orientation!(orientation, rect)
-    orientation = orientation.to_sym
-    launcher = Calabash::Cucumber::Launcher.launcher
-    device = launcher.device
-
-    # Coordinate translations for orientation is handled in the server for iOS 8+
-    if device.ios_major_version.to_i >= 8
-      return
-    end
-
-    # We cannot use Device#screen_dimensions here because on iPads the height
-    # and width are the opposite of what we expect.
-    # @todo Move all coordinate/orientation translation into the server.
-    if device.ipad?
-      screen_size = { :width => 768, :height => 1024 }
-    elsif device.iphone_4in?
-      screen_size = { :width => 320, :height => 568 }
-    else
-      screen_size = { :width => 320, :height => 480 }
-    end
-
-    case orientation
-      when :right
-        cx = rect['center_x']
-        rect['center_x'] = rect['center_y']
-        rect['center_y'] = screen_size[:width] - cx
-      when :left
-        cx = rect['center_x']
-        rect['center_x'] = screen_size[:height] - rect['center_y']
-        rect['center_y'] = cx
-      when :up
-        cy = rect['center_y']
-        cx = rect['center_x']
-        rect['center_y'] = screen_size[:height] - cy
-        rect['center_x'] = screen_size[:width] - cx
-      else
-        # no-op by design.
-    end
-  end
-end