browsermob-proxy 0.1.8.rc1 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bdd2b3507ced188063a1a939bafb7b9793ad19d
-  data.tar.gz: 169eec559c1dcb96da3a1dbcf8b72849dc26b176
+  metadata.gz: d7c5eb8a3141707dbe6e94473f0332074603abf0
+  data.tar.gz: fa973c10a15c6ba4eb50314387244b1e0f83535a
 SHA512:
-  metadata.gz: 2dd5837ba90f1d3e6ed484e1e725700892df163d16c670805d8aa3486bda7b5fe7ec562bcefdb9dfef98fde45297c8bad2572c621112106a337da4b17dad9408
-  data.tar.gz: fcaaf1b49b3d60826acd54a042c93e9f9e49328124ed4fa29758318cc5b26eacc14d62c5bc4fc267ced948a76adeccdb8e475fb6b9277f5bf59d11448a80430c
+  metadata.gz: fe0a416c7a286bfba23f0ede933f37b13b6c279af029496015fb03f9bec85290a89f88773f0f890849619d31d437932923de9ff333cc96c685c8c44039f92ccd
+  data.tar.gz: 744b35697c60c51e821f834c7c32717cd60acdcc367a21c186bc9b3fb4b11ea11aa4cd899259930bd5eecc9fd598b7eca2fe59baae0090db0834e264f58e87cd

data/README.md

@@ -15,7 +15,7 @@ Manually:
 require 'selenium/webdriver'
 require 'browsermob/proxy'
 
-server = BrowserMob::Proxy::Server.new("/path/to/download/browsermob-proxy") #=> #<BrowserMob::Proxy::Server:0x000001022c6ea8 ...>
+server = BrowserMob::Proxy::Server.new("/path/to/downloads/browsermob-proxy/bin/browsermob-proxy") #=> #<BrowserMob::Proxy::Server:0x000001022c6ea8 ...>
 server.start
 
 proxy = server.create_proxy #=> #<BrowserMob::Proxy::Client:0x0000010224bdc0 ...>

data/browsermob-proxy.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "browsermob-proxy-rb"
 
   s.add_runtime_dependency "rest-client"
-  s.add_runtime_dependency "childprocess"
+  s.add_runtime_dependency "childprocess", "~> 0.5"
   s.add_runtime_dependency "multi_json", "~> 1.0"
   s.add_runtime_dependency "har"
 

data/lib/browsermob/proxy/server.rb

@@ -7,25 +7,31 @@ module BrowserMob
     class Server
       attr_reader :port
 
-      def initialize(path, opts = {})
-        unless File.exist?(path)
-          raise Errno::ENOENT, path
-        end
+      #
+      # Create a new server instance
+      #
+      # @param       [String]  path    Path to the BrowserMob Proxy server executable
+      # @param       [Hash]    opts    options to create the server with
+      # @option opts [Integer] port    What port to start the server on
+      # @option opts [Boolean] log     Show server output (server inherits stdout/stderr)
+      # @option opts [Integer] timeout Seconds to wait for server to launch before timing out.
+      #
 
-        unless File.executable?(path)
-          raise Errno::EACCES, "not executable: #{path}"
-        end
+      def initialize(path, opts = {})
+        assert_executable path
 
-        @path = path
-        @port = Integer(opts[:port] || 8080)
+        @path    = path
+        @port    = Integer(opts[:port] || 8080)
+        @timeout = Integer(opts[:timeout] || 10)
+        @log     = !!opts[:log]
 
-        @process = ChildProcess.new(path, "--port", port.to_s)
-        @process.io.inherit! if opts[:log]
+        @process = create_process
       end
 
       def start
         @process.start
-        sleep 0.1 until listening? && initialized?
+
+        wait_for_startup
 
         pid = Process.pid
         at_exit { stop if Process.pid == pid }
@@ -47,6 +53,28 @@ module BrowserMob
 
       private
 
+      def create_process
+        process        = ChildProcess.new(@path, "--port", @port.to_s)
+        process.leader = true
+
+        process.io.inherit! if @log
+
+        process
+      end
+
+      def wait_for_startup
+        end_time = Time.now + @timeout
+
+        sleep 0.1 until (listening? && initialized?) || Time.now > end_time || !@process.alive?
+
+        if Time.now > end_time
+          raise TimeoutError, "timed out waiting for the server to start (rerun with :log => true to see process output)"
+        end
+
+        unless @process.alive?
+          raise ServerDiedError, "unable to launch the server (rerun with :log => true to see process output)"
+        end
+      end
 
       def listening?
         TCPSocket.new("127.0.0.1", port).close
@@ -61,7 +89,23 @@ module BrowserMob
       rescue RestClient::Exception
         false
       end
-    end # Server
 
+      def assert_executable(path)
+        unless File.exist?(path)
+          raise Errno::ENOENT, path
+        end
+
+        unless File.executable?(path)
+          raise Errno::EACCES, "not executable: #{path}"
+        end
+      end
+
+      class TimeoutError < StandardError
+      end
+
+      class ServerDiedError < StandardError
+      end
+
+    end # Server
   end # Proxy
 end # BrowserMob

data/lib/browsermob/proxy/version.rb

@@ -1,5 +1,5 @@
 module BrowserMob
   module Proxy
-    VERSION = "0.1.8.rc1"
+    VERSION = "0.1.8"
   end
 end

data/spec/e2e/selenium_spec.rb

@@ -105,7 +105,9 @@ describe "Proxy + WebDriver" do
       proxy.blacklist(Regexp.quote(dest), 404)
       driver.get dest
 
-      proxy.har.entries.first.response.status.should == 404
+      entry = proxy.har.entries.find { |e| e.request.url == dest }
+      entry.should_not be_nil
+      entry.response.status.should == 404
     end
 
     it "allows access to urls outside blacklist" do
@@ -124,7 +126,9 @@ describe "Proxy + WebDriver" do
       proxy.clear_blacklist
       driver.get dest
 
-      proxy.har.entries.first.response.status.should_not == 404
+      entry = proxy.har.entries.find { |e| e.request.url == dest }
+      entry.should_not be_nil
+      entry.response.status.should_not == 404
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browsermob-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.8.rc1
+  version: 0.1.8
 platform: ruby
 authors:
 - jari.bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -28,16 +28,16 @@ dependencies:
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -181,9 +181,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: browsermob-proxy-rb
 rubygems_version: 2.2.0