appium_lib 0.19.1 → 0.21.0

data/lib/appium_lib/common/patch.rb

@@ -49,10 +49,20 @@ module Appium::Common
     # https://github.com/appium/appium/wiki/Automating-mobile-gestures
     # @return [OpenStruct] the relative x, y in a struct. ex: { x: 0.50, y: 0.20 }
     def location_rel
-      xy = self.location
+      location = self.location
+      location_x = location.x.to_f
+      location_y = location.y.to_f
+
+      size = self.size
+      size_width = size.width.to_f
+      size_height = size.height.to_f
+
+      center_x = location_x + (size_width / 2.0)
+      center_y = location_y + (size_height / 2.0)
+
       w = $driver.window_size
-      OpenStruct.new( x: "#{xy.x.to_f} / #{w.width.to_f}",
-                      y: "#{xy.y.to_f} / #{w.height.to_f}" )
+      OpenStruct.new( x: "#{center_x} / #{w.width.to_f}",
+                      y: "#{center_y} / #{w.height.to_f}" )
     end
   end
 end # module Appium::Common

data/lib/appium_lib/common/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Appium
   # Version and Date are defined on the 'Appium' module, not 'Appium::Common'
-  VERSION = '0.19.1' unless defined? ::Appium::VERSION
-  DATE = '2014-02-25' unless defined? ::Appium::DATE
+  VERSION = '0.21.0' unless defined? ::Appium::VERSION
+  DATE = '2014-03-13' unless defined? ::Appium::DATE
 end

data/lib/appium_lib/driver.rb

@@ -148,8 +148,6 @@ module Appium
   require_relative 'android/element/alert'
   require_relative 'android/element/generic'
   require_relative 'android/element/textfield'
-  require_relative 'android/webview/javascript'
-  require_relative 'android/webview/webview'
 
   def self.promote_singleton_appium_methods main_module
     raise 'Driver is nil' if $driver.nil?
@@ -324,8 +322,6 @@ module Appium
       # load common methods
       extend Appium::Common
       if @device == 'Android'
-        raise 'APP_ACTIVITY must be set.' if @app_activity.nil?
-
         # load Android specific methods
         extend Appium::Android
       else

data/lib/appium_lib/ios/element/generic.rb

@@ -42,7 +42,7 @@ module Appium::Ios
   # @return [String] the completed JavaScript program
   def first_ele_js predicate
     (<<-JS).strip # remove trailing newline
-       au.mainApp.getFirstWithPredicateWeighted("#{predicate}");
+       au.mainApp().getFirstWithPredicateWeighted("#{predicate}");
     JS
   end
 
@@ -51,7 +51,7 @@ module Appium::Ios
   # @return [String] the completed JavaScript program
   def all_ele_js predicate
     (<<-JS).strip # remove trailing newline
-      au.mainApp.getAllWithPredicate("#{predicate}");
+      au.mainApp().getAllWithPredicate("#{predicate}");
     JS
   end
 

data/lib/appium_lib/ios/patch.rb

@@ -30,13 +30,13 @@ Swiping inside the keyboard will not dismiss it.
           # setValue will work, however the keyboard will never display
           # because users are normally not allowed to type into it.
           $driver.wait_true(5) do
-            $driver.execute_script %(au.mainApp.keyboard().type() !== 'UIAElementNil')
+            $driver.execute_script %(au.mainApp().keyboard().type() !== 'UIAElementNil')
           end
 
           # dismiss keyboard
           js = <<-JS
-            if (au.mainApp.keyboard().type() !== "UIAElementNil") {
-              var startY = au.mainApp.keyboard().rect().origin.y - 10;
+            if (au.mainApp().keyboard().type() !== "UIAElementNil") {
+              var startY = au.mainApp().keyboard().rect().origin.y - 10;
               var endY = au.mainWindow.rect().size.height - 10;
               au.flickApp(0, startY, 0, endY);
             }

data/readme.md

@@ -49,6 +49,9 @@ apk = {
 Appium::Driver.new(apk).start_driver
 
 # Define the methods on all objects.
+# Note that this can also be scoped to limit the potential for conflicts.
+# Example: Appium.promote_appium_methods ::Minitest::Spec
+# Another alternative is to not promote at all. Instead access methods via $driver
 Appium.promote_appium_methods Object
 ```
 

data/release_notes.md

@@ -1,3 +1,27 @@
+#### v0.21.0 2014-03-13
+
+- [db2df39](https://github.com/appium/ruby_lib/commit/db2df39eb6fc09e516e22334dd990699755c0509) Release 0.21.0
+- [bf74d7a](https://github.com/appium/ruby_lib/commit/bf74d7a70c0f7cab8e4cb115d53d86c3720e2df3) Remove webview. Update gemspec
+
+
+#### v0.20.0 2014-03-13
+
+- [e79923f](https://github.com/appium/ruby_lib/commit/e79923f731c0f7ba85f280b512f5d82d365fd619) Release 0.20.0
+- [9a6c6ea](https://github.com/appium/ruby_lib/commit/9a6c6eaf798938f8a483466e718e53483e3c0f02) Add bundle update to release rake task
+- [093ba77](https://github.com/appium/ruby_lib/commit/093ba7712275b009d66146bcd9429ed9bf2f8d7f) Update readme.md
+- [8dbe853](https://github.com/appium/ruby_lib/commit/8dbe853909a3a2691d3cc510d9751cfe8179dc76) Fix mainApp
+- [347ae13](https://github.com/appium/ruby_lib/commit/347ae13cc78101875bb223fdfee97898f50a791b) Update readme.md
+- [ba4d51c](https://github.com/appium/ruby_lib/commit/ba4d51c44329db8a849f59bfeedfa1eb99538d3a) Update location_rel to use center point
+
+
+#### v0.19.1 2014-02-25
+
+- [efa2e3f](https://github.com/appium/ruby_lib/commit/efa2e3feb74319a19d1fe3ef49d5a7fe3a2eb59a) Release 0.19.1
+- [1aee2fc](https://github.com/appium/ruby_lib/commit/1aee2fcc5773cc92b1f83a80188f6cac50d2e206) Add android coverage cap
+- [ccb213f](https://github.com/appium/ruby_lib/commit/ccb213f3866672f2be7ea526e6deb1656d497e6e) Update path logic
+- [9772383](https://github.com/appium/ruby_lib/commit/97723833f1d888fa809d704801d98bdff8a3e2a4) Fix load_appium_txt relative path
+
+
 #### v0.19.0 2014-02-20
 
 - [6fd332b](https://github.com/appium/ruby_lib/commit/6fd332b1715d7b8f4b3b3c99e7ca58e5d4d01b52) Release 0.19.0

metadata

@@ -1,125 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.21.0
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.39'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.39.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.39'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.39.0
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: toml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: posix-spawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+        version: '0.3'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.8
-- !ruby/object:Gem::Dependency
-  name: webkit_remote
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.3.8
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.4
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7.3
 description: Ruby library for Appium.
@@ -129,7 +157,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE-2.0.txt
 - Rakefile
@@ -147,8 +175,6 @@ files:
 - lib/appium_lib/android/element/textfield.rb
 - lib/appium_lib/android/helper.rb
 - lib/appium_lib/android/patch.rb
-- lib/appium_lib/android/webview/javascript.rb
-- lib/appium_lib/android/webview/webview.rb
 - lib/appium_lib/common/element/button.rb
 - lib/appium_lib/common/element/text.rb
 - lib/appium_lib/common/element/window.rb
@@ -173,17 +199,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby library for Appium

data/lib/appium_lib/android/webview/javascript.rb

@@ -1,76 +0,0 @@
-# encoding: utf-8
-module Appium; end # fix module not defined
-module Android; end
-module Appium::Android::Webview
-  class << self
-    # firstEmailInput().value = 'example';
-    # firstPasswordInput().value =  'example'
-    # firstSubmitElement().click();
-
-    # todo: prevent namespace pollution
-    # AppiumWebview = { 'ok': function() { return 'ok'; }, 'ok2': function() { return self.ok(); } }
-
-    def javascript
-      @javascript_webview_helpers ||= <<-'JS'
-function firstTagWithTypeOrName(targetTag, targetType, targetName) {
-  var inputs = document.getElementsByTagName(targetTag);
-  var inputsLength = inputs.length;
-  var target = null;
-
-  var targetNames = [];
-  if (targetName) targetNames = targetName.split(",");
-
-  for (var i = 0; i < inputsLength; i++) {
-    var input = inputs[i];
-
-    if (targetType) {
-      var type = input.type;
-      var hasType = typeof type !== "undefined";
-      if (hasType && type.trim().toLowerCase() === targetType) {
-        target = input;
-        break;
-      }
-    }
-
-    // type only search will have undefined targetName.
-    if (targetName) {
-      var name = input.name;
-      var hasName = typeof name !== "undefined";
-      if (hasName && targetNames.indexOf(name.trim().toLowerCase()) !== -1) {
-        target = input;
-        break;
-      }
-    }
-  }
-
-  return target;
-}
-
-function firstInputWithTypeOrName(targetType, targetName) {
-  return firstTagWithTypeOrName('input', targetType, targetName);
-}
-
-function firstEmailInput() {
-  return firstInputWithTypeOrName('email', 'id,username');
-}
-
-function firstPasswordInput() {
-  return firstInputWithTypeOrName('password', 'password');
-}
-
-// yahoo uses a submit button
-function firstSubmitElement() {
-  return firstTagWithTypeOrName('button', 'submit', 'submit') ||
-         firstTagWithTypeOrName('input', 'submit', 'submit') ||
-         firstTagWithTypeOrName('a', 'submit', 'submit');
-}
-
-// yahoo authorize link
-// <a type="submit"
-function firstAuthElement() {
-  return firstTagWithTypeOrName('a', 'submit');
-}
-      JS
-    end
-  end
-end

data/lib/appium_lib/android/webview/webview.rb

@@ -1,105 +0,0 @@
-# encoding: utf-8
-# system requires
-require 'net/http'
-
-# 3rd party gems
-require 'rubygems'
-require 'json'
-require 'posix/spawn'
-require 'webkit_remote' # https://github.com/pwnall/webkit_remote/
-
-module Appium; end # fix module not defined
-module Android; end
-module Appium::Android::Webview
-  class << self
-    # @private
-    def adb_cmd cmd
-      _pid, _in, _out, _err = POSIX::Spawn::popen4 cmd, {:err => [:child, :out]}
-      _in.close
-
-      output = ''
-
-      begin
-        Process.waitpid _pid
-        output = _out.read
-        [_out, _err].each { |io| io.close unless io.nil? || io.closed? }
-      rescue # no such process
-      end
-
-      output
-    end
-
-    # @private
-    # returns nil if not found
-    def package_to_pid package
-      # USER     PID   PPID  VSIZE  RSS     WCHAN    PC         NAME
-      # use detect to return the first match
-      ps = adb_cmd('adb shell ps').split("\r\n").detect { |l| l.split(' ').last == package }
-      ps ? ps.split(' ')[1].to_i : nil # return pid
-    end
-
-    # @private
-    # 1 pid may have many webviews. The path remains the same
-    #
-    #["00000000: 00000002 00000000 00010000 0001 01  4716 @webview_devtools_remote_1597",
-    # "00000000: 00000003 00000000 00000000 0001 03 55080 @webview_devtools_remote_1597",
-    # "00000000: 00000003 00000000 00000000 0001 03 55078 @webview_devtools_remote_1597"]
-    #
-    # returns nil if not found
-    def pid_to_webview pid
-      return nil if pid.nil?
-      # Num       RefCount Protocol Flags    Type St Inode Path
-      cat_proc = adb_cmd 'adb shell cat /proc/net/unix'
-      pid_webview = "@webview_devtools_remote_#{pid}"
-      found = cat_proc.split("\r\n").detect { |l| l.include?(pid_webview) }
-      # must remove '@' prefix for use with adb forward command
-      found ? found.split(' ').last.sub('@', '') : nil
-    end
-
-    # @private
-    # connect_to_webview package: 'com.example.Package'
-    def connect_to_webview opts={}
-      package = opts[:package]
-      raise 'Must provide package' unless package
-      port = opts.fetch :port, 9000
-
-      unix_socket = pid_to_webview package_to_pid package
-      raise 'No webview found' unless unix_socket
-      adb_cmd "adb forward tcp:#{port} localabstract:#{unix_socket}"
-    end
-
-    # @public
-    #
-    # ```ruby
-    # webview = Appium::Android::Webview.attach_to_tab package: 'com.example.Package', url: 'yahoo.com/'
-    # webview.location
-    # webview.client
-    # webview.client.remote_eval Appium::Android::Webview.javascript
-    # ```
-    #
-    # port: is optional.
-    #
-    # can't be called more than once.
-    #
-    # returns URL of connected tab.
-    def attach_to_tab opts={}
-      connect_to_webview package: opts[:package]
-      target_url = opts[:url]
-      raise 'Must provide :url' unless target_url
-      port = opts.fetch(:port, 9000)
-
-      # webkit_remote defaults to using the last tab.
-      # The browser may have many tabs and the last tab is not always correct.
-      # Detect the tab by inspecting the URL.
-      # https://github.com/pwnall/webkit_remote/blob/590bfd3ace098f2b75d1a07651f36f4392109a23/lib/webkit_remote/top_level.rb#L30
-      browser = WebkitRemote::Browser.new host: 'localhost', port: port
-      target_tab = browser.tabs.detect { |tab| tab.url.include?(target_url) }
-
-      client = WebkitRemote::Client.new tab: target_tab, close_browser: true
-      document_location = client.remote_eval 'document.location.toString()'
-      client.clear_all
-
-      OpenStruct.new( client: client, location: document_location )
-    end
-  end
-end