lbspec 0.1.3 → 0.1.4

data/README.md

@@ -29,7 +29,9 @@ You can use lbspec to test load balancers.
 You can use following chains with `#transfer`.
 
 - port
- - Tests if a virtual host transfers requests to specified port on target nodes.
+  - Tests if a virtual host transfers requests to specified port on target nodes.
+- include
+  - Tests if a virtual host transfers requests include string.
 - tcp
   - Tests with tcp packets for the virtual host.
 - udp

data/lib/lbspec/transfer.rb

@@ -25,11 +25,12 @@ RSpec::Matchers.define :transfer do |nodes|
   @request_node = nil
   @include_str = nil
   @output_request = ''
+  @output_capture = []
   @options = {}
 
   @capture_command = lambda do |port, prove|
     port_str = port > 0 ? "port #{port}" : ''
-    "sudo ngrep #{prove} #{port_str} | grep -v \"match:\""
+    "sudo ngrep -W byline #{prove} #{port_str} | grep -v \"match:\""
   end
 
   @udp_request_command = lambda do |addr, port, prove|
@@ -140,21 +141,31 @@ RSpec::Matchers.define :transfer do |nodes|
     @threads << Thread.new do
       Net::SSH.start(node, nil, config: true) do |ssh|
         @ssh << ssh
-        ssh.open_channel { |channel| run_check channel }
+        ssh.open_channel do |channel|
+          output = run_check channel
+          @output_capture.push(node: node, output: output)
+        end
       end
     end
   end
 
   def run_check(channel)
+    output = ''
     channel.request_pty do |chan, success|
       fail 'Could not obtain pty' unless success
       @nodes_connected.push(true)
-      exec_capture(chan)
+      output = exec_capture(chan)
     end
+    output
   end
 
   def exec_capture(channel)
     command = capture_command(@node_port, @prove)
+    output = exec_capture_command(channel, command)
+    command + "\n" +  output
+  end
+
+  def exec_capture_command(channel, command)
     channel.exec command do |ch, stream, data|
       whole_data = ''
       ch.on_data do |c, d|
@@ -163,6 +174,7 @@ RSpec::Matchers.define :transfer do |nodes|
         patterns << @include_str if @include_str
         @result = match_all?(whole_data, patterns)
       end
+      whole_data
     end
   end
 
@@ -225,19 +237,25 @@ RSpec::Matchers.define :transfer do |nodes|
 
   failure_message_for_should do |vhost|
     result =  "expected #{vhost} to transfer requests to"
-    result << nodes.to_s
-    result << @chain_str
-    result << ", but did not.\n"
-    result << "requested:\n"
-    result << @output_request
+    result <<
+      result_string(nodes, @chain_str, @output_request, @output_capture)
   end
 
   failure_message_for_should_not do |vhost|
     result =  "expected #{vhost} not to transfer requests to"
-    result << nodes.to_s
-    result << @chain_str
-    result << ", but did.\n"
-    result << "requested:\n"
-    result << @output_request
+    result <<
+      result_string(nodes, @chain_str, @output_request, @output_capture)
+  end
+
+  def result_string(nodes, chain_str, request_str, capture_str)
+    result = nodes.to_s + chain_str
+    result << ", but did.\n" + "requested:\n"
+    result << request_str.gsub(/^/, '  ')
+    result << "\ncaptured:\n"
+    @output_capture.each do |o|
+      result << o[:node].gsub(/^/, '  ') + "\n"
+      result << o[:output].gsub(/^/, '    ') + "\n"
+    end
+    result
   end
 end

data/lib/lbspec/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 # Lbspec is an RSpec plugin for easy Loadbalancer testing.
 module Lbspec
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lbspec
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4298291710759407848
+      hash: 2692456461482340401
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4298291710759407848
+      hash: 2692456461482340401
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21