appium_lib 0.5.15 → 0.5.16

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.5.15' unless defined? ::Appium::VERSION
-  DATE = '2013-07-03' unless defined? ::Appium::DATE
+  VERSION = '0.5.16' unless defined? ::Appium::VERSION
+  DATE = '2013-07-26' unless defined? ::Appium::DATE
 end

data/lib/appium_lib/driver.rb

@@ -8,7 +8,7 @@ https://github.com/appium/appium/blob/c58eeb66f2d6fa3b9a89d188a2e657cca7cb300f/L
 # Load appium.txt (toml format) into system ENV
 # the basedir of this file + appium.txt is what's used
 # @param opts [Hash] file: '/path/to/appium.txt', verbose: true
-# @return [nil]
+# @return [Array<String>] the require files. nil if require doesn't exist
 def load_appium_txt opts
   raise 'opts must be a hash' unless opts.kind_of? Hash
   opts.each_pair { |k,v| opts[k.to_s.downcase.strip.intern] = v }
@@ -17,7 +17,8 @@ def load_appium_txt opts
   raise 'Must pass file' unless file
   verbose = opts.fetch :verbose, false
   # Check for env vars in .txt
-  toml = File.expand_path File.join File.dirname(file), 'appium.txt'
+  parent_dir = File.dirname file
+  toml = File.expand_path File.join parent_dir, 'appium.txt'
   puts "appium.txt path: #{toml}" if verbose
   # @private
   def update data, *args
@@ -29,6 +30,7 @@ def load_appium_txt opts
 
   toml_exists = File.exists? toml
   puts "Exists? #{toml_exists}" if verbose
+  data = nil
 
   if toml_exists
     require 'toml'
@@ -39,9 +41,14 @@ def load_appium_txt opts
     # toml requires A = "OK"
     #
     # A="OK" => A = "OK"
-    data = File.read(toml).gsub /([^\s])\=(")/, "\\1 = \\2"
+    data = File.read toml
+
+    data = data.split("\n").map do |line|
+      line.sub /([^\s])\=/, "\\1 = "
+    end.join "\n"
+
     data = TOML::Parser.new(data).parsed
-    ap data unless data.empty?
+    ap data unless data.empty? if verbose
 
     update data, 'APP_PATH', 'APP_APK', 'APP_PACKAGE',
            'APP_ACTIVITY', 'APP_WAIT_ACTIVITY',
@@ -50,7 +57,21 @@ def load_appium_txt opts
     # Ensure app path is absolute
     ENV['APP_PATH'] = File.expand_path ENV['APP_PATH'] if ENV['APP_PATH']
   end
-  nil
+
+  # return list of require files as an array
+  # nil if require doesn't exist
+  if data && data['require']
+    r = data['require']
+    r = r.kind_of?(Array) ? r : [ r ]
+    # ensure files are absolute
+    r.map! do |file|
+      file = file.include?(File::Separator) ? file :
+             File.join(parent_dir, file)
+      file = File.expand_path file
+      File.exists?(file) ? file : nil
+    end
+    r.compact # remove nils
+  end
 end
 
 module Appium
@@ -209,6 +230,22 @@ module Appium
     end # def initialize
 
     # Returns the status payload
+    #
+    # ```ruby
+    # {"status"=>0,
+    #  "value"=>
+    #   {"build"=>
+    #     {"version"=>"0.8.2",
+    #      "revision"=>"f2a2bc3782e4b0370d97a097d7e04913cf008995"}},
+    #  "sessionId"=>"8f4b34a7-a9a9-4ac5-b125-36258143446a"}
+    # ```
+    #
+    #  Discover the Appium rev running on the server.
+    #
+    # `status["value"]["build"]["revision"]`
+    # `f2a2bc3782e4b0370d97a097d7e04913cf008995`
+    #
+    # @return [JSON]
     def status
       driver.status.payload
     end

data/lib/appium_lib/ios/patch.rb

@@ -9,11 +9,29 @@ module Appium::Ios
       # Cross platform way of entering text into a textfield
       def type text
         # enter text then tap window to hide the keyboard.
+=begin
+Find the top left corner of the keyboard and move up 10 pixels (origin.y - 10)
+now swipe down until the end of the window - 10 pixels.
+-10 to ensure we're not going outside the window bounds.
+
+Swiping inside the keyboard will not dismiss it.
+=end
+        # type
+        execute_script %(au.getElement('#{self.ref}').setValue('#{text}');)
+
+        # wait for keyboard
+        wait_true { execute_script %(au.mainApp.keyboard().type() !== 'UIAElementNil') }
+
+        # dismiss keyboard
         js = <<-JS
-          au.getElement('#{self.ref}').setValue('#{text}');
-          au.lookup('window')[0].tap();
+          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);
+          }
         JS
-        @driver.execute_script js
+
+        execute_script js
       end
     end
   end

data/readme.md

@@ -4,13 +4,13 @@
 - [Documentation for appium_lib](http://www.rubydoc.info/github/appium/ruby_lib/master/frames)
 - [Appium Ruby Console](https://github.com/appium/ruby_console)
 
-Helper methods for writing cross platform (iPad, iPhone, Android) tests in Ruby using Appium.
+Helper methods for writing cross platform (iPad, iPhone, Android) tests in Ruby using Appium. Note that user waits should not exceed 120 seconds if they're going to run on Sauce Labs.
 
 Make sure you're using Ruby 1.9.3+ with upgraded rubygems and bundler.
 
 #### Start appium server
 
-`node server.js -V --fast-reset --without-delay`
+`node server.js`
 
 #### Install / Upgrade
 
@@ -41,8 +41,8 @@ Appium::Driver.new(app).start_driver
 # Start Android driver
 apk = { app_path: '/path/to/the.apk',
         app_package: 'com.example.pkg',
-        app_activity: 'act.Start',
-        app_wait_activity: 'act.Start'
+        app_activity: '.act.Start',
+        app_wait_activity: '.act.Start'
       }
 Appium::Driver.new(apk).start_driver
 ```
@@ -68,7 +68,7 @@ Appium::Driver.new(apk).start_driver
 
 1. Does `adb kill-server; adb devices` list an active Android device?
 2. Have you defined the proper env vars? `APP_PATH, APP_PACKAGE, APP_ACTIVITY, APP_WAIT_ACTIVITY`
-3. Are you running appium from source? `node server.js -V --fast-reset`
+3. Are you running appium from source? `node server.js`
 
 #### Documentation
 

data/release_notes.md

@@ -1,3 +1,10 @@
+#### v0.5.15 2013-07-03
+
+- [734fe68](https://github.com/appium/ruby_lib/commit/734fe6887f36aa1ad59ef7ce992ba2e2f4c8c7d3) Release 0.5.15
+- [0e203d7](https://github.com/appium/ruby_lib/commit/0e203d76610abd519ba9d2fe9c14b50c94df5bbd) Fix driver methods overriding object methods
+- [efc4602](https://github.com/appium/ruby_lib/commit/efc460278af5b6f2a24c290f704781be4e9b2d4b) Fix open struct
+
+
 #### v0.5.14 2013-07-03
 
 - [521f79b](https://github.com/appium/ruby_lib/commit/521f79b11497c0c963b7059347e02d81a08f665a) Release 0.5.14

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib
 version: !ruby/object:Gem::Version
-  version: 0.5.15
-  prerelease: 
+  version: 0.5.16
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: toml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -132,30 +121,26 @@ files:
 homepage: https://github.com/appium/ruby_lib
 licenses:
 - http://www.apache.org/licenses/LICENSE-2.0.txt
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4217890362488520360
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby library for Appium
 test_files: []
 has_rdoc: