lbspec 0.2.2 → 0.2.3

data/README.md

@@ -31,7 +31,7 @@ You can use following chains with `#transfer`.
 - port
   - Tests if a virtual host transfers requests to specified port on target nodes.
 - include
-  - Tests if a virtual host transfers requests include string.
+  - Tests if requests a virtual host transferred include string or are matched with regular expression.
 - tcp
   - Tests with tcp packets for the virtual host.
 - udp
@@ -50,6 +50,7 @@ You can use following chains with `#transfer`.
 
 ### #respond
 `#respond` tests if a virtual host on a load balancer respond as same as expected.
+You can use both a string and a regular expression as a expectation.
 
 #### chains
 You can use following chains with `#respond`.

data/lib/lbspec/respond.rb

@@ -5,16 +5,6 @@ require 'rspec/expectations'
 require 'lbspec'
 
 RSpec::Matchers.define :respond do |expect|
-
-  @expect = expect
-  @protocol = :tcp
-  @application = nil
-  @path = nil
-  @string = nil
-  @chain_str = ''
-  @options = {}
-  @output_request = ''
-
   match do |vhost|
     request =
       Lbspec::Request.new(vhost, @from,
@@ -27,40 +17,40 @@ RSpec::Matchers.define :respond do |expect|
   chain :tcp do
     @protocol = :tcp
     @application = nil
-    @chain_str << ' tcp'
+    Lbspec::Util.add_string(@chain_str, ' tcp')
   end
 
   chain :udp do
     @protocol = :udp
     @application = nil
-    @chain_str << ' udp'
+    Lbspec::Util.add_string(@chain_str, ' udp')
   end
 
   chain :http do
     @protocol = :tcp
     @application = :http
-    @chain_str << ' http'
+    Lbspec::Util.add_string(@chain_str, ' http')
   end
 
   chain :https do
     @protocol = :tcp
     @application = :https
-    @chain_str << ' https'
+    Lbspec::Util.add_string(@chain_str, ' https')
   end
 
   chain :from do |from|
     @from = from
-    @chain_str << " from #{from}"
+    Lbspec::Util.add_string(@chain_str, " from #{from}")
   end
 
   chain :path do |path|
     @path = path
-    @chain_str << " via #{path}"
+    Lbspec::Util.add_string(@chain_str, " via #{path}")
   end
 
   chain :with do |string|
     @string = string
-    @chain_str << " via #{string}"
+    Lbspec::Util.add_string(@chain_str, " via #{string}")
   end
 
   chain :options do |options|

data/lib/lbspec/transfer.rb

@@ -5,15 +5,6 @@ require 'rspec/expectations'
 require 'lbspec'
 
 RSpec::Matchers.define :transfer do |nodes|
-
-  @include_str = nil
-  @port = 0
-  @path = nil
-  @chain_str = ''
-  @options = {}
-  @output_request = ''
-  @output_capture = ''
-
   match do |vhost|
     prove = Lbspec::Util.create_prove
     capture =
@@ -31,44 +22,44 @@ RSpec::Matchers.define :transfer do |nodes|
 
   chain :port do |port|
     @port = port
-    @chain_str << " port #{port}"
+    Lbspec::Util.add_string(@chain_str, " port #{port}")
   end
 
   chain :tcp do
     @protocol = :tcp
-    @chain_str << ' tcp'
+    Lbspec::Util.add_string(@chain_str, ' tcp')
   end
 
   chain :udp do
     @protocol = :udp
-    @chain_str << ' udp'
+    Lbspec::Util.add_string(@chain_str, ' udp')
   end
 
   chain :http do
     @protocol = :tcp
     @application = :http
-    @chain_str << ' http'
+    Lbspec::Util.add_string(@chain_str, ' http')
   end
 
   chain :https do
     @protocol = :tcp
     @application = :https
-    @chain_str << ' https'
+    Lbspec::Util.add_string(@chain_str, ' https')
   end
 
   chain :from do |from|
     @from = from
-    @chain_str << " from #{from}"
+    Lbspec::Util.add_string(@chain_str, " from #{from}")
   end
 
   chain :include do |str|
     @include_str = str
-    @chain_str << " including #{str}"
+    Lbspec::Util.add_string(@chain_str, " including #{str}")
   end
 
   chain :path do |path|
     @path = path
-    @chain_str << " via #{path}"
+    Lbspec::Util.add_string(@chain_str, " via #{path}")
   end
 
   chain :options do |options|

data/lib/lbspec/util.rb

@@ -3,6 +3,14 @@
 module Lbspec
   # Lbspec::Util provides some utilities
   class Util
+    def self.add_string(target, addition)
+      if target.nil?
+        target = addition
+      else
+        target << addition
+      end
+    end
+
     def self.create_prove
       t = Time.now
       t.to_i.to_s + t.nsec.to_s

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.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lbspec
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -188,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 677344431770284692
+      hash: -1779935330635841208
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 677344431770284692
+      hash: -1779935330635841208
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21