calabash-android 0.5.16.pre1 → 0.6.0.prelatestcrosswalk

data/lib/calabash-android/text_helpers.rb

@@ -12,6 +12,7 @@ module Calabash
       end
 
       def keyboard_enter_text(text, options = {})
+        wait_for_keyboard
         perform_action('keyboard_enter_text', text)
       end
 
@@ -19,36 +20,62 @@ module Calabash
         keyboard_enter_text(character[0,1], options)
       end
 
+      # Appends `text` into the first view matching `uiquery`.
       def enter_text(uiquery, text, options = {})
         tap_when_element_exists(uiquery, options)
         sleep 0.5
+        set_selection(-1, -1)
         keyboard_enter_text(text, options)
       end
 
       def clear_text_in(query_string, options={})
-        unless query_string.nil?
-          touch(query_string, options)
-          sleep 0.5
-        end
-
+        touch(query_string, options)
+        sleep 0.5
         clear_text(options)
       end
 
+      # Clears the text of the currently focused view.
       def clear_text(options={})
-        if options.is_a?(String)
-          puts "Warning: The method clear_text now clears the text in the currently focused view. Use clear_text_in instead"
-          puts "Notice that clear_text_in only clears the text of the first element matching the given query, not all."
-          puts "Use query(query, setText: '') to replicate the old behaviour"
+        set_selection(-1, -1)
+        perform_action("delete_surrounding_text", -1, 0)
+      end
+
+      def escape_quotes(str)
+        str.gsub("'", "\\\\'")
+      end
 
-          clear_text_in(options)
+      # Sets the selection of the currently focused view.
+      #
+      # @param [Integer] selection_start The start of the selection, can be
+      #  negative to begin counting from the end of the string.
+      # @param [Integer] selection_end The end of the selection, can be
+      #  negative to begin counting from the end of the string.
+      def set_selection(selection_start, selection_end)
+        perform_action("set_selection", selection_start, selection_end)
+      end
+
+      def keyboard_visible?
+        input_method = `#{default_device.adb_command} shell dumpsys input_method`.force_encoding('UTF-8')
+        shown = input_method.each_line.grep(/mInputShown\s*=\s*(.*)/){$1}.first.chomp
+
+        if shown == "true"
+          true
+        elsif shown == "false"
+          false
         else
-          perform_action('clear_text')
+          raise "Could not detect keyboard visibility. '#{shown}'"
         end
       end
 
-      def escape_quotes(str)
-        str.gsub("'", "\\\\'")
+      def wait_for_keyboard(opt={})
+        params = opt.clone
+        params[:timeout_message] ||= "Timed out waiting for the keyboard to appear"
+        params[:timeout] ||= 5
+
+        wait_for(params) do
+          keyboard_visible?
+        end
       end
     end
   end
-end
+end

data/lib/calabash-android/usage_tracker.rb

@@ -0,0 +1,192 @@
+module Calabash
+  module Android
+    class UsageTracker
+
+      require "httpclient"
+
+      # @!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::Android::UsageTracker.track_usage? &&
+            info_we_are_allowed_to_track != "none"
+          begin
+            HTTPClient.post(ROUTE, info)
+          rescue => e
+            message = %Q{ERROR: Could not post usage tracking information:#{$-0}#{e}}
+            Calabash::Android::Logging.log_to_file(message)
+          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::Android::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.1"
+
+      # @!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_ANDROID,
+              :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::Android::VERSION,
+
+              :ci => Calabash::Android::Environment.ci?,
+              :jenkins => Calabash::Android::Environment.jenkins?,
+              :travis => Calabash::Android::Environment.travis?,
+              :circle_ci => Calabash::Android::Environment.circle_ci?,
+              :gitlab => Calabash::Android::Environment.gitlab?,
+              :teamcity => Calabash::Android::Environment.teamcity?
+            }
+          )
+        end
+
+        hash
+      end
+    end
+  end
+end
+

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.5.16.pre1"
+    VERSION = "0.6.0.prelatestcrosswalk"
   end
 end

data/lib/calabash-android/wait_helpers.rb

@@ -14,7 +14,7 @@ module Calabash
           :post_timeout => 0,
           :timeout_message => 'Timed out waiting...',
           :screenshot_on_error => true
-      }.freeze
+      }
 
       def wait_for(options_or_timeout=DEFAULT_OPTS, &block)
         #note Hash is preferred, number acceptable for backwards compat

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.5.16.pre1
+  version: 0.6.0.prelatestcrosswalk
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-05 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -176,6 +176,118 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !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: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: pry-nav
+  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: guard-rspec
+  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: guard-bundler
+  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: growl
+  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: stub_env
+  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'
 description: 'calabash-android drives tests for native  and hybrid Android apps. '
 email:
 - jonas@lesspainful.com
@@ -184,14 +296,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".calabash_settings"
-- ".yardopts"
-- CHANGES.txt
-- ENVIRONMENT_VARIABLES.md
-- Gemfile
 - LICENSE
-- README_YARDOC.md
-- Rakefile
 - bin/calabash-android
 - bin/calabash-android-build.rb
 - bin/calabash-android-console.rb
@@ -199,7 +304,6 @@ files:
 - bin/calabash-android-helpers.rb
 - bin/calabash-android-run.rb
 - bin/calabash-android-setup.rb
-- calabash-android.gemspec
 - epl-v10.html
 - features-skeleton/my_first.feature
 - features-skeleton/step_definitions/calabash_steps.rb
@@ -211,21 +315,24 @@ files:
 - lib/calabash-android.rb
 - lib/calabash-android/abase.rb
 - lib/calabash-android/calabash_steps.rb
-- lib/calabash-android/canned_steps.md
 - lib/calabash-android/color_helper.rb
 - lib/calabash-android/cucumber.rb
 - lib/calabash-android/defaults.rb
 - lib/calabash-android/deprecated_actions.map
+- lib/calabash-android/dot_dir.rb
 - lib/calabash-android/drag_helpers.rb
 - lib/calabash-android/env.rb
+- lib/calabash-android/environment.rb
 - lib/calabash-android/environment_helpers.rb
 - lib/calabash-android/gestures.rb
 - lib/calabash-android/helpers.rb
 - lib/calabash-android/java_keystore.rb
 - lib/calabash-android/lib/AXMLPrinter2.jar
+- lib/calabash-android/lib/AndroidManifest.xml
 - lib/calabash-android/lib/TestServer.apk
 - lib/calabash-android/lib/manifest_extractor.jar
 - lib/calabash-android/lib/screenshotTaker.jar
+- lib/calabash-android/logging.rb
 - lib/calabash-android/management/adb.rb
 - lib/calabash-android/management/app_installation.rb
 - lib/calabash-android/monkey_helpers.rb
@@ -246,15 +353,15 @@ 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/store/preferences.rb
 - lib/calabash-android/text_helpers.rb
 - lib/calabash-android/touch_helpers.rb
+- lib/calabash-android/usage_tracker.rb
 - lib/calabash-android/version.rb
 - lib/calabash-android/wait_helpers.rb
-- test-server/AndroidManifest.xml
-- test-server/build.xml
-- test-server/calabash-js/src/calabash.js
 homepage: http://github.com/calabash
-licenses: []
+licenses:
+- EPL-1.0
 metadata: {}
 post_install_message: 
 rdoc_options: []