appium_lib 0.18.0 → 0.18.1

data/lib/appium_lib/android/helper.rb

@@ -401,7 +401,7 @@ module Appium::Android
   # Returns a string containing interesting elements.
   # @return [String]
   def get_inspect
-    @device == :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.18.0' unless defined? ::Appium::VERSION
-  DATE = '2014-01-27' unless defined? ::Appium::DATE
+  VERSION = '0.18.1' unless defined? ::Appium::VERSION
+  DATE = '2014-01-28' unless defined? ::Appium::DATE
 end

data/lib/appium_lib/driver.rb

@@ -292,19 +292,24 @@ module Appium
 
       @port = opts.fetch :port, ENV['PORT'] || 4723
 
-      # device as used in device capabilities.
-      # iOS only.
+      # 'iPhone Simulator'
+      # 'iPad Simulator'
+      # 'Android'
+      # 'Selendroid'
       #
-      # Android is always Android or Selendroid so there's no
-      # override required.
-      @device_cap = opts.fetch :device_cap, 'iPhone Simulator'
-
       # :ios, :android, :selendroid
-      @device = opts.fetch :device, ENV['DEVICE'] || :ios
-      @device = @device.to_s.downcase.intern # device must be a symbol
+      @device = opts[:device]
+      raise 'Device must be set' unless @device
+
+      @device = 'Android' if @device.to_s == 'android'
+      @device = 'Selendroid' if @device.to_s == 'selendroid'
+      @device = 'iPhone Simulator' if @device.to_s == 'ios'
+
+      raise 'Device must be set iPhone Simulator, iPad Simulator, Android' unless @device &&
+          ['iPhone Simulator', 'iPad Simulator', 'Android', 'Selendroid'].include?(@device)
 
       @version = opts[:version]
-      if @device == :android || @device == :selendroid
+      if @device == 'Android' || @device == 'Selendroid'
         @version = '4.3' unless @version # default android to 4.3
       else
         @version = '7' unless @version # default ios to 7
@@ -315,7 +320,7 @@ module Appium
 
       # load common methods
       extend Appium::Common
-      if @device == :android
+      if @device == 'Android'
         raise 'APP_ACTIVITY must be set.' if @app_activity.nil?
 
         # load Android specific methods
@@ -387,7 +392,7 @@ module Appium
         compressXml: @compress_xml,
         platform: 'Linux',
         version: @version,
-        device: @device == :android ? 'Android' : 'selendroid',
+        device: @device,
         :'device-type' => @device_type,
         :'device-orientation' => @device_orientation,
         name: @app_name || 'Ruby Console Android Appium',
@@ -404,7 +409,7 @@ module Appium
       {
         platform: 'OS X 10.9',
         version: @version,
-        device: @device_cap,
+        device: @device,
         name: @app_name || 'Ruby Console iOS Appium',
         :'device-orientation' => @device_orientation
       }
@@ -412,7 +417,7 @@ module Appium
 
     # @private
     def capabilities
-      caps = @device == :ios ? ios_capabilities : android_capabilities
+      caps = ['iPhone Simulator', 'iPad Simulator'].include?(@device) ? ios_capabilities : android_capabilities
       caps[:app] = absolute_app_path unless @app_path.nil? || @app_path.empty?
       caps
     end
@@ -507,7 +512,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 @device == :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/release_notes.md

@@ -1,3 +1,10 @@
+#### v0.18.0 2014-01-27
+
+- [e0ea2f2](https://github.com/appium/ruby_lib/commit/e0ea2f2d77875b9ffc88d8649b3652c39a1ab51a) Release 0.18.0
+- [c94bf57](https://github.com/appium/ruby_lib/commit/c94bf57dadf2049a3aace8ed35d978c1d4545be2) Update capabilities for Sauce
+- [2859c83](https://github.com/appium/ruby_lib/commit/2859c831916ef1541fe2a283c9afc6af55e43a25) Update session id example
+
+
 #### v0.17.0 2014-01-22
 
 - [8571197](https://github.com/appium/ruby_lib/commit/8571197b04ea923db6e375bae808bf84dea52c98) Release 0.17.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver