lbspec 0.0.5 → 0.0.6

data/README.md

@@ -66,6 +66,13 @@ describe 'vhost_c:443' do
   it { should transfer(['node_b','node_c']).port(80).https.path('/test/') }
 end
 
+describe 'vhost_c:443' do
+  it do
+    should transfer(['node_b','node_c']).port(80).https.path('/test/')
+      .options(ignore_valid_ssl: true)
+  end
+end
+
 ```
 ## How it works
 ### #transfer
@@ -79,7 +86,7 @@ end
 
 ## Configuration
 ### #transfer
-You can cnange how to capture probes and access to `vhost` with probes. You can replace default procedures to your procedures in spec_helpers or .spec files as follows.
+You can change how to capture probes and access to `vhost` with probes. You can replace default procedures to your procedures in spec_helpers or .spec files as follows.
 ```ruby
 RSpec.configuration.lbspec_capture_command =
   lambda do |port, prove|
@@ -93,6 +100,16 @@ RSpec.configuration.lbspec_https_request_command =
   system("curl -o /dev/null -sk #{uri}")
 end
 ```
+You can also use the procedures with `options` with a chain `options`.
+```ruby
+RSpec.configuration.lbspec_https_request_command =
+  lambda do |addr, port, path, prove|
+  opt =  @options[:timeout] ? " -m #{@options[:timeout]}" : ''
+  opt << (@options[:ignore_valid_ssl] ? ' -k' : '')
+  system("curl -o /dev/null -s #{opt} #{uri}")
+end
+```
+
 You can replace following items.
 
  - `lbspec_capture_command` with `|port, prove|`

data/images/transfer_overview.svg

@@ -15,7 +15,7 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="overview.svg">
+   sodipodi:docname="transfer_overview.svg">
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -27,7 +27,7 @@
      inkscape:cx="184.15599"
      inkscape:cy="676.17692"
      inkscape:document-units="px"
-     inkscape:current-layer="layer2"
+     inkscape:current-layer="layer5"
      showgrid="false"
      inkscape:window-width="1274"
      inkscape:window-height="760"
@@ -274,7 +274,7 @@
     </g>
   </g>
   <g
-     style="display:none"
+     style="display:inline"
      inkscape:label="step1"
      id="layer2"
      inkscape:groupmode="layer">
@@ -304,7 +304,7 @@
      inkscape:groupmode="layer"
      id="layer7"
      inkscape:label="step1-2"
-     style="display:none">
+     style="display:inline">
     <path
        style="fill:#0000ff;stroke:#0000ff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1MendW);display:inline"
        d="m 181,430.36218 c 171,-144 171,-144 171,-144"
@@ -317,7 +317,7 @@
        inkscape:connector-curvature="0" />
   </g>
   <g
-     style="display:none"
+     style="display:inline"
      inkscape:label="step2"
      id="layer3"
      inkscape:groupmode="layer">
@@ -359,7 +359,7 @@
      inkscape:groupmode="layer"
      id="layer6"
      inkscape:label="step2-3"
-     style="display:none">
+     style="display:inline">
     <text
        xml:space="preserve"
        style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Sans;-inkscape-font-specification:Sans Bold"
@@ -384,7 +384,7 @@
          sodipodi:role="line">probe=123456</tspan></text>
   </g>
   <g
-     style="display:none"
+     style="display:inline"
      inkscape:label="step3"
      id="layer4"
      inkscape:groupmode="layer">
@@ -443,7 +443,7 @@
      inkscape:groupmode="layer"
      id="layer8"
      inkscape:label="step3-4"
-     style="display:none">
+     style="display:inline">
     <text
        sodipodi:linespacing="125%"
        id="text4140"
@@ -479,7 +479,7 @@
          y="391.76321">probe=123456</tspan></text>
   </g>
   <g
-     style="display:none"
+     style="display:inline"
      inkscape:label="step4"
      id="layer5"
      inkscape:groupmode="layer">

data/lib/lbspec/transfer.rb

@@ -5,11 +5,11 @@ require 'rspec/expectations'
 require 'lbspec'
 
 RSpec.configure do |c|
-  c.add_setting :lbspec_capture_command      , :default => nil
-  c.add_setting :lbspec_udp_request_command  , :default => nil
-  c.add_setting :lbspec_tcp_request_command  , :default => nil
-  c.add_setting :lbspec_http_request_command , :default => nil
-  c.add_setting :lbspec_https_request_command, :default => nil
+  c.add_setting :lbspec_capture_command      , default: nil
+  c.add_setting :lbspec_udp_request_command  , default: nil
+  c.add_setting :lbspec_tcp_request_command  , default: nil
+  c.add_setting :lbspec_http_request_command , default: nil
+  c.add_setting :lbspec_https_request_command, default: nil
 end
 
 RSpec::Matchers.define :transfer do |nodes|
@@ -22,6 +22,7 @@ RSpec::Matchers.define :transfer do |nodes|
   @http_path = '/'
   @vhost_port = 80
   @node_port = 0
+  @options = {}
 
   @capture_command = lambda do |port, prove|
     port_str = port > 0 ? "port #{port}" : ''
@@ -35,12 +36,15 @@ RSpec::Matchers.define :transfer do |nodes|
     system("echo #{prove} | nc #{addr} #{port}")
   end
   @http_request_command = lambda do |addr, port, path, prove|
+    opt =  @options[:timeout] ? " -m #{@options[:timeout]}" : ''
     uri = 'http://' + "#{addr}:#{port}#{path}?#{prove}"
-    system("curl -o /dev/null -s #{uri}")
+    system("curl -o /dev/null -s #{opt} #{uri}")
   end
   @https_request_command = lambda do |addr, port, path, prove|
+    opt =  @options[:timeout] ? " -m #{@options[:timeout]}" : ''
+    opt << (@options[:ignore_valid_ssl] ? ' -k' : '')
     uri = 'https://' + "#{addr}:#{port}#{path}?#{prove}"
-    system("curl -o /dev/null -sk #{uri}")
+    system("curl -o /dev/null -sk #{opt} #{uri}")
   end
 
   @result = false
@@ -88,6 +92,10 @@ RSpec::Matchers.define :transfer do |nodes|
     @chain_str << " via #{path}"
   end
 
+  chain :options do |options|
+    @options = options
+  end
+
   def override_commands
     capture = RSpec.configuration.lbspec_capture_command
     udp_request = RSpec.configuration.lbspec_udp_request_command
@@ -116,7 +124,7 @@ RSpec::Matchers.define :transfer do |nodes|
 
   def capture_on_node(node)
     @threads << Thread.new do
-      Net::SSH.start(node, nil, :config => true) do |ssh|
+      Net::SSH.start(node, nil, config: true) do |ssh|
         @ssh << ssh
         ssh.open_channel { |channel| run_check channel }
       end
@@ -190,14 +198,14 @@ RSpec::Matchers.define :transfer do |nodes|
 
   failure_message_for_should do |vhost|
     result =  "expected #{vhost} to transfer requests to"
-    result << nodes
+    result << nodes.to_s
     result << @chain_str
     result << ', but did not.'
   end
 
   failure_message_for_should_not do |vhost|
     result =  "expected #{vhost} not to transfer requests to"
-    result << nodes
+    result << nodes.to_s
     result << @chain_str
     result << ', but did.'
   end

data/lib/lbspec/util.rb

@@ -12,7 +12,7 @@ module Lbspec
       splits = addr_port_str.split(':')
       addr = splits.first
       port = splits.last.to_i if /\d+/ =~ splits.last
-      { :addr => addr, :port => port }
+      { addr: addr, port: port }
     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.0.5'
+  VERSION = '0.0.6'
 end

data/rubocop-todo.yml

@@ -1,2 +0,0 @@
-HashSyntax:
-  EnforcedStyle: hash_rockets

data/spec/lbspec_transfer_spec.rb

@@ -23,7 +23,7 @@ describe Lbspec do
       'vhost_a'.should transfer('node_a')
     end
     it 'should test transfer nodes' do
-      'vhost_a'.should transfer(%w{node_a node_b})
+      'vhost_a'.should transfer(%w(node_a node_b))
     end
     it 'should test transfer a node on port 80' do
       'vhost_a'.should transfer('node_a').port(80)
@@ -53,5 +53,15 @@ describe Lbspec do
       it { should transfer('node_a').https.path('/test') }
       it { should transfer('node_a').port(80).tcp.https.path('/test') }
     end
+    describe 'vhost_a:443' do
+      it do
+        should transfer('node_a').https.path('/test')
+          .options(ignore_valid_ssl: true)
+      end
+      it do
+        should transfer('node_a').https.path('/test')
+          .options(ignore_valid_ssl: false, timeout: 5)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lbspec
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -200,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2895181196576280225
+      hash: -3960315955505799530
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2895181196576280225
+      hash: -3960315955505799530
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21