appium_lib 0.5.16 → 0.6.0

data/lib/appium_lib/android/helper.rb

@@ -361,7 +361,7 @@ module Appium::Android
   # Returns a string containing interesting elements.
   # @return [String]
   def get_inspect
-    @selendroid ? get_selendroid_inspect : get_android_inspect
+    @device == :selendroid ? get_selendroid_inspect : get_android_inspect
   end
 
   # Intended for use with console.

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.16' unless defined? ::Appium::VERSION
-  DATE = '2013-07-26' unless defined? ::Appium::DATE
+  VERSION = '0.6.0' unless defined? ::Appium::VERSION
+  DATE = '2013-08-05' unless defined? ::Appium::DATE
 end

data/lib/appium_lib/driver.rb

@@ -52,10 +52,15 @@ def load_appium_txt opts
 
     update data, 'APP_PATH', 'APP_APK', 'APP_PACKAGE',
            'APP_ACTIVITY', 'APP_WAIT_ACTIVITY',
-           'SELENDROID'
+           'DEVICE'
 
     # Ensure app path is absolute
-    ENV['APP_PATH'] = File.expand_path ENV['APP_PATH'] if ENV['APP_PATH']
+    ENV['APP_PATH'] = File.expand_path ENV['APP_PATH'] if ENV['APP_PATH'] &&
+        !ENV['APP_PATH'].empty?
+
+    if ! %w(ios android selendroid).include? ENV['DEVICE']
+      raise 'DEVICE must be ios, android, or selendroid'
+    end
   end
 
   # return list of require files as an array
@@ -74,6 +79,14 @@ def load_appium_txt opts
   end
 end
 
+# Fix uninitialized constant Minitest (NameError)
+module Minitest
+  # Fix superclass mismatch for class Spec
+  class Runnable; end
+  class Test < Runnable; end
+  class Spec < Test; end
+end
+
 module Appium
   add_to_path __FILE__
 
@@ -105,10 +118,11 @@ module Appium
   class Driver
     @@loaded = false
 
-    attr_reader :default_wait, :app_path, :app_name, :selendroid,
+    attr_reader :default_wait, :app_path, :app_name, :device,
                 :app_package, :app_activity, :app_wait_activity,
-                :sauce_username, :sauce_access_key, :port, :os, :debug
+                :sauce_username, :sauce_access_key, :port, :debug
     # Creates a new driver.
+    # :device is :android, :ios, or :selendroid
     #
     # ```ruby
     # # Options include:
@@ -120,11 +134,12 @@ module Appium
     # require 'appium_lib'
     #
     # # Start iOS driver
-    # app = { app_path: '/path/to/MyiOS.app'}
+    # app = { device: :ios, app_path: '/path/to/MyiOS.app'}
     # Appium::Driver.new(app).start_driver
     #
     # # Start Android driver
-    # apk = { app_path: '/path/to/the.apk',
+    # apk = { device: :android
+    #         app_path: '/path/to/the.apk',
     #         app_package: 'com.example.pkg',
     #         app_activity: 'act.Start',
     #         app_wait_activity: 'act.Start'
@@ -152,10 +167,6 @@ module Appium
       # The name to use for the test run on Sauce.
       @app_name = opts.fetch :app_name, ENV['APP_NAME']
 
-      # If Android, this will toggle selendroid as a device
-      @selendroid = opts.fetch :selendroid, ENV['SELENDROID']
-      @selendroid = 'selendroid' if @selendroid
-
       # Android app package
       @app_package = opts.fetch :app_package, ENV['APP_PACKAGE']
 
@@ -173,12 +184,13 @@ module Appium
 
       @port = opts.fetch :port, ENV['PORT'] || 4723
 
-      @os = :ios
-      @os = :android if @app_path.match /\.apk/i
+      # :ios, :android, :selendroid
+      @device = opts.fetch :device, ENV['DEVICE'] || :ios
+      @device = @device.intern # device must be a symbol
 
       # load common methods
       extend Appium::Common
-      if @os == :android
+      if @device == :android
         raise 'APP_ACTIVITY must be set.' if @app_activity.nil?
 
         # load Android specific methods
@@ -197,7 +209,7 @@ module Appium
       puts "Debug is: #{@debug}"
       if @debug
         ap opts unless opts.empty?
-        puts "OS is: #{@os}"
+        puts "Device is: #{@device}"
         patch_webdriver_bridge
       end
 
@@ -210,14 +222,18 @@ module Appium
         @@loaded = true
         # Promote Appium driver methods to Object instance methods.
         $driver.public_methods(false).each do | m |
-          Object.class_eval do
+          # not MiniTest::Spec
+          ::Minitest::Spec.class_eval do
             define_method m do | *args, &block |
                 begin
                   # puts "[Object.class_eval] Calling super for '#{m}'"
                   # prefer existing method.
                   # super will invoke method missing on driver
                   super(*args, &block)
-                rescue NoMethodError
+                  # minitest also defines a name method,
+                  # so rescue argument error
+                  # and call the name method on $driver
+                rescue NoMethodError, ArgumentError
                   # puts "[Object.class_eval] '#{m}' not on super"
                   $driver.send m, *args, &block if $driver.respond_to?(m)
                 end
@@ -264,9 +280,8 @@ module Appium
         browserName: 'Android',
         platform: 'LINUX',
         version: '4.2',
-        device: @selendroid || 'Android',
+        device: @device == :android ? 'Android' : 'selendroid',
         name: @app_name || 'Ruby Console Android Appium',
-        app: absolute_app_path,
         :'app-package' => @app_package,
         :'app-activity' => @app_activity,
         :'app-wait-activity' => @app_wait_activity || @app_activity
@@ -281,14 +296,15 @@ module Appium
         platform: 'Mac 10.8',
         version: '6.0',
         device: 'iPhone Simulator',
-        name: @app_name || 'Ruby Console iOS Appium',
-        app: absolute_app_path
+        name: @app_name || 'Ruby Console iOS Appium'
       }
     end
 
     # @private
     def capabilities
-      @os == :ios ? ios_capabilities : android_capabilities
+      caps = @device == :ios ? ios_capabilities : android_capabilities
+      caps[:app] = absolute_app_path unless @app_path.nil? || @app_path.empty?
+      caps
     end
 
     # Converts environment variable APP_PATH to an absolute path.
@@ -365,7 +381,7 @@ module Appium
       # Set timeout to a large number so that Appium doesn't quit
       # when no commands are entered after 60 seconds.
       # broken on selendroid: https://github.com/appium/appium/issues/513
-      mobile :setCommandTimeout, timeout: 9999 unless @selendroid
+      mobile :setCommandTimeout, timeout: 9999 unless @device == :selendroid
 
       # Set implicit wait by default unless we're using Pry.
       @driver.manage.timeouts.implicit_wait = @default_wait unless defined? Pry

data/lib/appium_lib/ios/patch.rb

@@ -17,10 +17,11 @@ now swipe down until the end of the window - 10 pixels.
 Swiping inside the keyboard will not dismiss it.
 =end
         # type
-        execute_script %(au.getElement('#{self.ref}').setValue('#{text}');)
+        $driver.execute_script %(au.getElement('#{self.ref}').setValue('#{text}');)
 
         # wait for keyboard
-        wait_true { execute_script %(au.mainApp.keyboard().type() !== 'UIAElementNil') }
+        $driver.wait_true { $driver.execute_script %(au.mainApp.keyboard().type
+() !== 'UIAElementNil') }
 
         # dismiss keyboard
         js = <<-JS
@@ -31,7 +32,7 @@ Swiping inside the keyboard will not dismiss it.
           }
         JS
 
-        execute_script js
+        $driver.execute_script js
       end
     end
   end

data/readme.md

@@ -35,11 +35,13 @@ require 'rubygems'
 require 'appium_lib'
 
 # Start iOS driver
-app = { app_path: '/path/to/MyiOS.app'}
+app = { device: :ios, app_path: '/path/to/MyiOS.app'}
 Appium::Driver.new(app).start_driver
 
 # Start Android driver
-apk = { app_path: '/path/to/the.apk',
+apk = { 
+        device: :android
+        app_path: '/path/to/the.apk',
         app_package: 'com.example.pkg',
         app_activity: '.act.Start',
         app_wait_activity: '.act.Start'

data/release_notes.md

@@ -1,3 +1,22 @@
+#### v0.5.16 2013-07-26
+
+- [bd71fb4](https://github.com/appium/ruby_lib/commit/bd71fb4e430608d32923c583c8d4d592f11a96fc) Release 0.5.16
+- [7b83b85](https://github.com/appium/ruby_lib/commit/7b83b85c41caf25376414d978ff63d49ab22f057) Only return files that exist
+- [1f0428d](https://github.com/appium/ruby_lib/commit/1f0428dca4e843a82de2d46be3c724e2dc7930c7) Fix keyboard race condition
+- [c99ed34](https://github.com/appium/ruby_lib/commit/c99ed341c779fb3eff4ab92a95a4a773a1ce212f) Update docs.md
+- [7103921](https://github.com/appium/ruby_lib/commit/71039210e1e0b7481df59210ce4addebcae7ba08) Fix link
+- [f76ea9b](https://github.com/appium/ruby_lib/commit/f76ea9b42a728aae247f88f732879cda94101624) Add require support to appium.txt
+- [12b8e59](https://github.com/appium/ruby_lib/commit/12b8e5938cb616015cb86d62e41ee9d29cace097) Update docs.md
+- [7d6a8f2](https://github.com/appium/ruby_lib/commit/7d6a8f2fa728e616e7fd459cdeef0d5cce9064b4) Add current_app to docs
+- [16ea945](https://github.com/appium/ruby_lib/commit/16ea9454941d84bb02ba4950aeea8df6d70cab26) Fix hide keyboard on iOS
+- [ad9263c](https://github.com/appium/ruby_lib/commit/ad9263cbabb4e1c56bbe9fafe85b048f2a285c11) Add Sauce wait req
+- [98ee244](https://github.com/appium/ruby_lib/commit/98ee244d460f6251c5c6cff8cc79ca8610cc6165) Add .clear example for textfield
+- [d373071](https://github.com/appium/ruby_lib/commit/d3730717faba192cc66f5346c2847ecf6cb60e16) Fix activity name example in readme
+- [50023f3](https://github.com/appium/ruby_lib/commit/50023f3a8201b0875025e5a94ec841fb23c35714) Fix Android version
+- [c4d281a](https://github.com/appium/ruby_lib/commit/c4d281a62d7923f9e6a65fbc870cb1dc6a959849) Add Android set version code
+- [5675f4a](https://github.com/appium/ruby_lib/commit/5675f4a03f8b20939e8cc1b5b13df795072d6553) Update readme.md
+
+
 #### v0.5.15 2013-07-03
 
 - [734fe68](https://github.com/appium/ruby_lib/commit/734fe6887f36aa1ad59ef7ce992ba2e2f4c8c7d3) Release 0.5.15

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.6.0
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver