lbspec 0.1.2 → 0.1.3

data/lib/lbspec/transfer.rb

@@ -23,6 +23,8 @@ RSpec::Matchers.define :transfer do |nodes|
   @vhost_port = 80
   @node_port = 0
   @request_node = nil
+  @include_str = nil
+  @output_request = ''
   @options = {}
 
   @capture_command = lambda do |port, prove|
@@ -39,41 +41,14 @@ RSpec::Matchers.define :transfer do |nodes|
       .exec_command("echo #{prove} | nc #{addr} #{port}", @request_node)
   end
   @http_request_command = lambda do |addr, port, path, prove|
-    env, opt = '', ''
-    opt << (@options[:timeout] ? " -m #{@options[:timeout]}" : '')
-    opt << (@options[:proxy] ? %Q( -x "#{@options[:proxy]}") : '')
-    if @options[:noproxy]
-      env << %Q( no_proxy="#{@options[:noproxy]}")
-      env << %Q( NO_PROXY="#{@options[:noproxy]}")
-    end
-    if @options[:header]
-      header = @options[:header]
-      header = [header] unless header.respond_to? :each
-      header.each { |h| opt << %Q( -H '#{h}') }
-    end
     uri = 'http://' + "#{addr}:#{port}#{path}?#{prove}"
-    Lbspec::Util
-      .exec_command(%Q(#{env} curl -o /dev/null -s #{opt} '#{uri}'),
-                    @request_node)
+    command = Lbspec::Util.build_curl_command(uri, @options)
+    Lbspec::Util.exec_command(command, @request_node)
   end
   @https_request_command = lambda do |addr, port, path, prove|
-    env, opt = '', ''
-    opt << (@options[:timeout] ? " -m #{@options[:timeout]}" : '')
-    opt << (@options[:ignore_valid_ssl] ? ' -k' : '')
-    opt << (@options[:proxy] ? %Q( -x "#{@options[:proxy]}") : '')
-    if @options[:noproxy]
-      env << %Q( no_proxy="#{@options[:noproxy]}")
-      env << %Q( NO_PROXY="#{@options[:noproxy]}")
-    end
-    if @options[:header]
-      header = @options[:header]
-      header = [header] unless header.respond_to? :each
-      header.each { |h| opt << %Q( -H '#{h}') }
-    end
     uri = 'https://' + "#{addr}:#{port}#{path}?#{prove}"
-    Lbspec::Util
-      .exec_command(%Q(#{env} curl -o /dev/null -s #{opt} '#{uri}'),
-                    @request_node)
+    command = Lbspec::Util.build_curl_command(uri, @options)
+    Lbspec::Util.exec_command(command, @request_node)
   end
 
   @result = false
@@ -126,6 +101,11 @@ RSpec::Matchers.define :transfer do |nodes|
     @chain_str << " from #{from}"
   end
 
+  chain :include do |str|
+    @include_str = str
+    @chain_str << " including #{str}"
+  end
+
   chain :options do |options|
     @options = options
   end
@@ -176,14 +156,25 @@ RSpec::Matchers.define :transfer do |nodes|
   def exec_capture(channel)
     command = capture_command(@node_port, @prove)
     channel.exec command do |ch, stream, data|
-      num_match = 0
+      whole_data = ''
       ch.on_data do |c, d|
-        num_match += 1 if /#{@prove}/ =~ d
-        @result = true if num_match > 0
+        whole_data << d
+        patterns = [@prove]
+        patterns << @include_str if @include_str
+        @result = match_all?(whole_data, patterns)
       end
     end
   end
 
+  def match_all?(string, patterns)
+    num_patterns, num_match = 0, 0
+    patterns.each do |pat|
+      num_patterns += 1
+      num_match += 1 if /#{pat}/ =~ string
+    end
+    num_match == num_patterns
+  end
+
   def capture_command(port, prove)
     @capture_command[port, prove]
   end
@@ -202,9 +193,11 @@ RSpec::Matchers.define :transfer do |nodes|
     vhost_addr, vhost_port = addr_port[:addr], addr_port[:port]
     @vhost_port = vhost_port if vhost_port > 0
     if @application
-      send_request_application(vhost_addr, @vhost_port, @prove)
+      @output_request =
+        send_request_application(vhost_addr, @vhost_port, @prove)
     else
-      send_request_transport(vhost_addr, @vhost_port, @prove)
+      @output_request =
+        send_request_transport(vhost_addr, @vhost_port, @prove)
     end
   end
 
@@ -234,13 +227,17 @@ RSpec::Matchers.define :transfer do |nodes|
     result =  "expected #{vhost} to transfer requests to"
     result << nodes.to_s
     result << @chain_str
-    result << ', but did not.'
+    result << ", but did not.\n"
+    result << "requested:\n"
+    result << @output_request
   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.'
+    result << ", but did.\n"
+    result << "requested:\n"
+    result << @output_request
   end
 end

data/lib/lbspec/util.rb

@@ -14,13 +14,32 @@ module Lbspec
       port = splits.last.to_i if /\d+/ =~ splits.last
       { addr: addr, port: port }
     end
+    def self.build_curl_command(uri, options)
+      env, opt = '', ''
+      opt << (options[:timeout] ? " -m #{options[:timeout]}" : '')
+      opt << (options[:ignore_valid_ssl] ? ' -k' : '')
+      opt << (options[:proxy] ? %Q( -x "#{options[:proxy]}") : '')
+      if options[:noproxy]
+        env << %Q( no_proxy="#{options[:noproxy]}")
+        env << %Q( NO_PROXY="#{options[:noproxy]}")
+      end
+      opt << header_option(options[:header])
+      %Q(#{env} curl -o /dev/null -s #{opt} '#{uri}')
+    end
+    def self.header_option(header)
+      opt = ''
+      header = [header] unless header.respond_to? :each
+      header.each { |h| opt << %Q( -H '#{h}') }
+      opt
+    end
     def self.exec_command(command, node = nil)
+      output = command
       if node
         Net::SSH.start(node, nil, config: true) do |ssh|
-          ssh.exec!(command)
+          output << ssh.exec!(command).to_s
         end
       else
-        `#{command}`
+        output << `#{command}`.to_s
       end
     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.2'
+  VERSION = '0.1.3'
 end

data/spec/lbspec_transfer_spec.rb

@@ -6,11 +6,14 @@ describe Lbspec do
   describe '#transfer' do
     before(:each) do
       key = Lbspec::Util.create_prove
+      include_str = 'X-Test: 1'
       Lbspec::Util.stub(:create_prove).and_return(key)
       channel_connected = double('channel_connected')
       channel_connected.stub(:request_pty).and_yield(channel_connected, true)
       channel_connected.stub(:exec).and_yield(channel_connected, nil, nil)
-      channel_connected.stub(:on_data).and_yield(nil, key).and_yield(nil, key)
+      channel_connected.stub(:on_data)
+        .and_yield(nil, key + include_str)
+        .and_yield(nil, key + include_str)
       ssh_connected = double('ssh_connected')
       ssh_connected.stub(:open_channel).and_yield(channel_connected)
       ssh_connected.stub(:closed?).and_return(false)
@@ -60,6 +63,12 @@ describe Lbspec do
       'vhost_a:443'.should transfer('node_a')
         .https.path('/test').from('node_a')
     end
+    it 'should test transfer vhost:80 and a node with http includes ' do
+      'vhost_a:80'.should transfer('node_a').http
+        .include('X-Test: 1')
+      'vhost_a:80'.should transfer('node_a').http
+        .include(/Test:/)
+    end
 
     describe 'request_command' do
       it 'should create single header options for http' do
@@ -68,7 +77,7 @@ describe Lbspec do
         Lbspec::Util.should_not_receive(:exec_command)
           .with(/ -H.* -H/, nil)
         'vhost_a:443'.should transfer('node_a').http
-          .options({ header: 'X-Test1:1' })
+          .options(header: 'X-Test1:1')
       end
       it 'should create single header options for https' do
         Lbspec::Util.should_receive(:exec_command)
@@ -76,19 +85,19 @@ describe Lbspec do
         Lbspec::Util.should_not_receive(:exec_command)
           .with(/ -H.* -H/, nil)
         'vhost_a:443'.should transfer('node_a').https
-          .options({ header: 'X-Test1:1' })
+          .options(header: 'X-Test1:1')
       end
       it 'should create multi header options for http' do
         Lbspec::Util.should_receive(:exec_command)
           .with(/ -H.* -H/, nil)
         'vhost_a:443'.should transfer('node_a').http
-          .options({ header: %w(X-Test1:1 X-Test2:2) })
+          .options(header: %w(X-Test1:1 X-Test2:2))
       end
       it 'should create multi header options for https' do
         Lbspec::Util.should_receive(:exec_command)
           .with(/ -H.* -H/, nil)
         'vhost_a:443'.should transfer('node_a').https
-          .options({ header: %w(X-Test1:1 X-Test2:2) })
+          .options(header: %w(X-Test1:1 X-Test2:2))
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lbspec
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-03-27 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: -3855103968202962501
+      hash: -4298291710759407848
 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: -3855103968202962501
+      hash: -4298291710759407848
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21