lbspec 0.2.6 → 0.2.7

checksums.yaml

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

data/lib/lbspec/capture.rb

@@ -19,6 +19,7 @@ module Lbspec
       @nodes_connected = []
       @result = false
       @output = []
+      Util.log.debug("#{self.class} initialized #{inspect}")
     end
 
     def open

data/lib/lbspec/request.rb

@@ -13,6 +13,7 @@ module Lbspec
       @application = options[:application] ? options[:application] : nil
       @path = options[:path] if options[:path]
       @options = options[:options] ? options[:options] : {}
+      Util.log.debug("#{self.class} initialized #{inspect}")
     end
 
     def send(prove = nil)

data/lib/lbspec/respond.rb

@@ -6,6 +6,8 @@ require 'lbspec'
 
 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")
     @expect = expect
     request =
       Lbspec::Request.new(vhost, @from,
@@ -40,16 +42,19 @@ RSpec::Matchers.define :respond do |expect|
   end
 
   chain :from do |from|
+    fail ArgumentError, '#from must have non-nil argument' unless from
     @from = from
     @chain_str = Lbspec::Util.add_string(@chain_str, " from #{from}")
   end
 
   chain :path do |path|
+    fail ArgumentError, '#path must have non-nil argument' unless path
     @path = path
     @chain_str = Lbspec::Util.add_string(@chain_str, " via #{path}")
   end
 
   chain :with do |string|
+    fail ArgumentError, '#with must have non-nil argument' unless string
     @string = string
     @chain_str = Lbspec::Util.add_string(@chain_str, " via #{string}")
   end
@@ -77,4 +82,8 @@ RSpec::Matchers.define :respond do |expect|
     result <<  ", but did#{negation}.\n" + "requested:\n"
     result << request_str.gsub(/^/, '  ')
   end
+
+  def log
+    Lbspec::Util.log
+  end
 end

data/lib/lbspec/transfer.rb

@@ -6,6 +6,8 @@ require 'lbspec'
 
 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")
     prove = Lbspec::Util.create_prove
     capture =
       Lbspec::Capture.new(nodes, @port, prove, @include_str)
@@ -21,6 +23,7 @@ RSpec::Matchers.define :transfer do |nodes|
   end
 
   chain :port do |port|
+    fail ArgumentError, '#port must have non-nil argument' unless port
     @port = port
     @chain_str = Lbspec::Util.add_string(@chain_str, " port #{port}")
   end
@@ -48,16 +51,19 @@ RSpec::Matchers.define :transfer do |nodes|
   end
 
   chain :from do |from|
+    fail ArgumentError, '#from must have non-nil argument' unless from
     @from = from
     @chain_str = Lbspec::Util.add_string(@chain_str, " from #{from}")
   end
 
   chain :include do |str|
+    fail ArgumentError, '#include must have non-nil argument' unless str
     @include_str = str
     @chain_str = Lbspec::Util.add_string(@chain_str, " including #{str}")
   end
 
   chain :path do |path|
+    fail ArgumentError, '#path must have non-nil argument' unless path
     @path = path
     @chain_str = Lbspec::Util.add_string(@chain_str, " via #{path}")
   end
@@ -98,4 +104,8 @@ RSpec::Matchers.define :transfer do |nodes|
       result << o[:output].gsub(/^/, '    ') + "\n"
     end
   end
+
+  def log
+    Lbspec::Util.log
+  end
 end

data/lib/lbspec/util.rb

@@ -3,9 +3,9 @@
 module Lbspec
   # Lbspec::Util provides some utilities
   class Util
+    @logger = nil
+    @log_level =  Logger::ERROR
     class << self
-      @logger = nil
-      @log_level =  Logger::ERROR
       attr_accessor :logger, :log_level
     end
 
@@ -39,22 +39,35 @@ module Lbspec
     end
 
     def self.exec_command(command, node = nil)
-      output = command + "\n"
       if node
-        options = { config: true, verbose: log_level }
-        Net::SSH.start(node, ssh_user(node), options) do |ssh|
-          output << ssh.exec!(command).to_s
-        end
+        exec_command_remote(command, node)
       else
-        output << `#{command}`.to_s
+        exec_command_local(command)
+      end
+    end
+
+    def self.exec_command_remote(command, node = nil)
+      output = command + "\n"
+      log.debug("ssh to #{node}:#{command}")
+      options = { config: true, verbose: log_level }
+      Net::SSH.start(node, ssh_user(node), options) do |ssh|
+        output << ssh.exec!(command).to_s
       end
     end
 
+    def self.exec_command_local(command)
+      output = command + "\n"
+      log.debug("execute locally: #{command}")
+      output << `#{command}`.to_s
+    end
+
     def self.ssh_user(node)
       # if there is no user for the node in ~/.ssh/config
       # use current user name for login
       user = Net::SSH::Config.for(node)[:user]
       user ? user : `whoami`.chomp
+      log.debug("ssh #{node} as user:#{user}")
+      user
     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.2.6'
+  VERSION = '0.2.7'
 end

data/spec/lbspec_util_spec.rb

@@ -10,6 +10,12 @@ describe Lbspec::Util do
       Lbspec::Util.logger.should 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)
+    end
+  end
   describe '#log' do
     before :each do
       Lbspec::Util.logger = nil

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: lbspec
 version: !ruby/object:Gem::Version
-  version: 0.2.6
-  prerelease: 
+  version: 0.2.7
 platform: ruby
 authors:
 - OTA Hiroshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-04-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,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !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
@@ -177,33 +160,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: -1965399059659681873
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1965399059659681873
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easily test your Loadbalancers with RSpec.
 test_files:
 - spec/lbspec_respond_spec.rb