Skip to content

Commit

Permalink
Merge pull request #52 from jhoblitt/maint/plumbing
Browse files Browse the repository at this point in the history
Maint/plumbing
  • Loading branch information
Joshua Hoblitt committed Aug 8, 2015
2 parents 6e27f73 + 659cb9c commit 4f74a38
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ group :development, :test do
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', '>= 1.1.0', :require => false
gem 'puppet-syntax', :require => false
gem 'rspec-puppet', '~> 2.1.0', :require => false
gem 'rspec-puppet', '~> 2.2', :require => false
gem 'metadata-json-lint', :require => false
end

Expand All @@ -29,6 +29,7 @@ group :beaker do
gem 'beaker-rspec', :require => false
gem 'pry', :require => false
gem 'travis-lint', :require => false
gem 'puppet-blacksmith', :require => false
end

# vim:ft=ruby
5 changes: 5 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-syntax/tasks/puppet-syntax'
require 'puppet-lint/tasks/puppet-lint'

begin
require 'puppet_blacksmith/rake_tasks'
rescue LoadError
end

PuppetSyntax.exclude_paths = ['spec/fixtures/**/*']

PuppetLint::RakeTask.new :lint do |config|
Expand Down
9 changes: 0 additions & 9 deletions spec/acceptance/nodesets/default.yml

This file was deleted.

0 comments on commit 4f74a38

Please sign in to comment.