wdbomber 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68b1d92a4aed3a99a11ae2125e05fdca360859d888b80476f40da5518bf03645
-  data.tar.gz: 4f44dac0755946ca09488da51013aa2454bc06c0634528983d7bd713b4279b43
+  metadata.gz: 76cc800c1313f1c2f133cb06eb685eb972db6e2679f08aad0330caf2518e186b
+  data.tar.gz: 3219434faec36dde950e804628f04fa5bfa6667ac7223ac31d405c2b6cd215a1
 SHA512:
-  metadata.gz: bce6b82a94a695227d6743b5f932b430c3e2833213b5eb5d3ee42b36d59bf4700df0910018bb4b2b660fdb6aa36e110f7b1dc0ca9f2763dc9f895253946f8d06
-  data.tar.gz: b29135ea9b571d9bf2e3df0aa2f5c58a891d82ce9be9f6802de60b9901c803333aefff1125813a9b87a4206917de7e78f97e50a0799efa4eebac61aaeea4d6b9
+  metadata.gz: 188de4d99dc7bf63ddbd3eb03494c7ee5afe3ff6e353870de80a96ae32f6b6aba7690969c88c56dcecb2f17b1c31a0a30cb651f757bf2c9c73eca07d8bfc12b5
+  data.tar.gz: b37dda3ca362dd44a3269636f94b9f23704f576872445c7a4f4add87dc2d54c0aa90d65688b2e087f2e4e535e3e725d515c667228bf572c338a684de97e9f132

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.6.0

data/Gemfile.lock

@@ -1,26 +1,33 @@
 PATH
   remote: .
   specs:
-    wdbomber (0.1.3)
-      superbot-selenium-webdriver
+    wdbomber (0.1.4)
+      async-webdriver (>= 0.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    archive-zip (0.11.0)
-      io-like (~> 0.3.0)
+    async (1.13.1)
+      nio4r (~> 2.3)
+      timers (~> 4.1)
+    async-http (0.37.7)
+      async (~> 1.6)
+      async-io (~> 1.16)
+      http-protocol (~> 0.10)
+    async-io (1.17.2)
+      async (~> 1.3)
+    async-webdriver (0.1.1)
+      async-http
+      selenium-webdriver
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
-    chromedriver-helper (2.1.0)
-      archive-zip (~> 0.10)
-      nokogiri (~> 1.8)
     diff-lcs (1.3)
-    ffi (1.9.25)
-    io-like (0.3.0)
+    ffi (1.10.0)
+    http-hpack (0.1.1)
+    http-protocol (0.10.1)
+      http-hpack (~> 0.1.0)
     kommando (0.1.2)
-    mini_portile2 (2.3.0)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
+    nio4r (2.3.1)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -39,9 +46,7 @@ GEM
     selenium-webdriver (3.141.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2, >= 1.2.2)
-    superbot-selenium-webdriver (1.0.0)
-      chromedriver-helper (= 2.1.0)
-      selenium-webdriver (= 3.141.0)
+    timers (4.2.0)
 
 PLATFORMS
   ruby
@@ -54,4 +59,4 @@ DEPENDENCIES
   wdbomber!
 
 BUNDLED WITH
-   1.17.1
+   1.17.2

data/lib/wdbomber.rb

@@ -1,5 +1,6 @@
+require "async"
+require "async/webdriver"
 require "wdbomber/version"
-require "selenium-webdriver"
 
 Signal.trap("INT") {
   if $SHUTDOWN_REQUESTED
@@ -25,51 +26,50 @@ module Wdbomber
       desired_capabilities['superOptions']['region'] = ENV["SUPERBOT_REGION"]
     end
 
-    threads = []
-    concurrency.times do |t|
-      bomber = t+1
-      sleep t*concurrency_delay #for specs
+    main_task = Async.run do |main_task|
+      concurrency.times do |t|
+        bomber = t+1
+        main_task.sleep t*concurrency_delay #for specs
 
-      threads << Thread.new do
-        if rampup
-          my_rampup = rand(rampup).floor
-          puts "#{bomber}: starting after #{my_rampup} rampup"
-          sleep my_rampup
-          puts "#{bomber}: started"
-        end
-        iterations.times do |i|
-          if $SHUTDOWN_REQUESTED
-            puts "#{bomber}: SHUTDOWN"
-            break
+        main_task.async do |sub_task|
+          if rampup
+            my_rampup = rand(rampup).floor
+            puts "#{bomber}: starting after #{my_rampup} rampup"
+            sub_task.sleep my_rampup
+            puts "#{bomber}: started"
           end
 
-          iteration = i+1
+          iterations.times do |i|
+            if $SHUTDOWN_REQUESTED
+              puts "#{bomber}: SHUTDOWN"
+              break
+            end
 
-          started_at = Time.now
-          client = Selenium::WebDriver::Remote::Http::Default.new
-          client.read_timeout = 500
-          driver = Selenium::WebDriver.for :remote, {
-            url: endpoint,
-            desired_capabilities: desired_capabilities,
-            http_client: client,
-          }
-          actions.times do
-            driver.navigate.to "about:blank"
-          end
-          took = Time.now - started_at
+            iteration = i+1
+            client = Async::Webdriver::Client.new endpoint: endpoint, desired_capabilities: desired_capabilities
+            started_at = Time.now
+            session = client.session.create!
+
+            actions.times do
+              session.navigate! "about:blank"
+            end
 
-          puts "#{bomber}: took #{took.floor(1)}s (##{iteration}/#{iterations})"
-        rescue
-          puts "#{bomber}: EXCEPTION (#{iteration}/#{iterations})"
-          p $!
-          exit 1 unless ENV["WDBOMBER_KEEP_BOMBING"] == "true"
-        ensure
-          driver&.quit unless ENV["WDBOMBER_NO_QUIT"] == "true"
+            took = Time.now - started_at
+
+            puts "#{bomber}: took #{took.floor(1)}s (##{iteration}/#{iterations})"
+          rescue
+            puts "#{bomber}: EXCEPTION (#{iteration}/#{iterations})"
+            p $!
+            exit 1 unless ENV["WDBOMBER_KEEP_BOMBING"] == "true"
+          ensure
+            session.delete! unless ENV["WDBOMBER_NO_QUIT"] == "true"
+          end
         end
       end
     end
 
-    threads.each(&:join)
+    main_task.wait
+
     STDERR.puts "OK"
   end
 end

data/lib/wdbomber/version.rb

@@ -1,3 +1,3 @@
 module Wdbomber
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/wdbomber.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "superbot-selenium-webdriver"
+  spec.add_dependency "async-webdriver", ">= 0.1.1"
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: wdbomber
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Matti Paksula
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: superbot-selenium-webdriver
+  name: async-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -123,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: bomb remote webdrivers