Merge pull request #200 from ghoneycutt/fix_dependencies

Fix ruby dependencies
This commit is contained in:
Garrett Honeycutt 2016-11-03 16:02:56 -04:00 committed by GitHub
commit eb0aaa5583
5 changed files with 18 additions and 5 deletions

3
.gitignore vendored
View File

@ -21,6 +21,9 @@ doc/
# Vim # Vim
*.swp *.swp
# Eclipse
.project
# OS X # OS X
.DS_Store .DS_Store

View File

@ -26,11 +26,13 @@ env:
- PUPPET_GEM_VERSION="~> 4.4.0" - PUPPET_GEM_VERSION="~> 4.4.0"
- PUPPET_GEM_VERSION="~> 4.5.0" - PUPPET_GEM_VERSION="~> 4.5.0"
- PUPPET_GEM_VERSION="~> 4.6.0" - PUPPET_GEM_VERSION="~> 4.6.0"
- PUPPET_GEM_VERSION="~> 4.7.0"
- PUPPET_GEM_VERSION="~> 4.8.0"
- PUPPET_GEM_VERSION="~> 4" - PUPPET_GEM_VERSION="~> 4"
sudo: false sudo: false
script: 'bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--format documentation" bundle exec rake spec' script: 'SPEC_OPTS="--format documentation" bundle exec rake validate lint spec'
matrix: matrix:
fast_finish: true fast_finish: true
@ -59,6 +61,10 @@ matrix:
env: PUPPET_GEM_VERSION="~> 4.5.0" env: PUPPET_GEM_VERSION="~> 4.5.0"
- rvm: 1.8.7 - rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 4.6.0" env: PUPPET_GEM_VERSION="~> 4.6.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 4.7.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 4.8.0"
- rvm: 1.8.7 - rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 4" env: PUPPET_GEM_VERSION="~> 4"
- rvm: 2.3.1 - rvm: 2.3.1

View File

@ -1,4 +1,4 @@
source 'https://rubygems.org' source ENV['GEM_SOURCE'] || 'https://rubygems.org'
if puppetversion = ENV['PUPPET_GEM_VERSION'] if puppetversion = ENV['PUPPET_GEM_VERSION']
gem 'puppet', puppetversion, :require => false gem 'puppet', puppetversion, :require => false
@ -6,11 +6,10 @@ else
gem 'puppet', :require => false gem 'puppet', :require => false
end end
gem 'metadata-json-lint'
gem 'puppetlabs_spec_helper', '>= 1.2.0' gem 'puppetlabs_spec_helper', '>= 1.2.0'
gem 'facter', '>= 1.7.0' gem 'facter', '>= 1.7.0'
gem 'rspec-puppet' gem 'rspec-puppet'
gem 'puppet-lint', '>= 1.0', '< 3.0' gem 'puppet-lint', '~> 2.0'
gem 'puppet-lint-absolute_classname-check' gem 'puppet-lint-absolute_classname-check'
gem 'puppet-lint-alias-check' gem 'puppet-lint-alias-check'
gem 'puppet-lint-empty_string-check' gem 'puppet-lint-empty_string-check'
@ -27,3 +26,5 @@ gem 'rspec', '~> 2.0' if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
gem 'rake', '~> 10.0' if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9' gem 'rake', '~> 10.0' if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
gem 'json', '<= 1.8' if RUBY_VERSION < '2.0.0' gem 'json', '<= 1.8' if RUBY_VERSION < '2.0.0'
gem 'json_pure', '<= 2.0.1' if RUBY_VERSION < '2.0.0' gem 'json_pure', '<= 2.0.1' if RUBY_VERSION < '2.0.0'
gem 'metadata-json-lint', '0.0.11' if RUBY_VERSION < '1.9'
gem 'metadata-json-lint' if RUBY_VERSION >= '1.9'

View File

@ -5,7 +5,7 @@ PuppetLint.configuration.send('disable_140chars')
PuppetLint.configuration.relative = true PuppetLint.configuration.relative = true
PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"] PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
desc 'Run puppet in noop mode and check for syntax errors.' desc 'Validate manifests, templates, and ruby files'
task :validate do task :validate do
Dir['manifests/**/*.pp'].each do |manifest| Dir['manifests/**/*.pp'].each do |manifest|
sh "puppet parser validate --noop #{manifest}" sh "puppet parser validate --noop #{manifest}"

View File

@ -10,4 +10,7 @@ RSpec.configure do |config|
Facter.clear Facter.clear
Facter.clear_messages Facter.clear_messages
end end
config.default_facts = {
:environment => 'rp_env',
}
end end