lbspec 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86e46129e9a44bc560ec269a223ae968e0bcb307
-  data.tar.gz: df753021edf7e751a0a8d3e84e6555fec95bb615
+  metadata.gz: bc6f025cf48f9f28b899219aee4782724b75affe
+  data.tar.gz: bfaaad1d0182f19d0210f329d0a981a19151dad9
 SHA512:
-  metadata.gz: 9590196fd3c452ca5c776d1b58ac1bb4be30edc43e4fbb21e32028bee97993d9cbffffcd71cfc243cec368a52fdc718990c8921ae4f84d48fcca9130c6ebbcc5
-  data.tar.gz: 2c36467d20e08a8a11eb83ecf0138c1dad5ae7072f165ed419668fac40c69f9440f54b5302720448fd9d1a5e3c613d42f3ad4171278f770df6406bcb9a08dff4
+  metadata.gz: be891f0b85609b354e73c05fdc87bad1b03fa5e099744a25815d9eb2399e7eef34e083227fd00aa09dcc1178a91e0625475ff4fdfd1c3c5d1b5b61ba59b827bb
+  data.tar.gz: bef0f7f51636c4978f297957ce1853462c81e8dc33fa80db2be973ba89c4ca8515b12ab5b8c21a8869571f55bb724db5f2bfd3508521625d4a33f48de8077f87

data/lib/lbspec/respond.rb

@@ -8,6 +8,7 @@ RSpec::Matchers.define :respond do |expect|
   match do |vhost|
     fail ArgumentError, '#respond must have non-nil argument' unless expect
     log.debug("#respond(#{expect.inspect}) is called")
+    @vhost = vhost
     @expect = expect
     request =
       Lbspec::Request.new(vhost, @from,
@@ -67,20 +68,20 @@ RSpec::Matchers.define :respond do |expect|
     "respond #{@expect}#{@chain_str}."
   end
 
-  failure_message_for_should do |vhost|
-    result_string(vhost, @expect)
+  failure_message_for_should do
+    result_string
   end
 
-  failure_message_for_should_not do |vhost|
+  failure_message_for_should_not do
     negative = true
-    result_string(vhost, @expect, negative)
+    result_string(negative)
   end
 
-  def result_string(vhost, expect, negative = false)
+  def result_string(negative = false)
     negation = negative ? ' not' : ''
-    result =  "expected #{vhost}#{negation} to respond #{expect}"
+    result =  "expected #{@vhost}#{negation} to respond #{@expect}"
     result <<  ", but did#{negation}.\n" + "requested:\n"
-    result << request_str.gsub(/^/, '  ')
+    result << @output_request.gsub(/^/, '  ')
   end
 
   def log

data/lib/lbspec/transfer.rb

@@ -8,6 +8,7 @@ RSpec::Matchers.define :transfer do |nodes|
   match do |vhost|
     fail ArgumentError, '#transfer must have non-nil argument' unless nodes
     log.debug("#transfer(#{nodes.inspect}) is called")
+    @vhost = vhost
     prove = Lbspec::Util.create_prove
     capture =
       Lbspec::Capture.new(nodes, @port, prove, @include_str)
@@ -76,33 +77,33 @@ RSpec::Matchers.define :transfer do |nodes|
     "transfer requests to #{nodes}#{@chain_str}."
   end
 
-  failure_message_for_should do |vhost|
-    result_string(nodes, @chain_str, @output_request, @output_capture)
+  failure_message_for_should do
+    result_string
   end
 
-  failure_message_for_should_not do |vhost|
+  failure_message_for_should_not do
     negative = true
-    result_string(nodes, @chain_str, @output_request, @output_capture,
-                  negative)
+    result_string(negative)
   end
 
-  def result_string(nodes, chain_str,
-                    request_str, capture_str, negative = false)
+  def result_string(negative = false)
     negation = negative ? ' not' : ''
-    result =  "expected #{vhost}#{negation} to transfer requests to"
-    result << nodes.to_s + chain_str
+    result =  "expected #{@vhost}#{negation} to transfer requests to"
+    result << @nodes.to_s + @chain_str
     result << ", but did#{negation}.\n" + "requested:\n"
-    result << request_str.gsub(/^/, '  ')
+    result << @output_request.gsub(/^/, '  ')
     result << "\ncaptured:\n"
     result << result_capture
     result
   end
 
   def result_capture
+    result = ''
     @output_capture.each do |o|
       result << o[:node].gsub(/^/, '  ') + "\n"
       result << o[:output].gsub(/^/, '    ') + "\n"
     end
+    result
   end
 
   def log

data/lib/lbspec/util.rb

@@ -53,12 +53,14 @@ module Lbspec
       Net::SSH.start(node, ssh_user(node), options) do |ssh|
         output << ssh.exec!(command).to_s
       end
+      output
     end
 
     def self.exec_command_local(command)
       output = command + "\n"
       log.debug("execute locally: #{command}")
       output << `#{command}`.to_s
+      output
     end
 
     def self.ssh_user(node)

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.2.7'
+  VERSION = '0.2.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lbspec
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - OTA Hiroshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler