using fixtures.yml for linking folders

diff --git a/.fixtures.yml b/.fixtures.yml
new file mode 100644 (file)
index 0000000..42598a6
--- /dev/null
+++ b/.fixtures.yml
@@ -0,0 +1,3 @@
+fixtures:
+  symlinks:
+    sshd: "#{source_dir}"
\ No newline at end of file

diff --git a/Rakefile b/Rakefile
index a9a4da907d6ede535b0035d2d3d19a050ba54780..e3213518a603f52af0a091bf6ffb1ea0e5dbfa7c 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -8,15 +8,9 @@ require 'rspec-system/rake_task'
 PuppetLint.configuration.log_format = '%{path}:%{linenumber}:%{KIND}: %{message}'
 PuppetLint.configuration.send("disable_80chars")
 
-# use librarian-puppet to manage fixtures instead of .fixtures.yml
-# offers more possibilities like explicit version management, forge downloads,...
 puppet_module='sshd'
 task :librarian_spec_prep do
-  sh "librarian-puppet install --path=spec/fixtures/modules/"
-  pwd = `pwd`.strip
-  unless File.directory?("#{pwd}/spec/fixtures/modules/#{puppet_module}")
-    sh "ln -s #{pwd} #{pwd}/spec/fixtures/modules/#{puppet_module}"
-  end
+  sh 'librarian-puppet install --path=spec/fixtures/modules/'
 end
 task :spec_prep => :librarian_spec_prep
-task :default => [:spec, :lint]
\ No newline at end of file
+task :default => [:spec, :lint]