aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Barton <barton.tomas@gmail.com>2014-01-26 18:35:44 +0100
committerTomas Barton <barton.tomas@gmail.com>2014-01-26 18:35:44 +0100
commit3fdd59f65478ba7d5e8b0f66aa5ea04ed23ec45e (patch)
tree024260d4a17358c9731a2f17d5874acde637e50d
parentc1588ff6c304aeb1a8c8c39e3c8c957eedfac160 (diff)
downloadpuppet-sshd-3fdd59f65478ba7d5e8b0f66aa5ea04ed23ec45e.tar.gz
puppet-sshd-3fdd59f65478ba7d5e8b0f66aa5ea04ed23ec45e.tar.bz2
using fixtures.yml for linking folders
-rw-r--r--.fixtures.yml3
-rw-r--r--Rakefile10
2 files changed, 5 insertions, 8 deletions
diff --git a/.fixtures.yml b/.fixtures.yml
new file mode 100644
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 a9a4da9..e321351 100644
--- 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]