lbspec 0.2.10 → 0.2.11

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 48b23c45d1f0d0399f34543470a376b5fb6b85bd
+  data.tar.gz: e24a0f6d1576dcdd37678c55184b7a9c09838d6e
+SHA512:
+  metadata.gz: 52b6e18a76563962c7d2a11bf0de40aea25901a707a2bca1bf86731c0693e79ea31ddfc46ca4a92a32239abb145d9bc38dc9170dc38e9eedcbdb9c58abbcd734
+  data.tar.gz: 2040d851d1c251d52964ee3f1a819d3df5146f987018bd312286ed3f9a9f16414e39219b1e65d7b83cc39d4f2385c367399057a7448abbb9cc1e6a6bc81356d0

data/README.md

@@ -88,7 +88,7 @@ Lbspec::Util.logger = Logger.new('test.log')
 ```
 
 The default Logger show Logger::ERROR level on STDOUT.
-=======
+
 ### #haelthcheck
 `#healthcheck` tests if a load balancer healthchecks to target nodes.
 

data/Rakefile

@@ -17,7 +17,7 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = 'spec/**/*_spec.rb'
 end
 
-Rubocop::RakeTask.new(:rubocop) do |task|
+RuboCop::RakeTask.new(:rubocop) do |task|
   task.patterns = %w(lib/**/*.rb spec/**/*.rb)
 end
 

data/lbspec.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~> 10.2"
-  spec.add_development_dependency "rubocop", "~> 0.20"
+  spec.add_development_dependency 'rubocop', '0.24.1'
   spec.add_development_dependency "coveralls", "~> 0.7"
   spec.add_development_dependency "debugger", "~> 1.6"
   spec.add_development_dependency "highline", "~> 1.6"

data/lib/lbspec/capture.rb

@@ -40,11 +40,10 @@ module Lbspec
       filter = ''
 
       options.each do |k, v|
-        if k && v
-          filter << ' and ' unless is_first
-          filter << k.to_s.gsub('_', ' ') + ' ' + v.to_s
-          is_first = false
-        end
+        next unless k && v
+        filter << ' and ' unless is_first
+        filter << k.to_s.gsub('_', ' ') + ' ' + v.to_s
+        is_first = false
       end
       filter
     end
@@ -77,21 +76,20 @@ module Lbspec
       output = ''
       channel.request_pty do |chan, success|
         fail 'Could not obtain pty' unless success
-        @nodes_connected.push(true)
         output = exec_capture(chan)
       end
       output
     end
 
     def exec_capture(channel)
-      output = exec_capture_command(channel, capture_command)
-      capture_command + "\n" +  output.to_s
+      exec_capture_command(channel, capture_command)
+      @nodes_connected.push(true)
     end
 
     def exec_capture_command(channel, command)
       whole_data = ''
       @start_sec = Time.now.to_i + 1
-      channel.exec command do |ch, _stream , _data|
+      channel.exec command do |ch, _stream, _data|
         ch.on_data do |_c, d|
           whole_data << d
           @result = match_all?(whole_data)

data/lib/lbspec/healthcheck.rb

@@ -70,10 +70,11 @@ RSpec::Matchers.define :healthcheck do |nodes|
   end
 
   def result_string(negative = false)
-    negation = negative ? '' : ' not'
-    result = "expected #{@lb} to healthcheck to"
+    neg_expect = negative ? ' not' : ''
+    neg_actual = negative ? '' : ' not'
+    result = "expected #{@lb} #{neg_expect} to healthcheck to"
     result << @nodes.to_s + @chain_str
-    result << ", but did#{negation}.\n"
+    result << ", but did#{neg_actual}.\n"
     result << "\ncaptured:\n"
     result << result_capture
     result

data/lib/lbspec/request.rb

@@ -59,13 +59,13 @@ module Lbspec
         env << %Q(NO_PROXY="#{options[:noproxy]}" )
       end
       opt << header_option(options[:header])
-      %Q(#{env}curl -v -i -s #{opt} '#{uri}')
+      "#{env}curl -v -i -s #{opt} '#{uri}'"
     end
 
     def header_option(header)
       opt = ''
       header = [header] unless header.respond_to? :each
-      header.each { |h| opt << %Q( -H '#{h}') }
+      header.each { |h| opt << " -H '#{h}'" }
       opt
     end
 

data/lib/lbspec/respond.rb

@@ -78,9 +78,10 @@ RSpec::Matchers.define :respond do |expect|
   end
 
   def result_string(negative = false)
-    negation = negative ? ' not' : ''
-    result =  "expected #{@vhost}#{negation} to respond #{@expect}"
-    result <<  ", but did#{negation}.\n" + "requested:\n"
+    neg_expect = negative ? ' not' : ''
+    neg_actual = negative ? '' : ' not'
+    result =  "expected #{@vhost}#{neg_expect} to respond #{@expect}"
+    result <<  ", but did#{neg_actual}.\n" + "requested:\n"
     result << @output_request.gsub(/^/, '  ')
   end
 

data/lib/lbspec/transfer.rb

@@ -88,10 +88,11 @@ RSpec::Matchers.define :transfer do |nodes|
   end
 
   def result_string(negative = false)
-    negation = negative ? ' not' : ''
-    result =  "expected #{@vhost}#{negation} to transfer requests to"
+    neg_expect = negative ? ' not' : ''
+    neg_actual = negative ? '' : ' not'
+    result =  "expected #{@vhost}#{neg_expect} to transfer requests to"
     result << @nodes.to_s + @chain_str
-    result << ", but did#{negation}.\n" + "requested:\n"
+    result << ", but did#{neg_actual}.\n" + "requested:\n"
     result << @output_request.gsub(/^/, '  ')
     result << "\ncaptured:\n"
     result << result_capture

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.10'
+  VERSION = '0.2.11'
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: lbspec
 version: !ruby/object:Gem::Version
-  version: 0.2.10
-  prerelease: 
+  version: 0.2.11
 platform: ruby
 authors:
 - OTA Hiroshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,23 +41,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: 0.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -179,33 +162,26 @@ files:
 homepage: https://github.com/otahi/lbspec
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4192125846985335727
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4192125846985335727
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easily test your Loadbalancers with RSpec.
 test_files:
 - spec/lbspec_healthcheck_spec.rb