Skip to content

Commit

Permalink
Merge pull request jhoblitt#19 from jhoblitt/feature/boilerplate_update
Browse files Browse the repository at this point in the history
Feature/boilerplate update
  • Loading branch information
Joshua Hoblitt committed Apr 11, 2014
2 parents 860edc7 + 6ea41b2 commit 0950ccb
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
10 changes: 6 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
pkg/
spec/fixtures/manifests/
spec/fixtures/modules/
.bundle
Gemfile.lock
*.orig
*.rej
*.patch
pkg/
*.rej
.rspec_system/
spec/fixtures/manifests/
spec/fixtures/modules/
*.swp
.vagrant
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ matrix:
env: PUPPET_GEM_VERSION="~> 2.7"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 2.7"
fast_finish: true
notifications:
email: false
1 change: 1 addition & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Copyright 2012 Massachusetts Institute of Technology
Copyright (C) 2013-2014 Joshua Hoblitt <[email protected]>

Permission to use, copy, modify, and distribute this software and
its documentation for any purpose and without fee is hereby
Expand Down
10 changes: 6 additions & 4 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
require 'puppetlabs_spec_helper/rake_tasks'
require 'rspec-system/rake_task'
require 'puppet-syntax/tasks/puppet-syntax'
require 'puppet-lint/tasks/puppet-lint'
require 'rspec-system/rake_task'

PuppetLint.configuration.send("disable_class_inherits_from_params_class")
PuppetLint.configuration.ignore_paths = ['pkg/**/*.pp', 'spec/**/*.pp', 'tests/**/*.pp']
PuppetLint.configuration.ignore_paths = [
'pkg/**/*.pp',
'spec/**/*.pp',
'tests/**/*.pp',
]

task :default => [
:syntax,
:lint,
:spec,
]

# vim:ft=ruby

0 comments on commit 0950ccb

Please sign in to comment.