Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Switch to using the puppetlabs_spec_helper gem for common files inste…

…ad of duplicating code
  • Loading branch information...
commit ecc5a2d605fbc8363ad56c3ad5662d1ee962c957 1 parent 959e527
@branan branan authored
Showing with 4 additions and 123 deletions.
  1. +1 −8 .gemfile
  2. +1 −1  .travis.yml
  3. +1 −91 Rakefile
  4. +1 −23 spec/spec_helper.rb
View
9 .gemfile
@@ -1,12 +1,5 @@
source :rubygems
puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
-
gem 'puppet', puppetversion
-
-group :test do
- gem 'rake', '>= 0.9.0'
- gem 'rspec', '>= 2.8.0'
- gem 'rspec-puppet', '>= 0.1.1'
- gem 'mocha', '>= 0.11.0'
-end
+gem 'puppetlabs_spec_helper', '>= 0.1.0'
View
2  .travis.yml
@@ -3,7 +3,7 @@ rvm:
- 1.8.7
before_script:
after_script:
-script: "rake spec_full"
+script: "rake spec"
branches:
only:
- master
View
92 Rakefile
@@ -1,91 +1 @@
-require 'rake'
-require 'rspec/core/rake_task'
-require 'yaml'
-
-task :default => [:spec]
-
-desc "Run all module spec tests (Requires rspec-puppet gem)"
-RSpec::Core::RakeTask.new(:spec) do |t|
- t.rspec_opts = ['--color']
- t.pattern = 'spec/{classes,defines,unit}/**/*_spec.rb'
-end
-
-# This is a helper for the self-symlink entry of fixtures.yml
-def source_dir
- File.dirname(__FILE__)
-end
-
-def fixtures(category)
- begin
- fixtures = YAML.load_file(".fixtures.yml")["fixtures"]
- rescue Errno::ENOENT
- return {}
- end
-
- if not fixtures
- abort("malformed fixtures.yml")
- end
-
- result = {}
- if fixtures.include? category
- fixtures[category].each do |fixture, source|
- target = "spec/fixtures/modules/#{fixture}"
- real_source = eval('"'+source+'"')
- result[real_source] = target
- end
- end
- return result
-end
-
-desc "Create the fixtures directory"
-task :spec_prep do
- fixtures("repositories").each do |repo, target|
- File::exists?(target) || system("git clone #{repo} #{target}")
- end
-
- FileUtils::mkdir_p("spec/fixtures/modules")
- fixtures("symlinks").each do |source, target|
- File::exists?(target) || FileUtils::ln_s(source, target)
- end
-end
-
-desc "Clean up the fixtures directory"
-task :spec_clean do
- fixtures("repositories").each do |repo, target|
- FileUtils::rm_rf(target)
- end
-
- fixtures("symlinks").each do |source, target|
- FileUtils::rm(target)
- end
-end
-
-task :spec_full do
- Rake::Task[:spec_prep].invoke
- Rake::Task[:spec].invoke
- Rake::Task[:spec_clean].invoke
-end
-
-desc "Build puppet module package"
-task :build do
- # This will be deprecated once puppet-module is a face.
- begin
- Gem::Specification.find_by_name('puppet-module')
- rescue Gem::LoadError, NoMethodError
- require 'puppet/face'
- pmod = Puppet::Face['module', :current]
- pmod.build('./')
- end
-end
-
-desc "Clean a built module package"
-task :clean do
- FileUtils.rm_rf("pkg/")
-end
-
-desc "Check puppet manifests with puppet-lint"
-task :lint do
- # This requires pull request: https://github.com/rodjek/puppet-lint/pull/81
- system("puppet-lint manifests")
- system("puppet-lint tests")
-end
+require 'puppetlabs_spec_helper/rake_tasks'
View
24 spec/spec_helper.rb
@@ -1,23 +1 @@
-require 'rubygems'
-require 'puppet'
-require 'rspec-puppet'
-
-def param_value(subject, type, title, param)
- subject.resource(type, title).send(:parameters)[param.to_sym]
-end
-
-def verify_contents(subject, title, expected_lines)
- content = subject.resource('file', title).send(:parameters)[:content]
- (content.split("\n") & expected_lines).should == expected_lines
-end
-
-Puppet.parse_config
-puppet_module_path = Puppet[:modulepath]
-
-fixture_path = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures'))
-
-RSpec.configure do |c|
- fixture_module_path = File.join(fixture_path, 'modules')
- c.module_path = [fixture_module_path, puppet_module_path].join(":")
- c.manifest_dir = File.join(fixture_path, 'manifests')
-end
+require 'puppetlabs_spec_helper/module_spec_helper'
Please sign in to comment.
Something went wrong with that request. Please try again.