appium_lib 5.0.1 → 6.0.0

data/lib/appium_lib/common/patch.rb

@@ -90,7 +90,7 @@ def patch_webdriver_bridge
       path_match = path.match /.*\h{8}-?\h{4}-?\h{4}-?\h{4}-?\h{12}/
       path_str   = path.sub(path_match[0], '') unless path_match.nil?
 
-      puts "#{verb} #{path_str}"
+      Appium::Logger.info  "#{verb} #{path_str}"
 
       # must check to see if command_hash is a hash. sometimes it's not.
       if command_hash.is_a?(Hash) && !command_hash.empty?
@@ -103,18 +103,18 @@ def patch_webdriver_bridge
           print_command[:value] = value.length == 1 ? value[0] : value
 
           # avoid backslash escape quotes in strings. "\"a\"" => "a"
-          puts print_command.ai.gsub('\"', '"')
+          Appium::Logger.info print_command.ai.gsub('\"', '"')
         else
-          ap print_command
+          Appium::Logger.ap_info print_command
         end
       else # non-standard command hash
         # It's important to output this for debugging problems.
         # for example invalid JSON will not be a Hash
-        ap command_hash if command_hash
+        Appium::Logger.ap_info command_hash if command_hash
       end
       delay = $driver.global_webdriver_http_sleep
       sleep delay if !delay.nil? && delay > 0
-      # puts "verb: #{verb}, path #{path}, command_hash #{command_hash.to_json}"
+      # Appium::Logger.info "verb: #{verb}, path #{path}, command_hash #{command_hash.to_json}"
       http.call verb, path, command_hash
     end # def
   end # class

data/lib/appium_lib/common/version.rb

@@ -1,5 +1,5 @@
 module Appium
   # Version and Date are defined on the 'Appium' module, not 'Appium::Common'
-  VERSION = '5.0.1' unless defined? ::Appium::VERSION
-  DATE    = '2014-12-30' unless defined? ::Appium::DATE
+  VERSION = '6.0.0' unless defined? ::Appium::VERSION
+  DATE    = '2015-01-26' unless defined? ::Appium::DATE
 end

data/lib/appium_lib/driver.rb

@@ -76,20 +76,20 @@ module Appium
 
     parent_dir = File.dirname file
     toml       = File.expand_path File.join parent_dir, 'appium.txt'
-    puts "appium.txt path: #{toml}" if verbose
+    Appium::Logger.info "appium.txt path: #{toml}" if verbose
 
     toml_exists = File.exists? toml
-    puts "Exists? #{toml_exists}" if verbose
+    Appium::Logger.info "Exists? #{toml_exists}" if verbose
 
     raise "toml doesn't exist #{toml}" unless toml_exists
     require 'toml'
-    puts "Loading #{toml}" if verbose
+    Appium::Logger.info "Loading #{toml}" if verbose
 
     data = File.read toml
     data = TOML::Parser.new(data).parsed
     # TOML creates string keys. must symbolize
     data = Appium::symbolize_keys data
-    ap data unless data.empty? if verbose
+    Appium::Logger.ap_info data unless data.empty? if verbose
 
     if data && data[:caps] && data[:caps][:app] && !data[:caps][:app].empty?
       data[:caps][:app] = Appium::Driver.absolute_app_path data
@@ -319,9 +319,9 @@ module Appium
       @appium_debug = appium_lib_opts.fetch :debug, !!defined?(Pry)
 
       if @appium_debug
-        ap opts unless opts.empty?
-        puts "Debug is: #{@appium_debug}"
-        puts "Device is: #{@appium_device}"
+        Appium::Logger.ap_debug opts unless opts.empty?
+        Appium::Logger.debug "Debug is: #{@appium_debug}"
+        Appium::Logger.debug "Device is: #{@appium_device}"
         patch_webdriver_bridge
       end
 
@@ -512,14 +512,14 @@ module Appium
     # @return [void]
     def set_wait timeout=nil
       if timeout.nil?
-        # puts "timeout = @default_wait = @last_wait"
-        # puts "timeout = @default_wait = #{@last_waits}"
+        # Appium::Logger.info "timeout = @default_wait = @last_wait"
+        # Appium::Logger.info "timeout = @default_wait = #{@last_waits}"
         timeout = @default_wait = @last_waits.first
       else
         @default_wait = timeout
-        # puts "last waits before: #{@last_waits}"
+        # Appium::Logger.info "last waits before: #{@last_waits}"
         @last_waits   = [@last_waits.last, @default_wait]
-        # puts "last waits after: #{@last_waits}"
+        # Appium::Logger.info "last waits after: #{@last_waits}"
       end
 
       @driver.manage.timeouts.implicit_wait = timeout

data/lib/appium_lib/logger.rb

@@ -1,12 +1,24 @@
+require 'logger'
+
 module Appium
   module Logger
     class << self
       extend Forwardable
-      def_delegators :@logger, :warn, :error, :info
+      def_delegators :logger, :ap, :fatal, :error, :warn, :info, :debug, :level, :level=, :formatter, :formatter=
+
+      [:fatal, :error, :warn, :info, :debug].each do |level|
+        define_method("ap_#{level}") {|obj| logger.ap(obj, level) }
+      end
 
-      # @private
+    private
+    
       def logger
-        @logger ||= Logger.new
+        @logger ||= begin
+          logger = ::Logger.new($stdout)
+          logger.level = ::Logger::WARN
+          logger.formatter = proc { |severity, datetime, progname, msg| "#{msg}\n" } # do no special formatting
+          logger
+        end
       end
     end # class << self
   end # module Logger

data/readme.md

@@ -46,3 +46,11 @@ gem install --no-rdoc --no-ri appium_lib
 - [Ruby Android methods](https://github.com/appium/ruby_lib/blob/master/docs/android_docs.md)
 - [Ruby iOS methods](https://github.com/appium/ruby_lib/blob/master/docs/ios_docs.md)
 - [Appium Server docs](https://github.com/appium/appium/tree/master/docs)
+
+#### Logging
+
+[Log level](https://github.com/appium/ruby_lib/blob/1673a694121d2ae24ffd1530eb71b7015d44dc52/lib/appium_lib/logger.rb) can be adjusted. The default level is `Logger::WARN`
+
+```ruby
+Appium::Logger.level = Logger::INFO
+```

data/release_notes.md

@@ -1,3 +1,12 @@
+#### v6.0.0 2015-01-26
+
+- [ea11190](https://github.com/appium/ruby_lib/commit/ea11190b9ab36e34226d988f85fe612af6f769de) Release 6.0.0
+- [d15371d](https://github.com/appium/ruby_lib/commit/d15371deb2bbb0e6a441c7b38cabdc83b3e36256) Update readme.md
+- [4f99dd3](https://github.com/appium/ruby_lib/commit/4f99dd31ad0a1976214858195b5911e79a42c3a1) Merge pull request #302 from whoward/use-logger
+- [1673a69](https://github.com/appium/ruby_lib/commit/1673a694121d2ae24ffd1530eb71b7015d44dc52) Use the logger object for outputting debug information
+- [4573473](https://github.com/appium/ruby_lib/commit/457347379f26804af143269e896f45869e2860e1) Create index_paths.md
+
+
 #### v5.0.1 2014-12-30
 
 - [9b15701](https://github.com/appium/ruby_lib/commit/9b157011965442e6f021dcfeef588450277f1c6a) Release 5.0.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 6.0.0
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-30 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -247,6 +247,7 @@ files:
 - docs/android_docs.md
 - docs/api_19_webview.md
 - docs/docs.md
+- docs/index_paths.md
 - docs/ios_docs.md
 - docs/migration.md
 - docs_gen/docs_from_js.md