webdrone 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12d5f77489ba2ded5102586a7193da98399de127
-  data.tar.gz: 200238d4b2e92a09db311aa2ca4aff02e419a372
+  metadata.gz: 84f21a7830d512ee51ce79b98399df8a9cbec93c
+  data.tar.gz: 524e702b1786541742a00043fdc41a7f79b52d3c
 SHA512:
-  metadata.gz: a56fb22e5f839479299ce86057edd24bd125789558c92dd9a06e23ca9f41e14e8c0eb0137dec5fbf68342f8295ca87bed30818b328b87d9bfe29282435374c20
-  data.tar.gz: a1e7c9b1f3b08da28a3f35a54737d54b76cdfc3bad2b003baee86bd958fae20d5efe5add1d9185933bbc951e4321c8b85159da306948d06fe2f518b49f6adbc5
+  metadata.gz: bda08bad9dddf2224b562942856e463583d99bf6398f74298c6dadb76342fc1028d132ef0c07fbac87e951b2349b4ed69993d84ea6d7739da03e9199b4a3f370
+  data.tar.gz: 65baa45b966b033cc6961390d71ce0708d40b3803a6b7974543b5d073f848ef3273b0d8a75696aa86b8a44cd8c872a9e607054f37f1db1f3aac5bacb49223144

data/lib/webdrone.rb

@@ -1,3 +1,15 @@
+require 'os'
+require 'selenium-webdriver'
+require 'xpath'
+require 'rubyXL'
+require 'irb'
+require 'fileutils'
+require 'binding_of_caller'
+require 'pathname'
+require 'pry'
+require 'highline'
+require 'csv'
+
 require 'webdrone/version'
 require 'webdrone/error'
 require 'webdrone/browser'
@@ -15,15 +27,7 @@ require 'webdrone/wait'
 require 'webdrone/text'
 require 'webdrone/vrfy'
 require 'webdrone/html'
-require 'os'
-require 'selenium-webdriver'
-require 'xpath'
-require 'rubyXL'
-require 'irb'
-require 'fileutils'
-require 'binding_of_caller'
-require 'pathname'
-require 'pry'
+require 'webdrone/logg'
 
 module Webdrone
   def self.create(*args)

data/lib/webdrone/browser.rb

@@ -50,7 +50,7 @@ module Webdrone
       end
     end
 
-    def initialize(browser: 'firefox', create_outdir: true, outdir: nil, timeout:, developer: false, quit_at_exit: false, maximize: true, error: :raise_report, win_x: nil, win_y: nil, win_w: nil, win_h: nil, use_env: true, chrome_prefs: nil, firefox_profile: nil)
+    def initialize(browser: 'firefox', create_outdir: true, outdir: nil, timeout:, developer: false, logger: true, quit_at_exit: false, maximize: true, error: :raise_report, win_x: nil, win_y: nil, win_w: nil, win_h: nil, use_env: true, chrome_prefs: nil, firefox_profile: nil)
       env_update(Kernel.binding) if use_env
       if create_outdir or outdir
         outdir ||= File.join("webdrone_output", Time.new.strftime('%Y%m%d_%H%M%S'))
@@ -80,6 +80,7 @@ module Webdrone
       self.conf.error = error.to_sym
       self.conf.developer = developer
       self.conf.timeout = timeout.to_i if timeout
+      self.conf.logger = logger
       
       if developer
         win_x = win_y = 0

data/lib/webdrone/conf.rb

@@ -6,7 +6,7 @@ module Webdrone
   end
 
   class Conf
-    attr_accessor :a0, :timeout, :outdir, :error, :developer
+    attr_accessor :a0, :timeout, :outdir, :error, :developer, :logger
 
     def initialize(a0)
       @a0 = a0

data/lib/webdrone/error.rb

@@ -1,20 +1,22 @@
 module Webdrone
   class WebdroneError < RuntimeError
-    attr_reader :original, :a0, :caller_locations, :caller_location_index
+    attr_reader :original, :a0, :binding
 
-    def initialize(msg, original = $!, a0, caller_locations)
+    def initialize(msg, original = $!, a0, bindings)
       super(msg)
       @original = original
       @a0 = a0
-      @caller_locations = caller_locations
       @buffer = []
+      @binding = nil
+      @location = nil
 
       begin
         # find location of user error
-        @caller_locations[0..-1].each_with_index do |location, index|
-          if Gem.path.none? { |path| location.path.include? path }
+        bindings[0..-1].each_with_index do |binding, index|
+          location = { path: binding.eval('__FILE__'), lineno: binding.eval('__LINE__') }
+          if Gem.path.none? { |path| location[:path].include? path }
             @location = location
-            @caller_location_index = index
+            @binding = binding
             break
           end
         end
@@ -56,14 +58,14 @@ module Webdrone
 
     def report_script
       begin
-        ini, fin = [@location.lineno - 10 - 1, @location.lineno + 10 - 1]
+        ini, fin = [@location[:lineno] - 10 - 1, @location[:lineno] + 10 - 1]
         ini = 0 if ini < 0
 
         write_title "LOCATION OF ERROR"
-        write_line "#{@location.path} AT LINE #{sprintf '%3d', @location.lineno}"
-        File.readlines(@location.path)[ini..fin].each_with_index do |line, index|
+        write_line "#{@location[:path]} AT LINE #{sprintf '%3d', @location[:lineno]}"
+        File.readlines(@location[:path])[ini..fin].each_with_index do |line, index|
           lno = index + ini + 1
-          if lno == @location.lineno
+          if lno == @location[:lineno]
             write_line sprintf "%3d ==> %s", lno, line
           else
             write_line sprintf "%3d     %s", lno, line
@@ -100,9 +102,8 @@ module Webdrone
 
         write_line "#{@original.class}: #{@original.message}"
         @original.backtrace_locations.each_with_index do |location, index|
-          if location.path == @location.path and location.lineno == @location.lineno
+          if location.path == @location[:path] and location.lineno == @location[:lineno]
             write_line sprintf "%02d: ==> from %s", index, location
-            @caller_index = index
           else
             write_line sprintf "%02d:     from %s", index, location
           end
@@ -132,11 +133,11 @@ module Webdrone
   def self.report_error(a0, exception)
     return if a0.conf.error == :ignore
     if exception.class != WebdroneError
-      exception = WebdroneError.new(exception.message, exception, a0, Kernel.caller_locations)
-      if a0.conf.developer and not exception.caller_location_index.nil?
+      exception = WebdroneError.new(exception.message, exception, a0, Kernel.binding.callers)
+      if a0.conf.developer and exception.binding
         exception.write_title "STARTING DEVELOPER CONSOLE ON ERROR"
         exception.dump_error_report
-        a0.console Kernel.binding.of_caller(exception.caller_location_index + 1)
+        a0.console exception.binding
       end
     end
 

data/lib/webdrone/logg.rb

@@ -0,0 +1,146 @@
+module Webdrone
+  class MethodLogger < Module
+    def initialize(methods_0 = nil)
+      @methods_0 = methods_0
+    end
+
+    def included(base)
+      @methods_0 = base.instance_methods(false) if @methods_0 == nil
+      method_list = @methods_0
+      base.class_eval do
+        method_list.each do |method_name|
+          original_method = instance_method(method_name)
+          define_method method_name do |*args, &block|
+            caller_location = Kernel.caller_locations[0]
+            cl_path = caller_location.path
+            cl_line = caller_location.lineno
+            if @a0.conf.logger and Gem.path.none? { |path| cl_path.include? path }
+              $a0_webdrone_logger_last_time = Time.new unless $a0_webdrone_logger_last_time
+              ini = $a0_webdrone_logger_last_time
+              $a0_webdrone_screenshot = nil
+              begin
+                result = original_method.bind(self).call(*args, &block)
+                fin = $a0_webdrone_logger_last_time = Time.new
+                @a0.logs.trace(ini, fin, cl_path, cl_line, base, method_name, args, result, nil, $a0_webdrone_screenshot)
+                result
+              rescue => exception
+                fin = $a0_webdrone_logger_last_time = Time.new
+                @a0.logs.trace(ini, fin, cl_path, cl_line, base, method_name, args, nil, exception, $a0_webdrone_screenshot)
+                raise exception
+              end
+            else
+              original_method.bind(self).call(*args, &block)
+            end
+          end
+        end
+      end
+    end
+  end
+
+  class Browser
+    def logs
+      @logs ||= Logs.new self
+    end
+  end
+
+  class Logs
+    attr_accessor :a0
+
+    def initialize(a0)
+      @a0 = a0
+      setup_format
+      setup_trace
+    end
+
+    def trace(ini, fin, from, lineno, base, method_name, args, result, exception, screenshot)
+      exception = "#{exception.class}: #{exception}" if exception
+      printf @format, (fin-ini), base, method_name, args, (result || exception)
+      CSV.open(@path, "a+") do |csv|
+        csv << [ini.strftime('%Y-%m-%d %H:%M:%S.%L %z'), (fin-ini), from, lineno, base, method_name, args, result, exception, screenshot]
+      end
+    end
+
+    def setup_format
+      cols, line = HighLine::SystemExtensions.terminal_size
+      total = 6 + 15 + 11 + 5
+      w = cols - total
+      w /= 2
+      w = 20 if w < 20
+      w1 = w
+      w2 = cols - total - w1
+      @format = "%5.3f %14.14s %10s %#{w1}.#{w1}s => %#{w2}.#{w2}s\n"
+    end
+
+    def setup_trace
+      @path = File.join(a0.conf.outdir, 'a0_webdrone_trace.csv')
+      CSV.open(@path, "a+") do |csv|
+        os = "Windows" if OS.windows?
+        os = "Linux" if OS.linux?
+        os = "OS X" if OS.osx?
+        bits = OS.bits
+        hostname = Socket.gethostname
+        browser_name = a0.driver.capabilities[:browser_name]
+        browser_version = a0.driver.capabilities[:version]
+        webdrone_version = Webdrone::VERSION
+
+        csv << %w.OS ARCH HOSTNAME BROWSER\ NAME BROWSER\ VERSION WEBDRONE\ VERSION.
+        csv << [os, bits, hostname, browser_name, browser_version, webdrone_version]
+      end
+      CSV.open(@path, "a+") do |csv|
+        csv << %w.DATE DUR FROM LINENO MODULE CALL PARAMS RESULT EXCEPTION SCREENSHOT.
+      end
+    end
+  end
+
+  class Clic
+    include MethodLogger.new [:id, :css, :link, :button, :on, :option, :xpath]
+  end
+
+  class Conf
+    include MethodLogger.new [:timeout=, :outdir=, :error=, :developer=, :logger=]
+  end
+
+  class Ctxt
+    include MethodLogger.new [:create_tab, :close_tab, :with_frame, :reset, :with_alert, :ignore_alert, :with_conf]
+  end
+
+  class Find
+    include MethodLogger.new [:id, :css, :link, :button, :on, :option, :xpath]
+  end
+
+  class Form
+    include MethodLogger.new [:with_xpath, :save, :set, :get, :clic, :mark, :submit, :xlsx]
+  end
+
+  class Html
+    include MethodLogger.new [:id, :css, :link, :button, :on, :option, :xpath]
+  end
+
+  class Mark
+    include MethodLogger.new [:id, :css, :link, :button, :on, :option, :xpath]
+  end
+
+  class Open
+    include MethodLogger.new [:url, :reload]
+  end
+
+  class Shot
+    include MethodLogger.new [:screen]
+  end
+
+  class Text
+    include MethodLogger.new [:id, :css, :link, :button, :on, :option, :xpath]
+  end
+
+  class Vrfy
+    include MethodLogger.new [:id, :css, :link, :button, :on, :option, :xpath]
+  end
+
+  class Wait
+    include MethodLogger.new [:for, :time]
+  end
+
+  class Xlsx
+    include MethodLogger.new [:dict, :rows, :both, :save, :reset]
+  end
+end

data/lib/webdrone/shot.rb

@@ -16,6 +16,7 @@ module Webdrone
       @counter = (@counter || 0) + 1
       filename = sprintf "screenshot-%04d-%s.png", @counter, name
       filename = File.join(@a0.conf.outdir, filename)
+      $a0_webdrone_screenshot = filename
       @a0.driver.save_screenshot filename
     rescue => exception
       Webdrone.report_error(@a0, exception)

data/lib/webdrone/version.rb

@@ -1,3 +1,3 @@
 module Webdrone
-  VERSION = "1.2.2"
+  VERSION = "1.3.0"
 end

data/webdrone.gemspec

@@ -38,4 +38,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rubyXL"
   spec.add_runtime_dependency "binding_of_caller"
   spec.add_runtime_dependency "pry"
+  spec.add_runtime_dependency "highline"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webdrone
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Aldrin Martoq
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: See webpage for more info.
 email:
 - a@a0.cl
@@ -192,6 +206,7 @@ files:
 - lib/webdrone/find.rb
 - lib/webdrone/form.rb
 - lib/webdrone/html.rb
+- lib/webdrone/logg.rb
 - lib/webdrone/mark.rb
 - lib/webdrone/open.rb
 - lib/webdrone/shot.rb