appium_lib 0.3.7 → 0.3.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTA4NWY0MDU1NzNmY2ZjMjQ1NjM3MjNhYzJlNjgxMmMzYzlmZWMxNA==
+    OTZiYzE1YTUyN2Y0Nzg0YjZhZjhiOWJlYzlmYWZlY2UwMGE2MzlhZQ==
   data.tar.gz: !binary |-
-    ODlmYTM1YWJjMmU2MTQxYmFiOTRkOWE3MGI0MDExY2ZhZmFiOWIwOA==
+    OWYxYTgxZTNjZWQ4YzQ3ZmY1ODA4OTY1YjMxMzQ0ZjI4MmU5NjdhZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmQyMGE4Y2FiZDA4YmNiMWI2YzYyZGUzNGFhNWI5NWFhMTZkMGY4ZjI4MzBh
-    MjMzMjk2NjRjMzRjMjhkYzBlZjk1N2E5Zjc5N2E0ZTNjZmE1YWQ0YjRjNGMw
-    OGNkM2FjODJmMzY3MGE5MzcxM2NiN2E5OWYyOTMyNDlkMjZiM2Y=
+    MTMyZjliODBmNDk2MjZmNGY3MGU5NGVkODRjYTAwNzMwMzZmZWZiMTc4ZmFj
+    ZGY4YzA3YmU4MzZlN2ViZWY3OGM3NGM2NmM0NWEwMGQ1Yjc0MzYxNGU2OWU4
+    ZWU1YjJjYjlkYmRlZmMyMWIwZTliMWVhZTUwMDQzMzg3NTM2Njc=
   data.tar.gz: !binary |-
-    OGM0MGJhMzQxMDA5YjU3Zjc0N2I3ZGY1ODE0YThjZmU5NjA5MzY4NWE2OGJh
-    ZTUyN2VhYjFkODdlNGNmOTBhOTYzZDdlMWIxNGFjNjZlNGUzN2ZhMTQ4MGEz
-    YjM0OWJkOWYzYWIyOGFiYjQ3YjE2N2NhNGU0ZDE4YjA5YmU0ZTg=
+    NDAzZTJjZDRmOWIwZmIzOGRlMjgzNThmODViYTgzYWQwZWY1N2VlYWVkOTdh
+    ZmI1YTNjYmNlYjdlODI3YzA2ODE1MzI0NTc4OGI4MTFjM2FhZWFmNjQ4MzE3
+    NTJiMjU5ZTFjMTZlM2ZjYzNkNzQzNmMyNWQzZmE2YzFjNzJlZTQ=

data/lib/appium_lib/android/helper.rb

@@ -54,9 +54,67 @@ module Appium::Android
     mobile :find, array
   end
 
+  def get_selendroid_inspect
+    def run node
+      r = []
+
+      run_internal = lambda do |node|
+        if node.kind_of? Array
+          node.each { |node| run_internal.call node }
+          return
+        end
+
+        keys = node.keys
+        return if keys.empty?
+
+        obj = {}
+        # name is id
+        obj.merge!( { id: node['name'] } ) if keys.include?('name') && !node['name'].empty?
+        obj.merge!( { text: node['value'] } ) if keys.include?('value') && !node['value'].empty?
+        # label is name
+        obj.merge!( { name: node['label'] } ) if keys.include?('label') && !node['label'].empty?
+        obj.merge!( { class: node['type'] } ) if keys.include?('type') && !obj.empty?
+
+        r.push obj if !obj.empty?
+        run_internal.call node['children'] if keys.include?('children')
+      end
+
+      run_internal.call node
+      r
+    end
+
+    json = get_source
+    node = json['children']
+    results = run node
+
+    out = ''
+    results.each { |e|
+      no_text = e[:text].nil?
+      no_name = e[:name].nil? || e[:name] == 'null'
+
+      # Ignore elements with id only.
+      next if no_text && no_name
+
+      out += e[:class].split('.').last + "\n"
+
+      # name is id when using selendroid.
+      # remove id/ prefix
+      e[:id].sub!(/^id\//, '') if e[:id]
+
+      out += "  class: #{e[:class]}\n"
+      # id('back_button').click
+      out += "  id: #{e[:id]}\n" unless e[:id].nil?
+      # find_element(:link_text, 'text')
+      out += "  text: #{e[:text]}\n" unless no_text
+      # label is name. default is 'null'
+      # find_element(:link_text, 'Facebook')
+      out += "  name: #{e[:name]}\n" unless no_name
+    }
+    out
+  end
 
   # Android only.
-  def get_inspect
+  def get_android_inspect
     def run node
       r = []
 
@@ -101,6 +159,10 @@ module Appium::Android
     out
   end
 
+  def get_inspect
+    @selendroid ? get_selendroid_inspect : get_android_inspect
+  end
+
   # Android only. Intended for use with console.
   # Inspects and prints the current page.
   def page

data/lib/appium_lib/common/helper.rb

@@ -57,6 +57,11 @@ module Appium::Common
     result
   end
 
+  # Find by id. Useful for selendroid
+  def id id
+    find_element :id, id
+  end
+
   # Presses the back button on Android.
   # @return [void]
   def back

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.3.7' unless defined? ::Appium::VERSION
-  DATE = '2013-05-01' unless defined? ::Appium::DATE
+  VERSION = '0.3.8' unless defined? ::Appium::VERSION
+  DATE = '2013-05-06' unless defined? ::Appium::DATE
 end

data/lib/appium_lib/driver.rb

@@ -36,7 +36,7 @@ module Appium
 
     attr_reader :app_path, :app_name, :app_package, :app_activity,
                 :app_wait_activity, :sauce_username, :sauce_access_key,
-                :port, :os, :ios_js
+                :port, :os, :ios_js, :debug
     def initialize options={}
       # quit last driver
       $driver.driver_quit if $driver
@@ -76,7 +76,6 @@ module Appium
 
       @os = :ios
       @os = :android if @app_path.end_with?('.apk') || @app_path.end_with?('.apk.zip')
-      puts "OS is: #{@os}" if defined?(Pry)
 
       # load common methods
       extend Appium::Common
@@ -95,7 +94,12 @@ module Appium
       patch_webdriver_element
 
       # enable debug patch
-      patch_webdriver_bridge if opts.fetch :debug, defined?(Pry)
+      @debug = opts.fetch :debug, defined?(Pry)
+
+      if @debug
+        puts "OS is: #{@os}"
+        patch_webdriver_bridge
+      end
 
       # Save global reference to last created Appium driver for top level methods.
       $driver = self
@@ -121,7 +125,7 @@ module Appium
       {
         browserName: 'Android',
         platform: 'LINUX',
-        version: '4.1',
+        version: '4.2',
         device: @selendroid || 'Android',
         name: @app_name || 'Ruby Console Android Appium',
         app: absolute_app_path,
@@ -203,13 +207,16 @@ module Appium
 
       begin
         @driver = Selenium::WebDriver.for :remote, http_client: @client, desired_capabilities: capabilities, url: server_url
+        # Load touch methods. Required for Selendroid.
+        @driver.extend Selenium::WebDriver::DriverExtensions::HasTouchScreen
       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.
-      mobile :setCommandTimeout, timeout: 9999
+      # broken on selendroid: https://github.com/appium/appium/issues/513
+      mobile :setCommandTimeout, timeout: 9999 unless @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/element/textfield.rb

@@ -55,8 +55,6 @@ module Appium::Ios
       t.concat(s)[0];
     )
 
-    puts js if defined? Pry
-
     execute_script js
   end
 
@@ -71,8 +69,6 @@ module Appium::Ios
       t.concat(s)[0];
     )
 
-    puts js if defined? Pry
-
     execute_script js
   end
 

data/release_notes.md

@@ -1,3 +1,10 @@
+#### v0.3.7 2013-05-01
+
+- [edfd20a](https://github.com/appium/ruby_lib/commit/edfd20a6ffdef8484b9f7b5eddb9c21815241d42) Release 0.3.7
+- [9f8511c](https://github.com/appium/ruby_lib/commit/9f8511c1416867df606dfb3d058f83ee277ce39a) Remove puts
+- [366da1f](https://github.com/appium/ruby_lib/commit/366da1f6e3c0621d55920bce244fc5aedd678e7d) Update release notes
+
+
 #### v0.3.6 2013-05-01
 
 - [67e5c86](https://github.com/appium/ruby_lib/commit/67e5c867d38251687dc7ebd5de013db5712fcac3) Release 0.3.6

metadata

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