1 files changed, 16 insertions, 46 deletions
diff --git a/Rakefile b/Rakefile
index 9b1114b..e5103dd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,53 +1,23 @@
-# encoding: utf-8
-
-require 'rubygems'
 require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
+Bundler.require(:rake)
 
-require 'jeweler'
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
-require 'trocla'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "trocla"
-  gem.homepage = "https://tech.immerda.ch/2011/12/trocla-get-hashed-passwords-out-of-puppet-manifests/"
-  gem.license = "GPLv3"
-  gem.summary = "Trocla a simple password generator and storage" 
-  gem.description = "Trocla helps you to generate random passwords and to store them in various formats (plain, MD5, bcrypt) for later retrival."
-  gem.email = "mh+trocla@immerda.ch"
-  gem.authors = ["mh"]
-  gem.version = Trocla::VERSION::STRING
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
+require 'puppetlabs_spec_helper/rake_tasks'
+require 'puppet-lint/tasks/puppet-lint'
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
+PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "vendor/**/*.pp"]
+PuppetLint.configuration.log_format = '%{path}:%{linenumber}:%{KIND}: %{message}'
+PuppetLint.configuration.send("disable_class_inherits_from_params_class")
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+# use librarian-puppet to manage fixtures instead of .fixtures.yml
+# offers more possibilities like explicit version management, forge downloads,...
+task :librarian_spec_prep do
+  sh "librarian-puppet install --path=spec/fixtures/modules/"
+  pwd = `pwd`.strip
+  unless File.directory?("#{pwd}/spec/fixtures/modules/trocla")
+    sh "ln -s #{pwd} #{pwd}/spec/fixtures/modules/trocla"
+  end
 end
+task :spec_prep => :librarian_spec_prep
 
-task :default => :spec
 
-gem 'rdoc'
-require 'rdoc/task'
-RDoc::Task.new do |rdoc|
-  version = Trocla::VERSION::STRING
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "trocla #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+task :default => [:spec, :lint]