webdrone 1.8.12 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bd524cfbe7c2f32c7fa572044fc14c6c554098ca5ad770bebb8231d8cff9194
-  data.tar.gz: ddc1e729d7daa429d85eaa5f6652a00ea8f739e34ed0e060226a1816951fcc3b
+  metadata.gz: 54033552a41d39468377a85f94dab87190f0e390488835a37b13647503950189
+  data.tar.gz: 874c198bc2ae7167600be37ad096c744b82b5cd3fc88ad53a854020e1c8062d7
 SHA512:
-  metadata.gz: 04c477dc7ab916f8ddd131100192e882ee300e917b5f77dd1e298e4fa33932166b9c114ac45ecdb7e7faa807298f955636bd1a730ef7887d6cda206c89c96bba
-  data.tar.gz: 16a6ee6f371d350624cafcf296341799b8dcccdde108ee745c92bb87ed1c371649d288f324cb6bf43a3a738a1c4963a3c8b4d002c4e9c76617e29d75036889c5
+  metadata.gz: 529391d94128a9d0e7bd0ab5ff68de96e8991e8d4400e9e5446e74572fe651505ae57caa9e48ca880bea72ac0b020d212b39bfe368309476a9ed79526b1c5062
+  data.tar.gz: 40f4855afbfe706c0821936cd302364edd0d16fd24b65c227eea1a7f139614d08678b69ce7b8915af5a642259b1a476ff37cc5145b4f2a2ba4d73d017fa4a53b

data/.rubocop.relaxed.yml

@@ -1,5 +1,5 @@
 # Relaxed.Ruby.Style
-## Version 2.2
+## Version 2.4
 
 Style/Alias:
   Enabled: false
@@ -65,6 +65,10 @@ Style/NegatedWhile:
   Enabled: false
   StyleGuide: https://relaxed.ruby.style/#stylenegatedwhile
 
+Style/NumericPredicate:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#stylenumericpredicate
+
 Style/ParallelAssignment:
   Enabled: false
   StyleGuide: https://relaxed.ruby.style/#styleparallelassignment
@@ -121,6 +125,10 @@ Style/TrailingCommaInHashLiteral:
   Enabled: false
   StyleGuide: https://relaxed.ruby.style/#styletrailingcommainhashliteral
 
+Style/SymbolArray:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesymbolarray
+
 Style/WhileUntilModifier:
   Enabled: false
   StyleGuide: https://relaxed.ruby.style/#stylewhileuntilmodifier

data/.rubocop.yml

@@ -6,3 +6,13 @@ Naming/UncommunicativeMethodParamName:
   Enabled: false
 Style/AccessModifierDeclarations:
   Enabled: false
+Naming/RescuedExceptionsVariableName:
+  Enabled: false
+Metrics/BlockLength:
+  Max: 50
+Style/Attr:
+  Exclude:
+    - lib/webdrone/xpath.rb
+Lint/DuplicateMethods:
+  Exclude:
+    - lib/webdrone/xpath.rb

data/.ruby-version

@@ -1 +1 @@
-ruby-2.5.3
+ruby-2.6.4

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.6.4

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/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'webdrone'

data/bin/release-version

@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+path = File.realpath File.join(__dir__, '../lib/webdrone/version.rb')
+load path
+
+current = Webdrone::VERSION
+numbers = current.split('.').map(&:to_i)
+length = numbers.count
+
+versions = length.times.map do |index|
+  version = numbers.dup
+  version[index] += index.zero? ? 1 : 2
+  index += 1
+  (index...length).each do |i|
+    version[i] = 0
+  end
+  version.join '.'
+end.reverse
+
+text = versions.each_with_index.map do |version, index|
+  "#{index + 1}. #{version}"
+end.join("\n")
+
+puts <<~FIN
+
+  Version file: #{path}
+
+  Current version: #{current}. Choose next version:
+  #{text}
+
+FIN
+
+print 'Choose? [1]'
+option = gets.strip
+
+index = option == '' ? 0 : option.to_i - 1
+version = versions[index]
+raise "Invalid option #{option}" unless version
+
+`ruby -p -i -e 'gsub /#{current}/,"#{version}"' #{path}`
+puts `bundle; git add #{path} Gemfile.lock; git commit -m "Version #{version}."; git tag v#{version}`
+
+puts <<~FIN
+
+  Press enter to git push or CTRL+C to cancel
+
+FIN
+
+print 'git push origin master --tags'
+gets
+puts `git push origin master --tags`
+
+puts 'rake release'
+gets
+puts `rake release`

data/lib/webdrone.rb

@@ -53,8 +53,9 @@ module Webdrone
   end
 
   def self.irb_console(binding = nil)
-    puts "Webdrone: Webdrone.irb_console IS DEPRECATED, please use a0.console instead."
+    puts 'Webdrone: Webdrone.irb_console IS DEPRECATED, please use a0.console instead.'
     return if IRB.CurrentContext && !binding
+
     binding ||= Kernel.binding.of_caller(1)
     IRB.start_session(binding)
   end
@@ -62,7 +63,7 @@ module Webdrone
   Webdrone.running_pry = false
   def self.pry_console(binding = nil)
     if Webdrone.running_pry
-      puts "Webdrone: pry console already running."
+      puts 'Webdrone: pry console already running.'
     else
       Webdrone.running_pry = true
       binding ||= Kernel.binding.of_caller(1)
@@ -91,7 +92,7 @@ module IRB
     @CONF[:IRB_RC]&.call(irb.context)
     @CONF[:MAIN_CONTEXT] = irb.context
 
-    trap("SIGINT") do
+    trap('SIGINT') do
       irb.signal_handle
     end
 

data/lib/webdrone/browser.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'English'
+
 module Webdrone
   class Browser
     attr_reader :driver
@@ -14,7 +16,7 @@ module Webdrone
         @firefox_profile['startup.homepage_welcome_url.additional'] = 'about:blank'
         @firefox_profile['browser.download.folderList'] = 2
         @firefox_profile['browser.download.manager.showWhenStarting'] = false
-        @firefox_profile['browser.helperApps.neverAsk.saveToDisk'] = "images/jpeg, application/pdf, application/octet-stream, application/download"
+        @firefox_profile['browser.helperApps.neverAsk.saveToDisk'] = 'images/jpeg, application/pdf, application/octet-stream, application/download'
 
         @firefox_profile
       end
@@ -42,7 +44,7 @@ module Webdrone
       env_update(Kernel.binding) if use_env
 
       if create_outdir || outdir
-        outdir ||= File.join("webdrone_output", Time.new.strftime('%Y%m%d_%H%M%S'))
+        outdir ||= File.join('webdrone_output', Time.new.strftime('%Y%m%d_%H%M%S'))
         conf.outdir = outdir
       end
       outdir = File.join(Dir.pwd, outdir) if !outdir.nil? && !Pathname.new(outdir).absolute?
@@ -57,15 +59,17 @@ module Webdrone
         chrome_options.add_argument '--start-maximized' if maximize
         maximize = false
 
-        @driver = Selenium::WebDriver.for browser.to_sym, options: chrome_options, driver_opts: { log_path: "/tmp/chromedriver.#{$$}.log", verbose: true }
+        service = Selenium::WebDriver::Service.chrome(args: { log_path: "/tmp/chromedriver.#{$PID}.log", verbose: true })
+        @driver = Selenium::WebDriver.for browser.to_sym, options: chrome_options, service: service
       elsif !outdir.nil? && browser.to_sym == :firefox
         firefox_options ||= Browser.firefox_options
         firefox_profile ||= Browser.firefox_profile
 
         firefox_options.add_argument '-headless' if headless
-        downdir = OS.windows? ? outdir.tr("/", "\\") : outdir
+        downdir = OS.windows? ? outdir.tr('/', '\\') : outdir
         firefox_profile['browser.download.dir'] = downdir
-        @driver = Selenium::WebDriver.for browser.to_sym, profile: firefox_profile, options: firefox_options
+        firefox_options.profile = firefox_profile
+        @driver = Selenium::WebDriver.for browser.to_sym, options: firefox_options
       else
         @driver = Selenium::WebDriver.for browser.to_sym
       end
@@ -124,6 +128,7 @@ module Webdrone
 
     def console(binding = nil)
       return unless conf.developer
+
       binding ||= Kernel.binding.of_caller(1)
       old_error = conf.error
       old_developer = conf.developer
@@ -140,9 +145,9 @@ module Webdrone
     protected
 
     def env_update_bool(binding, var, val_old, val_new)
-      if val_new == "true"
+      if val_new == 'true'
         val_new = true
-      elsif val_new == "false"
+      elsif val_new == 'false'
         val_new = false
       else
         puts "Webdrone: ignoring value '#{val_new}' for boolean parameter #{var}."

data/lib/webdrone/conf.rb

@@ -32,7 +32,8 @@ module Webdrone
     end
 
     def error=(val)
-      raise "Invalid value '#{val}' for error" if !%i[raise_report raise ignore].include? val
+      raise "Invalid value '#{val}' for error" unless %i[raise_report raise ignore].include? val
+
       @error = val
     rescue StandardError => error
       Webdrone.report_error(@a0, error)

data/lib/webdrone/error.rb

@@ -133,6 +133,7 @@ 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.binding.callers)
       if a0.conf.developer && exception.binding

data/lib/webdrone/logg.rb

@@ -101,7 +101,8 @@ module Webdrone
     def setup_format
       begin
         cols, _line = HighLine.default_instance.terminal.terminal_size
-      rescue StandardError
+      rescue StandardError => error
+        puts "ignoring error: #{error}"
       end
       cols ||= 120
       total = 6 + 15 + 11 + 5

data/lib/webdrone/version.rb

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

data/lib/webdrone/vrfy.rb

@@ -42,6 +42,7 @@ module Webdrone
       targ = "contains: [#{contains}]" if contains
 
       raise "VRFY: #{callee} [#{text}] text value [#{item.text}] does not comply #{targ}" if attr.nil?
+
       raise "VRFY: #{callee} [#{text}] attr [#{attr}] value [#{item.attribute(attr)}] does not comply #{targ}"
     end
 

data/lib/webdrone/xpath.rb

@@ -27,7 +27,7 @@ module Webdrone
       locator = locator.to_s
       button = descendant(:input)[attr(:type).one_of('submit', 'reset', 'image', 'button')][attr(:id).equals(locator) | attr(:value).is(locator) | attr(:title).is(locator)]
       button += descendant(:button)[attr(:id).equals(locator) | attr(:value).is(locator) | string.n.is(locator) | attr(:title).is(locator)]
-      button += descendant(:input)[attr(:type).equals('image')][attr(:alt).is(locator)]
+      button + descendant(:input)[attr(:type).equals('image')][attr(:alt).is(locator)]
     end
 
     # Match anything returned by either {#link} or {#button}.
@@ -154,7 +154,7 @@ module Webdrone
     #   Id of the 'dd' element or text from preciding 'dt' element content
     def definition_description(locator)
       locator = locator.to_s
-      descendant(:dd)[attr(:id).equals(locator) | previous_sibling(:dt)[string.n.equals(locator)] ]
+      descendant(:dd)[attr(:id).equals(locator) | previous_sibling(:dt)[string.n.equals(locator)]]
     end
 
     protected

data/webdrone.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'webdrone/version'
@@ -15,7 +17,8 @@ Gem::Specification.new do |spec|
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
-  raise "RubyGems 2.0 or newer is required to protect against public gem pushes." unless spec.respond_to?(:metadata)
+  raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.' unless spec.respond_to?(:metadata)
+
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webdrone
 version: !ruby/object:Gem::Version
-  version: 1.8.12
+  version: 1.10.0
 platform: ruby
 authors:
 - Aldrin Martoq
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2019-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -219,6 +219,7 @@ files:
 - ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
+- ".tool-versions"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -226,6 +227,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/release-version
 - bin/setup
 - lib/webdrone.rb
 - lib/webdrone/browser.rb
@@ -268,8 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A simple selenium webdriver wrapper, ruby version.