rspec-system 1.0.0 → 1.1.0

data/.gitignore

@@ -3,3 +3,6 @@ Gemfile.lock
 .*.swp
 doc/
 .yardoc
+vendor/
+.bundle
+spec/reports/

data/.nodeset.yml

@@ -53,3 +53,10 @@ sets:
     nodes:
       "main":
         prefab: 'sles-11sp1-x64'
+  'centos-64-x64-multi':
+    default_node: 'first'
+    nodes:
+      "first":
+        prefab: 'centos-64-x64'
+      "second":
+        prefab: 'centos-64-x64'

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 group :development, :test do
   gem 'rake'
   gem 'mocha', :require => 'mocha/api'
+  gem 'ci_reporter'
 end
 
 group :development do

data/README.md

@@ -4,7 +4,7 @@
 
 The goal here is to provide facilities to aid in the launching of tests nodes, copying of test content to such nodes, and executing commands on such nodes to be tested with standard rspec assertions within the standard rspec test format.
 
-*Note:* This library is fairly alpha at the moment, and the interface may change at without warning. That said, if you're good at ruby and have an opinion, I'd appreciate patches and improvements to move this further torwards stability.
+*Note:* This library is fairly new at the moment, so your mileage may vary. That said, if you're good at ruby and have an opinion, I'd appreciate patches and improvements to move this further torwards stability.
 
 ### Gem installation
 
@@ -20,7 +20,7 @@ However it is usually recommended to include it in your `Gemfile` and let bundle
 
 Then installing with:
 
-    bundle install
+    bundle install --path vendor
 
 ### Writing tests
 
@@ -36,7 +36,7 @@ Start by creating a helper file in `spec/spec_helper_system.rb` containing somet
       end
     end
 
-Create the directory `spec/system` in your project, make sure your unit tests go into `spec/unit` or somesuch so you can isolate them easily during test time. Add files with the spec prefix ie. `mytests_spec.rb` and make sure they always include the line `require 'spec_helper_system'` eg.:
+Create the directory `spec/system` in your project, its recommended to make sure your unit tests go into `spec/unit` instead so you can isolate them easily during test time. Add files with the spec prefix ie. `mytests_spec.rb` and make sure they always include the line `require 'spec_helper_system'` eg.:
 
     require 'spec_helper_system'
 
@@ -48,18 +48,18 @@ Create the directory `spec/system` in your project, make sure your unit tests go
       end
     end
 
-Also consult the example in `example` in the source of this library for more details.
+Also consult the examples in the `examples` directory in the source of this library for more details.
 
-For you reference, here are the list of custom rspec configuration items that can be overriden in your `spec_helper_system.rb` file:
+For your reference, here are the list of custom rspec configuration items that can be overriden in your `spec_helper_system.rb` file:
 
 * *system_setup_block* - this accepts a proc that is called after node setup, but before every test (ie. before suite). The goal of this option is to provide a good place for node setup independant of tests.
 * *system_tmp* - For some of our activity, we require a temporary file area. By default we just a random temporary path, so you normally do not need to set this.
 
-Currently to get the nice formatting rspec-system specific formatter its recommended to use the Rake task, so the following to your `Rakefile`:
+Currently to get the nice formatting rspec-system specific formatter its recommended to use the Rake task, so add the following to your `Rakefile`:
 
     require 'rspec-system/rake_task'
 
-That will setup the rake task `rake spec:system`.
+That will setup the `spec:system` rake task.
 
 ### Creating a nodeset file
 
@@ -98,21 +98,62 @@ For this reason there are various `provider_specific` settings that apply to dif
 
 ### Running tests
 
-Run the system tests with:
+There are two providers at the moment you can use to launch your nodes for testing:
+
+* Vagrant: for the local desktop to run during development and debugging mainly
+* VSphere: for CI systems such as Jenkins
+
+Although both systems can be used for either purpose, if you so desire.
+
+#### Vagrant Provider
+
+This is the default provider, as all the products for this provider are free, most people should be able to run it.
+
+Make sure you have already installed:
+
+* VirtualBox 4.2.10+
+* Vagrant 1.2.x+
+
+Once these are ready, you can Run the system tests with:
 
     rake spec:system
 
+The VM's should be downloaded from the internet, started and tests should run.
+
 Instead of switches, we use a number of environment variables to modify the behaviour of running tests. This is more inline with the way testing frameworks like Jenkins work, and should be pretty easy for command line users as well:
 
-* *RSPEC_VIRTUAL_ENV* - the type of virtual environment to run (currently `vagrant` is the only option). I'm undecided about this variable, so assume it might change in the future.
+* *RSPEC_VIRTUAL_ENV* - set this to `vagrant` if you wish, for now `vagrant` is the default so this is optional.
 * *RSPEC_SET* - the set to use when running tests (defaults to the `default_set` setting in the projects `.nodeset.yml` file). This string must align with the entries under `sets` in your `.nodeset.yml`.
 
 So if you wanted to run an alternate nodeset you could use:
 
-    RSPEC_SET=nodeset2 rake spec:system
+    RSPEC_SET=fedora18 rake spec:system
 
 In Jenkins you should be able to use RSPEC\_SET in a test matrix, thus obtaining quite a nice integration and visual display of nodesets in Jenkins.
 
+#### VSphere Provider
+
+*Note:* this provider requires some templates to be created in a globally accessable folder somewhere in your VSphere system, in the near future the site: <http://puppet-vagrant-boxes.puppetlabs.com> should provide you with deployable OVF files for this purpose, and I'll provide you with better docs on how to load these ;-). Look at prefabs.yml for the names of the templates that we expect.
+
+This provider will launch nodes using VMWare VSphere API's and use those for running tests. This provider is really aimed at the users who want to use this library within their own CI system for example, as apposed to developers who wish to run tests locally themselves.
+
+This provider has a lot more options for setup, in the form of environment variables:
+
+* *RSPEC_VIRTUAL_ENV* - set this to 'vsphere' to use this provider
+* *RSPEC_SET* - same as the vagrant provider, this defines the 'set' to launch.
+* *RSPEC_VSPHERE_HOST* - hostname of your vsphere api
+* *RSPEC_VSPHERE_USER* - username to authenticate with
+* *RSPEC_VSPHERE_PASS* - password to authenticate with
+* *RSPEC_VSPHERE_DEST_DIR* - destination path to launch vm's
+* *RSPEC_VSPHERE_TEMPLATE_DIR* - path to where you deployed the templates from the OVF files described above
+* *RSPEC_VSPHERE_RPOOL* - name of resource pool to use
+
+Set these variables, and run the usual rake command:
+
+    rake spec:system
+
+In Jenkins, set the authentication variables above using environment variable injection. I recommend using the private environment variables feature for user & pass however so these do not get displayed in the console output. As with the vagrant provider however, turn RSPEC\_SET into a test matrix, containing all the sets you want to test against.
+
 ### Plugins to rspec-system
 
 Right now we have two types of plugins, the framework is in a state of flux as to how one writes these things but here we go.
@@ -121,13 +162,13 @@ Right now we have two types of plugins, the framework is in a state of flux as t
 
 Libraries that provide test helpers, and setup helpers for testing development on the software in question.
 
-* rspec-system-puppet <http://rubygems.org/gems/rspec-system-puppet>
+* [rspec-system-puppet](http://rubygems.org/gems/rspec-system-puppet)
 
 #### Node providers
 
-A node provider should provide the ability to launch nodes (or if they are already launched provide information to get to them), run commands on nodes, transfer files and shutdown nodes.
+A node provider should provide the ability to launch nodes (or if they are already launched provide information to get to them), run commands on nodes, transfer files and shutdown nodes. That is, abstractions around other virtualisation, cloud or system tools.
 
-That is, abstractions around other virtualisation, cloud or system tools. Right now we only have one of these for Vagrant using VirtualBox specifically and its in core.
+Right now the two options are: vagrant & vsphere and these are installed with core. In the future we probably want to split these out to plugins, but the plugin system isn't quite ready for that yet.
 
 #### The Future of Plugins
 
@@ -145,13 +186,13 @@ I want to start an eco-system of plugins for rspec-system, but do it in a sane w
     * other config management tools - for the purposes of testing modules against them, or using them for test setup provisioners like I've mentioned before with Puppet.
     * others I'm sure ...
 
-These could be shipped as external gems, and plugged in to the rspec-system framework somehow. Ideas on how to do this properly are very welcome, if you bring code as well :-).
+These could be shipped as external gems, and plugged in to the rspec-system framework somehow. Ideas on how to do this properly are very welcome, especially if you bring code as well :-).
 
 ### CI Integration
 
 So currently I've only integrated this with Jenkins. If you have luck doing it on other CI platforms, feel free to add to this documentation.
 
-#### Jenkins
+#### Jenkins and the Vagrant provider
 
 My setup was:
 
@@ -171,13 +212,39 @@ The setup for a job is basically:
 * Use touchstone with a filter of RSPEC_SET=='centos-64-x64' so you don't chew up cycles running a whole batch of broken builds
 * Create an execute shell job like so:
 
-    #!/bin/bash
-    set +e
+        #!/bin/bash
+        set +e
+    
+        [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
+        rvm use ruby-2.0.0@some_unique_name_here --create
+    
+        bundle update
+        rake spec:system
 
-    [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
-    rvm use ruby-2.0.0@some_unique_name_here --create
+I went quite complex and had Github pull request integration working with this, and quite a few other nice features. If you need help setting it up get in touch.
 
-    bundle update
-    rake spec:system
+#### Jenkins and the VSphere provider
 
-I went quite complex and had Github pull request integration working with this, and quite a few other nice features. If you need help setting it up get in touch.
+My setup was:
+
+* Debian 7
+* Jenkins 1.510
+* VSphere 5.1 'cloud'
+
+The setup for a job is basically:
+
+* Create new matrix build
+* Specify VCS settings etc. as per normal
+* Create a user defined axis called 'RSPEC\_SET' and add your nodesets in there: fedora-18-x64, centos-64-x64 etc.
+* Use the enviornment injection facility to add all the other RSPEC\_VSPHERE vars as above
+* Use touchstone with a filter of RSPEC\_SET=='centos-64-x64' so you don't chew up cycles running a whole batch of broken builds
+* Create an execute shell job like so:
+
+        #!/bin/bash
+        set +e
+        [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
+        rvm use ruby-2.0.0
+        bundle install --vendor
+        bundle exec rake spec:system
+
+Basically the results were quite nice, as apposed to the 'vagrant' provider I was able to achieve running parallel jobs using my matrix setup.

data/Rakefile

@@ -6,6 +6,11 @@ Bundler.require :default
 require 'rspec/core/rake_task'
 require 'rspec-system/rake_task'
 
+begin
+  require 'ci/reporter/rake/rspec'
+rescue LoadError
+end
+
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = "spec/unit/**/*_spec.rb"
 end

data/examples/.nodeset.yml

@@ -1,7 +1,7 @@
 ---
-default_set: 'centos-58-x64'
+default_set: 'centos-59-x64'
 sets:
-  'centos-58-x64':
+  'centos-59-x64':
     nodes:
       "main":
-        prefab: 'centos-58-x64'
+        prefab: 'centos-59-x64'

data/examples/spec/system/test1_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe "test1" do
   it 'run test1 - part1' do
-    run_on('main', "cat /etc/resolv.conf")
+    system_run("cat /etc/resolv.conf")
   end
 
   it 'run test1 - part2' do
-    run_on('main', "cat /etc/issue")
+    system_run("cat /etc/issue")
   end
 end

data/lib/rspec-system/node_set.rb

@@ -9,6 +9,8 @@ module RSpecSystem
       case(virtual_env)
       when 'vagrant'
         RSpecSystem::NodeSet::Vagrant.new(setname, config)
+      when 'vsphere'
+        RSpecSystem::NodeSet::Vsphere.new(setname, config)
       else
         raise "Unsupported virtual environment #{virtual_env}"
       end
@@ -18,3 +20,4 @@ end
 
 require 'rspec-system/node_set/base'
 require 'rspec-system/node_set/vagrant'
+require 'rspec-system/node_set/vsphere'

data/lib/rspec-system/node_set/base.rb

@@ -60,5 +60,79 @@ module RSpecSystem
         return nodes[dn]
       end
     end
+
+    # Return a random string of chars, used for temp dir creation
+    #
+    # @return [String] string of 50 random characters A-Z and a-z
+    def random_string(length = 50)
+      o =  [('a'..'z'),('A'..'Z')].map{|i| i.to_a}.flatten
+      (0...length).map{ o[rand(o.length)] }.join
+    end
+
+    # Generates a random string for use in remote transfers.
+    #
+    # @return [String] a random path
+    # @todo Very Linux dependant, probably need to consider OS X and Windows at
+    #   least.
+    def tmppath
+      '/tmp/' + random_string
+    end
+
+    # Execute command via SSH.
+    #
+    # A special version of exec! from Net::SSH that returns exit code and exit
+    # signal as well. This method is blocking.
+    #
+    # @param ssh [Net::SSH::Connection::Session] an active ssh session
+    # @param command [String] command to execute
+    # @return [Hash] a hash of results
+    def ssh_exec!(ssh, command)
+      r = {
+        :stdout => '',
+        :stderr => '',
+        :exit_code => nil,
+        :exit_signal => nil,
+      }
+      ssh.open_channel do |channel|
+        channel.exec(command) do |ch, success|
+          unless success
+            abort "FAILED: couldn't execute command (ssh.channel.exec)"
+          end
+          channel.on_data do |ch,data|
+            d = data
+            print d
+            r[:stdout]+=d
+          end
+
+          channel.on_extended_data do |ch,type,data|
+            d = data
+            print d
+            r[:stderr]+=d
+          end
+
+          channel.on_request("exit-status") do |ch,data|
+            c = data.read_long
+            puts "Exit code: #{c}"
+            r[:exit_code] = c
+          end
+
+          channel.on_request("exit-signal") do |ch, data|
+            s = data.read_string
+            puts "Exit signal: #{s}"
+            r[:exit_signal] = s
+          end
+        end
+      end
+      ssh.loop
+
+      r
+    end
+
+    # Return a random mac address
+    #
+    # @return [String] a random mac address
+    def randmac
+      "080027" + (1..3).map{"%0.2X"%rand(256)}.join
+    end
   end
 end

data/lib/rspec-system/node_set/vagrant.rb

@@ -178,82 +178,5 @@ module RSpecSystem
       nil
     end
 
-    # Return a random string of chars, used for temp dir creation
-    #
-    # @api private
-    # @return [String] string of 50 random characters A-Z and a-z
-    def random_string
-      o =  [('a'..'z'),('A'..'Z')].map{|i| i.to_a}.flatten
-      (0...50).map{ o[rand(o.length)] }.join
-    end
-
-    # Generates a random string for use in remote transfers.
-    #
-    # @api private
-    # @return [String] a random path
-    # @todo Very Linux dependant, probably need to consider OS X and Windows at
-    #   least.
-    def tmppath
-      '/tmp/' + random_string
-    end
-
-    # Return a random mac address
-    #
-    # @api private
-    # @return [String] a random mac address
-    def randmac
-      "080027" + (1..3).map{"%0.2X"%rand(256)}.join
-    end
-
-    # Execute command via SSH.
-    #
-    # A special version of exec! from Net::SSH that returns exit code and exit
-    # signal as well. This method is blocking.
-    #
-    # @api private
-    # @param ssh [Net::SSH::Connection::Session] an active ssh session
-    # @param command [String] command to execute
-    # @return [Hash] a hash of results
-    def ssh_exec!(ssh, command)
-      r = {
-        :stdout => '',
-        :stderr => '',
-        :exit_code => nil,
-        :exit_signal => nil,
-      }
-      ssh.open_channel do |channel|
-        channel.exec(command) do |ch, success|
-          unless success
-            abort "FAILED: couldn't execute command (ssh.channel.exec)"
-          end
-          channel.on_data do |ch,data|
-            d = data
-            print d
-            r[:stdout]+=d
-          end
-
-          channel.on_extended_data do |ch,type,data|
-            d = data
-            print d
-            r[:stderr]+=d
-          end
-
-          channel.on_request("exit-status") do |ch,data|
-            c = data.read_long
-            puts "Exit code: #{c}"
-            r[:exit_code] = c
-          end
-
-          channel.on_request("exit-signal") do |ch, data|
-            s = data.read_string
-            puts "Exit signal: #{s}"
-            r[:exit_signal] = s
-          end
-        end
-      end
-      ssh.loop
-
-      r
-    end
   end
 end

data/lib/rspec-system/node_set/vsphere.rb

@@ -0,0 +1,196 @@
+require 'fileutils'
+require 'systemu'
+require 'net/ssh'
+require 'net/scp'
+require 'rbvmomi'
+
+module RSpecSystem
+  # A NodeSet implementation for VSphere
+  class NodeSet::Vsphere < RSpecSystem::NodeSet::Base
+    include RSpecSystem::Log
+
+    ENV_TYPE = 'vsphere'
+
+    # Creates a new instance of RSpecSystem::NodeSet::Vsphere
+    #
+    # @param setname [String] name of the set to instantiate
+    # @param config [Hash] nodeset configuration hash
+    def initialize(setname, config)
+      super
+      @vim = RbVmomi::VIM.connect(
+        :host => ENV["RSPEC_VSPHERE_HOST"],
+        :user => ENV["RSPEC_VSPHERE_USER"],
+        :password => ENV["RSPEC_VSPHERE_PASS"],
+        :ssl => true,
+        :insecure => true
+      )
+
+      # Initialize node storage if not already
+      RSpec.configuration.rspec_storage[:nodes] ||= {}
+    end
+
+    # @!group NodeSet Methods
+
+    # Setup the NodeSet by starting all nodes.
+    #
+    # @return [void]
+    def setup
+      log.info "[Vsphere#setup] Setup begins"
+
+      dest_dir = ENV['RSPEC_VSPHERE_DEST_DIR']
+      template_dir = ENV['RSPEC_VSPHERE_TEMPLATE_DIR']
+
+      si = @vim.serviceInstance
+      dc = si.find_datacenter
+
+      rp = dc.find_compute_resource('general').resourcePool.find(ENV["RSPEC_VSPHERE_RPOOL"])
+      relocateSpec = RbVmomi::VIM.VirtualMachineRelocateSpec(:pool => rp)
+      spec = RbVmomi::VIM.VirtualMachineCloneSpec(
+        :location => relocateSpec,
+        :powerOn => true,
+        :template => false
+      )
+
+      vm_folder = dc.vmFolder
+      vm_newfolder = vm_folder.find(dest_dir)
+
+      log.info "[Vsphere#setup] launching instances one by one"
+      nodes.each do |k,v|
+        ps = v.provider_specifics['vsphere']
+
+        raise 'No provider specifics for this prefab' if ps.nil?
+
+        template = ps['template']
+
+        raise "No template specified for this prefab" if template.nil?
+
+        log.info "[Vsphere#setup] launching instance #{k} with template #{template}"
+
+        vm = vm_folder.find(ENV['RSPEC_VSPHERE_TEMPLATE_DIR']).find(template)
+
+        raise "No template found" if vm.nil?
+
+        vm_name = "rspec-system-#{k}-#{random_string(10)}"
+
+        log.info "[Vsphere#setup] Cloning new vm #{vm_name} in folder #{dest_dir}"
+
+        vm.CloneVM_Task(
+          :folder => vm_newfolder,
+          :name => vm_name,
+          :spec => spec
+        ).wait_for_completion
+
+        log.info "[Vsphere#setup] Cloning complete"
+
+        newvm = vm_newfolder.find(vm_name)
+        guest_info = newvm.guest
+
+        timeout(60) do
+          while(newvm.guest.guestState != 'running') do
+            sleep 2
+            puts "#{k}> Waiting for vm to run ..."
+          end
+        end
+
+        timeout(60) do
+          while(newvm.guest.ipAddress == nil) do
+            sleep 2
+            puts "#{k}> Waiting for ip address ..."
+          end
+        end
+
+        ipaddress = newvm.guest.ipAddress
+
+        log.info "[Vsphere#setup] establishing Net::SSH channel with #{k}"
+        chan = Net::SSH.start(ipaddress, 'vagrant', :password => 'vagrant')
+
+        RSpec.configuration.rspec_storage[:nodes][k] = {
+          :ipaddress => ipaddress,
+          :ssh => chan,
+          :vm => newvm
+        }
+        log.info "[Vsphere#setup] Node launched: #{k}"
+      end
+
+      log.info("[Vsphere#setup] setup complete")
+
+      nil
+    end
+
+    # Shutdown the NodeSet by shutting down all nodes.
+    #
+    # @return [void]
+    def teardown
+      nodes.each do |k,v|
+        storage = RSpec.configuration.rspec_storage[:nodes][k]
+
+        if storage.nil?
+          log.info "[Vsphere#teardown] No entry for node #{k}, no teardown necessary"
+          next
+        end
+
+        log.info "[Vsphere#teardown] closing ssh channel to #{k}"
+        ssh = storage[:ssh]
+        ssh.close unless ssh.closed?
+
+        log.info "[Vsphere#teardown] destroy instance #{k}"
+        vm = storage[:vm]
+        if vm == nil
+          puts "No vm object"
+          next
+        end
+        vm.PowerOffVM_Task.wait_for_completion
+        vm.Destroy_Task.wait_for_completion
+      end
+
+      nil
+    end
+
+    # Run a command on a host in the NodeSet.
+    #
+    # @param opts [Hash] options
+    # @return [Hash] a hash containing :exit_code, :stdout and :stderr
+    def run(opts)
+      dest = opts[:n].name
+      cmd = opts[:c]
+
+      ssh = RSpec.configuration.rspec_storage[:nodes][dest][:ssh]
+      puts "-----------------"
+      puts "#{dest}$ #{cmd}"
+      result = ssh_exec!(ssh, "cd /tmp && sudo sh -c '#{cmd}'")
+      puts "-----------------"
+      result
+    end
+
+    # Transfer files to a host in the NodeSet.
+    #
+    # @param opts [Hash] options
+    # @return [Boolean] returns true if command succeeded, false otherwise
+    # @todo This is damn ugly, because we ssh in as vagrant, we copy to a temp
+    #   path then move it later. Its slow and brittle and we need a better
+    #   solution. Its also very Linux-centrix in its use of temp dirs.
+    def rcp(opts)
+      #log.debug("[Vagrant@rcp] called with #{opts.inspect}")
+
+      dest = opts[:d].name
+      source = opts[:sp]
+      dest_path = opts[:dp]
+
+      # Grab a remote path for temp transfer
+      tmpdest = tmppath
+
+      # Do the copy and print out results for debugging
+      ssh = RSpec.configuration.rspec_storage[:nodes][dest][:ssh]
+      ssh.scp.upload! source.to_s, tmpdest.to_s, :recursive => true
+
+      # Now we move the file into their final destination
+      result = run(:n => opts[:d], :c => "mv #{tmpdest} #{dest_path}")
+      if result[:exit_code] == 0
+        return true
+      else
+        return false
+      end
+    end
+
+  end
+end

data/lib/rspec-system/spec_helper.rb

@@ -16,6 +16,7 @@ RSpec.configure do |c|
   c.add_setting :system_setup_block
   # Storage for ssh channels
   c.add_setting :ssh_channels, :default => {}
+  c.add_setting :rspec_storage, :default => {}
 
   def nodeset
     Pathname.new(File.join(File.basename(__FILE__), '..', '.nodeset.yml'))
@@ -66,11 +67,24 @@ RSpec.configure do |c|
   c.system_tmp = Dir.mktmpdir
 
   c.before :suite do
-    start_nodes
-    call_custom_setup_block
+    # Before Suite exceptions get captured it seems
+    begin
+      start_nodes
+      call_custom_setup_block
+    rescue => ex
+      puts ex.inspect + " in"
+      puts ex.backtrace.join("\n  ")
+      exit(1)
+    end
   end
 
   c.after :suite do
-    stop_nodes
+    # After Suite exceptions get captured it seems
+    begin
+      stop_nodes
+    rescue => ex
+      puts ex.inspect + " in"
+      puts ex.backtrace.join("\n  ")
+    end
   end
 end

data/resources/kwalify-schemas/nodeset_schema.yml

@@ -7,6 +7,7 @@ mapping:
       =:
         type: map
         mapping:
+          default_node: { type: str }
           nodes:
             type: map
             mapping:

data/resources/prefabs.yml

@@ -45,6 +45,8 @@
     vagrant:
       box: 'centos-59-x64-vbox4210-nocm'
       box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box'
+    vsphere:
+      template: 'centos-59-x64-vs51-nocm'
 'centos-63-x64':
   description: "Vagrant images obtained from http://puppet-vagrant-boxes.puppetlabs.com"
   facts:
@@ -84,6 +86,8 @@
     vagrant:
       box: 'centos-64-x64-vbox4210-nocm'
       box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box'
+    vsphere:
+      template: 'centos-64-x64-vs51-nocm'
 'fedora-18-x64':
   description: ""
   facts:
@@ -101,6 +105,8 @@
     vagrant:
       box: 'fedora-18-x64-vbox4210-nocm'
       box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box'
+    vsphere:
+      template: 'fedora-18-x64-vs51-nocm'
 'debian-606-x64':
   description: "Vagrant images obtained from http://puppet-vagrant-boxes.puppetlabs.com"
   facts:
@@ -142,6 +148,8 @@
     vagrant:
       box: 'debian-607-x64-vbox4210-nocm'
       box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210-nocm.box'
+    vsphere:
+      template: 'debian-607-x64-vs51-nocm'
 'debian-70rc1-x64':
   description: ""
   facts:
@@ -164,6 +172,8 @@
     vagrant:
       box: 'debian-70rc1-x64-vbox4210-nocm'
       box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vbox4210-nocm.box'
+    vsphere:
+      template: 'debian-70rc1-x64-vs51-nocm'
 'ubuntu-server-1004-x64':
   description: ''
   facts:
@@ -208,6 +218,8 @@
     vagrant:
       box: 'ubuntu-server-10044-x64-vbox4210-nocm'
       box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box'
+    vsphere:
+      template: 'ubuntu-server-10044-x64-vs51-nocm'
 'ubuntu-server-1204-x64':
   description: ''
   facts:
@@ -252,6 +264,8 @@
     vagrant:
       box: 'ubuntu-server-12042-x64-vbox4210-nocm'
       box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box'
+    vsphere:
+      template: 'ubuntu-server-12042-x64-vs51-nocm'
 'sles-11sp1-x64':
   description: ''
   facts:
@@ -269,3 +283,5 @@
     vagrant:
       box: 'sles-11sp1-x64-vbox4210-nocm'
       box_url: 'http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box'
+    vsphere:
+      template: 'sles-11sp1-x64-vs51-nocm'

data/rspec-system.gemspec

@@ -2,10 +2,10 @@
 Gem::Specification.new do |s|
   # Metadata
   s.name        = "rspec-system"
-  s.version     = "1.0.0"
+  s.version     = "1.1.0"
   s.authors     = ["Ken Barber"]
   s.email       = ["ken@bob.sh"]
-  s.homepage    = "https://github.com/kbarber/rspec-system"
+  s.homepage    = "https://github.com/puppetlabs/rspec-system"
   s.summary     = "System testing with rspec"
 
   # Manifest
@@ -20,4 +20,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "kwalify"
   s.add_runtime_dependency "systemu"
   s.add_runtime_dependency "net-ssh", '~>2.6'
+  s.add_runtime_dependency "net-scp"
+  s.add_runtime_dependency "rbvmomi"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-system
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-21 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -75,6 +75,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rbvmomi
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - ken@bob.sh
@@ -107,6 +139,7 @@ files:
 - 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/vsphere.rb
 - lib/rspec-system/prefab.rb
 - lib/rspec-system/rake_task.rb
 - lib/rspec-system/spec_helper.rb
@@ -123,7 +156,7 @@ files:
 - spec/system/system_run_spec.rb
 - spec/unit/kwalify-schemas/nodeset_schema_spec.rb
 - spec/unit/kwalify-schemas/prefabs_schema_spec.rb
-homepage: https://github.com/kbarber/rspec-system
+homepage: https://github.com/puppetlabs/rspec-system
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -153,4 +186,3 @@ test_files:
 - spec/system/system_run_spec.rb
 - spec/unit/kwalify-schemas/nodeset_schema_spec.rb
 - spec/unit/kwalify-schemas/prefabs_schema_spec.rb
-has_rdoc: