webdrone 1.14.0 → 1.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e526be196c417ab71f06e9d08c199b86295ca3327b0b73c6aff13f8e7bf12f2
-  data.tar.gz: 4d128b76393382af9908f48ad8967a3dc8d41f4c619ee70673053b1bf1b2dbc2
+  metadata.gz: 835b95e7d4d0fc1c897e509b8453275e6592995316e9d98a93731d1db66f6700
+  data.tar.gz: 5cf48bef62eb1c88a8b0d01f24353c96a4e49a77239bbdbd219ecbec72257dff
 SHA512:
-  metadata.gz: 1306f0537f417e66c279512c5952dd8be5487aee66fa33cf40c42e6e0a69bf36af62a96a41c834ec191fe2b8be0544f5c279f2e24d19f07e0f9b77d1365b351b
-  data.tar.gz: d9366338f341cffbdbc4059a9e2c3676e65af01078cfa838d1e00ca8862cddda2e7274335e5b55ef8c95917f93102aa6018b92d40d96ef9d6dc24f6e3cfb2189
+  metadata.gz: b45bf5023816225a22bdbf5f91edb5577d2c321af36db254004b3434bf848604088584da733212e7732ef6082df4a29a495cccc73de41580a2ea559b9f4a4ebe
+  data.tar.gz: 2e9fecee89b66cafd117c515edce83216dc20e6d64e83da11408371aaf97bf5d96353dbc5ae255081268c72c718d71e63afa109af595f784a9bfd9f8c98db9df

data/.rubocop.relaxed.yml

@@ -1,5 +1,5 @@
 # Relaxed.Ruby.Style
-## Version 2.4
+## Version 2.5
 
 Style/Alias:
   Enabled: false
@@ -145,29 +145,8 @@ Lint/AssignmentInCondition:
   Enabled: false
   StyleGuide: https://relaxed.ruby.style/#lintassignmentincondition
 
-Metrics/AbcSize:
+Layout/LineLength:
   Enabled: false
 
-Metrics/BlockNesting:
-  Enabled: false
-
-Metrics/ClassLength:
-  Enabled: false
-
-Metrics/ModuleLength:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Enabled: false
-
-Metrics/LineLength:
-  Enabled: false
-
-Metrics/MethodLength:
-  Enabled: false
-
-Metrics/ParameterLists:
-  Enabled: false
-
-Metrics/PerceivedComplexity:
+Metrics:
   Enabled: false

data/.rubocop.yml

@@ -1,5 +1,6 @@
 AllCops:
   TargetRubyVersion: 2.6
+  NewCops: enable
 inherit_from:
 - .rubocop.relaxed.yml
 Naming/MethodParameterName:

data/.tool-versions

@@ -1 +1 @@
-ruby 2.7.2
+ruby 2.7.3

data/CHANGELOG.md

@@ -4,7 +4,32 @@ New features are summarized here.
 
 
 
-## v.1.12.2 - 2021-03-19
+## v.1.18.2 - 2021-08-26
+### Fixed
+- Getting back support for ruby 2.6
+
+
+
+## v.1.18.0 - 2021-04-24
+### Changed
+- Minimum Ruby version supported is now >= 2.6
+- Added support to Ruby version 3.0
+
+
+
+## v.1.16.2 - 2021-03-19
+### Fixed
+- Remove rspec from runtime_dependencies.
+
+
+
+## v.1.16.0 - 2021-03-19
+### Changed
+- Webdrone will not start a developer console when an exception is raised an a0.conf.error is set to :raise, only when it is set to :raise_report
+
+
+
+## v.1.14.0 - 2021-03-19
 ### Changed
 - New option for logger: :quiet that supress the normal stdout log, but not the log sent to webdrone_output dir.
 ```ruby

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in webdrone.gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/lib/webdrone/browser.rb

@@ -145,9 +145,10 @@ module Webdrone
     protected
 
     def env_update_bool(binding, var, val_old, val_new)
-      if val_new == 'true'
+      case val_new
+      when 'true'
         val_new = true
-      elsif val_new == 'false'
+      when 'false'
         val_new = false
       else
         puts "Webdrone: ignoring value '#{val_new}' for boolean parameter #{var}."
@@ -160,7 +161,7 @@ module Webdrone
     def env_update(binding)
       bool_vars = %i[create_outdir developer quit_at_exit maximize headless]
       ENV.keys.select { |env| env.start_with? 'WEBDRONE_' }.each do |env|
-        var = env[9..-1].downcase.to_sym
+        var = env[9..].downcase.to_sym
         if binding.local_variable_defined? var
           val_old = binding.local_variable_get(var)
           val_new = ENV[env]

data/lib/webdrone/error.rb

@@ -14,8 +14,8 @@ module Webdrone
 
       begin
         # find location of user error
-        bindings[0..-1].each do |binding|
-          location = { path: binding.eval('__FILE__'), lineno: binding.eval('__LINE__') }
+        bindings[0..].each do |binding|
+          location = { path: binding.source_location[0], lineno: binding.source_location[1] }
           next unless Gem.path.none? { |path| location[:path].include? path }
 
           @location = location
@@ -136,7 +136,7 @@ module Webdrone
 
     if exception.class != WebdroneError
       exception = WebdroneError.new(exception.message, exception, a0, Kernel.binding.callers)
-      if a0.conf.developer && exception.binding
+      if a0.conf.developer && exception.binding && %i[raise_report].include?(a0.conf.error)
         exception.write_title "STARTING DEVELOPER CONSOLE ON ERROR"
         exception.dump_error_report
         a0.console exception.binding

data/lib/webdrone/find.rb

@@ -69,9 +69,10 @@ module Webdrone
 
     def choose(list, n, all, visible, scroll)
       list = list.select do |x|
-        if visible == true
+        case visible
+        when true
           x.displayed?
-        elsif visible == false
+        when false
           !x.displayed?
         else
           true

data/lib/webdrone/logg.rb

@@ -7,34 +7,71 @@ module Webdrone
     end
 
     def initialize(methods = nil)
+      super()
+
       @methods = methods
     end
 
-    def included(base)
-      @methods ||= base.instance_methods(false)
-      method_list = @methods
-      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 && Gem.path.none? { |path| cl_path.include? path }
-              ini = ::Webdrone::MethodLogger.last_time ||= Time.new
-              ::Webdrone::MethodLogger.screenshot = nil
-              begin
-                result = original_method.bind(self).call(*args, &block)
-                fin = ::Webdrone::MethodLogger.last_time = Time.new
-                @a0.logs.trace(ini, fin, cl_path, cl_line, base, method_name, args, result, nil, ::Webdrone::MethodLogger.screenshot)
-                result
-              rescue StandardError => exception
-                fin = ::Webdrone::MethodLogger.last_time = Time.new
-                @a0.logs.trace(ini, fin, cl_path, cl_line, base, method_name, args, nil, exception, ::Webdrone::MethodLogger.screenshot)
-                raise exception
+    if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7')
+      def included(base)
+        @methods ||= base.instance_methods(false)
+        method_list = @methods
+        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 && Gem.path.none? { |path| cl_path.include? path }
+                ini = ::Webdrone::MethodLogger.last_time ||= Time.new
+                ::Webdrone::MethodLogger.screenshot = nil
+                args_log = [args].compact.reject(&:empty?).map(&:to_s).join(' ')
+                begin
+                  result = original_method.bind(self).call(*args, &block)
+                  fin = ::Webdrone::MethodLogger.last_time = Time.new
+                  @a0.logs.trace(ini, fin, cl_path, cl_line, base, method_name, args_log, result, nil, ::Webdrone::MethodLogger.screenshot)
+                  result
+                rescue StandardError => exception
+                  fin = ::Webdrone::MethodLogger.last_time = Time.new
+                  @a0.logs.trace(ini, fin, cl_path, cl_line, base, method_name, args_log, nil, exception, ::Webdrone::MethodLogger.screenshot)
+                  raise exception
+                end
+              else
+                original_method.bind(self).call(*args, &block)
+              end
+            end
+          end
+        end
+      end
+    else
+      def included(base)
+        @methods ||= base.instance_methods(false)
+        method_list = @methods
+        base.class_eval do
+          method_list.each do |method_name|
+            original_method = instance_method(method_name)
+            define_method method_name do |*args, **kwargs, &block|
+              caller_location = Kernel.caller_locations[0]
+              cl_path = caller_location.path
+              cl_line = caller_location.lineno
+              if @a0.conf.logger && Gem.path.none? { |path| cl_path.include? path }
+                ini = ::Webdrone::MethodLogger.last_time ||= Time.new
+                ::Webdrone::MethodLogger.screenshot = nil
+                args_log = [args, kwargs].compact.reject(&:empty?).map(&:to_s).join(' ')
+                begin
+                  result = original_method.bind(self).call(*args, **kwargs, &block)
+                  fin = ::Webdrone::MethodLogger.last_time = Time.new
+                  @a0.logs.trace(ini, fin, cl_path, cl_line, base, method_name, args_log, result, nil, ::Webdrone::MethodLogger.screenshot)
+                  result
+                rescue StandardError => exception
+                  fin = ::Webdrone::MethodLogger.last_time = Time.new
+                  @a0.logs.trace(ini, fin, cl_path, cl_line, base, method_name, args_log, nil, exception, ::Webdrone::MethodLogger.screenshot)
+                  raise exception
+                end
+              else
+                original_method.bind(self).call(*args, **kwargs, &block)
               end
-            else
-              original_method.bind(self).call(*args, &block)
             end
           end
         end
@@ -80,8 +117,8 @@ module Webdrone
       rescue StandardError => e
         exception = e
         bindings = Kernel.binding.callers
-        bindings[0..-1].each do |binding|
-          location = { path: binding.eval('__FILE__'), lineno: binding.eval('__LINE__') }
+        bindings[0..].each do |binding|
+          location = { path: binding.source_location[0], lineno: binding.source_location[1] }
           next unless Gem.path.none? { |path| location[:path].include? path }
 
           result[:exception] = {}
@@ -93,7 +130,7 @@ module Webdrone
       end
       result[:trace_count] = @group_trace_count.pop
       fin = Time.new
-      trace(ini, fin, cl_path, cl_line, Logs, :with_group, [name, abort_error: abort_error], result, exception, nil)
+      trace(ini, fin, cl_path, cl_line, Logs, :with_group, [name, { abort_error: abort_error }], result, exception, nil)
       puts "abort_error: #{abort_error} exception: #{exception}"
       exit if abort_error == true && exception
     end

data/lib/webdrone/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Webdrone
-  VERSION = '1.14.0'
+  VERSION = '1.18.2'
 end

data/lib/webdrone/wait.rb

@@ -20,11 +20,9 @@ module Webdrone
       @ignore << Selenium::WebDriver::Error::InvalidSelectorError
     end
 
-    def for
+    def for(&block)
       if @a0.conf.timeout
-        Selenium::WebDriver::Wait.new(timeout: @a0.conf.timeout, ignore: @ignore).until do
-          yield
-        end
+        Selenium::WebDriver::Wait.new(timeout: @a0.conf.timeout, ignore: @ignore).until(&block)
       else
         yield
       end

data/lib/webdrone/xpath.rb

@@ -58,8 +58,7 @@ module Webdrone
     def field(locator)
       locator = locator.to_s
       xpath = descendant(:input, :textarea, :select)[~attr(:type).one_of('submit', 'image', 'hidden')]
-      xpath = locate_field(xpath, locator)
-      xpath
+      locate_field(xpath, locator)
     end
 
     # Match any `input` or `textarea` element that can be filled with text.
@@ -72,8 +71,7 @@ module Webdrone
     def fillable_field(locator)
       locator = locator.to_s
       xpath = descendant(:input, :textarea)[~attr(:type).one_of('submit', 'image', 'radio', 'checkbox', 'hidden', 'file')]
-      xpath = locate_field(xpath, locator)
-      xpath
+      locate_field(xpath, locator)
     end
 
     # Match any `select` element.

data/lib/webdrone.rb

@@ -36,8 +36,8 @@ module Webdrone
   class << self
     attr_accessor :running_pry, :irb_setup_done
 
-    def create(*args)
-      a0 = Webdrone::Browser.new(*args)
+    def create(*args, **kwargs)
+      a0 = Webdrone::Browser.new(*args, **kwargs)
       if block_given?
         begin
           yield a0

data/webdrone.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'lib/webdrone/version'
 
 Gem::Specification.new do |spec|
@@ -10,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'See webpage for more info.'
   spec.homepage      = 'http://github.com/a0/a0-webdrone-ruby'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webdrone
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.18.2
 platform: ruby
 authors:
 - Aldrin Martoq
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-20 00:00:00.000000000 Z
+date: 2021-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -244,7 +244,7 @@ metadata:
   homepage_uri: http://github.com/a0/a0-webdrone-ruby
   source_code_uri: http://github.com/a0/a0-webdrone-ruby
   changelog_uri: http://github.com/a0/a0-webdrone-ruby/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -252,15 +252,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: A simple selenium webdriver wrapper, ruby version.
 test_files: []