Fix os specific patches

Automatically quit old driver when a new driver is created. Appium only supports
one active driver.
Rename last_driver global to driver.

Author: bootstraponline

lib/appium_lib.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 
-$last_driver = nil
+$driver = nil
 
 # Invoke top level methods on last created Appium driver.
 def self.method_missing method, *args, &block
-  raise "driver is nil. called #{method}" if $last_driver == nil
+  raise "driver is nil. called #{method}" if $driver == nil
 
-  $last_driver.respond_to?(method) ?
-    $last_driver.send( method, *args, &block ) :
-    super
+  $driver.respond_to?(method) ?
+      $driver.send( method, *args, &block ) :
+      super
 end
 
 module Appium

lib/appium_lib/android/patch.rb

@@ -1,11 +1,14 @@
 # encoding: utf-8
 module Appium::Android
-  # Implement useful features for element.
-  class Selenium::WebDriver::Element
-    # Cross platform way of entering text into a textfield
-    def type text
-      puts 'android type'
-      self.send_keys text
+  # class_eval inside a method because class Selenium::WebDriver::Element
+  # will trigger as soon as the file is required. in contrast a method
+  # will trigger only when invoked.
+  def patch_webdriver_element
+      Selenium::WebDriver::Element.class_eval do
+        # Cross platform way of entering text into a textfield
+        def type text
+          self.send_keys text
+        end
+      end
     end
-  end
-end
+  end

lib/appium_lib/common/patch.rb

@@ -75,7 +75,7 @@ def raw_execute(command, opts = {}, command_hash = nil)
       path_str = path.sub(path_match[0], '') unless path_match.nil?
 
       puts "#{verb} #{path_str}"
-      puts command_hash.to_json unless command_hash.to_json == 'null'
+      ap command_hash.to_json unless command_hash.to_json == 'null'
       # puts "verb: #{verb}, path #{path}, command_hash #{command_hash.to_json}"
       http.call verb, path, command_hash
     end # def

lib/appium_lib/driver.rb

@@ -38,6 +38,9 @@ class Driver
                 :app_wait_activity, :sauce_username, :sauce_access_key,
                 :port, :os, :ios_js
     def initialize opts={}
+      # quit last driver
+      $driver.driver_quit if $driver
+
       opts = {} if opts.nil?
       # Path to the .apk, .app or .app.zip.
       # The path can be local or remote for Sauce.
@@ -81,18 +84,21 @@ def initialize opts={}
         extend Appium::Ios
       end
 
+      # apply os specific patches
+      patch_webdriver_element
+
       # Save global reference to last created Appium driver for top level methods.
-      $last_driver = self
+      $driver = self
 
       # Promote exactly once the first time the driver is created.
       # Subsequent drivers do not trigger promotion.
       unless @@loaded
         @@loaded = true
         # Promote Appium driver methods to Object instance methods.
-        $last_driver.public_methods(false).each do | m |
+        $driver.public_methods(false).each do | m |
           Object.class_eval do
             define_method m do | *args, &block |
-              $last_driver.send m, *args, &block
+              $driver.send m, *args, &block
             end
           end
         end

lib/appium_lib/ios/patch.rb

@@ -1,17 +1,19 @@
 # encoding: utf-8
 module Appium::Ios
-  # Implement useful features for element.
-  class Selenium::WebDriver::Element
-    # Cross platform way of entering text into a textfield
-    def type text
-      puts 'ios type'
-      # enter text then tap window to hide the keyboard.
-      js = <<-JS
-        au.getElement('#{self.ref}').setValue('#{text}');
-        au.lookup('window')[0].tap();
-      JS
-      puts js
-      @driver.execute_script js
+  # class_eval inside a method because class Selenium::WebDriver::Element
+  # will trigger as soon as the file is required. in contrast a method
+  # will trigger only when invoked.
+  def patch_webdriver_element
+    Selenium::WebDriver::Element.class_eval do
+      # Cross platform way of entering text into a textfield
+      def type text
+        # enter text then tap window to hide the keyboard.
+        js = <<-JS
+          au.getElement('#{self.ref}').setValue('#{text}');
+          au.lookup('window')[0].tap();
+        JS
+        @driver.execute_script js
+      end
     end
   end
 end