lbspec 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54d84e1c4eaec31b2382125950e00a920f3a8060
-  data.tar.gz: 8625ccd2d2c09e0352b4c57ba49638a0904022a1
+  metadata.gz: c9f738bbb24cc50691fcd210cca953720045e400
+  data.tar.gz: d66a10b5cca908ca83ca4aa48c9d511add8cf147
 SHA512:
-  metadata.gz: 3e6b849c0db14c5f8f95c940c171352558963525ca0e16ad0a093bae2bea0d9a2dd8500e455f00d60ed60f1d5d96149763c1404b8d89f01ca776ead014a30093
-  data.tar.gz: 6c8fccc2d834d5cd7d67b0042d88a083febf4db5707865642280f3d8845377d97a23bd56320f8a2f94de3e0e56321caca6e1868344d3d922ed829a842cbaf2c5
+  metadata.gz: bef533b8b8f50479149c3cc9e0e506509a096dc795dc2166f3bdf995d89f6f2bda1515292ae97b57ce2f85f789223d234caf1d12647dc61a1609dd7339a4e920
+  data.tar.gz: 00d9755f13aa03dba972f22d28d541c7d03732026549961da9b2fd23598dfa0e7eb202cddd1a6f2817f4548a5dbdc23033131cd55a80425f71e6726525b94329

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
-
-script: "rake travis"
+cache: bundler
 
 rvm:
   - 1.9.3
-  - 2.0.0
+  - 2.0.0
+  - 2.1.3

data/lbspec.gemspec

@@ -22,9 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.2"
   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"
 
-  spec.add_runtime_dependency "rspec", "~> 2.14"
+  spec.add_runtime_dependency "rspec", "~> 3.1"
   spec.add_runtime_dependency "net-ssh", "~> 2.8"
 end

data/lib/lbspec/healthcheck.rb

@@ -60,11 +60,11 @@ RSpec::Matchers.define :healthcheck do |nodes|
     "healthcheck #{@nodes}#{@chain_str}."
   end
 
-  failure_message_for_should do
+  failure_message do
     result_string
   end
 
-  failure_message_for_should_not do
+  failure_message_when_negated do
     negative = true
     result_string(negative)
   end

data/lib/lbspec/respond.rb

@@ -68,11 +68,11 @@ RSpec::Matchers.define :respond do |expect|
     "respond #{@expect}#{@chain_str}."
   end
 
-  failure_message_for_should do
+  failure_message do
     result_string
   end
 
-  failure_message_for_should_not do
+  failure_message_when_negated do
     negative = true
     result_string(negative)
   end

data/lib/lbspec/transfer.rb

@@ -78,11 +78,11 @@ RSpec::Matchers.define :transfer do |nodes|
     "transfer requests to #{nodes}#{@chain_str}."
   end
 
-  failure_message_for_should do
+  failure_message do
     result_string
   end
 
-  failure_message_for_should_not do
+  failure_message_when_negated do
     negative = true
     result_string(negative)
   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.2.13'
+  VERSION = '0.2.14'
 end

data/spec/lbspec_healthcheck_spec.rb

@@ -6,43 +6,46 @@ describe '#healthcheck' do
   before(:each) do
     include_str = 'X-Test: 1'
     channel_connected = double('channel_connected')
-    channel_connected.stub(:request_pty).and_yield(channel_connected, true)
-    channel_connected.stub(:exec).and_yield(channel_connected, nil, nil)
-    channel_connected.stub(:on_data)
+    allow(channel_connected).to receive(:request_pty)
+      .and_yield(channel_connected, true)
+    allow(channel_connected).to receive(:exec)
+      .and_yield(channel_connected, nil, nil)
+    allow(channel_connected).to receive(:on_data)
       .and_yield(nil, include_str)
       .and_yield(nil, include_str)
     ssh_connected = double('ssh_connected')
-    ssh_connected.stub(:open_channel).and_yield(channel_connected)
-    ssh_connected.stub(:closed?).and_return(false)
-    ssh_connected.stub(:close)
-    ssh_connected.stub(:exec!).and_return(true)
-    Net::SSH.stub(:start).and_yield(ssh_connected).and_return(ssh_connected)
-    Kernel.stub(:system).and_return true
-    Kernel.stub(:`).and_return(include_str) # `
+    allow(ssh_connected).to receive(:open_channel).and_yield(channel_connected)
+    allow(ssh_connected).to receive(:closed?).and_return(false)
+    allow(ssh_connected).to receive(:close)
+    allow(ssh_connected).to receive(:exec!).and_return(true)
+    allow(Net::SSH).to receive(:start).and_yield(ssh_connected)
+      .and_return(ssh_connected)
+    allow(Kernel).to receive(:system).and_return true
+    allow(Kernel).to receive(:`).and_return(include_str) # `
   end
 
   it 'should test loadbalancer healthchecks' do
-    'loadbalancer'.should healthcheck('node_a')
+    expect('loadbalancer').to healthcheck('node_a')
   end
   it 'should test loadbalancer healthchecks include string' do
-    'loadbalancer'.should healthcheck('node_a').include('X-Test')
+    expect('loadbalancer').to healthcheck('node_a').include('X-Test')
   end
   it 'should test loadbalancer healthchecks from specified host' do
-    'loadbalancer'.should healthcheck('node_a').from('X-Test')
+    expect('loadbalancer').to healthcheck('node_a').from('X-Test')
   end
   it 'should test loadbalancer healthchecks at specified interval' do
-    'loadbalancer'.should healthcheck('node_a').interval(5)
+    expect('loadbalancer').to healthcheck('node_a').interval(5)
   end
   it 'should test loadbalancer healthchecks specified port' do
-    'loadbalancer'.should healthcheck('node_a').port(80)
+    expect('loadbalancer').to healthcheck('node_a').port(80)
   end
   it 'should test loadbalancer healthchecks icmp' do
-    'loadbalancer'.should healthcheck('node_a').icmp
+    expect('loadbalancer').to healthcheck('node_a').icmp
   end
   it 'should test loadbalancer healthchecks tcp' do
-    'loadbalancer'.should healthcheck('node_a').tcp
+    expect('loadbalancer').to healthcheck('node_a').tcp
   end
   it 'should test loadbalancer healthchecks udp' do
-    'loadbalancer'.should healthcheck('node_a').udp
+    expect('loadbalancer').to healthcheck('node_a').udp
   end
 end

data/spec/lbspec_respond_spec.rb

@@ -6,61 +6,61 @@ describe '#respond' do
 
   context 'http/https' do
     it 'should test vhost_a responds with 200 OK' do
-      Lbspec::Util.stub(:exec_command).and_return '200 OK'
-      'vhost_a'.should respond('200 OK')
+      allow(Lbspec::Util).to receive(:exec_command).and_return '200 OK'
+      expect('vhost_a').to respond('200 OK')
     end
     it 'should test vhost:80 responds with 200 OK by request with options' do
-      Lbspec::Util.stub(:exec_command).and_return '200 OK'
-      'vhost_a:443'.should respond('200 OK').http.path('/test')
+      allow(Lbspec::Util).to receive(:exec_command).and_return '200 OK'
+      expect('vhost_a:443').to respond('200 OK').http.path('/test')
     end
     it 'should test vhost:443 responds with 404 by request with options' do
-      Lbspec::Util.stub(:exec_command).and_return '404 Not Found'
-      'vhost_a:443'.should respond('404').https.path('/test')
+      allow(Lbspec::Util).to receive(:exec_command).and_return '404 Not Found'
+      expect('vhost_a:443').to respond('404').https.path('/test')
         .options(ignore_valid_ssl: false, timeout: 5)
     end
     it 'should test vhost:443 responds by requests from specified host' do
-      Lbspec::Util.stub(:exec_command).and_return '200 OK'
-      'vhost_a:443'.should respond('200 OK')
+      allow(Lbspec::Util).to receive(:exec_command).and_return '200 OK'
+      expect('vhost_a:443').to respond('200 OK')
         .https.path('/test').from('node_a')
     end
     it 'should test vhost:443 does not respond 404' do
-      Lbspec::Util.stub(:exec_command).and_return '200 OK'
-      'vhost_a:443'.should_not respond('404')
+      allow(Lbspec::Util).to receive(:exec_command).and_return '200 OK'
+      expect('vhost_a:443').to_not respond('404')
         .https.path('/test').from('node_a')
     end
     it 'should test vhost:443/test does not respond 404' do
-      Lbspec::Util.stub(:exec_command).and_return '200 OK'
-      'vhost_a:443/test'.should_not respond('404')
+      allow(Lbspec::Util).to receive(:exec_command).and_return '200 OK'
+      expect('vhost_a:443/test').to_not respond('404')
         .https.from('node_a')
     end
     it 'should test vhost:443/test does not respond 404' do
-      Lbspec::Util.stub(:exec_command).and_return '200 OK'
-      'vhost_a:443/test'.should_not respond('404')
+      allow(Lbspec::Util).to receive(:exec_command).and_return '200 OK'
+      expect('vhost_a:443/test').to_not respond('404')
         .https.from('node_a')
     end
     it 'should test vhost:443/test does respond /^404/' do
-      Lbspec::Util.stub(:exec_command).and_return '404 Not Found'
-      'vhost_a:443/test'.should respond(/^404/)
+      allow(Lbspec::Util).to receive(:exec_command).and_return '404 Not Found'
+      expect('vhost_a:443/test').to respond(/^404/)
         .https.from('node_a')
     end
   end
   context 'tcp/udp' do
     it 'should test vhost:25/tcp respond 220' do
-      Lbspec::Util.stub(:exec_command).and_return '220'
-      'vhost_a:25'.should respond('220')
+      allow(Lbspec::Util).to receive(:exec_command).and_return '220'
+      expect('vhost_a:25').to respond('220')
         .tcp.with('HELO test.example.com')
     end
     it 'should test vhost:53/udp respond ' do
-      Lbspec::Util.stub(:exec_command).and_return '220'
-      'vhost_a:53'.should respond('220')
+      allow(Lbspec::Util).to receive(:exec_command).and_return '220'
+      expect('vhost_a:53').to respond('220')
         .udp.with('HELO test.example.com')
     end
   end
   context 'description works with 200 OK' do
     subject { 'vhost_a' }
     it  do
-      Lbspec::Util.stub(:exec_command).and_return '200 OK'
-      should respond('200 OK')
+      allow(Lbspec::Util).to receive(:exec_command).and_return '200 OK'
+      is_expected.to respond('200 OK')
     end
   end
 end

data/spec/lbspec_spec.rb

@@ -3,6 +3,6 @@ require 'spec_helper'
 
 describe Lbspec do
   it 'should have a version number' do
-    Lbspec::VERSION.should_not be_nil
+    expect(Lbspec::VERSION).not_to be_nil
   end
 end

data/spec/lbspec_transfer_spec.rb

@@ -6,96 +6,99 @@ describe '#transfer' do
   before(:each) do
     key = Lbspec::Util.create_prove
     include_str = 'X-Test: 1'
-    Lbspec::Util.stub(:create_prove).and_return(key)
+    allow(Lbspec::Util).to receive(:create_prove).and_return(key)
     channel_connected = double('channel_connected')
-    channel_connected.stub(:request_pty).and_yield(channel_connected, true)
-    channel_connected.stub(:exec).and_yield(channel_connected, nil, nil)
-    channel_connected.stub(:on_data)
+    allow(channel_connected).to receive(:request_pty)
+      .and_yield(channel_connected, true)
+    allow(channel_connected).to receive(:exec)
+      .and_yield(channel_connected, nil, nil)
+    allow(channel_connected).to receive(:on_data)
       .and_yield(nil, key + include_str)
       .and_yield(nil, key + include_str)
     ssh_connected = double('ssh_connected')
-    ssh_connected.stub(:open_channel).and_yield(channel_connected)
-    ssh_connected.stub(:closed?).and_return(false)
-    ssh_connected.stub(:close)
-    ssh_connected.stub(:exec!).and_return(true)
-    Net::SSH.stub(:start).and_yield(ssh_connected).and_return(ssh_connected)
-    Lbspec::Util.stub(:`).and_return(key + include_str) # `
+    allow(ssh_connected).to receive(:open_channel).and_yield(channel_connected)
+    allow(ssh_connected).to receive(:closed?).and_return(false)
+    allow(ssh_connected).to receive(:close)
+    allow(ssh_connected).to receive(:exec!).and_return(true)
+    allow(Net::SSH).to receive(:start)
+      .and_yield(ssh_connected).and_return(ssh_connected)
+    allow(Lbspec::Util).to receive(:`).and_return(key + include_str) # `
   end
 
   it 'should test transfer a node' do
-    'vhost_a'.should transfer('node_a')
+    expect('vhost_a').to transfer('node_a')
   end
   it 'should test transfer nodes' do
-    'vhost_a'.should transfer(%w(node_a node_b))
+    expect('vhost_a').to 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)
+    expect('vhost_a').to transfer('node_a').port(80)
   end
   it 'should test transfer vhost:80 and a node on port 80' do
-    'vhost_a:80'.should transfer('node_a').port(80)
+    expect('vhost_a:80').to transfer('node_a').port(80)
   end
   it 'should test transfer vhost:80 and a node on port 80/tcp' do
-    'vhost_a:80'.should transfer('node_a').port(80).tcp
+    expect('vhost_a:80').to transfer('node_a').port(80).tcp
   end
   it 'should test transfer vhost:80 and a node on port 53/tcp' do
-    'vhost_a:80'.should transfer('node_a').port(53).udp
+    expect('vhost_a:80').to transfer('node_a').port(53).udp
   end
   it 'should test transfer vhost:80 and a node with http' do
-    'vhost_a:80'.should transfer('node_a').http
+    expect('vhost_a:80').to transfer('node_a').http
   end
   it 'should test transfer vhost:443 and a node with https' do
-    'vhost_a:443'.should transfer('node_a').port(80).https
+    expect('vhost_a:443').to transfer('node_a').port(80).https
   end
   it 'should test transfer vhost:443 and a node:80 with https' do
-    'vhost_a:443'.should transfer('node_a').port(80).https
+    expect('vhost_a:443').to transfer('node_a').port(80).https
   end
   it 'should test transfer vhost:443 and a node with https /test' do
-    'vhost_a:443/test'.should transfer('node_a').https
+    expect('vhost_a:443/test').to transfer('node_a').https
   end
   it 'should test transfer vhost:443 with options for requests' do
-    'vhost_a:443'.should transfer('node_a').https.path('/test')
+    expect('vhost_a:443').to transfer('node_a').https.path('/test')
       .options(ignore_valid_ssl: true)
-    'vhost_a:443/test'.should transfer('node_a').https
+    expect('vhost_a:443/test').to transfer('node_a').https
       .options(ignore_valid_ssl: false, timeout: 5)
   end
   it 'should test transfer vhost:443 requests from specified host' do
-    'vhost_a:443/test'.should transfer('node_a')
+    expect('vhost_a:443/test').to transfer('node_a')
       .https.from('node_a')
   end
   it 'should test transfer vhost:80 and a node with http includes ' do
-    'vhost_a:80'.should transfer('node_a').http
+    expect('vhost_a:80').to transfer('node_a').http
       .include('X-Test: 1')
-    'vhost_a:80'.should transfer('node_a').http
+    expect('vhost_a:80').to transfer('node_a').http
       .include(/Test:/)
   end
 
   describe 'request_command' do
     it 'should create single header options for http' do
-      Lbspec::Util.should_receive(:exec_command)
+      expect(Lbspec::Util).to receive(:exec_command)
         .with(/ -H.*/, nil)
-      Lbspec::Util.should_not_receive(:exec_command)
+      expect(Lbspec::Util).not_to receive(:exec_command)
         .with(/ -H.* -H/, nil)
-      'vhost_a:443'.should transfer('node_a').http
+      expect('vhost_a:443').to 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)
+      expect(Lbspec::Util).to receive(:exec_command)
         .with(/ -H.*/, nil)
-      Lbspec::Util.should_not_receive(:exec_command)
+      expect(Lbspec::Util).not_to receive(:exec_command)
         .with(/ -H.* -H/, nil)
-      'vhost_a:443'.should transfer('node_a').https
+      expect('vhost_a:443').to 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)
+      expect(Lbspec::Util).to receive(:exec_command)
         .with(/ -H.* -H/, nil)
-      'vhost_a:443'.should transfer('node_a').http
+      expect('vhost_a:443').to 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)
+      expect(Lbspec::Util).to receive(:exec_command)
         .with(/ -H.* -H/, nil)
-      'vhost_a:443'.should transfer('node_a').https
+      expect('vhost_a:443').to transfer('node_a').https
         .options(header: %w(X-Test1:1 X-Test2:2))
     end
   end

data/spec/lbspec_util_spec.rb

@@ -7,13 +7,13 @@ describe Lbspec::Util do
   describe '#logger' do
     it 'should set/get logger' do
       Lbspec::Util.logger = 'test'
-      Lbspec::Util.logger.should eql('test')
+      expect(Lbspec::Util.logger).to eql('test')
     end
   end
   describe '#log_level' do
     it 'should set/get log_level' do
       Lbspec::Util.log_level = Logger::WARN
-      Lbspec::Util.log_level.should eql(Logger::WARN)
+      expect(Lbspec::Util.log_level).to eql(Logger::WARN)
     end
   end
   describe '#log' do
@@ -21,7 +21,7 @@ describe Lbspec::Util do
       Lbspec::Util.logger = nil
     end
     it 'should return Logger instance' do
-      Lbspec::Util.log.should be_instance_of(Logger)
+      expect(Lbspec::Util.log).to be_instance_of(Logger)
     end
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: lbspec
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - OTA Hiroshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.2'
 - !ruby/object:Gem::Dependency
@@ -56,70 +56,56 @@ dependencies:
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
 description: Lbspec is an RSpec plugin for easy Loadbalancer testing.
@@ -129,11 +115,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - LICENSE.txt
@@ -169,17 +155,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easily test your Loadbalancers with RSpec.