appium_lib 0.24.1 → 1.0.0

data/lib/appium_lib/device/multi_touch.rb

@@ -0,0 +1,94 @@
+module Appium
+
+  # MultiTouch actions allow for multiple touches to happen at the same time,
+  # for instance, to simulate multiple finger swipes.
+  #
+  # Create a series of touch actions by themselves (without a `prepare()`), then
+  # add to a new MultiTouch action.  When ready, call `prepare()` and all
+  # actions will be executed simultaneously.
+  #
+  # ```ruby
+  # action_1 = TouchAction.new.press(x: 45, y: 100).wait(5).release
+  # action_2 = TouchAction.new.tap(element: el, x: 50, y:5, count: 3).release
+  #
+  # multi_touch_action = MultiTouch.new
+  # multi_touch_action.add action_1
+  # multi_touch_action.add action_2
+  # multi_touch_action.perform
+  class MultiTouch
+    class << self
+
+      # Convenience method for pinching the screen.
+      # Places two fingers at the edges of the screen and brings them together.
+      # @param percentage (int) The percent size by which to shrink the screen when pinched.
+      # @param auto_perform (boolean) Whether to perform the action immediately (default true)
+      #
+      # ```ruby
+      # action = pinch 75 #=> Pinch the screen from the top right and bottom left corners
+      # action.perform    #=> to 25% of its size.
+      # ```
+      def pinch(percentage=25, auto_perform=true)
+        raise ArgumentError("Can't pinch to greater than screen size.") if percentage > 100
+
+        p = Float(percentage) / 100
+        i = 1 - p
+
+        top = TouchAction.new
+        top.swipe start_x: 1.0, start_y: 0.0, end_x: i, end_y: i, duration: 1
+
+        bottom = TouchAction.new
+        bottom.swipe(start_x: 0.0, start_y: 1.0, end_x: p, end_y: p, duration: 1)
+
+        pinch = MultiTouch.new
+        pinch.add top
+        pinch.add bottom
+        return pinch unless auto_perform
+        pinch.perform
+      end
+
+      # Convenience method for zooming the screen.
+      # Places two fingers at the edges of the screen and brings them together.
+      # @param percentage (int) The percent size by which to shrink the screen when pinched.
+      # @param auto_perform (boolean) Whether to perform the action immediately (default true)
+      #
+      # ```ruby
+      # action = zoom 200 #=> Zoom in the screen from the center until it doubles in size.
+      # action.perform
+      # ```
+      def zoom(percentage=200, auto_perform=true)
+        raise ArgumentError("Can't zoom to smaller then screen size.") if percentage < 100
+
+        p = 100 / Float(percentage)
+        i = 1 - p
+
+        top = TouchAction.new
+        top.swipe start_x: i, start_y: i, end_x: 1, end_y: 1, duration: 1
+
+        bottom = TouchAction.new
+        bottom.swipe start_x: p, start_y: p, end_x: 1, end_y: 1, duration: 1
+
+        zoom = MultiTouch.new
+        zoom.add top
+        zoom.add bottom
+        return zoom unless auto_perform
+        zoom.perform
+      end
+    end
+    
+    # Create a new multi-action
+    def initialize
+      @actions = []
+    end
+
+    # Add a touch_action to be performed
+    # @param chain (TouchAction) The action to add to the chain
+    def add(chain)
+      @actions << chain.actions
+    end
+
+    # Ask Appium to perform the actions
+    def perform
+      $driver.multi_touch @actions
+    end
+  end # class MultiTouch
+end # module Appium

data/lib/appium_lib/device/touch_actions.rb

@@ -0,0 +1,142 @@
+module Appium
+
+  # Perform a series of gestures, one after another.  Gestures are chained
+  # together and only performed when `perform()` is called.
+  #
+  # Each method returns the object itself, so calls can be chained.
+  #
+  # ```ruby
+  # action = TouchAction.new.press(x: 45, y: 100).wait(5).release
+  # action.perform
+  class TouchAction
+    ACTIONS = [:move_to, :press_for_duration, :press, :release, :tap, :wait, :perform]
+    COMPLEX_ACTIONS = [:swipe]
+    
+    class << self
+      COMPLEX_ACTIONS.each do |action|
+        define_method(action) do |opts|
+          auto_perform = opts.delete(:auto_perform) {|k| true}
+          ta = TouchAction.new
+          ta.send(action, opts)
+          return ta unless auto_perform
+          ta.perform
+        end
+      end
+    end  
+
+    attr_reader :actions
+
+    def initialize
+      @actions = []
+    end
+
+    # Move to the given co-ordinates.
+    # @option opts [integer] :x x co-ordinate to move to.
+    # @option opts [integer] :y y co-ordinate to move to.
+    # @option opts [WebDriver::Element] Element to scope this move within.
+    def move_to(opts)
+      opts = args_with_ele_ref(opts)
+      chain_method(:moveTo, opts)
+    end
+
+    # Press down for a specific duration.
+    # @param element [WebDriver::Element] the element to press.
+    # @param x [integer] x co-ordinate to press on.
+    # @param y [integer] y co-ordinate to press on.
+    # @param duration [integer] Number of seconds to press.
+    def press_for_duration(element, x, y, duration)
+      @actions << {element: element.ref, x: x, y: y, duration: duration}
+      chain_method(:longPress, args)
+    end
+
+    # Press a finger onto the screen.  Finger will stay down until you call
+    # `release`.
+    #
+    # @option opts [WebDriver::Element] :element (Optional) Element to press within.
+    # @option opts [integer] :x x co-ordinate to press on
+    # @option opts [integer] :y y co-ordinate to press on
+    def press(opts)
+      args = opts.select {|k, v| [:element, :x, :y].include? k}
+      args = args_with_ele_ref(args)
+      chain_method(:press, args)
+    end
+
+    # Remove a finger from the screen.
+    #
+    # @option opts [WebDriver::Element] :element (Optional) Element to release from.
+    # @option opts [integer] :x x co-ordinate to release from
+    # @option opts [integer] :y y co-ordinate to release from
+    def release(opts=nil)
+      args = args_with_ele_ref(opts) if opts
+      chain_method(:release, args)
+    end
+
+    # Touch a point on the screen
+    #
+    # @option opts [WebDriver::Element] :element (Optional) Element to restrict scope too.
+    # @option opts [integer] :x x co-ordinate to tap
+    # @option opts [integer] :y y co-ordinate to tap
+    # @option opts [integer] :fingers how many fingers to tap with (Default 1)
+    def tap(opts)
+      opts[:count] = opts.delete(:fingers) if opts[:fingers]
+      opts_with_defaults = {count: 1}.merge opts
+      chain_method(:tap, opts_with_defaults)
+    end
+
+    # Pause for a number of seconds before the next action
+    # @param seconds [integer] Number of seconds to pause for
+    def wait(seconds)
+      args = {ms: seconds}
+      chain_method(:wait, args)
+    end
+
+    # Convenience method to peform a swipe.
+    # @option opts [int] :start_x Where to start swiping, on the x axis.  Default 0.
+    # @option opts [int] :start_y Where to start swiping, on the y axis.  Default 0.
+    # @option opts [int] :end_x Where to end swiping, on the x axis.  Default 0.
+    # @option opts [int] :end_y Where to end swiping, on the y axis.  Default 0.
+    # @option opts [int] :duration How long the actual swipe takes to complete.
+    def swipe(opts)
+      start_x = opts.fetch :start_x, 0
+      start_y = opts.fetch :start_y, 0
+      end_x = opts.fetch :end_x, 0
+      end_y = opts.fetch :end_y, 0
+      duration = opts[:duration]
+
+      self.press x: start_x, y: start_y
+      self.wait(duration) if duration
+      self.move_to x: end_x, y: end_y
+      self.release
+      self
+    end
+
+    # Ask the driver to perform all actions in this action chain.
+    def perform
+      $driver.touch_actions @actions
+      self
+    end
+
+    # Does nothing, currently.
+    def cancel
+      @actions << {action: cancel}
+      $driver.touch_actions @actions
+      self
+    end
+
+    private
+
+    def chain_method(method, args=nil)
+      if args
+        @actions << {action: method, options: args}
+      else
+        @actions << {action: method}
+      end
+      self
+    end
+
+    def args_with_ele_ref(args)
+      args[:element] = args[:element].ref if args.has_key? :element
+      args
+    end
+  end # class TouchAction
+end # module Appium

data/lib/appium_lib/driver.rb

@@ -1,146 +1,152 @@
-# encoding: utf-8
-=begin
-Based on simple_test.rb
-https://github.com/appium/appium/blob/82995f47408530c80c3376f4e07a1f649d96ba22/sample-code/examples/ruby/simple_test.rb
-https://github.com/appium/appium/blob/c58eeb66f2d6fa3b9a89d188a2e657cca7cb300f/LICENSE
-=end
-
 require 'rubygems'
 require 'ap'
+require 'selenium-webdriver'
+require 'nokogiri'
+
+# patch ap
+require_relative 'awesome_print/ostruct'
+
+# common
+require_relative 'common/helper'
+require_relative 'common/patch'
+require_relative 'common/version'
+require_relative 'common/element/window'
+
+# ios
+require_relative 'ios/helper'
+require_relative 'ios/patch'
+
+require_relative 'ios/element/alert'
+require_relative 'ios/element/button'
+require_relative 'ios/element/generic'
+require_relative 'ios/element/textfield'
+require_relative 'ios/element/text'
+require_relative 'ios/mobile_methods'
+
+# android
+require_relative 'android/dynamic'
+require_relative 'android/helper'
+require_relative 'android/patch'
+require_relative 'android/element/alert'
+require_relative 'android/element/button'
+require_relative 'android/element/generic'
+require_relative 'android/element/textfield'
+require_relative 'android/element/text'
+require_relative 'android/mobile_methods'
+
+# device methods
+require_relative 'device/device'
+require_relative 'device/touch_actions'
+require_relative 'device/multi_touch'
 
-# Support OpenStruct in Awesome Print
-# /awesome_print/lib/awesome_print/formatter.rb
-# upstream issue: https://github.com/michaeldv/awesome_print/pull/36
-class AwesomePrint::Formatter
-    remove_const :CORE if defined?(CORE)
-    CORE = [ :array, :hash, :class, :file, :dir, :bigdecimal, :rational, :struct, :openstruct, :method, :unboundmethod ]
-
-  def awesome_openstruct target
-    awesome_hash target.marshal_dump
+# 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
 
-# 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 [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 }
-  opts = {} if opts.nil?
-  file = opts.fetch :file, nil
-  raise 'Must pass file' unless file
-  verbose = opts.fetch :verbose, false
-  # Check for env vars in .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
-    args.each do |name|
-      var = data[name]
-      ENV[name] = var if var
-    end
-  end
+module Appium
+  # Load appium.txt (toml format)
+  # the basedir of this file + appium.txt is what's used
+  #
+  # ```
+  # [caps]
+  # app = "path/to/app"
+  #
+  # [appium_lib]
+  # port = 8080
+  # ```
+  #
+  # :app is expanded
+  # :require is expanded
+  # all keys are converted to symbols
+  #
+  # @param opts [Hash] file: '/path/to/appium.txt', verbose: true
+  # @return [hash] the symbolized hash with updated :app and :require keys
+  def self.load_appium_txt opts={}
+    raise 'opts must be a hash' unless opts.kind_of? Hash
+    raise 'opts must not be empty' if opts.empty?
+
+    file = opts[:file]
+    raise 'Must pass file' unless file
+    verbose = opts.fetch :verbose, false
+
+    parent_dir = File.dirname file
+    toml       = File.expand_path File.join parent_dir, 'appium.txt'
+    puts "appium.txt path: #{toml}" if verbose
 
-  toml_exists = File.exists? toml
-  puts "Exists? #{toml_exists}" if verbose
-  data = nil
+    toml_exists = File.exists? toml
+    puts "Exists? #{toml_exists}" if verbose
 
-  if toml_exists
+    raise "toml doesn't exist #{toml}" unless toml_exists
     require 'toml'
     puts "Loading #{toml}" if verbose
 
-    # bash requires A="OK"
-    # toml requires A = "OK"
-    #
-    # A="OK" => A = "OK"
     data = File.read toml
-
-    data = data.split("\n").map do |line|
-      line.sub /([^\s])\=/, "\\1 = "
-    end.join "\n"
-
     data = TOML::Parser.new(data).parsed
+    # TOML creates string keys. must symbolize
+    data = Appium::symbolize_keys data
     ap data unless data.empty? if verbose
 
-    update data, 'APP_PATH', 'APP_APK', 'APP_PACKAGE',
-           'APP_ACTIVITY', 'APP_WAIT_ACTIVITY',
-           'DEVICE'
-
-    # ensure app path is resolved correctly from the context of the .txt file
-    ENV['APP_PATH'] = Appium::Driver.absolute_app_path ENV['APP_PATH']
-  end
-
-  # 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
+    if data && data[:caps] && data[:caps][:app]
+      data[:caps][:app] = Appium::Driver.absolute_app_path data[:caps][:app]
     end
-    r.compact! # remove nils
-
-    files = []
 
-    # now expand dirs
-    r.each do |item|
-      unless File.directory? item
-        # save file
-        files << item
-        next # only look inside folders
+    # return list of require files as an array
+    # nil if require doesn't exist
+    if data && data[:appium_lib] && data[:appium_lib][:require]
+      r = data[:appium_lib][:require]
+      r = r.kind_of?(Array) ? r : [r]
+      # ensure files are absolute
+      r.map! do |file|
+        file = File.exists?(file) ? file :
+            File.join(parent_dir, file)
+        file = File.expand_path file
+
+        File.exists?(file) ? file : nil
       end
-      Dir.glob(File.join(item, '**/*.rb')) do |file|
-        # do not add folders to the file list
-        files << File.expand_path(file) unless File.directory? file
+      r.compact! # remove nils
+
+      files = []
+
+      # now expand dirs
+      r.each do |item|
+        unless File.directory? item
+          # save file
+          files << item
+          next # only look inside folders
+        end
+        Dir.glob(File.expand_path(File.join(item, '**', '*.rb'))) do |file|
+          # do not add folders to the file list
+          files << File.expand_path(file) unless File.directory? file
+        end
       end
+
+      # Must not sort files. File order is specified in appium.txt
+      data[:appium_lib][:require] = files
     end
 
-    files
+    data
   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__
-
-  require 'selenium-webdriver'
-
-  # common
-  require_relative 'common/helper'
-  require_relative 'common/patch'
-  require_relative 'common/version'
-  require_relative 'common/element/button'
-  require_relative 'common/element/text'
-  require_relative 'common/element/window'
-
-  # ios
-  require_relative 'ios/helper'
-  require_relative 'ios/patch'
-  require_relative 'ios/element/alert'
-  require_relative 'ios/element/generic'
-  require_relative 'ios/element/textfield'
-
-  # android
-  require_relative 'android/dynamic'
-  require_relative 'android/helper'
-  require_relative 'android/patch'
-  require_relative 'android/element/alert'
-  require_relative 'android/element/generic'
-  require_relative 'android/element/textfield'
+  # convert all keys (including nested) to symbols
+  #
+  # based on deep_symbolize_keys & deep_transform_keys from rails
+  # https://github.com/rails/docrails/blob/a3b1105ada3da64acfa3843b164b14b734456a50/activesupport/lib/active_support/core_ext/hash/keys.rb#L84
+  def self.symbolize_keys hash
+    raise 'symbolize_keys requires a hash' unless hash.is_a? Hash
+    result = {}
+    hash.each do |key, value|
+      key = key.to_sym rescue key
+      result[key] = value.is_a?(Hash) ? symbolize_keys(value) : value
+    end
+    result
+  end
 
   def self.promote_singleton_appium_methods main_module
     raise 'Driver is nil' if $driver.nil?
@@ -171,7 +177,6 @@ module Appium
   # ```ruby
   # Appium.promote_appium_methods Object
   # ```
-
   def self.promote_appium_methods class_array
     raise 'Driver is nil' if $driver.nil?
     # Wrap single class into an array
@@ -185,9 +190,9 @@ module Appium
               # Prefer existing method.
               # super will invoke method missing on driver
               super(*args, &block)
-              # minitest also defines a name method,
-              # so rescue argument error
-              # and call the name method on $driver
+                # minitest also defines a name method,
+                # so rescue argument error
+                # and call the name method on $driver
             rescue NoMethodError, ArgumentError
               $driver.send m, *args, &block if $driver.respond_to?(m)
             end
@@ -201,37 +206,26 @@ module Appium
   class Driver
     @@loaded = false
 
-    attr_reader :default_wait, :app_path, :app_name, :device,
-                :app_package, :app_activity, :app_wait_activity,
-                :sauce_username, :sauce_access_key, :port, :debug,
-                :export_session, :device_cap, :compress_xml, :custom_url
+    # attr readers are promoted to global scope. To avoid clobbering, they're
+    # made available via the driver_attributes method
 
     # The amount to sleep in seconds before every webdriver http call.
     attr_accessor :global_webdriver_http_sleep
-    # Creates a new driver.
-    # :device is :android, :ios, or :selendroid
+
+    # Creates a new driver
     #
     # ```ruby
-    # # Options include:
-    # :app_path, :app_name, :app_package, :app_activity,
-    # :app_wait_activity, :sauce_username, :sauce_access_key,
-    # :port, :os, :debug
-    #
     # require 'rubygems'
     # require 'appium_lib'
     #
+    # # platformName takes a string or a symbol.
+    #
     # # Start iOS driver
-    # app = { device: :ios, app_path: '/path/to/MyiOS.app'}
-    # Appium::Driver.new(app).start_driver
+    # opts = { caps: { platformName: :ios, app: '/path/to/MyiOS.app' } }
+    # Appium::Driver.new(opts).start_driver
     #
     # # Start Android driver
-    # apk = { device: :android
-    #         app_path: '/path/to/the.apk',
-    #         app_package: 'com.example.pkg',
-    #         app_activity: 'act.Start',
-    #         app_wait_activity: 'act.Start'
-    # }
-    #
+    # opts = { caps: { platformName: :android, app: '/path/to/my.apk' } }
     # Appium::Driver.new(apk).start_driver
     # ```
     #
@@ -240,75 +234,38 @@ module Appium
     def initialize opts={}
       # quit last driver
       $driver.driver_quit if $driver
-      opts = {} if opts.nil?
-      tmp_opts = {}
-
-      # convert to downcased symbols
-      opts.each_pair { |k,v| tmp_opts[k.to_s.downcase.strip.intern] = v }
-      opts = tmp_opts
-
-      @raw_capabilities = opts.fetch(:raw, {})
+      raise 'opts must be a hash' unless opts.kind_of? Hash
 
-      @custom_url = opts.fetch :server_url, false
+      opts              = Appium::symbolize_keys opts
 
-      @compress_xml = opts[:compress_xml] ? true : false
+      # default to {} to prevent nil.fetch and other nil errors
+      @caps             = opts[:caps] || {}
+      appium_lib_opts   = opts[:appium_lib] || {}
 
-      @export_session = opts.fetch :export_session, false
-
-      @default_wait = opts.fetch :wait, 30
-      @last_waits = [@default_wait]
+      # appium_lib specific values
+      @custom_url       = appium_lib_opts.fetch :server_url, false
+      @export_session   = appium_lib_opts.fetch :export_session, false
+      @default_wait     = appium_lib_opts.fetch :wait, 30
+      @last_waits       = [@default_wait]
+      @sauce_username   = appium_lib_opts.fetch :sauce_username, ENV['SAUCE_USERNAME']
+      @sauce_access_key = appium_lib_opts.fetch :sauce_access_key, ENV['SAUCE_ACCESS_KEY']
+      @port             = appium_lib_opts.fetch :port, 4723
 
       # Path to the .apk, .app or .app.zip.
       # The path can be local or remote for Sauce.
-      @app_path = opts.fetch :app_path, ENV['APP_PATH']
-      raise 'APP_PATH must be set.' if @app_path.nil?
-
-      # The name to use for the test run on Sauce.
-      @app_name = opts.fetch :app_name, ENV['APP_NAME']
-
-      # Android app package
-      @app_package = opts.fetch :app_package, ENV['APP_PACKAGE']
-
-      # Android app starting activity.
-      @app_activity = opts.fetch :app_activity, ENV['APP_ACTIVITY']
-
-      # Android app waiting activity
-      @app_wait_activity = opts.fetch :app_wait_activity, ENV['APP_WAIT_ACTIVITY']
-
-      @android_coverage = opts.fetch :android_coverage, ENV['ANDROID_COVERAGE']
-      # init to empty hash because it's merged later as an optional desired cap.
-      @android_coverage = @android_coverage ? { androidCoverage: @android_coverage} : {}
-
-      # Sauce Username
-      @sauce_username = opts.fetch :sauce_username, ENV['SAUCE_USERNAME']
-
-      # Sauce Key
-      @sauce_access_key = opts.fetch :sauce_access_key, ENV['SAUCE_ACCESS_KEY']
-
-      @port = opts.fetch :port, ENV['PORT'] || 4723
-
-      # 'iPhone Simulator'
-      # 'iPad Simulator'
-      # 'Android'
-      # 'Selendroid'
-      #
-      # :ios, :android, :selendroid
-      @device = opts.fetch :device, ENV['DEVICE']
-      raise 'Device must be set' unless @device
-
-      @device_type = opts.fetch :device_type, 'tablet'
-      @device_orientation = opts.fetch :device_orientation, 'portrait'
-
-      @full_reset = opts.fetch :full_reset, true
-      @no_reset = opts.fetch :no_reset, false
+      unless !@caps || @caps[:app].nil? || @caps[:app].empty?
+        @caps[:app] = self.class.absolute_app_path @caps[:app]
+      end
 
-      # no_reset/full_reset are mutually exclusive
-      @no_reset = false if @full_reset
-      @full_reset = false if @no_reset
+      # https://code.google.com/p/selenium/source/browse/spec-draft.md?repo=mobile
+      @device = @caps[:platformName]
+      @device = @device.is_a?(Symbol) ? @device : @device.downcase.strip.intern if @device
+      raise "platformName must be set. Not found in options: #{opts}" unless @device
+      raise 'platformName must be Android or iOS' unless [:android, :ios].include?(@device)
 
       # load common methods
       extend Appium::Common
-      if @device.downcase == 'android'
+      if device_is_android?
         # load Android specific methods
         extend Appium::Android
       else
@@ -321,7 +278,7 @@ module Appium
 
       # enable debug patch
       # !!'constant' == true
-      @debug = opts.fetch :debug, !!defined?(Pry)
+      @debug = appium_lib_opts.fetch :debug, !!defined?(Pry)
       puts "Debug is: #{@debug}"
       if @debug
         ap opts unless opts.empty?
@@ -329,6 +286,7 @@ module Appium
         patch_webdriver_bridge
       end
 
+
       # Save global reference to last created Appium driver for top level methods.
       $driver = self
 
@@ -336,78 +294,58 @@ module Appium
       # Subsequent drivers do not trigger promotion.
       unless @@loaded
         @@loaded = true
+        # load device methods exactly once
+        extend Appium::Device
+        
         # Promote only on Minitest::Spec (minitest 5) by default
         Appium.promote_appium_methods ::Minitest::Spec
       end
 
       self # return newly created driver
-    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
-
-    # Returns the server's version string
-    # @return [String]
-    def server_version
-      status['value']['build']['version']
     end
 
-    # @private
-    # WebDriver capabilities. Must be valid for Sauce to work.
-    # https://github.com/jlipps/appium/blob/master/app/android.js
-    def android_capabilities
-      {
-        compressXml: @compress_xml,
-        platform: 'Linux',
-        platformName: @device,
-        fullReset: @full_reset,
-        noReset: @no_reset,
-        :'device-type' => @device_type,
-        :'device-orientation' => @device_orientation,
-        name: @app_name || 'Ruby Console Android Appium',
-        :'app-package' => @app_package,
-        :'app-activity' => @app_activity,
-        :'app-wait-activity' => @app_wait_activity || @app_activity,
-      }.merge(@android_coverage).merge(@raw_capabilities)
+    # Returns a hash of the driver attributes
+    def driver_attributes
+      attributes = { caps:             @caps,
+                     custom_url:       @custom_url,
+                     export_session:   @export_session,
+                     default_wait:     @default_wait,
+                     last_waits:       @last_waits,
+                     sauce_username:   @sauce_username,
+                     sauce_access_key: @sauce_access_key,
+                     port:             @port,
+                     device:           @device,
+                     debug:            @debug,
+      }
+
+      # Return duplicates so attributes are immutable
+      attributes.each do |key, value|
+        attributes[key] = value.duplicable? ? value.dup : value
+      end
+      attributes
     end
 
-    # @private
-    # WebDriver capabilities. Must be valid for Sauce to work.
-    def ios_capabilities
-      {
-        platform: 'OS X 10.9',
-        platformName: @device,
-        name: @app_name || 'Ruby Console iOS Appium',
-        :'device-orientation' => @device_orientation
-      }.merge(@raw_capabilities)
+    def device_is_android?
+      @device == :android
     end
 
-    # @private
-    def capabilities
-      caps = @device.downcase === 'android' ? android_capabilities : ios_capabilities
-      caps[:app] = self.class.absolute_app_path(@app_path) unless @app_path.nil? || @app_path.empty?
-      caps
+    # Returns the server's version info
+    #
+    # ```ruby
+    # {
+    #     "build" => {
+    #         "version" => "0.18.1",
+    #         "revision" => "d242ebcfd92046a974347ccc3a28f0e898595198"
+    #     }
+    # }
+    # ```
+    #
+    # @return [Hash]
+    def appium_server_version
+      driver.remote_status
     end
 
-    # Converts environment variable APP_PATH to an absolute path.
+    # Converts app_path to an absolute path.
     # @return [String] APP_PATH as an absolute path
     def self.absolute_app_path app_path
       raise 'APP_PATH not set!' if app_path.nil? || app_path.empty?
@@ -431,7 +369,7 @@ module Appium
       app_path
     end
 
-    # Get the server url for sauce or local based on env vars.
+    # Get the server url
     # @return [String] the server url
     def server_url
       return @custom_url if @custom_url
@@ -469,40 +407,32 @@ module Appium
     # Quits the driver
     # @return [void]
     def driver_quit
-      # rescue NoSuchDriverError
-      begin; @driver.quit unless @driver.nil?; rescue; end
+      # rescue NoSuchDriverError or nil driver
+      @driver.quit rescue nil
     end
 
     # Creates a new global driver and quits the old one if it exists.
     #
     # @return [Selenium::WebDriver] the new global driver
     def start_driver
-      @client = @client || Selenium::WebDriver::Remote::Http::Default.new
+      @client         = @client || Selenium::WebDriver::Remote::Http::Default.new
       @client.timeout = 999999
 
       begin
-        @driver = Selenium::WebDriver.for :remote, http_client: @client, desired_capabilities: capabilities, url: server_url
-        # Load touch methods. Required for Selendroid.
+        @driver = Selenium::WebDriver.for :remote, http_client: @client, desired_capabilities: @caps, url: server_url
+        # Load touch methods.
         @driver.extend Selenium::WebDriver::DriverExtensions::HasTouchScreen
 
         # export session
         if @export_session
-          begin
-            File.open('/tmp/appium_lib_session', 'w') do |f|
-              f.puts @driver.session_id
-            end
-          rescue
-          end
+          File.open('/tmp/appium_lib_session', 'w') do |f|
+            f.puts @driver.session_id
+          end rescue nil
         end
       rescue Errno::ECONNREFUSED
         raise 'ERROR: Unable to connect to Appium. Is the server running?'
       end
 
-      # 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'
-
       # Set implicit wait by default unless we're using Pry.
       @driver.manage.timeouts.implicit_wait = @default_wait unless defined? Pry
 
@@ -511,8 +441,8 @@ module Appium
 
     # Set implicit wait and default_wait to zero.
     def no_wait
-      @last_waits = [@default_wait, 0]
-      @default_wait = 0
+      @last_waits                           = [@default_wait, 0]
+      @default_wait                         = 0
       @driver.manage.timeouts.implicit_wait = 0
     end
 
@@ -537,7 +467,7 @@ module Appium
       else
         @default_wait = timeout
         # puts "last waits before: #{@last_waits}"
-        @last_waits = [@last_waits.last, @default_wait]
+        @last_waits   = [@last_waits.last, @default_wait]
         # puts "last waits after: #{@last_waits}"
       end
 
@@ -569,7 +499,7 @@ module Appium
       # which then gets converted to a 1 second wait.
       @driver.manage.timeouts.implicit_wait = pre_check
       # the element exists unless an error is raised.
-      exists = true
+      exists                                = true
 
       begin
         search_block.call # search for element
@@ -591,25 +521,6 @@ module Appium
       @driver.execute_script script, *args
     end
 
-    # Helper method for mobile gestures
-    #
-    # https://github.com/appium/appium/wiki/Automating-mobile-gestures
-    #
-    # driver.execute_script 'mobile: swipe', endX: 100, endY: 100, duration: 0.01
-    #
-    # becomes
-    #
-    # mobile :swipe, endX: 100, endY: 100, duration: 0.01
-    # @param method [String, Symbol] the method to execute
-    # @param args [*args] the args to pass to the method
-    # @return [Object]
-    def mobile method, *args
-      raise 'Method must not be nil' if method.nil?
-      raise 'Method must have .to_s' unless method.respond_to? :to_s
-
-      @driver.execute_script "mobile: #{method.to_s}", *args
-    end
-
     # Calls @driver.find_elements
     #
     # @param args [*args] the args to use
@@ -633,10 +544,10 @@ module Appium
       driver_quit
       exit # exit pry
     end
-  end # end class Driver
-end # end module Appium
+  end # class Driver
+end # module Appium
 
 # Paging in Pry is annoying :q required to exit.
 # With pager disabled, the output is similar to IRB
 # Only set if Pry is defined.
-Pry.config.pager = false if defined?(Pry)
+Pry.config.pager = false if defined?(Pry)