Merge pull request jhoblitt#15 from jhoblitt/rspec-system-updates

update rspec-system boilerplate
samuraiii · Dec 22, 2013 · 1d5dc37 · 1d5dc37
2 parents edf71eb + 60de1c5
commit 1d5dc37
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/.nodeset.yml b/.nodeset.yml
@@ -9,3 +9,7 @@ sets:
     nodes:
       'main.vm':
         prefab: 'debian-607-x64'
+  'ubuntu-server-12042-x64':
+    nodes:
+      "main.vm":
+        prefab: 'ubuntu-server-12042-x64'
diff --git a/Gemfile b/Gemfile
@@ -6,13 +6,13 @@ else
   gem 'puppet', :require => false
 end
 
-gem 'rake',                    :require => false
-gem 'puppetlabs_spec_helper',  :require => false
-gem 'puppet-lint',             :require => false
-gem 'puppet-syntax',           :require => false
-gem 'rspec-system',            :require => false
-gem 'rspec-system-puppet',     :require => false
-gem 'rspec-system-serverspec', :require => false
-gem 'serverspec',              :require => false
+gem 'rake',                                :require => false
+gem 'puppetlabs_spec_helper',              :require => false
+gem 'puppet-lint',                         :require => false
+gem 'puppet-syntax',                       :require => false
+gem 'rspec-system',                        :require => false
+gem 'rspec-system-puppet',                 :require => false
+gem 'rspec-system-serverspec', '>= 2.0.1', :require => false
+gem 'serverspec',                          :require => false
 
 # vim:ft=ruby
diff --git a/Rakefile b/Rakefile
@@ -11,3 +11,5 @@ task :default => [
   :lint,
   :spec,
 ]
+
+# vim:ft=ruby
diff --git a/spec/spec_helper_system.rb b/spec/spec_helper_system.rb
@@ -4,9 +4,6 @@
 
 include RSpecSystemPuppet::Helpers
 
-include Serverspec::Helper::RSpecSystem
-include Serverspec::Helper::DetectOS
-
 RSpec.configure do |c|
   # Project root
   proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
@@ -24,5 +21,6 @@
     # Install modules and dependencies
     puppet_module_install(:source => proj_root, :module_name => 'smartd')
     shell('puppet module install puppetlabs-stdlib')
+    shell('puppet module install csail-shell_config')
   end
 end