capybara-chromedriver-logger 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bf949569140cd895d2e29fb9c168b933a362c71
-  data.tar.gz: 932cc9b2c08c52af54a05728428ac100621024d6
+  metadata.gz: a2adb7cdaeb7970c7f543a69bade1af3c1dd37bf
+  data.tar.gz: 5296595dcd28304754d3c6bc122463fc0b965363
 SHA512:
-  metadata.gz: 77de57767e12fcac2eade8c81795e1e413bbdcb6ab169696f6a1b18d3c786e83542f66ceae06c1b92cb44f7d4064e15383e8ecc5dc38ae3727ab29f07f42c968
-  data.tar.gz: 8edc993525de574405a2cb840956281040f8f9689de0d84d7439a072d1edc86bb781abe3313ebb9f50ed854222bcba9c35ae74fad79e8f1262f5779d801cabcf
+  metadata.gz: f99ad48a1477114a5323163a535a7ed112bee149ab8a4dccc668562c9187a256e2821b1370176de5496010ee5f21a8a0b4fd53c36b4ac93228764a0df10972bd
+  data.tar.gz: 27578f35e27085a1a800890545c85d49a9f03a65f27c642ca5b018b02713b9ccde3d5ba8d696609ea0f6a11c11e5cf0232b7fb13cdaa7dde8cf4d3642c047823

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.2.0 [Feb 17, 2018]
+
+* Stop using threads, it's a fool's errand. We now output logs at the end of each test
+* Update colors
+* Drop dependencies on net-http-persistent + selenium-webdriver
+
 # 0.1.2 [Feb 16, 2018]
 
 * Use a new instance with each spec example to avoid issues with code reloading

data/Gemfile.lock

@@ -1,11 +1,9 @@
 PATH
   remote: .
   specs:
-    capybara-chromedriver-logger (0.1.2)
+    capybara-chromedriver-logger (0.2.0)
       capybara
       colorize
-      net-http-persistent
-      selenium-webdriver
 
 GEM
   remote: https://rubygems.org/
@@ -28,15 +26,12 @@ GEM
       nokogiri (~> 1.8)
     coderay (1.1.2)
     colorize (0.8.1)
-    connection_pool (2.2.1)
     diff-lcs (1.3)
     ffi (1.9.21)
     io-like (0.3.0)
     method_source (0.9.0)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
-    net-http-persistent (3.0.0)
-      connection_pool (~> 2.2)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     pry (0.11.3)
@@ -79,6 +74,7 @@ DEPENDENCIES
   pry
   rake (~> 10.0)
   rspec (~> 3.0)
+  selenium-webdriver
   stub_server
 
 BUNDLED WITH

data/README.md

@@ -1,13 +1,12 @@
 # capybara-chromedriver-logger
 
-This gem provides real-time `console.log` debug output for Ruby feature specs running under Chromedriver.
+This gem provides `console.log` debug output for Ruby feature specs running under Chromedriver.
 
 We currently assume you're running:
 
 * capybara
-* chromedriver
+* chromedriver + selenium-webdriver
 * rspec
-* selenium-webdriver
 
 to handle your JS feature specs. I'd love to expand support for other combinations of test environments!
 
@@ -42,14 +41,10 @@ Capybara.register_driver(:chrome) do |app|
     }
   )
 
-  # Selenium needs to use a thread-safe HTTP client
-  client = Capybara::Chromedriver::Logger::SeleniumHttpClient.new
-
   Capybara::Selenium::Driver.new(
     app,
     browser: :chrome,
-    desired_capabilities: capabilities,
-    http_client: client
+    desired_capabilities: capabilities
   )
 end
 
@@ -57,8 +52,15 @@ end
 Capybara.default_driver = :chrome
 Capybara.javascript_driver = :chrome
 
-# Setup before/after hooks for your feature specs
+# Option 1: Setup hooks for your feature specs
 Capybara::Chromedriver::Logger::TestHooks.for_rspec!
+
+# Option 2: if you prefer to hook it in manually:
+RSpec.configure do |config|
+  config.after :each, type: :feature do
+    Capybara::Chromedriver::Logger::TestHooks.after_example!
+  end
+end
 ```
 
 ## Configuration

data/capybara-chromedriver-logger.gemspec

@@ -31,13 +31,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "capybara"
   spec.add_dependency "colorize"
-  spec.add_dependency "net-http-persistent"
-  spec.add_dependency "selenium-webdriver"
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "chromedriver-helper"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "selenium-webdriver"
   spec.add_development_dependency "stub_server"
 end

data/lib/capybara/chromedriver/logger.rb

@@ -1,24 +1,15 @@
 require 'capybara'
 require 'selenium-webdriver'
-require 'selenium/webdriver/remote/http/persistent'
 
 require "capybara/chromedriver/logger/test_hooks"
 require "capybara/chromedriver/logger/version"
 require "capybara/chromedriver/logger/js_error"
 require "capybara/chromedriver/logger/message"
-require "capybara/chromedriver/logger/watcher"
-require "capybara/chromedriver/logger/selenium_thread_safe_bridge"
-
-class Selenium::WebDriver::Remote::Bridge
-  prepend Capybara::Chromedriver::Logger::SeleniumThreadSafeBridge
-end
+require "capybara/chromedriver/logger/collector"
 
 module Capybara
   module Chromedriver
     module Logger
-      # This HTTP client is thread-safe, unlike the default client.
-      SeleniumHttpClient = ::Selenium::WebDriver::Remote::Http::Persistent
-
       extend self
 
       def filters

data/lib/capybara/chromedriver/logger/{watcher.rb → collector.rb}

@@ -1,45 +1,22 @@
-require 'thread'
-
 module Capybara
   module Chromedriver
     module Logger
-      class Watcher
+      class Collector
         def initialize(log_destination: $stdout, filters: nil)
           @log_destination = log_destination
-          @last_timestamp = 0
-          @mutex = Mutex.new
-          @thread = nil
-          @paused = true
           @filters = filters || Capybara::Chromedriver::Logger.filters
           @errors = []
         end
 
-        def before_example!
-          unpause!
-          start_listener!
-        end
-
-        def after_example!
-          pause!
+        def flush_and_check_errors!
           flush_logs!
 
           raise_errors_if_needed!
           clear_errors!
-        ensure
-          thread.kill if thread
         end
 
         private
 
-        def start_listener!
-          @thread = Thread.new do
-            loop do
-              flush_logs! unless paused?
-              sleep 0.1
-            end
-          end
-        end
-
         def raise_errors_if_needed!
           return unless Capybara::Chromedriver::Logger.raise_js_errors?
           return if errors.empty?
@@ -53,13 +30,9 @@ module Capybara
 
         def flush_logs!
           browser_logs.each do |log|
-            next if log.timestamp < last_timestamp
-
-            @last_timestamp = log.timestamp
-
             message = Message.new(log)
-
             errors << message if message.error?
+
             log_destination.puts message.to_s unless should_filter?(message)
           end
         end
@@ -73,14 +46,12 @@ module Capybara
         end
 
         def logs(type)
-          mutex.synchronize do
-            Capybara
-              .current_session
-              .driver.browser
-              .manage
-              .logs
-              .get(type)
-          end
+          Capybara
+            .current_session
+            .driver.browser
+            .manage
+            .logs
+            .get(type)
         end
 
         def should_filter?(message)
@@ -91,37 +62,13 @@ module Capybara
           @errors
         end
 
-        def unpause!
-          @paused = false
-        end
-
-        def pause!
-          @paused = true
-        end
-
-        def mutex
-          @mutex
-        end
-
         def filters
           @filters
         end
 
-        def last_timestamp
-          @last_timestamp
-        end
-
-        def paused?
-          !!@paused
-        end
-
         def log_destination
           @log_destination
         end
-
-        def thread
-          @thread
-        end
       end
     end
   end

data/lib/capybara/chromedriver/logger/message.rb

@@ -36,6 +36,7 @@ module Capybara
         COLORS = {
           'SEVERE' => :light_red,
           'INFO' => :light_green,
+          'WARNING' => :light_cyan,
           'DEBUG' => :light_blue
         }.freeze
 

data/lib/capybara/chromedriver/logger/test_hooks.rb

@@ -2,17 +2,15 @@ module Capybara
   module Chromedriver
     module Logger
       class TestHooks
+        def self.after_example!
+          collector = Capybara::Chromedriver::Logger::Collector.new
+          collector.flush_and_check_errors!
+        end
+
         def self.for_rspec!
           ::RSpec.configure do |config|
-            filters = { type: :feature }
-
-            config.before :each, filters do
-              @_log_watcher = Capybara::Chromedriver::Logger::Watcher.new
-              @_log_watcher.before_example!
-            end
-
-            config.after :each, filters do
-              @_log_watcher.after_example!
+            config.after :each, type: :feature do
+              Capybara::Chromedriver::Logger::TestHooks.after_example!
             end
           end
         end

data/lib/capybara/chromedriver/logger/version.rb

@@ -1,7 +1,7 @@
 module Capybara
   module Chromedriver
     module Logger
-      VERSION = "0.1.2"
+      VERSION = "0.2.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-chromedriver-logger
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - David Balatero
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-17 00:00:00.000000000 Z
+date: 2018-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -38,34 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: net-http-persistent
-  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'
-- !ruby/object:Gem::Dependency
-  name: selenium-webdriver
-  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'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: stub_server
   requirement: !ruby/object:Gem::Requirement
@@ -171,12 +157,11 @@ files:
 - capybara-chromedriver-logger.gemspec
 - images/example.png
 - lib/capybara/chromedriver/logger.rb
+- lib/capybara/chromedriver/logger/collector.rb
 - lib/capybara/chromedriver/logger/js_error.rb
 - lib/capybara/chromedriver/logger/message.rb
-- lib/capybara/chromedriver/logger/selenium_thread_safe_bridge.rb
 - lib/capybara/chromedriver/logger/test_hooks.rb
 - lib/capybara/chromedriver/logger/version.rb
-- lib/capybara/chromedriver/logger/watcher.rb
 homepage: https://github.com/dbalatero/capybara-chromedriver-logger
 licenses:
 - MIT

data/lib/capybara/chromedriver/logger/selenium_thread_safe_bridge.rb

@@ -1,16 +0,0 @@
-module Capybara
-  module Chromedriver
-    module Logger
-      # Ensure our polling thread doesn't compete with the main spec example
-      module SeleniumThreadSafeBridge
-        def __execute_lock
-          @__execute_lock ||= Mutex.new
-        end
-
-        def execute(*args)
-          __execute_lock.synchronize { super }
-        end
-      end
-    end
-  end
-end