Skip to content

Commit

Permalink
Update rspec-puppet ~> 2.0 and metadata-json-lint >= 0.0.4 with modul…
Browse files Browse the repository at this point in the history
…esync.
  • Loading branch information
razorsedge committed Feb 7, 2015
1 parent 7496a52 commit 2bd6ca9
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: ruby
cache:
directories:
- vendor/bundle
- spec/fixtures/modules
# - spec/fixtures/modules
sudo: false
branches:
only:
Expand Down
21 changes: 8 additions & 13 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
source ENV['GEM_SOURCE'] || "https://rubygems.org"

group :development, :unit_tests do
gem 'rake', :require => false
gem 'rspec-puppet', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', :require => false
gem 'simplecov', :require => false
gem 'puppet_facts', :require => false
gem 'json', :require => false
gem 'metadata-json-lint', :require => false
end

group :system_tests do
gem 'beaker-rspec', :require => false
gem 'serverspec', :require => false
gem 'rake', :require => false
gem 'rspec-puppet', '~> 2.0', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', :require => false
gem 'simplecov', :require => false
gem 'puppet_facts', :require => false
gem 'json', :require => false
gem 'metadata-json-lint', '>= 0.0.4', :require => false
end

if facterversion = ENV['FACTER_GEM_VERSION']
Expand Down
6 changes: 1 addition & 5 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-lint/tasks/puppet-lint'
require 'metadata-json-lint/rake_task'

PuppetLint.configuration.fail_on_warnings = true
PuppetLint.configuration.send('relative')
Expand All @@ -11,8 +12,3 @@ PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "vender/

PuppetSyntax.exclude_paths = ["spec/**/*", "pkg/**/*", "vender/**/*"]
PuppetSyntax.hieradata_paths = ["**/data/**/*.yaml", "hieradata/**/*.yaml", "hiera*.yaml"]

desc "Check puppet metadata.json with metadata-json-lint."
task :metadata do
sh "metadata-json-lint metadata.json"
end

0 comments on commit 2bd6ca9

Please sign in to comment.