lbspec 0.1.1 → 0.1.2

data/lib/lbspec/transfer.rb

@@ -41,13 +41,16 @@ RSpec::Matchers.define :transfer do |nodes|
   @http_request_command = lambda do |addr, port, path, prove|
     env, opt = '', ''
     opt << (@options[:timeout] ? " -m #{@options[:timeout]}" : '')
-    opt << (@options[:proxy] ? %Q(-x "#{@options[:proxy]}") : '')
+    opt << (@options[:proxy] ? %Q( -x "#{@options[:proxy]}") : '')
     if @options[:noproxy]
-      opt << %Q( --noproxy "#{@options[:noproxy]}")
       env << %Q( no_proxy="#{@options[:noproxy]}")
       env << %Q( NO_PROXY="#{@options[:noproxy]}")
     end
-    opt << (@options[:header] ? %Q(-H '#{@options[:header]}') : '')
+    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}'),
@@ -59,11 +62,14 @@ RSpec::Matchers.define :transfer do |nodes|
     opt << (@options[:ignore_valid_ssl] ? ' -k' : '')
     opt << (@options[:proxy] ? %Q( -x "#{@options[:proxy]}") : '')
     if @options[:noproxy]
-      opt << %Q( --noproxy "#{@options[:noproxy]}")
       env << %Q( no_proxy="#{@options[:noproxy]}")
       env << %Q( NO_PROXY="#{@options[:noproxy]}")
     end
-    opt << (@options[:header] ? %Q( -H '#{@options[:header]}') : '')
+    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}'),

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.1'
+  VERSION = '0.1.2'
 end

data/spec/lbspec_transfer_spec.rb

@@ -60,5 +60,37 @@ describe Lbspec do
       'vhost_a:443'.should transfer('node_a')
         .https.path('/test').from('node_a')
     end
+
+    describe 'request_command' do
+      it 'should create single header options for http' do
+        Lbspec::Util.should_receive(:exec_command)
+          .with(/ -H.*/, nil)
+        Lbspec::Util.should_not_receive(:exec_command)
+          .with(/ -H.* -H/, nil)
+        'vhost_a:443'.should transfer('node_a').http
+          .options({ header: 'X-Test1:1' })
+      end
+      it 'should create single header options for https' do
+        Lbspec::Util.should_receive(:exec_command)
+          .with(/ -H.*/, nil)
+        Lbspec::Util.should_not_receive(:exec_command)
+          .with(/ -H.* -H/, nil)
+        'vhost_a:443'.should transfer('node_a').https
+          .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) })
+      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) })
+      end
+    end
+
   end
 end

metadata

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