calabash-cucumber 0.16.4 → 0.17.0

data/lib/calabash-cucumber/uia.rb

@@ -61,49 +61,6 @@ module Calabash
         end
       end
 
-
-      # @!visibility private
-      def uia_wait_tap(query, options={})
-        launcher = Calabash::Cucumber::Launcher.launcher_if_used
-        run_loop = launcher && launcher.active? && launcher.run_loop
-
-        unless run_loop
-          raise 'The current launcher must be active and be attached to a run_loop'
-        end
-
-        unless query
-          raise ArgumentError, "Expected a query argument but got '#{query}'"
-        end
-
-        strategy = run_loop[:uia_strategy]
-
-        case strategy
-          when :preferences
-            path = 'uia-tap'
-          when :shared_element
-            path = 'uia-tap-shared'
-          when :host
-            lines = ['wait_tap is not supported when using the :host strategy',
-                     'Please see:',
-                     '',
-                     'https://github.com/calabash/calabash-ios/issues/675',
-                     '',
-                     'for details and workarounds'
-            ]
-
-            raise lines.join("\n")
-          else
-            raise "Unknown UIA strategy '#{strategy}'; expected {:host | :preferences | :shared_element}"
-        end
-
-        res = http({:method => :post, :path => path}, {:query => query}.merge(options))
-        res = JSON.parse(res)
-        if res['outcome'] != 'SUCCESS'
-          raise "wait-uia-tap action failed because: #{res['reason']}\n#{res['details']}"
-        end
-        res['results']
-      end
-
       # Invoke a Calabash query inside the UIAutomation Calabash engine
       # Note that this traverses the UIA (accessibility) hierarchy.
       # @example uia query equivalent of "button marked:'Hello'"

data/lib/calabash-cucumber/usage_tracker.rb

@@ -0,0 +1,192 @@
+module Calabash
+  module Cucumber
+    class UsageTracker
+
+      require "httpclient"
+      require "run_loop"
+
+      # @!visibility private
+      @@track_usage = true
+
+      # @!visibility private
+      def self.enable_usage_tracking
+        @@track_usage = true
+      end
+
+      # @!visibility private
+      def self.disable_usage_tracking
+        @@track_usage = false
+      end
+
+      # @!visibility private
+      def post_usage
+        if Calabash::Cucumber::UsageTracker.track_usage? &&
+            info_we_are_allowed_to_track != "none"
+          begin
+            HTTPClient.post(ROUTE, info)
+          rescue => _
+            # do nothing
+            # Perhaps we should log?
+          end
+        end
+      end
+
+      # @!visibility private
+      def post_usage_async
+        t = Thread.new do
+          post_usage
+        end
+
+        m = Thread.current
+
+        Thread.new do
+          loop do
+            unless t.alive?
+              break
+            end
+
+            unless m.alive?
+              t.kill
+              break
+            end
+          end
+        end
+        nil
+      end
+
+      private
+
+      # @!visibility private
+      def preferences
+        Calabash::Cucumber::Preferences.new
+      end
+
+      # @!visibility private
+      def user_id
+        preferences.user_id
+      end
+
+      # @!visibility private
+      def info_we_are_allowed_to_track
+        preferences.usage_tracking
+      end
+
+      # @!visibility private
+      def self.track_usage?
+        @@track_usage && !self.xtc?
+      end
+
+      # @!visibility private
+      def self.xtc?
+        ENV["XAMARIN_TEST_CLOUD"] == "1"
+      end
+
+      # @!visibility private
+      DATA_VERSION = "1.0"
+
+      # @!visibility private
+      WINDOWS = "Windows"
+
+      # @!visibility private
+      OSX = "Darwin"
+
+      # @!visibility private
+      CALABASH_IOS = "iOS"
+
+      # @!visibility private
+      CALABASH_ANDROID = "Android"
+
+      # @!visibility private
+      ROUTE = "http://calabash-ci.macminicolo.net:56789/logEvent"
+
+      # @!visibility private
+      def host_os
+        @host_os ||= lambda do
+          if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+            WINDOWS
+          else
+            `uname -s`.chomp
+          end
+        end.call
+      end
+
+      # @!visibility private
+      def host_os_version
+        @host_os_version ||= lambda do
+          if host_os == WINDOWS
+            `ver`.chomp
+          elsif host_os == OSX
+            `sw_vers -productVersion`.chomp
+          else
+            `uname -r`.chomp
+          end
+        end.call
+      end
+
+      # @!visibility private
+      def irb?
+        $0 == "irb"
+      end
+
+      # @!visibility private
+      def ruby_version
+        @ruby_version ||= `#{RbConfig.ruby} -v`.chomp
+      end
+
+      # @!visibility private
+      def used_bundle_exec?
+        Object.const_defined?(:Bundler)
+      end
+
+      # @!visibility private
+      def used_cucumber?
+        Object.const_defined?(:Cucumber)
+      end
+
+      # @!visibility private
+      #
+      # Collect a hash of usage info.
+      def info
+
+        allowed = info_we_are_allowed_to_track
+
+        if allowed == "none"
+          raise RuntimeError,
+            "This method should not be called if the user does not want to be tracked."
+        end
+
+        # Events only
+        hash = {
+          :event_name => "session",
+          :data_version => DATA_VERSION,
+          :user_id => user_id
+        }
+
+        if allowed == "system_info"
+          hash.merge!(
+            {
+              :platform => CALABASH_IOS,
+              :host_os => host_os,
+              :host_os_version => host_os_version,
+              :irb => irb?,
+              :ruby_version => ruby_version,
+              :used_bundle_exec => used_bundle_exec?,
+              :used_cucumber => used_cucumber?,
+
+              :version => Calabash::Cucumber::VERSION,
+
+              :ci => RunLoop::Environment.ci?,
+              :jenkins => RunLoop::Environment.jenkins?,
+              :travis => RunLoop::Environment.travis?,
+              :circle_ci => RunLoop::Environment.circle_ci?,
+              :teamcity => RunLoop::Environment.teamcity?
+            }
+          )
+        end
+
+        hash
+      end
+    end
+  end
+end
+

data/lib/calabash-cucumber/version.rb

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

data/lib/calabash-cucumber/wait_helpers.rb

@@ -48,6 +48,38 @@ module Calabash
             :screenshot_on_error => true
       }
 
+      # Performs the `tap` gesture on the (first) view that matches query `uiquery`.
+      #
+      # As opposed to `touch`, `wait_tap` is a high-level method that combines:
+      #
+      # 1. waiting for the view to appear,
+      # 2. waiting for animations to complete on the view (and it's parents) and
+      # 3. actually tapping the view.
+      #
+      # This replaces the common pattern:
+      #
+      # ```
+      # wait_for_none_animating
+      # wait_for_element_exists("* marked:'log in'")
+      # touch("* marked:'log in'")
+      # ```
+      #
+      # By default, taps the center of the view.
+      # @see Calabash::Cucumber::Core#touch
+      # @see Calabash::Cucumber::Core#touch_point
+      # @param {String} uiquery query describing view to tap. Note `nil` is not allowed.
+      # @param {Hash} options option for modifying the details of the touch
+      # @option options {Hash} :offset (nil) optional offset to tap point. Offset has an `:x` and `:y` key
+      #   the tap will be performed on the center of the view plus the offset.
+      # @option options {Hash} :timeout (30) maximum number of seconds to wait for the view to appear
+      # @option options {Hash} :frequency (0.2) polling frequency to for checking if the view is present (>= 0.1)
+      # @return {Array<Hash>} serialized version of the tapped view
+      def wait_tap(uiquery, options={})
+        wait_for_none_animating
+        wait_for_element_exists(uiquery, options)
+        touch(uiquery, options)
+      end
+
       # Waits for a condition to be true. The condition is specified by a given block that is called repeatedly.
       # If the block returns a 'trueish' value the condition is considered true and
       # `wait_for` immediately returns.

data/scripts/.irbrc

@@ -27,10 +27,7 @@ ARGV.concat [ '--readline',
               '--prompt-mode',
               'simple']
 
-# 25 entries in the list
 IRB.conf[:SAVE_HISTORY] = 50
-
-# Store results in home directory with specified file name
 IRB.conf[:HISTORY_FILE] = '.irb-history'
 
 require 'calabash-cucumber/operations'
@@ -38,7 +35,6 @@ require 'calabash-cucumber/operations'
 # legacy support - module was deprecated 0.9.169
 # and replaced with simulator_launcher
 require 'calabash-cucumber/launch/simulator_helper'
-
 require 'calabash-cucumber/launch/simulator_launcher'
 SIM=Calabash::Cucumber::SimulatorLauncher.new()
 
@@ -47,3 +43,22 @@ extend Calabash::Cucumber::Operations
 def embed(x,y=nil,z=nil)
   puts "Screenshot at #{x}"
 end
+
+require "calabash-cucumber"
+
+def preferences
+  Calabash::Cucumber::Preferences.new
+end
+
+def disable_usage_tracking
+  preferences.usage_tracking = "none"
+  puts "Calabash will not collect usage information."
+  "none"
+end
+
+def enable_usage_tracking(level="system_info")
+  preferences.usage_tracking = level
+  puts "Calabash will collect statistics using the '#{level}' rule."
+  level
+end
+

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.16.4
+  version: 0.17.0
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.17
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.17
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: calabash-common
   requirement: !ruby/object:Gem::Requirement
@@ -144,20 +144,14 @@ dependencies:
   name: run_loop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.5
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.5
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -230,6 +224,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: luffa
   requirement: !ruby/object:Gem::Requirement
@@ -379,12 +387,12 @@ files:
 - doc/calabash-ios-help.txt
 - dylibs/libCalabashDyn.dylib
 - dylibs/libCalabashDynSim.dylib
-- features-skeleton/my_first.feature
-- features-skeleton/step_definitions/calabash_steps.rb
-- features-skeleton/step_definitions/my_first_steps.rb
+- features-skeleton/sample.feature
+- features-skeleton/steps/sample_steps.rb
 - features-skeleton/support/01_launch.rb
-- features-skeleton/support/02_pre_stop_hooks.rb
+- features-skeleton/support/dry_run.rb
 - features-skeleton/support/env.rb
+- features-skeleton/support/patches/cucumber.rb
 - features/step_definitions/calabash_steps.rb
 - lib/calabash-cucumber.rb
 - lib/calabash-cucumber/actions/instruments_actions.rb
@@ -397,6 +405,7 @@ files:
 - lib/calabash-cucumber/date_picker.rb
 - lib/calabash-cucumber/deprecated.rb
 - lib/calabash-cucumber/device.rb
+- lib/calabash-cucumber/dot_dir.rb
 - lib/calabash-cucumber/environment_helpers.rb
 - lib/calabash-cucumber/failure_helpers.rb
 - lib/calabash-cucumber/http_helpers.rb
@@ -407,6 +416,7 @@ files:
 - lib/calabash-cucumber/launch/simulator_helper.rb
 - lib/calabash-cucumber/launch/simulator_launcher.rb
 - lib/calabash-cucumber/launcher.rb
+- lib/calabash-cucumber/logging.rb
 - lib/calabash-cucumber/map.rb
 - lib/calabash-cucumber/operations.rb
 - lib/calabash-cucumber/playback_helpers.rb
@@ -513,8 +523,10 @@ files:
 - lib/calabash-cucumber/resources/wheel_up_ios5_iphone.base64
 - lib/calabash-cucumber/rotation_helpers.rb
 - lib/calabash-cucumber/status_bar_helpers.rb
+- lib/calabash-cucumber/store/preferences.rb
 - lib/calabash-cucumber/tests_helpers.rb
 - lib/calabash-cucumber/uia.rb
+- lib/calabash-cucumber/usage_tracker.rb
 - lib/calabash-cucumber/utils/logging.rb
 - lib/calabash-cucumber/utils/plist_buddy.rb
 - lib/calabash-cucumber/utils/simulator_accessibility.rb
@@ -543,7 +555,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="