rspec-system 1.2.1 → 1.3.0

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+1.3.0
+=====
+
+This release adds a new environment variable RSPEC_DESTROY, when set to false it stops the virtual machines from being destroyed. This is useful for debugging, so you can keep the virtual machine running and login after failures to dig deeper into the failed state if you so desire.
+
+#### Detailed Changes
+
+* Add an environment variale option, RSPEC_DESTROY. When set to 'no' or 'false' this prevents the VM from being destroy before and after a test. (Trey Dockendorf)

data/README.md

@@ -124,6 +124,7 @@ Instead of switches, we use a number of environment variables to modify the beha
 
 * *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`.
+* *RSPEC_DESTROY* - set this to `no` if you do not want the VM to be destroyed before or after a test completes.  May be useful during initial testing of rspec tests to allow inspection of the VM.
 
 So if you wanted to run an alternate nodeset you could use:
 
@@ -141,6 +142,7 @@ This provider has a lot more options for setup, in the form of environment varia
 
 * *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_DESTROY* - same as the vagrant provider, defines if the VM should be destroyed before and after a test.
 * *RSPEC_VSPHERE_HOST* - hostname of your vsphere api
 * *RSPEC_VSPHERE_USER* - username to authenticate with
 * *RSPEC_VSPHERE_PASS* - password to authenticate with

data/lib/rspec-system/node_set.rb

@@ -5,12 +5,12 @@ module RSpecSystem
     #
     # @return [RSpecSystem::NodeSet::Base] returns an object based on the Base
     #   abstract class.
-    def self.create(setname, config, virtual_env)
+    def self.create(setname, config, virtual_env, options)
       case(virtual_env)
       when 'vagrant'
-        RSpecSystem::NodeSet::Vagrant.new(setname, config)
+        RSpecSystem::NodeSet::Vagrant.new(setname, config, options)
       when 'vsphere'
-        RSpecSystem::NodeSet::Vsphere.new(setname, config)
+        RSpecSystem::NodeSet::Vsphere.new(setname, config, options)
       else
         raise "Unsupported virtual environment #{virtual_env}"
       end

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

@@ -7,11 +7,13 @@ module RSpecSystem
     attr_reader :config
     attr_reader :setname
     attr_reader :nodes
+    attr_reader :destroy
 
     # Create new NodeSet, populating necessary data structures.
-    def initialize(setname, config)
+    def initialize(setname, config, options)
       @setname = setname
       @config = config
+      @destroy = options[:destroy]
 
       @nodes = {}
       config['nodes'].each do |k,v|

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

@@ -14,7 +14,8 @@ module RSpecSystem
     #
     # @param setname [String] name of the set to instantiate
     # @param config [Hash] nodeset configuration hash
-    def initialize(setname, config)
+    # @param options [Hash] options Hash
+    def initialize(setname, config, options)
       super
       @vagrant_path = File.expand_path(File.join(RSpec.configuration.system_tmp, 'vagrant_projects', setname))
     end
@@ -53,8 +54,12 @@ module RSpecSystem
         v.close unless v.closed?
       end
 
-      log.info "[Vagrant#teardown] Running 'vagrant destroy'"
-      vagrant("destroy --force")
+      if destroy
+        log.info "[Vagrant#teardown] Running 'vagrant destroy'"
+        vagrant("destroy --force")
+      else
+        log.info "[Vagrant#teardown] Skipping 'vagrant destroy'"
+      end
       nil
     end
 

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

@@ -15,7 +15,8 @@ module RSpecSystem
     #
     # @param setname [String] name of the set to instantiate
     # @param config [Hash] nodeset configuration hash
-    def initialize(setname, config)
+    # @param options [Hash] options Hash
+    def initialize(setname, config, options)
       super
       @vim = RbVmomi::VIM.connect(
         :host => ENV["RSPEC_VSPHERE_HOST"],
@@ -133,14 +134,19 @@ module RSpecSystem
         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"
+        if destroy
+          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
+        else
+          log.info "[Vsphere#teardown] Skipping destroy instance #{k}"
           next
         end
-        vm.PowerOffVM_Task.wait_for_completion
-        vm.Destroy_Task.wait_for_completion
       end
 
       nil

data/lib/rspec-system/spec_helper.rb

@@ -31,10 +31,18 @@ RSpec.configure do |c|
     ENV["RSPEC_VIRTUAL_ENV"] || 'vagrant'
   end
 
+  # Defines if a set will be destroyed before and after tests
+  def rspec_destroy
+    return false if ENV["RSPEC_DESTROY"] =~ /(no|false)/
+    return true
+  end
+
   def rspec_system_node_set
     setname = ENV['RSPEC_SET'] || rspec_system_config['default_set']
     config = rspec_system_config['sets'][setname]
-    RSpecSystem::NodeSet.create(setname, config, rspec_virtual_env)
+    options = {}
+    options[:destroy] = rspec_destroy
+    RSpecSystem::NodeSet.create(setname, config, rspec_virtual_env, options)
   end
 
   def start_nodes
@@ -45,6 +53,7 @@ RSpec.configure do |c|
     log.info "Configuration is: " + ns.config.pretty_inspect
     log.info "Virtual Environment type is: #{ns.env_type}"
     log.info "Default node is: #{ns.default_node.name}"
+    log.info "Destroy node is: #{ns.destroy}"
 
     ns.setup
   end

data/rspec-system.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   # Metadata
   s.name        = "rspec-system"
-  s.version     = "1.2.1"
+  s.version     = "1.3.0"
   s.authors     = ["Ken Barber"]
   s.email       = ["ken@bob.sh"]
   s.homepage    = "https://github.com/puppetlabs/rspec-system"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-system
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -118,6 +118,7 @@ files:
 - .nodeset.yml
 - .ruby-version
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md