wbench 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dfb44fa9da6a36574ee13ee7b541a0beee68cbf
-  data.tar.gz: def12740e6a51ddf81d71d8479d1acb150d2fe17
+  metadata.gz: 3a99e98258f2293683471f454c7e0f9e7dbbfc9b
+  data.tar.gz: 78a484762385e2926fa49b47f0143e10bece9fa3
 SHA512:
-  metadata.gz: 0ebecb25fe5ae425c7effb70ea8b7fc2c71a5fde0c0df1865664a81201ef997e1b9bbd0386745bcf3dc6654ee1195df267f15fef5e7d7e94bde9265cc9efac8a
-  data.tar.gz: b90b6da372c793a2a28db28f12341d6b5625b0161f2c661133afa3729e9482e2d5b6a83e26b181b90bbfdf88c020623143c76f56869e9f6c572b715e2ac255f8
+  metadata.gz: 1da1f3692c3f18b4bb41313db19107c56553dae54c3dc0685d1be3e2f5893f8c52b2e991c0e923da6f8bf1d8caffe40b8354ee1f56f397b946f37316b72b96ea
+  data.tar.gz: 08ae38bf3f64536e2b2abdca96afe27b5516fc5322ab1a13321043db5c1936597563f2a22e0da00cc7867fbed5c7cc9bc13efcb2ed28cf9738a60dfd21580b2e

data/.rspec

@@ -1,2 +1,3 @@
+--require spec_helper
 --color
 --format progress

data/README.md

@@ -74,22 +74,34 @@ results.app_server # =>
   [25, 24, 24]
 
 results.browser # =>
-  {"navigationStart"=>[0, 0, 0], "fetchStart"=>[0, 0, 0],
-  "domainLookupStart"=>[0, 0, 0], "domainLookupEnd"=>[0, 0, 0],
-  "connectStart"=>[12, 12, 11], "connectEnd"=>[609, 612, 599],
-  "secureConnectionStart"=>[197, 195, 194], "requestStart"=>[609, 612, 599],
-  "responseStart"=>[829, 858, 821], "responseEnd"=>[1025, 1053, 1013],
-  "domLoading"=>[1028, 1055, 1016], "domInteractive"=>[1549, 1183, 1136],
-  "domContentLoadedEventStart"=>[1549, 1183, 1136],
-  "domContentLoadedEventEnd"=>[1549, 1184, 1137], "domComplete"=>[2042, 1712,
-  1663], "loadEventStart"=>[2042, 1712, 1663], "loadEventEnd"=>[2057, 1730,
-  1680]}
+  {
+    "navigationStart"            => [0, 0, 0],
+    "fetchStart"                 => [0, 0, 0],
+    "domainLookupStart"          => [0, 0, 0],
+    "domainLookupEnd"            => [0, 0, 0],
+    "connectStart"               => [12, 12, 11],
+    "connectEnd"                 => [609, 612, 599],
+    "secureConnectionStart"      => [197, 195, 194],
+    "requestStart"               => [609, 612, 599],
+    "responseStart"              => [829, 858, 821],
+    "responseEnd"                => [1025, 1053, 1013],
+    "domLoading"                 => [1028, 1055, 1016],
+    "domInteractive"             => [1549, 1183, 1136],
+    "domContentLoadedEventStart" => [1549, 1183, 1136],
+    "domContentLoadedEventEnd"   => [1549, 1184, 1137],
+    "domComplete"                => [2042, 1712, 1663],
+    "loadEventStart"             => [2042, 1712, 1663],
+    "loadEventEnd"               => [2057, 1730, 1680]
+  }
 
 results.latency # =>
-  {"a.desktopprassets.com"=>[352, 15, 15],
-  "beacon-1.newrelic.com"=>[587, 235, 248],
-  "d1ros97qkrwjf5.cloudfront.net"=>[368, 14, 14],
-  "ssl.google-analytics.com"=>[497, 14, 14], "www.desktoppr.co"=>[191, 210, 203]}
+  {
+    "a.desktopprassets.com"         => [352, 15, 15],
+    "beacon-1.newrelic.com"         => [587, 235, 248],
+    "d1ros97qkrwjf5.cloudfront.net" => [368, 14, 14],
+    "ssl.google-analytics.com"      => [497, 14, 14],
+    "www.desktoppr.co"              => [191, 210, 203]
+  }
 ```
 
 ### Benchmarking authenticated pages

data/bin/wbench

@@ -25,9 +25,16 @@ options = {}.tap do |options|
       options[:user_agent] = user_agent
     end
 
+    opts.on("-c", "--no-color", "Disable color output") do
+      options[:color_output] = false
+    end
   end.parse!
 end
 
+if options.has_key?(:color_output)
+  WBench.color_output = options.delete(:color_output)
+end
+
 if url = ARGV[0]
   puts WBench::Benchmark.run(url, options)
 else

data/lib/wbench.rb

@@ -13,6 +13,7 @@ require 'wbench/timings/browser'
 require 'wbench/timings/latency'
 require 'wbench/benchmark'
 require 'wbench/browser'
+require 'wbench/colored_string'
 require 'wbench/selenium_driver'
 require 'wbench/results'
 require 'wbench/results_formatter'
@@ -27,4 +28,10 @@ module WBench
   CAPYBARA_TIMEOUT = 60
   DEFAULT_LOOPS    = 10
   DEFAULT_BROWSER  = :chrome
+
+  class << self
+    attr_accessor :color_output
+  end
+
+  self.color_output = true
 end

data/lib/wbench/colored_string.rb

@@ -0,0 +1,11 @@
+module WBench
+  class ColoredString < String
+    def initialize(string, color)
+      if WBench.color_output
+        super(string.colorize(color))
+      else
+        super(string)
+      end
+    end
+  end
+end

data/lib/wbench/results_formatter.rb

@@ -49,15 +49,15 @@ module WBench
     end
 
     def latency_heading_s
-      "Host latency:\n".colorize(:yellow)
+      ColoredString.new("Host latency:\n", :yellow)
     end
 
     def browser_heading_s
-      "Browser performance:\n".colorize(:yellow)
+      ColoredString.new("Browser performance:\n", :yellow)
     end
 
     def app_heading_s
-      "Server performance:\n".colorize(:yellow)
+      ColoredString.new("Server performance:\n", :yellow)
     end
   end
 end

data/lib/wbench/row_formatter.rb

@@ -20,23 +20,23 @@ module WBench
     end
 
     def no_result_s
-      'Unable to be recorded'.center(40).colorize(:light_red)
+      ColoredString.new('Unable to be recorded'.center(40), :light_red)
     end
 
     def fastest_s
-      "#{@stats.min}ms".ljust(10).colorize(:green)
+      ColoredString.new("#{@stats.min}ms".ljust(10), :green)
     end
 
     def slowest_s
-      "#{@stats.max}ms".ljust(10).colorize(:red)
+      ColoredString.new("#{@stats.max}ms".ljust(10), :red)
     end
 
     def median_s
-      "#{@stats.median}ms".ljust(10).colorize(:blue)
+      ColoredString.new("#{@stats.median}ms".ljust(10), :blue)
     end
 
     def std_dev_s
-      "#{@stats.std_dev.to_i}ms".ljust(10).colorize(:yellow)
+      ColoredString.new("#{@stats.std_dev.to_i}ms".ljust(10), :yellow)
     end
   end
 end

data/lib/wbench/timings/app_server.rb

@@ -2,20 +2,32 @@ module WBench
   module Timings
     class AppServer
       def initialize(browser)
-        uri = Addressable::URI.parse(browser.url)
-        @http = Net::HTTP.new(uri.host, uri.inferred_port)
-        @http.use_ssl = uri.scheme == 'https'
-
-        @request = Net::HTTP::Get.new(uri.request_uri)
+        @browser = browser
       end
 
       def result
-        response = @http.request(@request)
+        response = http.request(request)
 
         unless response.header['x-runtime'].nil?
-          (response.header['x-runtime'].to_f*1000).to_i
+          (response.header['x-runtime'].to_f * 1000).to_i
         end
       end
+
+      private
+
+      def uri
+        Addressable::URI.parse(@browser.url)
+      end
+
+      def http
+        Net::HTTP.new(uri.host, uri.inferred_port).tap do |http|
+          http.use_ssl = uri.scheme == 'https'
+        end
+      end
+
+      def request
+        Net::HTTP::Get.new(uri.request_uri)
+      end
     end
   end
 end

data/lib/wbench/timings/browser.rb

@@ -6,10 +6,14 @@ module WBench
       end
 
       def result
-        timing_json = @browser.evaluate_script('window.performance.timing')
-
         TimingHash.new(timing_json)
       end
+
+      private
+
+      def timing_json
+        @browser.evaluate_script('window.performance.timing')
+      end
     end
   end
 end

data/lib/wbench/timings/latency.rb

@@ -6,20 +6,21 @@ module WBench
       end
 
       def result
-        Hash[domains.map { |domain| [domain, latency_for(domain) ] }.sort]
+        Hash[hosts.map { |host| [host.join(":"), latency_for(*host) ] }.sort]
       end
 
       private
 
-      def latency_for(domain)
-        (::Benchmark.measure { TCPSocket.new(domain, 80) }.real * 1000).to_i
+      def latency_for(hostname, port)
+        (::Benchmark.measure { TCPSocket.new(hostname, port) }.real * 1000).to_i
       rescue SocketError
         nil
       end
 
-      def domains
-        @domains ||= JSON.parse(@browser.evaluate_script('WBench.resourceURLs()')).map do |url|
-          Addressable::URI.parse(url).host
+      def hosts
+        @hosts ||= JSON.parse(@browser.evaluate_script('WBench.resourceURLs()')).map do |url|
+          u = Addressable::URI.parse(url)
+          [u.host, u.inferred_port]
         end.compact.uniq
       end
     end

data/lib/wbench/version.rb

@@ -1,3 +1,3 @@
 module WBench
-  VERSION = '0.3.7'
+  VERSION = '0.4.0'
 end

data/spec/wbench/integration_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 require File.expand_path(File.dirname(__FILE__)) + '/../support/test_sites'
 
 describe 'wbench' do

data/spec/wbench/latency_spec.rb

@@ -0,0 +1,64 @@
+describe WBench::Timings::Latency do
+  subject(:latency) { described_class.new(browser) }
+  let(:browser) { double 'browser' }
+  let(:resource_urls) do
+    JSON.dump([
+      "http://3.example.com/path",
+      "https://1.example.com/path",
+      "http://2.example.com:3000/path",
+    ])
+  end
+
+  before do
+    allow(browser).to receive(:evaluate_script).with('WBench.resourceURLs()') { resource_urls }
+    allow(::Benchmark).to receive(:measure).and_yield.and_return(30, 10, 20)
+  end
+
+  describe "#result" do
+    shared_examples_for "result" do
+      it "measures latency for every host" do
+        expect(::Benchmark).to receive(:measure).and_yield.and_return(30, 10, 20)
+        expect(::TCPSocket).to receive(:new).with("1.example.com", 443)
+        expect(::TCPSocket).to receive(:new).with("2.example.com", 3000)
+        expect(::TCPSocket).to receive(:new).with("3.example.com", 80)
+        latency.result
+      end
+
+      it "returns a hash of the measurement results, sorted by hostname" do
+        expect(latency.result).to eq expected_result
+      end
+    end
+
+    context "when no SocketError" do
+      before do
+        allow(::TCPSocket).to receive(:new)
+      end
+
+      let(:expected_result) do
+        {
+          "1.example.com:443" => 10000,
+          "2.example.com:3000" => 20000,
+          "3.example.com:80" => 30000,
+        }
+      end
+
+      it_behaves_like "result"
+    end
+
+    context "on SocketError" do
+      before do
+        allow(TCPSocket).to receive(:new).and_raise(SocketError.new)
+      end
+
+      let(:expected_result) do
+        {
+          "1.example.com:443" => nil,
+          "2.example.com:3000" => nil,
+          "3.example.com:80" => nil,
+        }
+      end
+
+      it_behaves_like "result"
+    end
+  end
+end

data/spec/wbench/stats_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe WBench::Stats do
   describe '#median' do
     context 'when there are an odd number of results' do

data/spec/wbench/timing_hash_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe WBench::TimingHash do
   describe '#new' do
     let(:timings) { { :end => 20, :middle => 15, :start => 10, :nope => 0 } }

data/spec/wbench/titleizer_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe WBench::Titleizer do
   describe '#to_s' do
     subject { described_class.new('dom loading time') }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wbench
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - Mario Visic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -89,6 +89,7 @@ files:
 - lib/wbench.rb
 - lib/wbench/benchmark.rb
 - lib/wbench/browser.rb
+- lib/wbench/colored_string.rb
 - lib/wbench/results.rb
 - lib/wbench/results_formatter.rb
 - lib/wbench/row_formatter.rb
@@ -103,6 +104,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/test_sites.rb
 - spec/wbench/integration_spec.rb
+- spec/wbench/latency_spec.rb
 - spec/wbench/stats_spec.rb
 - spec/wbench/timing_hash_spec.rb
 - spec/wbench/titleizer_spec.rb
@@ -127,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Benchmark website loading times
@@ -135,6 +137,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/test_sites.rb
 - spec/wbench/integration_spec.rb
+- spec/wbench/latency_spec.rb
 - spec/wbench/stats_spec.rb
 - spec/wbench/timing_hash_spec.rb
 - spec/wbench/titleizer_spec.rb