serverspec 0.0.12 → 0.0.13

data/lib/serverspec/helper.rb

@@ -1,25 +1,19 @@
-require 'net/ssh'
 require 'etc'
 
 module Serverspec
   module Helper
-    def ssh_exec(host, cmd, opt={})
-      options = Net::SSH::Config.for(host)
-      user    = options[:user] || Etc.getlogin
-
-      ret = nil
-      Net::SSH.start(host, user, options) do |ssh|
-        ret = ssh_exec!(ssh, "sudo #{cmd}")
-      end
-      ret
+    def ssh_exec(cmd, opt={})
+      ssh_exec!("sudo #{cmd}")
     end
 
     private
-    def ssh_exec!(ssh, command)
+    def ssh_exec!(command)
       stdout_data = ''
       stderr_data = ''
       exit_code   = nil
       exit_signal = nil
+
+      ssh = RSpec.configuration.ssh
       ssh.open_channel do |channel|
         channel.request_pty do |ch, success|
           abort "Could not obtain pty " if !success

data/lib/serverspec/matchers/be_directory.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_directory do
   match do |actual|
-    ret = ssh_exec(RSpec.configuration.host, commands.check_directory(actual))
+    ret = ssh_exec(commands.check_directory(actual))
     ret[:exit_code] == 0
   end
 end

data/lib/serverspec/matchers/be_enabled.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_enabled do
   match do |actual|
-    ret = ssh_exec(RSpec.configuration.host, commands.check_enabled(actual))
+    ret = ssh_exec(commands.check_enabled(actual))
     ret[:exit_code] == 0
   end
 end

data/lib/serverspec/matchers/be_file.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_file do
   match do |actual|
-    ret = ssh_exec(RSpec.configuration.host, commands.check_file(actual))
+    ret = ssh_exec(commands.check_file(actual))
     ret[:exit_code] == 0
   end
 end

data/lib/serverspec/matchers/be_group.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_group do
   match do |actual|
-    ret = ssh_exec(RSpec.configuration.host, commands.check_group(actual))
+    ret = ssh_exec(commands.check_group(actual))
     ret[:exit_code] == 0
   end
 end

data/lib/serverspec/matchers/be_grouped_into.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_grouped_into do |group|
   match do |file|
-    ret = ssh_exec(RSpec.configuration.host, commands.check_grouped(file, group))
+    ret = ssh_exec(commands.check_grouped(file, group))
     ret[:exit_code] == 0
   end
 end

data/lib/serverspec/matchers/be_installed.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_installed do
   match do |actual|
-    ret = ssh_exec(RSpec.configuration.host, commands.check_installed(actual))
+    ret = ssh_exec(commands.check_installed(actual))
     ret[:exit_code] == 0
   end
 end

data/lib/serverspec/matchers/be_listening.rb

@@ -1,7 +1,7 @@
 RSpec::Matchers.define :be_listening do
   match do |actual|
     port = actual.gsub(/port\s+/, '')
-    ret = ssh_exec(RSpec.configuration.host, commands.check_listening(port))
+    ret = ssh_exec(commands.check_listening(port))
     ret[:exit_code] == 0
   end
 end

data/lib/serverspec/matchers/be_mode.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_mode do |mode|
   match do |file|
-    ret = ssh_exec(RSpec.configuration.host, commands.check_mode(file, mode))
+    ret = ssh_exec(commands.check_mode(file, mode))
     ret[:exit_code] == 0
   end
 end

data/lib/serverspec/matchers/be_owned_by.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_owned_by do |owner|
   match do |file|
-    ret = ssh_exec(RSpec.configuration.host, commands.check_owner(file, owner))
+    ret = ssh_exec(commands.check_owner(file, owner))
     ret[:exit_code] == 0
   end
 end

data/lib/serverspec/matchers/be_running.rb

@@ -1,8 +1,8 @@
 RSpec::Matchers.define :be_running do
   match do |actual|
-    ret = ssh_exec(RSpec.configuration.host, commands.check_running(actual))
+    ret = ssh_exec(commands.check_running(actual))
     if ret[:exit_code] == 1
-      ret = ssh_exec(RSpec.configuration.host, commands.check_process(actual))
+      ret = ssh_exec(commands.check_process(actual))
     end
     ret[:exit_code] == 0
   end

data/lib/serverspec/matchers/be_user.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_user do
   match do |actual|
-    ret = ssh_exec(RSpec.configuration.host, commands.check_user(actual))
+    ret = ssh_exec(commands.check_user(actual))
     ret[:exit_code] == 0
   end
 end

data/lib/serverspec/matchers/contain.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :contain do |expected|
   match do |actual|
-    ret = ssh_exec(RSpec.configuration.host, commands.check_file_contain(actual, expected))
+    ret = ssh_exec(commands.check_file_contain(actual, expected))
     ret[:exit_code] == 0
   end
 end

data/lib/serverspec/setup.rb

@@ -57,10 +57,18 @@ EOF
       content = <<-EOF
 require 'serverspec'
 require 'pathname'
+require 'net/ssh'
 
 RSpec.configure do |c|
   c.before do
-    c.host = File.basename(Pathname.new(example.metadata[:location]).dirname)
+    host  = File.basename(Pathname.new(example.metadata[:location]).dirname)
+    if c.host != host
+      c.ssh.close if c.ssh
+      c.host  = host
+      options = Net::SSH::Config.for(c.host)
+      user    = options[:user] || Etc.getlogin
+      c.ssh   = Net::SSH.start(c.host, user, options)
+    end
   end
 end
 EOF

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/lib/serverspec.rb

@@ -17,4 +17,5 @@ RSpec.configure do |c|
   c.include(Serverspec::GentooHelper, :os => :gentoo)
   c.include(Serverspec::SolarisHelper, :os => :solaris)
   c.add_setting :host, :default => nil
+  c.add_setting :ssh,  :default => nil
 end

metadata

@@ -1,90 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: serverspec
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 12
-  version: 0.0.12
+version: !ruby/object:Gem::Version
+  version: 0.0.13
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-28 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: net-ssh
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: RSpec tests for your provisioned servers
-email: 
+email:
 - gosukenator@gmail.com
-executables: 
+executables:
 - serverspec-init
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -122,41 +120,32 @@ files:
 - spec/solaris/matchers_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_matcher_examples.rb
-has_rdoc: true
 homepage: https://github.com/mizzy/serverspec
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: RSpec tests for your provisioned servers
-test_files: 
+test_files:
 - spec/debian/matchers_spec.rb
 - spec/gentoo/matchers_spec.rb
 - spec/redhat/matchers_spec.rb