rspec-system 2.5.1 → 2.6.0

data/lib/rspec-system/spec_helper.rb

@@ -10,24 +10,56 @@ include RSpecSystem::Helpers
 
 RSpec.configure do |c|
   include RSpecSystem::Log
-  include RSpecSystem::InternalHelpers
   c.include RSpecSystem::Helpers
-  c.include RSpecSystem::InternalHelpers
   c.extend RSpecSystem::Helpers
 
-  # This provides a path to save vagrant files
-  c.add_setting :system_tmp
-  # Storage for ssh channels
-  c.add_setting :ssh_channels, :default => {}
-  c.add_setting :rspec_storage, :default => {}
+  # Various global configuration items
+  c.add_setting :rs_tmp,
+    :default => Pathname.new(ENV['RS_TMP'] ||
+                File.expand_path(File.join(File.basename(__FILE__), '..', '.rspec_system')))
+  c.add_setting :rs_provider,
+    :default => ENV['RS_PROVIDER'] ||
+                ENV['RSPEC_VIRTUAL_ENV'] ||
+                'vagrant_virtualbox'
+  c.add_setting :rs_set,
+    :default => ENV['RS_SET'] ||
+                ENV['RSPEC_SET']
+  c.add_setting :rs_destroy,
+    :default => (ENV['RS_DESTROY'] || ENV['RSPEC_DESTROY']) =~ /(no|false)/ ? false : true
+  c.add_setting :rs_custom_prefabs,
+    :default => Pathname.new(ENV['RS_CUSTOM_PREFABS'] ||
+                File.expand_path(File.join(File.basename(__FILE__), '..', '.prefabs.yml')))
+  c.add_setting :rs_config,
+    :default => YAML.load_file('.nodeset.yml')
+  c.add_setting :rs_ssh_tries,
+    :default => ENV['RS_SSH_TRIES'] || 10
+  c.add_setting :rs_ssh_sleep,
+    :default => ENV['RS_SSH_SLEEP'] || 4
+  c.add_setting :rs_ssh_timeout,
+    :default => ENV['RS_SSH_TIMEOUT'] || 60
 
-  # Default the system_tmp dir to something random
-  c.system_tmp = rspec_system_tmp
+  # Storage variable, for internal use only
+  # @private
+  c.add_setting :rs_storage, :default => {}
 
+  ns = RSpecSystem::NodeSet.create
   c.before :suite do
     # Before Suite exceptions get captured it seems
     begin
-      start_nodes
+      output << "=begin===========================================================\n"
+      output << "\n"
+      output << bold("Starting nodes") << "\n"
+      output << "\n"
+      output << bold("Setname:") << "             #{ns.setname}\n"
+      output << bold("Configuration:") << "       #{ns.config.pretty_inspect}"
+      output << bold("Virtual Environment:") << " #{ns.provider_type}\n"
+      output << bold("Default node:") << "        #{ns.default_node.name}\n"
+      output << bold("Destroy node:") << "        #{ns.destroy}\n"
+      output << "\n"
+      ns.setup
+      output << "\n"
+      output << "=end=============================================================\n"
+      output << "\n"
     rescue => ex
       output << ex.inspect + " in\n"
       output << ex.backtrace.join("\n  ") << "\n"
@@ -38,7 +70,14 @@ RSpec.configure do |c|
   c.after :suite do
     # After Suite exceptions get captured it seems
     begin
-      stop_nodes
+      output << "\n"
+      output << "=begin===========================================================\n"
+      output << "\n"
+      output << bold("Stopping nodes\n")
+      output << "\n"
+      ns.teardown
+      output << "\n"
+      output << "=end=============================================================\n"
     rescue => ex
       output << ex.inspect + " in\n"
       output << ex.backtrace.join("\n  ") << "\n"

data/resources/prefabs.yml

@@ -1,27 +1,4 @@
 ---
-'centos-58-x64':
-  description: "Vagrant images obtained from http://puppet-vagrant-boxes.puppetlabs.com"
-  facts:
-    architecture: x86_64
-    facterversion: "1.6.17"
-    kernel: Linux
-    kernelmajversion: "2.6"
-    kernelrelease: "2.6.18-308.el5"
-    kernelversion: "2.6.18"
-    lsbdistcodename: Final
-    lsbdistdescription: "CentOS release 5.8 (Final)"
-    lsbdistid: CentOS
-    lsbdistrelease: "5.8"
-    lsbmajdistrelease: "5"
-    lsbrelease: ":core-4.0-amd64:core-4.0-ia32:core-4.0-noarch:graphics-4.0-amd64:graphics-4.0-ia32:graphics-4.0-noarch:printing-4.0-amd64:printing-4.0-ia32:printing-4.0-noarch"
-    operatingsystem: CentOS
-    operatingsystemrelease: "5.8"
-    osfamily: RedHat
-    rubyversion: "1.9.2"
-  provider_specifics:
-    vagrant:
-      box: 'centos-58-x64'
-      box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/centos-58-x64.box'
 'centos-59-x64':
   description: "Vagrant images obtained from http://puppet-vagrant-boxes.puppetlabs.com"
   facts:
@@ -42,33 +19,11 @@
     osfamily: RedHat
     rubyversion: "1.9.2"
   provider_specifics:
-    vagrant:
+    vagrant_virtualbox:
       box: 'centos-59-x64-vbox4210-nocm'
       box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box'
     vsphere:
       template: 'centos-5-x86_64'
-'centos-63-x64':
-  description: "Vagrant images obtained from http://puppet-vagrant-boxes.puppetlabs.com"
-  facts:
-    architecture: x86_64
-    facterversion: "1.6.17"
-    kernel: Linux
-    kernelversion: "2.6.32"
-    kernelrelease: "2.6.32-279.el6.x86_64"
-    lsbmajdistrelease: "6"
-    lsbdistcodename: Final
-    lsbdistdescription: "CentOS release 6.3 (Final)"
-    lsbdistid: CentOS
-    lsbdistrelease: "6.3"
-    operatingsystem: CentOS
-    operatingsystemrelease: "6.3"
-    osfamily: RedHat
-    kernelmajversion: "2.6"
-    rubyversion: "1.8.7"
-  provider_specifics:
-    vagrant:
-      box: 'centos-63-x64'
-      box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/centos-63-x64.box'
 'centos-64-x64':
   description: ""
   facts:
@@ -88,9 +43,12 @@
     kernel: Linux
     rubyversion: "1.8.7"
   provider_specifics:
-    vagrant:
+    vagrant_virtualbox:
       box: 'centos-64-x64-vbox4210-nocm'
       box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box'
+    vagrant_vmware_fusion:
+      box: 'centos-64-x64-vf503-nocm'
+      box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-fusion503-nocm.box'
     vsphere:
       template: 'centos-6-x86_64'
 'fedora-18-x64':
@@ -110,30 +68,14 @@
     osfamily: RedHat
     rubyversion: 1.9.3
   provider_specifics:
-    vagrant:
+    vagrant_virtualbox:
       box: 'fedora-18-x64-vbox4210-nocm'
       box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box'
+    vagrant_vmware_fusion:
+      box: 'fedora-18-x64-vf503-nocm'
+      box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vf503-nocm.box'
     vsphere:
       template: 'fedora-18-x86_64'
-'debian-606-x64':
-  description: "Vagrant images obtained from http://puppet-vagrant-boxes.puppetlabs.com"
-  facts:
-    architecture: amd64
-    facterversion: "1.6.17"
-    kernel: Linux
-    kernelmajversion: "2.6"
-    kernelversion: "2.6.32"
-    lsbdistcodename: squeeze
-    lsbdistdescription: "Debian GNU/Linux 6.0.6 (squeeze)"
-    lsbdistid: Debian
-    lsbdistrelease: "6.0.6"
-    operatingsystem: Debian
-    osfamily: Debian
-    rubyversion: "1.8.7"
-  provider_specifics:
-    vagrant:
-      box: 'debian-606-x64'
-      box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/debian-606-x64.box'
 'debian-607-x64':
   description: ""
   facts:
@@ -153,9 +95,12 @@
     lsbdistid: Debian
     architecture: amd64
   provider_specifics:
-    vagrant:
+    vagrant_virtualbox:
       box: 'debian-607-x64-vbox4210-nocm'
       box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210-nocm.box'
+    vagrant_vmware_fusion:
+      box: 'debian-607-x64-vf503-nocm'
+      box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vf503-nocm.box'
     vsphere:
       template: 'debian-6-x86_64'
 'debian-70rc1-x64':
@@ -177,33 +122,14 @@
     osfamily: Debian
     rubyversion: "1.9.3"
   provider_specifics:
-    vagrant:
+    vagrant_virtualbox:
       box: 'debian-70rc1-x64-vbox4210-nocm'
       box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vbox4210-nocm.box'
+    vagrant_vmware_fusion:
+      box: 'debian-70rc1-x64-vf503-nocm'
+      box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vf503-nocm.box'
     vsphere:
       template: 'debian-7-x86_64'
-'ubuntu-server-1004-x64':
-  description: ''
-  facts:
-    kernel: Linux
-    operatingsystemrelease: "10.04"
-    lsbmajdistrelease: "10"
-    kernelrelease: "2.6.32-38-server"
-    osfamily: Debian
-    lsbdistrelease: "10.04"
-    lsbdistdescription: "Ubuntu 10.04.4 LTS"
-    kernelversion: "2.6.32"
-    lsbdistcodename: lucid
-    operatingsystem: Ubuntu
-    facterversion: "1.6.17"
-    kernelmajversion: "2.6"
-    architecture: amd64
-    rubyversion: "1.8.7"
-    lsbdistid: Ubuntu
-  provider_specifics:
-    vagrant:
-      box: 'ubuntu-server-1004-x64'
-      box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-1004-x64.box'
 'ubuntu-server-10044-x64':
   description: ""
   facts:
@@ -223,33 +149,14 @@
     rubyversion: "1.8.7"
     lsbdistid: Ubuntu
   provider_specifics:
-    vagrant:
+    vagrant_virtualbox:
       box: 'ubuntu-server-10044-x64-vbox4210-nocm'
       box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box'
+    vagrant_vmware_fusion:
+      box: 'ubuntu-server-10044-x64-vf503-nocm'
+      box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-fusion503-nocm.box'
     vsphere:
       template: 'ubuntu-1004-x86_64'
-'ubuntu-server-1204-x64':
-  description: ''
-  facts:
-    kernel: Linux
-    architecture: amd64
-    operatingsystem: Ubuntu
-    lsbdistid: Ubuntu
-    facterversion: "1.6.17"
-    kernelmajversion: "3.2"
-    kernelrelease: "3.2.0-29-generic"
-    kernelversion: "3.2.0"
-    lsbdistcodename: precise
-    lsbdistdescription: "Ubuntu 12.04.1 LTS"
-    lsbdistrelease: "12.04"
-    lsbmajdistrelease: "12"
-    operatingsystemrelease: "12.04"
-    osfamily: Debian
-    rubyversion: "1.9.2"
-  provider_specifics:
-    vagrant:
-      box: 'ubuntu-server-1204-x64'
-      box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-1204-x64.box'
 'ubuntu-server-12042-x64':
   description: "Foo"
   facts:
@@ -269,9 +176,12 @@
     osfamily: Debian
     rubyversion: "1.9.3"
   provider_specifics:
-    vagrant:
+    vagrant_virtualbox:
       box: 'ubuntu-server-12042-x64-vbox4210-nocm'
       box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box'
+    vagrant_vmware_fusion:
+      box: 'ubuntu-server-12042-x64-vf503-nocm'
+      box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vf503-nocm.box'
     vsphere:
       template: 'ubuntu-1204-x86_64'
 'sles-11sp1-x64':
@@ -288,7 +198,7 @@
     rubyversion: "1.8.7"
     architecture: x86_64
   provider_specifics:
-    vagrant:
+    vagrant_virtualbox:
       box: 'sles-11sp1-x64-vbox4210-nocm'
       box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box'
     vsphere:

data/rspec-system.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   # Metadata
   s.name        = "rspec-system"
-  s.version     = "2.5.1"
+  s.version     = "2.6.0"
   s.authors     = ["Ken Barber"]
   s.email       = ["info@puppetlabs.com"]
   s.homepage    = "https://github.com/puppetlabs/rspec-system"
@@ -17,12 +17,12 @@ Gem::Specification.new do |s|
 
   # Dependencies
   s.required_ruby_version = '>= 1.8.7'
-  s.add_runtime_dependency "rspec", '~>2.13'
+  s.add_runtime_dependency "rspec", '~>2.14'
   s.add_runtime_dependency "kwalify", '~>0.7.2'
   s.add_runtime_dependency "systemu", '~>2.5'
-  s.add_runtime_dependency "net-ssh", '~>2.6'
+  s.add_runtime_dependency "net-ssh", '~>2.7'
   s.add_runtime_dependency "net-scp", '~>1.1'
   s.add_runtime_dependency "rbvmomi", '~>1.6'
   # It seems 1.6.0 relies on ruby 1.9.2, so lets pin it for now
-  s.add_runtime_dependency "nokogiri", '~>1.5.9'
+  s.add_runtime_dependency "nokogiri", '~>1.5.10'
 end

data/spec/spec_helper_system.rb

@@ -21,7 +21,6 @@ RSpec.configure do |c|
   c.include ::LocalHelpers
 
   c.before :suite do
-    shell 'echo "mesg n" >> ~/.profile'
     shell 'echo foobar > /tmp/setupblock'
   end
 end

data/spec/system/base_spec.rb

@@ -1,9 +1,15 @@
 require 'spec_helper_system'
 
 describe "base:" do
-  it 'hostname -f returns something valid' do
+  it 'hostname variants should return the proper hostname' do
     shell 'hostname -f' do |r|
-      r.stdout.should =~ /^main/
+      r.stdout.should =~ /^main$/
+      r.exit_code.should == 0
+      r.stderr.should == ''
+    end
+
+    shell 'hostname' do |r|
+      r.stdout.should =~ /^main$/
       r.exit_code.should == 0
       r.stderr.should == ''
     end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: rspec-system
 version: !ruby/object:Gem::Version
-  version: 2.5.1
-  prerelease: 
+  version: 2.6.0
 platform: ruby
 authors:
 - Ken Barber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-20 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '2.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: kwalify
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   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: systemu
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,23 +55,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   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: rbvmomi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,19 +97,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: 1.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: 1.5.10
 description: 
 email:
 - info@puppetlabs.com
@@ -155,12 +140,13 @@ files:
 - lib/rspec-system/helpers.rb
 - lib/rspec-system/helpers/rcp.rb
 - lib/rspec-system/helpers/shell.rb
-- lib/rspec-system/internal_helpers.rb
 - lib/rspec-system/log.rb
 - lib/rspec-system/node.rb
 - lib/rspec-system/node_set.rb
 - lib/rspec-system/node_set/base.rb
-- lib/rspec-system/node_set/vagrant.rb
+- lib/rspec-system/node_set/vagrant_base.rb
+- lib/rspec-system/node_set/vagrant_virtualbox.rb
+- lib/rspec-system/node_set/vagrant_vmware_fusion.rb
 - lib/rspec-system/node_set/vsphere.rb
 - lib/rspec-system/prefab.rb
 - lib/rspec-system/rake_task.rb
@@ -190,28 +176,27 @@ files:
 homepage: https://github.com/puppetlabs/rspec-system
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - resources
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: System testing with rspec
 test_files:
 - spec/system/base_spec.rb