rspec-system-puppet 2.0.0 → 2.1.0

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+2.1.0
+=====
+
+This feature release provides some minor bug fixes, improved docuemntation and features as outlined below.
+
+#### Detailed Changes
+
+* Remove coupling with Bundler (Hunter Haugen)
+* Add module_path option to puppet_apply helper (Dominic Cleal)
+* Pass node option when creating the host alias for puppet (Trey Dockendorf)
+
 2.0.0
 =====
 

data/README.md

@@ -17,6 +17,8 @@ Recommended to be installed first:
 * VirtualBox 4.2.10 or greater
 * RVM or RBenv (current instructions are based on RVM however)
 
+### Create a nodeset file
+
 In your existing Puppet module project, create a `.nodeset.yml` with the following contents:
 
     ---
@@ -51,12 +53,21 @@ In your existing Puppet module project, create a `.nodeset.yml` with the followi
           "main.foo.vm":
             prefab: 'ubuntu-server-12042-x64'
 
-Make sure you have a `Gemfile` like the one below, this includes `rspec-puppet` test content as well:
+### Install the gem
+
+The intention is that this gem is used within your project as a development library.
+
+You may install `rspec-system-puppet` manually with:
+
+    # gem install rspec-system-puppet
+
+However it is usually recommended to include `gem 'rspec-system-puppet'` in your `Gemfile` and let bundler install it. An example `Gemfile` is shown below. This includes `rspec-puppet` test content as well:
 
     source 'https://rubygems.org'
 
     group :development, :test do
       gem 'rake'
+      gem 'rspec-puppet'
       gem 'puppetlabs_spec_helper', :require => false
       gem 'rspec-system-puppet'
       gem 'puppet-lint'
@@ -68,14 +79,16 @@ Make sure you have a `Gemfile` like the one below, this includes `rspec-puppet`
       gem 'puppet', :require => false
     end
 
-Create a `Rakefile` like so:
+Install using Bundler with:
 
-    require 'rubygems'
-    require 'bundler/setup'
+    bundle install --path vendor/bundle
 
-    Bundler.require :default
+If you're using git, add `.rspec_system` to your project's `.gitignore` file.  This is the default location for files created by rspec-system.
+
+### Create rakefile
+
+Create a `Rakefile` like so:
 
-    require 'rspec/core/rake_task'
     require 'puppetlabs_spec_helper/rake_tasks'
     require 'rspec-system/rake_task'
 
@@ -83,6 +96,8 @@ Create a `Rakefile` like so:
       sh %{rake -T}
     end
 
+### Create spec helper
+
 You will need a spec helper for your tests to `require`. So create the file `spec/spec_helper_system.rb`:
 
     require 'rspec-system/spec_helper'
@@ -91,10 +106,10 @@ You will need a spec helper for your tests to `require`. So create the file `spe
     include RSpecSystemPuppet::Helpers
 
     RSpec.configure do |c|
-      # Project root for the firewall code
+      # Project root
       proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
-      # Enable colour in Jenkins
+      # Enable colour
       c.tty = true
 
       c.include RSpecSystemPuppet::Helpers
@@ -110,7 +125,9 @@ You will need a spec helper for your tests to `require`. So create the file `spe
       end
     end
 
-Now if you are using rspec-puppet, I advise you to seperate the location of your system and unit tests:
+### Create system spec tests
+
+I advise you to seperate the location of your system and unit tests:
 
 * spec/system - system tests
 * spec/unit - rspec-puppet and other unit tests
@@ -132,7 +149,7 @@ And create your first system tests in say `spec/system/basic_spec.rb` (make sure
         pp = <<-EOS
           class { 'mymodule': }
         EOS
-      
+
         # Run it twice and test for idempotency
         puppet_apply(pp) do |r|
           r.exit_code.should_not == 1
@@ -142,23 +159,17 @@ And create your first system tests in say `spec/system/basic_spec.rb` (make sure
       end
     end
 
-Now start by creating a gemset environment for your run:
+### Run spec tests
 
-    # rvm --create --ruby-version use ruby-1.9.3@mymodule
-
-Then grab the gemset bundle:
+Now you should be able to do:
 
-    # bundle update
+    # bundle exec rake spec:system
 
-Now you should be able to do:
+If you want to test an alternate set, just use the `RSPEC_SET` environment variable like so:
 
-    # rake spec:system
-    
-If you want to test an alternate set, just use the RSPEC_SET environment variable like so:
+    # RSPEC_SET=debian-70rc1-x64 bundle exec rake spec:system
 
-    # RSPEC_SET=debian-70rc1-x64 rake spec:system
-    
-Consult the .nodeset.yml file for the list of sets.
+Consult the `.nodeset.yml` file for the list of sets.
 
 ## Further Information
 

data/Rakefile

@@ -1,8 +1,3 @@
-require 'rubygems'
-require 'bundler/setup'
-
-Bundler.require :default
-
 require 'rspec/core/rake_task'
 require 'rspec-system/rake_task'
 

data/lib/rspec-system-puppet/helpers.rb

@@ -91,6 +91,7 @@ module RSpecSystemPuppet::Helpers
   # @option opts [RSpecSystem::Node] :node node to execute DSL on
   # @option opts [Boolean] :debug true if debugging required
   # @option opts [Boolean] :trace true if trace required
+  # @option opts [String] :module_path puppet modulepath to use
   # @return [RSpecSystem::Helpers::PuppetApply] helper object
   # @yield [result] yields result when called as a block
   # @yieldparam result [RSpecSystemPuppet::Helpers::PuppetApply] helper object

data/lib/rspec-system-puppet/helpers/puppet_apply.rb

@@ -41,6 +41,7 @@ module RSpecSystem::Helpers
       cmd = "puppet apply --detailed-exitcodes"
       cmd += " --debug" if opts[:debug]
       cmd += " --trace" if opts[:trace]
+      cmd += " --modulepath #{opts[:module_path]}" if opts[:module_path]
       cmd += " #{remote_path}"
 
       shell(:c => cmd, :n => node).to_hash

data/lib/rspec-system-puppet/helpers/puppet_install.rb

@@ -48,7 +48,7 @@ host { 'puppet':
   ip => '127.0.0.1',
 }
       EOS
-      puppet_apply(pp)
+      puppet_apply :code => pp, :n => node
 
       # Create hiera.yaml
       file = Tempfile.new('hierayaml')

data/rspec-system-puppet.gemspec

@@ -2,11 +2,12 @@
 Gem::Specification.new do |s|
   # Metadata
   s.name        = "rspec-system-puppet"
-  s.version     = "2.0.0"
+  s.version     = "2.1.0"
   s.authors     = ["Ken Barber"]
-  s.email       = ["ken@bob.sh"]
+  s.email       = ["info@puppetlabs.com"]
   s.homepage    = "https://github.com/puppetlabs/rspec-system-puppet"
   s.summary     = "Puppet rspec-system plugin"
+  s.license     = "Apache 2.0"
 
   # Manifest
   s.files         = `git ls-files`.split("\n")

data/spec/spec_helper.rb

@@ -1,11 +1,6 @@
 dir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift File.join(dir, 'lib')
 
-require 'rubygems'
-require 'bundler/setup'
-
-Bundler.require :default, :test
-
 require 'pathname'
 require 'tmpdir'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-system-puppet
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 2
+  - 1
   - 0
-  - 0
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Ken Barber
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-10 00:00:00 Z
+date: 2013-08-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec-system
@@ -34,7 +34,7 @@ dependencies:
   version_requirements: *id001
 description: 
 email: 
-- ken@bob.sh
+- info@puppetlabs.com
 executables: []
 
 extensions: []
@@ -70,8 +70,8 @@ files:
 - spec/system/puppet_module_install_spec.rb
 - spec/system/puppet_resource_spec.rb
 homepage: https://github.com/puppetlabs/rspec-system-puppet
-licenses: []
-
+licenses: 
+- Apache 2.0
 post_install_message: 
 rdoc_options: []
 
@@ -112,4 +112,3 @@ test_files:
 - spec/system/puppet_apply_spec.rb
 - spec/system/puppet_module_install_spec.rb
 - spec/system/puppet_resource_spec.rb
-has_rdoc: