rspec-system 0.0.2 → 0.1.0

data/.gitignore

@@ -1,3 +1,5 @@
 Gemfile.lock
 *.gem
 .*.swp
+doc/
+.yardoc

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+bundler_args: --without development
+script: "rspec"
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+notifications:
+  email: false

data/Gemfile

@@ -1,3 +1,12 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :development, :test do
+  gem 'mocha', :require => 'mocha/api'
+end
+
+group :development do
+  gem 'yard'
+  gem 'redcarpet'
+end

data/LICENSE

@@ -0,0 +1,17 @@
+   rspec-system - System testing using RSpec
+
+   Copyright (C) 2013 Puppet Labs Inc
+
+   Puppet Labs can be contacted at: info@puppetlabs.com
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -1,16 +1,12 @@
 # rspec-system
 
-System testing with rspec.
+`rspec-system` provides a framework for creating system tests using the `rspec` testing library.
 
-* [Usage](#usage)
-    * [Setup](#setup)
-* [Tests](#tests)
+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.
 
-## Usage
+*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.
 
-### Setup
-
-#### Gem installation
+### Gem installation
 
 The intention is that this gem is used within your project as a development library.
 
@@ -26,20 +22,96 @@ Then installing with:
 
     bundle install
 
-#### Configuration
+### Writing tests
+
+Start by creating a helper file in `spec/spec_helper_system.rb` containing something like the following:
+
+    require 'rspec-system/spec_helper'
+
+    RSpec.configure do |c|
+      c.system_setup_block = proc do
+        include RSpecSystem::Helpers
+        # Insert some setup tasks here
+        run('main', 'yum install -y ntp')
+      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.:
+
+    require 'spec_helper_system'
+
+    describe 'basics' do
+      it 'should cat /etc/resolv.conf' do
+        run('main', 'cat /etc/resolv.conf') do |status,stdout,stderr|
+          stdout.should =~ /localhost/
+        end
+      end
+    end
+
+Also consult the example in `example` 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:
+
+* *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`:
+
+    require 'rspec-system/rake_task'
 
-TODO: for now just look at the `examples` directory.
+That will setup the rake task `rake spec:system`.
 
-### Tests
+### Creating a nodeset file
 
-Start by looking at the `examples` directory. I plan on fleshing out this documentation but for now just use the example.
+A nodeset file outlines all the node configurations for your tests. The concept here is to define one or more 'nodesets' each nodeset containing one or more 'nodes'.
 
-#### Running tests
+    ---
+    default_set: 'centos-58-x64'
+    sets:
+      'centos-58-x64':
+        nodes:
+          "main":
+            prefab: 'centos-58-x64'
+
+The file must adhere to the Kwalify schema supplied in `resources/kwalify-schemas/nodeset_schema.yml`.
+
+### Prefabs
+
+Prefabs are 'pre-rolled' virtual images, for now its the only way to do it.
+
+The current prefabs are defined in `resources/prefabs.yml`.
+
+### Running tests
 
 Run the system tests with:
 
     rake spec:system
 
-#### Writing tests
+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)
+* *RSPEC_SET* - the set to use when running tests (defaults to the `default_set` setting in the projects `.nodeset.yml` file)
+
+So if you wanted to run an alternate nodeset you could use:
+
+    RSPEC_SET=nodeset2 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.
+
+### Plugins to rspec-system
+
+I want to start an eco-system of plugins for rspec-system, but do it in a sane way. Right now I see the following potential plugin types, if you think you can help please do:
+
+* nodes providers - that is, abstractions around other virtualisation tools. Right now a NodeSet is tied to a virtual type, but I think this isn't granual enough.
+    * blimpy - for firing up EC2 and OpenStack nodes, useful for Jenkins integration
+    * vmware - for those who have VMWare virtual 'clouds' or boxen
+    * razor - for launching hardware nodes.
+    * manual - not everything has to be 'launched' I can see a need for defining a static configuration for older machines that can't be poked and peeked.
+* helper libraries - libraries that provide test helpers, and setup helpers for testing development on the software in question.
+    * distro - helpers that wrap common linux distro tasks, like package installation.
+    * puppet - helpers around installing different versions of puppet, PE as well - firing up masters. Perfect for testing modules I think.
+    * mcollective - for launching the basics, activemq, broker clusters. Useful for testing mcollective agents.
+    * puppetdb - helpers for setting up puppetdb, probably using the modules.
+    * others I'm sure ...
 
-Create the directory `spec/system` in your project. Add files with the spec prefix ie. `mytests_spec.rb`.
+These could be shipped as external gems, and plugged in to the rspec-system framework somehow.

data/lib/rspec-system.rb

@@ -5,12 +5,14 @@ module RSpecSystem; end
 require 'rspec-system/log'
 require 'rspec-system/helpers'
 require 'rspec-system/node_set'
+require 'rspec-system/prefab'
+require 'rspec-system/node'
 
 RSpec::configure do |c|
   c.include RSpecSystem::Helpers
 
   # This provides a path to save vagrant files
   c.add_setting :system_tmp
-  # Node set configuration
-  c.add_setting :system_nodesets
+  # Block to execute for environment setup
+  c.add_setting :system_setup_block
 end

data/lib/rspec-system/helpers.rb

@@ -1,8 +1,175 @@
+# This module contains the main rspec helpers that are to be used within
+# rspec-system tests.
+#
+# The methods here-in are accessible within your rspec tests and can also
+# be used within your setup blocks as well.
+#
+# These helpers in particular are core to the framework. You can however
+# combined these helpers to create your own more powerful helpers in rspec
+# if you wish.
+#
+# @example Using run within your tests
+#   describe 'test running' do
+#     it 'run cat' do
+#       run 'cat /etc/resolv.conf' do |status, out, err|
+#         status.exitstatus.should == 0
+#         stdout.should =~ /localhost/
+#       end
+#     end
+#   end
+# @example Using rcp in your tests
+#   describe 'test running' do
+#     it 'copy my files' do
+#       rcp :sp => 'mydata', :dp => '/srv/data'.should be_true
+#     end
+#   end
+# @example Using node in your tests
+#   describe 'test running' do
+#     it 'do something if redhat' do
+#       if node.facts[:operatingsystem] == 'RedHat' do
+#         run 'cat /etc/redhat-release'
+#       end
+#     end
+#   end
 module RSpecSystem::Helpers
-  def run_on(dest, command)
-    log.info("run_on(#{dest}, #{command}) executed")
-    result = rspec_system_node_set.run(dest, command)
-    log.info("run_on(#{dest}, #{command}) finished\n--result--\n#{result}\n--result--\n")
-    result
+  # @!group Actions
+
+  # Runs a shell command on a test host, returning status, stdout and stderr.
+  #
+  # When invoked as a block the status,stdout and stderr are yielded to the
+  # block as parameters.
+  #
+  # If you have only provided 1 node in your nodeset, or you have specified a
+  # a default you can avoid entering the name of the node if you wish.
+  #
+  # @api public
+  # @param options [Hash, String] options for command execution, if passed a
+  #   string it will just use that for the command instead as a convenience.
+  # @option options [String] :command command to execute. Mandatory.
+  # @option options [String] :c alias for :command
+  # @option options [RSpecSystem::Node] :node (defaults to what was defined
+  #   default in your YAML file, otherwise if there is only one node it uses
+  #   that) specifies node to execute command on.
+  # @option options [RSpecSystem::Node] :n alias for :node
+  # @yield [status, stdout, stderr] yields status, stdout and stderr when
+  #   called as a block.
+  # @yieldparam status [Process::Status] the status of the executed command
+  # @yieldparam stdout [String] the standard out of the command result
+  # @yieldparam stderr [String] the standard error of the command result
+  # @return [Array<Process::Status,String,String>] returns status, stdout and
+  #  stderr when called as a simple method.
+  def run(options)
+    ns = rspec_system_node_set
+    dn = ns.default_node
+
+    # Take options as a string instead
+    if options.is_a?(String)
+      options = {:c => options}
+    end
+
+    options = {
+      :node => options[:n] || dn,
+      :n => options[:node] || dn,
+      :c => options[:command],
+      :command => options[:c],
+    }.merge(options)
+
+    if options[:c].nil?
+      raise "Cannot use run with no :command option"
+    end
+
+    log.info("run #{options[:c]} on #{options[:n].name} executed")
+    status, stdout, stderr = result = ns.run(options)
+    log.info("run results:\n" +
+      "-----------------------\n" +
+      "Exit Status: #{status.exitstatus}\n" +
+      "<stdout>#{stdout}</stdout>\n" +
+      "<stderr>#{stderr}</stderr>\n" +
+      "-----------------------\n")
+
+    if block_given?
+      yield(*result)
+    else
+      result
+    end
+  end
+
+  # Remotely copy files to a test node. This will use the underlying nodes
+  # rcp mechanism to do the transfer for you, so you generally shouldn't
+  # need to consider the implementation.
+  #
+  # Just specify a source, and a destination path, and go.
+  #
+  # @example Remote copy /srv/data to remote host
+  #   rcp(:dest_path => '/srv/data', :source_path => 'mydata')
+  # @param options [Hash] options for command execution
+  # @option options [String] :source_path source to copy files from (currently
+  #    only locally)
+  # @option options [String] :sp alias for source_path
+  # @option options [String] :destination_path destination for copy
+  # @option options [String] :dp alias for dest_path
+  # @option options [RSpecSystem::Node] :destination_node (default_node) destination node 
+  #   to transfer files to. Optional.
+  # @option options [RSpecSystem::Node] :d alias for destination_node
+  # @option options [RSpecSystem::Node] :source_node ('') Reserved
+  #   for future use. Patches welcome.
+  # @option options [RSpecSystem::Node] :s alias for source_node
+  # @return [Bool] returns true if successful
+  # @todo Need to create some helpers for validating input and creating default,
+  #   aliases and bloody yarddocs from some other magic format. Ideas?
+  # @todo Support system to system copy using source_node option.
+  def rcp(options)
+    options = {
+      :source_path => options[:sp],
+      :destination_path => options[:dp],
+      :dp => options[:destination_path],
+      :sp => options[:source_path],
+      :destination_node => rspec_system_node_set.default_node,
+      :d => rspec_system_node_set.default_node,
+      :source_node => '',
+      :s => '',
+    }.merge(options)
+
+    d = options[:d]
+    sp = options[:sp]
+    dp = options[:dp]
+
+    log.info("rcp from #{sp} to #{d.name}:#{dp} executed")
+    status, stdout, stderr = results = rspec_system_node_set.rcp(options)
+    log.info("rcp results:\n" +
+      "-----------------------\n" +
+      "Exit Status: #{status.exitstatus}\n" +
+      "<stdout>#{stdout}</stdout>\n" +
+      "<stderr>#{stderr}</stderr>\n" +
+      "-----------------------\n")
+
+    if status.exitstatus == 1
+      return true
+    else
+      return false
+    end
+  end
+
+  # @!group Queries
+
+  # Returns a particular node object from the current nodeset given a set of
+  # criteria.
+  #
+  # If no options are supplied, it tries to return the default node.
+  #
+  # @param options [Hash] search criteria
+  # @option options [String] :name the canonical name of the node
+  # @return [RSpecSystem::Node] node object
+  def node(options = {})
+    ns = rspec_system_node_set
+    options = {
+      :name => ns.default_node,
+    }.merge(options)
+
+    if !options[:name].nil?
+      return ns.nodes[options[:name]]
+    else
+      raise "No nodes to return"
+    end
   end
 end

data/lib/rspec-system/node.rb

@@ -0,0 +1,76 @@
+module RSpecSystem
+  # This class represents a node in a nodeset
+  class Node
+    # Static helper for generating a node direct from the hash returned by
+    # the nodeset YAML file.
+    #
+    # @param nodeset [RSpecSystem::Node] nodeset that this node belongs to
+    # @param k [String] name of node
+    # @param v [Hash<String,String>] hash configuration as given from the nodeset yaml file
+    # @return [RSpecSystem::Node] returns a new node object
+    def self.node_from_yaml(nodeset, k, v)
+      RSpecSystem::Node.new(
+        :nodeset => nodeset,
+        :name => k,
+        :prefab => v['prefab']
+      )
+    end
+
+    # Create a new node object.
+    #
+    # @param options [Hash] options for new node
+    # @option options [String] :name name of node. Mandatory.
+    # @option options [String] :prefab prefab setting. Mandatory.
+    # @option options [RSpecSystem::NodeSet] :nodeset the parent nodeset for
+    #   this node. Mandatory.
+    def initialize(options)
+      @name = options[:name]
+      prefab = options[:prefab]
+      @nodeset = options[:nodeset]
+
+      if prefab.nil?
+        # TODO: do not support not prefabs yet
+        raise "No prefab defined, bailing"
+      else
+        @prefab = RSpecSystem::Prefab.prefab(prefab)
+        @facts = @prefab.facts
+        @provider_specifics = @prefab.provider_specifics
+      end
+    end
+
+    # Returns the name of the node as specified in the nodeset file.
+    #
+    # @return [String] name of node
+    def name
+      @name
+    end
+
+    # Returns the prefab object for this node (if any).
+    #
+    # @return [RSpecSystem::Prefab] the prefab object used to create this node
+    def prefab
+      @prefab
+    end
+
+    # Retreives facts from the nodeset definition or prefab.
+    #
+    # @return [Hash] returns a hash of facter facts defined for this node
+    def facts
+      @facts
+    end
+
+    # Returns the nodeset this node belongs in.
+    #
+    # @return [RSpecSystem::NodeSet] the nodeset this node belongs to
+    def nodeset
+      @nodeset
+    end
+
+    # Return provider specific settings
+    #
+    # @return [Hash] provider specific settings
+    def provider_specifics
+      @provider_specifics
+    end
+  end
+end

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

@@ -1,36 +1,64 @@
 module RSpecSystem
-  # Base class for a NodeSet.
+  # Base class for a NodeSet driver. If you want to create a new driver, you
+  # should sub-class this and override all the methods below.
+  #
+  # @abstract Subclass and override methods to create a new NodeSet variant.
   class NodeSet::Base
-    attr_reader :config, :setname
+    attr_reader :config
+    attr_reader :setname
+    attr_reader :nodes
 
+    # Create new NodeSet, populating necessary data structures.
     def initialize(setname, config)
       @setname = setname
       @config = config
+
+      @nodes = {}
+      config['nodes'].each do |k,v|
+        @nodes[k] = RSpecSystem::Node.node_from_yaml(self, k, v)
+      end
     end
 
     # Setup the NodeSet by starting all nodes.
     def setup
+      raise "Unimplemented method #setup"
     end
 
     # Shutdown the NodeSet by shutting down or pausing all nodes.
     def teardown
+      raise "Unimplemented method #teardown"
     end
 
-    # Take a snapshot of the NodeSet for rollback later.
-    def snapshot
+    # Run a command on a host in the NodeSet.
+    def run(options)
+      raise "Unimplemented method #run"
     end
 
-    # Rollback to the snapshot of the NodeSet.
-    def rollback
-    end
-
-    # Run a command on a host in the NodeSet.
-    def run(dest, command)
+    # Copy a file to the host in the NodeSet.
+    def rcp(options)
+      raise "Unimplemented method #rcp"
     end
 
     # Return environment type
     def env_type
       self.class::ENV_TYPE
     end
+
+    # Return default node
+    #
+    # @return [RSpecSystem::Node] default node for this nodeset
+    def default_node
+      dn = config['default_node']
+      if dn.nil?
+        if nodes.length == 1
+          dn = nodes.first[1]
+          return dn
+        else
+          raise "No default node"
+        end
+      else
+        return nodes[dn]
+      end
+    end
   end
 end

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

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'systemu'
 
 module RSpecSystem
   # A NodeSet implementation for Vagrant.
@@ -14,76 +15,130 @@ module RSpecSystem
 
     # Setup the NodeSet by starting all nodes.
     def setup
-      log.info "Begin setting up vagrant"
+      log.info "[Vagrant#setup] Begin setting up vagrant"
       create_vagrantfile
 
-      log.info "Running 'vagrant destroy'"
-      vagrant("destroy", "--force")
+      log.info "[Vagrant#setup] Running 'vagrant destroy'"
+      vagrant("destroy --force")
 
-      log.info "Running 'vagrant up'"
+      log.info "[Vagrant#setup] Running 'vagrant up'"
       vagrant("up")
     end
 
     # Shutdown the NodeSet by shutting down or pausing all nodes.
     def teardown
-      log.info "Running 'vagrant destroy'"
-      vagrant("destroy", "--force")
+      log.info "[Vagrant#teardown] Running 'vagrant destroy'"
+      vagrant("destroy --force")
     end
 
     # Run a command on a host in the NodeSet.
-    def run(dest, command)
+    #
+    # @param opts [Hash] options
+    def run(opts)
+      #log.debug("[Vagrant#run] called with #{opts.inspect}")
+
+      dest = opts[:n].name
+      cmd = opts[:c]
+
       result = ""
       Dir.chdir(@vagrant_path) do
-        result = `vagrant ssh #{dest} --command 'cd /tmp && #{command}'`
+        cmd = "vagrant ssh #{dest} --command \"cd /tmp && sudo -i #{cmd}\""
+        log.debug("[vagrant#run] Running command: #{cmd}")
+        result = systemu cmd
+        log.debug("[Vagrant#run] Finished running command: #{cmd}. Result is #{result}.")
       end
       result
     end
 
+    # Transfer files to a host in the NodeSet.
+    #
+    # @param opts [Hash] options
+    def rcp(opts)
+      #log.debug("[Vagrant@rcp] called with #{opts.inspect}")
+
+      dest = opts[:d].name
+      source = opts[:sp]
+      dest_path = opts[:dp]
+
+      # TODO: This is damn ugly, because we ssh in as vagrant, we copy to a
+      # temp path then move later. This pattern at the moment only really works
+      # on dirs.
+      log.info("[Vagrant#rcp] Transferring files from #{source} to #{dest}:#{dest_path}")
+
+      # TODO: The static temp path here is definately insecure
+      cmd = "scp -r -F #{ssh_config} #{source} #{dest}:/tmp/tmpxfer"
+      log.debug("[Vagrant#rcp] Running command: #{cmd}")
+      systemu cmd
+
+      # Now we move the file into place
+      run(:n => opts[:d], :c => "mv /tmp/tmpxfer #{dest_path}")
+    end
+
     # Create the Vagrantfile for the NodeSet.
+    #
     # @api private
     def create_vagrantfile
-      log.info "Creating vagrant file here: #{@vagrant_path}"
+      log.info "[Vagrant#create_vagrantfile] Creating vagrant file here: #{@vagrant_path}"
       FileUtils.mkdir_p(@vagrant_path)
       File.open(File.expand_path(File.join(@vagrant_path, "Vagrantfile")), 'w') do |f|
         f.write('Vagrant::Config.run do |c|')
-        @config['nodes'].each do |k,v|
+        nodes.each do |k,v|
           log.debug "Filling in content for #{k}"
           f.write(<<-EOS)
   c.vm.define '#{k}' do |vmconf|
-#{template_prefabs(v["prefab"])}
+    vmconf.vm.host_name = "#{k}"
+#{template_node(v.provider_specifics['vagrant'])}
   end
           EOS
         end
         f.write('end')
       end
-      log.debug "Finished creating vagrant file"
+      log.debug "[Vagrant#create_vagrantfile] Finished creating vagrant file"
     end
 
-    # Provide Vagrantfile templates for prefabs.
+    # Here we get vagrant to drop the ssh_config its using so we can monopolize
+    # it for transfers and custom stuff. We drop it into a single file, and
+    # since its indexed based on our own node names its quite ideal.
+    #
     # @api private
-    def template_prefabs(prefab)
-      case prefab
-      when 'centos-58-x64'
-        <<-EOS
-    vmconf.vm.box = 'centos-58-x64'
-    vmconf.vm.box_url = 'http://puppet-vagrant-boxes.puppetlabs.com/centos-58-x64.box'
-        EOS
-      when 'debian-606-x64'
-        <<-EOS
-    vmconf.vm.box = 'debian-606-x64'
-    vmconf.vm.box_url = 'http://puppet-vagrant-boxes.puppetlabs.com/debian-606-x64.box'
-        EOS
-      else
-        raise 'Unknown prefab'
+    def ssh_config
+      ssh_config_path = File.expand_path(File.join(@vagrant_path, "ssh_config"))
+      begin
+        File.unlink(ssh_config_path)
+      rescue Errno::ENOENT
+      end
+      self.nodes.each do |k,v|
+        Dir.chdir(@vagrant_path) do
+          result = systemu("vagrant ssh-config #{k} >> #{ssh_config_path}")
+          puts result.inspect
+        end
       end
+      ssh_config_path
+    end
+
+    # Provide Vagrantfile templates from node definition.
+    #
+    # @api private
+    # @param settings [Hash] provider specific settings for vagrant
+    def template_node(settings)
+      template = <<-EOS
+    vmconf.vm.box = '#{settings['box']}'
+    vmconf.vm.box_url = '#{settings['box_url']}'
+      EOS
     end
 
     # Execute vagrant command in vagrant_path
+    #
     # @api private
-    def vagrant(*args)
+    # @param args [String] args to vagrant
+    # @todo This seems a little too specific these days, might want to
+    #   generalize. It doesn't use systemu, because we want to see the output
+    #   immediately, but still - maybe we can make systemu do that.
+    def vagrant(args)
       Dir.chdir(@vagrant_path) do
-        system("vagrant", *args)
+        system("vagrant #{args}")
       end
+      nil
     end
   end
 end

data/lib/rspec-system/prefab.rb

@@ -0,0 +1,28 @@
+module RSpecSystem
+  class Prefab
+    attr_reader :name
+    attr_reader :description
+    attr_reader :facts
+    attr_reader :provider_specifics
+
+    # Return prefab object based on name
+    def self.prefab(name)
+      prefabs = YAML.load_file(File.join(File.dirname(__FILE__), '..', '..', 'resources', 'prefabs.yml'))
+      raise "No such prefab" unless pf = prefabs[name]
+
+      RSpecSystem::Prefab.new(
+        :name => name,
+        :description => pf['description'],
+        :facts => pf['facts'],
+        :provider_specifics => pf['provider_specifics']
+      )
+    end
+
+    def initialize(options = {})
+      @name = options[:name]
+      @description = options[:description]
+      @facts = options[:facts]
+      @provider_specifics = options[:provider_specifics]
+    end
+  end
+end

data/lib/rspec-system/rake_task.rb

@@ -7,7 +7,7 @@ require 'rspec/core/rake_task'
 require 'rspec-system/formatter'
 
 RSpec::Core::RakeTask.new(:spec_system) do |c|
-  c.pattern = "spec/system/**/test1_spec.rb"
+  c.pattern = "spec/system/**/*_spec.rb"
   c.rspec_opts = %w[--require rspec-system/formatter --format=RSpecSystem::Formatter]
 end
 

data/lib/rspec-system/spec_helper.rb

@@ -25,18 +25,41 @@ RSpec.configure do |c|
     RSpecSystem::NodeSet.create(setname, config, rspec_virtual_env)
   end
 
-  c.system_tmp = Dir.tmpdir
-  c.before :suite do
+  def start_nodes
+    ns = rspec_system_node_set
+
     log.info "START RSPEC-SYSTEM SETUP"
-    log.info "Setname is: " + rspec_system_node_set.setname
-    log.info "Configuration is: " + rspec_system_node_set.config.pretty_inspect
-    log.info "Virtual Environment type is: #{rspec_system_node_set.env_type}"
+    log.info "Setname is: " + ns.setname
+    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}"
 
-    rspec_system_node_set.setup
+    ns.setup
   end
 
-  c.after :suite do
+  def stop_nodes
     log.info 'FINALIZE RSPEC-SYSTEM SETUP'
     rspec_system_node_set.teardown
   end
+
+  def call_custom_setup_block
+    # Run test specific setup routines
+    if pr = RSpec.configuration.system_setup_block then
+      log.info "Running custom setup block"
+      pr.call
+      log.info "Finished running custom setup block"
+    end
+  end
+
+  # Default the system_tmp dir to something random
+  c.system_tmp = Dir.tmpdir
+
+  c.before :suite do
+    start_nodes
+    call_custom_setup_block
+  end
+
+  c.after :suite do
+    stop_nodes
+  end
 end

data/resources/kwalify-schemas/prefabs_schema.yml

@@ -0,0 +1,17 @@
+type: map
+mapping:
+  =:
+    type: map
+    mapping:
+      description: { type: str }
+      facts:
+        type: map
+        mapping:
+          =: { type: str }
+      provider_specifics:
+        type: map
+        mapping:
+          =:
+            type: map
+            mapping:
+              =: { type: str}

data/resources/prefabs.yml

@@ -0,0 +1,43 @@
+---
+'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'
+'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'

data/rspec-system.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   # Metadata
   s.name        = "rspec-system"
-  s.version     = "0.0.2"
+  s.version     = "0.1.0"
   s.authors     = ["Ken Barber"]
   s.email       = ["ken@bob.sh"]
   s.homepage    = "https://github.com/kbarber/rspec-system"
@@ -15,9 +15,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Dependencies
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 1.8.7'
   s.add_runtime_dependency "rspec"
   s.add_runtime_dependency "kwalify"
-  s.add_development_dependency "simplecov"
-  s.add_development_dependency "mocha"
+  s.add_runtime_dependency "systemu"
 end

data/spec/spec_helper.rb

@@ -16,8 +16,11 @@ end
 def fixture_path
   Pathname.new(File.expand_path(File.join(__FILE__, '..', 'fixtures')))
 end
+def resources_path
+  Pathname.new(File.expand_path(File.join(__FILE__, '..', '..', 'resources')))
+end
 def schema_path
-  Pathname.new(File.expand_path(File.join(__FILE__, '..', '..', 'resources', 'kwalify-schemas')))
+  resources_path + 'kwalify-schemas'
 end
 
 RSpec.configure do |config|

data/spec/unit/kwalify-schemas/prefabs_schema_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+require 'kwalify'
+
+describe 'prefabs_schema' do
+  let(:schema) do
+    YAML.load_file(schema_path + 'prefabs_schema.yml')
+  end
+  let(:validator) do
+    validator = Kwalify::Validator.new(schema)
+  end
+  let(:parser) do
+    parser = Kwalify::Yaml::Parser.new(validator)
+  end
+
+  it "should not return an error for prefabs.yml" do
+    ydoc = parser.parse_file(resources_path + 'prefabs.yml')
+    errors = parser.errors
+    if errors && !errors.empty?
+      errors.each do |e|
+        puts "line=#{e.linenum}, path=#{e.path}, mesg=#{e.message}"
+      end
+    end
+    errors.should == []
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-system
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,30 +44,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: systemu
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -84,7 +68,9 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .ruby-version
+- .travis.yml
 - Gemfile
+- LICENSE
 - README.md
 - examples/.gitignore
 - examples/.nodeset.yml
@@ -99,17 +85,22 @@ files:
 - lib/rspec-system/formatter.rb
 - lib/rspec-system/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/prefab.rb
 - lib/rspec-system/rake_task.rb
 - lib/rspec-system/spec_helper.rb
 - resources/kwalify-schemas/nodeset_schema.yml
+- resources/kwalify-schemas/prefabs_schema.yml
+- resources/prefabs.yml
 - rspec-system.gemspec
 - spec/fixtures/nodeset_example1.yml
 - spec/fixtures/nodeset_example2.yml
 - spec/spec_helper.rb
 - spec/unit/kwalify-schemas/nodeset_schema_spec.rb
+- spec/unit/kwalify-schemas/prefabs_schema_spec.rb
 homepage: https://github.com/kbarber/rspec-system
 licenses: []
 post_install_message: 
@@ -121,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -136,3 +127,5 @@ specification_version: 3
 summary: System testing with rspec
 test_files:
 - spec/unit/kwalify-schemas/nodeset_schema_spec.rb
+- spec/unit/kwalify-schemas/prefabs_schema_spec.rb
+has_rdoc: