webdrone 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64c654a025eb0472f1fb89926d62ca6e9c4de51d
-  data.tar.gz: 8ae214fbe1d02a4a15e5bff878c0ade333e8db11
+  metadata.gz: 49628fa13c5065c1432da4106b3cc5f012f6b4ad
+  data.tar.gz: 3eca80c42e15e21a427580b35b93d856ca830fec
 SHA512:
-  metadata.gz: 0d52f1d053cd9716e893a606d288b80ba5af59d8ba9b0a0be5a6f955fbce2252f3fe8f28da75ee19ecdfcad81fb13fb1f6be2c113e75e3226bda7b87e2c1c471
-  data.tar.gz: 683117fff323a66d68c7dc6be27a3e2b7a61a60a4e7ea1e636efd77e66e060161fff93d87b8f570c956d7ecf5e31a70d91c266f60f7b7c50a33ecdba9d1a62bb
+  metadata.gz: 32822abff939fbb3e3ad74c5b8a433ec90809b582909755048766d7a184a91952af4d85e5cc082302240d5e516070ef01825098d8f27789cb6a06e9882b983a0
+  data.tar.gz: 46d5e8ffefd7b389efbbcb9439913239a9efea7bc063732278769534edd9fa42d526e26c8bf69b7b27a4f858cf1dfe4baad3dcd272ae81a886e17454e3839442

data/lib/webdrone.rb

@@ -23,6 +23,7 @@ require 'irb'
 require 'fileutils'
 require 'binding_of_caller'
 require 'pathname'
+require 'pry'
 
 module Webdrone
   def self.create(*args)
@@ -31,7 +32,7 @@ module Webdrone
       begin
         yield a0
       rescue => exception
-        Webdrone.report_error(a0, exception, Kernel.caller_locations)
+        Webdrone.report_error(a0, exception)
       ensure
         a0.quit
       end
@@ -45,6 +46,11 @@ module Webdrone
     binding = Kernel.binding.of_caller(1) if binding == nil
     IRB.start_session(binding)
   end
+
+  def self.pry_console(binding = nil)
+    binding = Kernel.binding_of_caller(1) unless binding
+    binding.pry    
+  end
 end
 
 module IRB

data/lib/webdrone/browser.rb

@@ -25,7 +25,22 @@ module Webdrone
       @@chrome_prefs
     end
 
-    def initialize(browser: 'firefox', create_outdir: true, outdir: nil, timeout:, developer: false, maximize: true, error: :raise_report, chrome_prefs: nil, firefox_profile: nil)
+    def env_update(binding)
+      ENV.keys.select { |env| env.start_with? 'WEBDRONE_' }.each do |env|
+        v = env[9..-1].downcase.to_sym
+        if binding.local_variable_defined? v
+          o = binding.local_variable_get(v)
+          n = ENV[env]
+          binding.local_variable_set(v, n)
+          puts "Webdrone info: overriding #{v} from '#{o}' to '#{n}'."
+        else
+          puts "Webdrone warn: unknown environment #{env}."
+        end
+      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)
+      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'))
         self.conf.outdir = outdir
@@ -43,10 +58,42 @@ module Webdrone
       else
         @driver = Selenium::WebDriver.for browser.to_sym
       end
-      self.conf.error = error
+      if quit_at_exit
+        at_exit do
+          begin
+            @driver.quit
+          rescue
+          end
+        end
+      end
+      self.conf.error = error.to_sym
       self.conf.developer = developer
       self.conf.timeout = timeout if timeout
-      self.maximize if maximize
+      
+      if developer
+        win_x = win_y = 0
+        win_w = 0.5
+        win_h = 1.0
+      end
+      if win_x or win_y or win_w or win_h
+        x, y, w, h = self.exec.script 'return [window.screenLeft ? window.screenLeft : window.screenX, window.screenTop ? window.screenTop : window.screenY, window.screen.availWidth, window.screen.availHeight];'
+        win_x ||= x
+        win_y ||= y
+        if win_w.is_a? Float
+          win_w = (w * win_w).to_i
+        else
+          win_w ||= w
+        end
+        if win_h.is_a? Float
+          win_h = (h * win_h).to_i
+        else
+          win_h ||= h
+        end
+        @driver.manage.window.position= Selenium::WebDriver::Point.new win_x, win_y
+        @driver.manage.window.resize_to(win_w, win_h)
+      else
+        self.maximize if maximize
+      end
     end
 
     def maximize

data/lib/webdrone/clic.rb

@@ -20,7 +20,7 @@ module Webdrone
         item.click
       end
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     alias_method :id,     :clic

data/lib/webdrone/conf.rb

@@ -18,21 +18,21 @@ module Webdrone
       @timeout = val
       @a0.driver.manage.timeouts.implicit_wait = val
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     def outdir=(val)
       @outdir = val
       FileUtils.mkdir_p val
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     def error=(val)
       raise "Invalid value '#{val}' for error" if not [:raise_report, :raise, :ignore].include? val
       @error = val
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
   end
 end

data/lib/webdrone/ctxt.rb

@@ -17,14 +17,14 @@ module Webdrone
       @a0.exec.script "function a0_ctx_create_tab() { var w = window.open(); w.document.open(); w.document.write('A0 CTXT CREATE TAB'); w.document.close(); } a0_ctx_create_tab();"
       @a0.driver.switch_to.window @a0.driver.window_handles.last
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
     
     def close_tab
       @a0.driver.close
       @a0.driver.switch_to.window @a0.driver.window_handles.last
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     def with_frame(name)
@@ -41,14 +41,14 @@ module Webdrone
       end
       name
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
     
     def reset
       @a0.driver.switch_to.default_content
       @framestack = []
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
     
     def with_alert
@@ -56,13 +56,13 @@ module Webdrone
         yield @a0.driver.switch_to.alert
       end
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     def ignore_alert
       @a0.exec.script 'alert = function(message){return true;};'
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     def with_conf(new_config)
@@ -75,7 +75,7 @@ module Webdrone
 
       yield
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     ensure
       current_config.each do |k, v|
         @a0.conf.send "#{k}=", v

data/lib/webdrone/error.rb

@@ -1,6 +1,7 @@
 module Webdrone
-  class WebdroneError < StandardError
-    attr_reader :original, :a0, :caller_locations, :consoled
+  class WebdroneError < RuntimeError
+    attr_reader :original, :a0, :caller_locations, :caller_location_index
+
     def initialize(msg, original = $!, a0, caller_locations)
       super(msg)
       @original = original
@@ -10,9 +11,10 @@ module Webdrone
 
       begin
         # find location of user error
-        @caller_locations[0..-1].each do |location|
+        @caller_locations[0..-1].each_with_index do |location, index|
           if Gem.path.none? { |path| location.path.include? path }
             @location = location
+            @caller_location_index = index
             break
           end
         end
@@ -125,44 +127,17 @@ module Webdrone
 
       dump_error_report
     end
-
-    def start_console
-      return if @consoled
-      @consoled = true
-      while true do
-        write_title "DEVELOPER CONSOLE"
-        print "Enter stack index [#{@caller_index}] or 'exit': "
-        input = gets.chomp
-        break if input.include? 'exit'
-        begin
-          @caller_index = input.to_i if not input.empty?
-          location = @original.backtrace_locations[@caller_index]
-          raise '' if location == nil
-        rescue => e
-          puts "** INVALID STACK NUMBER **"
-          next
-        end
-
-        @a0.ctxt.with_conf error: :raise, developer: false do
-          begin            
-            index = Kernel.caller_locations.index do |item|
-              item.path == location.path and item.lineno == location.lineno
-            end
-            Webdrone.irb_console Kernel.binding.of_caller(index + 1) if index != nil
-          rescue => e
-            puts "** INVALID STACK NUMBER #{e} **"
-          end
-        end
-        report_exception
-      end
-    end
   end
 
-  def self.report_error(a0, exception, caller_locations)
+  def self.report_error(a0, exception)
     return if a0.conf.error == :ignore
-    exception = WebdroneError.new(exception.message, exception, a0, caller_locations) if exception.class != WebdroneError
+    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?
+        Kernel.binding.of_caller(exception.caller_location_index + 1).pry
+      end
+    end
 
-    exception.start_console if a0.conf.developer
     raise exception if a0.conf.error == :raise or a0.conf.error == :raise_report
   end
 end

data/lib/webdrone/exec.rb

@@ -15,7 +15,7 @@ module Webdrone
     def script(script, *more)
       @a0.driver.execute_script(script, *more)
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
   end
 end

data/lib/webdrone/find.rb

@@ -18,7 +18,7 @@ module Webdrone
         choose(items, n, all, visible)
       end
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     def css(text, n: 1, all: false, visible: true)
@@ -27,31 +27,31 @@ module Webdrone
         choose(items, n, all, visible)
       end
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     def link(text, n: 1, all: false, visible: true)
       self.xpath XPath::HTML.link(text).to_s, n: n, all: all, visible: visible
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     def button(text, n: 1, all: false, visible: true)
       self.xpath XPath::HTML.button(text).to_s, n: n, all: all, visible: visible
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     def on(text, n: 1, all: false, visible: true)
       self.xpath XPath::HTML.link_or_button(text).to_s, n: n, all: all, visible: visible
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     def option(text, n: 1, all: false, visible: true)
       self.xpath XPath::HTML.option(text).to_s, n: n, all: all, visible: visible
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     def xpath(text, n: 1, all: false, visible: true)
@@ -60,7 +60,7 @@ module Webdrone
         choose(items, n, all, visible)
       end
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     protected

data/lib/webdrone/form.rb

@@ -16,7 +16,7 @@ module Webdrone
       old_xpath, @xpath = @xpath, xpath
       instance_eval &block
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     ensure
       @xpath = old_xpath
     end
@@ -31,32 +31,32 @@ module Webdrone
         item.send_keys(val)
       end
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     def get(key, n: 1, visible: true)
       self.find_item(key, n: n, visible: visible)[:value]
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     def clic(key, n: 1, visible: true)
       self.find_item(key, n: n, visible: visible).click
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     def mark(key, n: 1, visible: true, color: '#af1616', times: 3, sleep: 0.05)
       @a0.mark.mark_item self.find_item(key, n: n, visible: visible), color: color, times: times, sleep: sleep
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     def submit(key = nil, n: 1, visible: true)
       self.find_item(key, n: n, visible: visible) if key
       @lastitem.submit
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     def xlsx(sheet: nil, filename: nil)
@@ -64,7 +64,7 @@ module Webdrone
         self.set k, v
       end
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     protected

data/lib/webdrone/html.rb

@@ -20,7 +20,7 @@ module Webdrone
         item.attribute 'innerHTML'
       end
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     alias_method :id,     :find_html

data/lib/webdrone/mark.rb

@@ -16,7 +16,7 @@ module Webdrone
       item = @a0.find.send __callee__, text, n: n, all: all, visible: visible
       mark_item item, color: color, times: times, sleep: sleep
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     alias_method :id,     :mark

data/lib/webdrone/open.rb

@@ -15,13 +15,13 @@ module Webdrone
     def url(url)
       @a0.driver.get url
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     def reload
       @a0.driver.navigate.refresh
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
   end
 end

data/lib/webdrone/shot.rb

@@ -18,7 +18,7 @@ module Webdrone
       filename = File.join(@a0.conf.outdir, filename)
       @a0.driver.save_screenshot filename
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
   end
 end

data/lib/webdrone/text.rb

@@ -20,7 +20,7 @@ module Webdrone
         item.text
       end
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     alias_method :id,     :text
@@ -34,7 +34,7 @@ module Webdrone
     def page_title
       @a0.driver.title
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     protected :text

data/lib/webdrone/version.rb

@@ -1,3 +1,3 @@
 module Webdrone
-  VERSION = "1.0.4"
+  VERSION = "1.0.6"
 end

data/lib/webdrone/wait.rb

@@ -26,13 +26,13 @@ module Webdrone
         yield
       end
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     def time(val)
       sleep val
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
   end
 end

data/lib/webdrone/xlsx.rb

@@ -30,7 +30,7 @@ module Webdrone
       end
       @dict
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     def rows(sheet: nil, filename: nil)
@@ -47,7 +47,7 @@ module Webdrone
       end
       @rows
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     def both(sheet: nil, filename: nil)
@@ -72,7 +72,7 @@ module Webdrone
       end
       @both
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
 
@@ -117,13 +117,13 @@ module Webdrone
       k = workbook.write(@filename)
       reset
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     def reset()
       @dict = @rows = @both = nil
     rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+      Webdrone.report_error(@a0, exception)
     end
 
     protected

data/webdrone.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webdrone
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Aldrin Martoq
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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