Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/puppet 4.0 #39

Merged
merged 4 commits into from
Apr 24, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .fixtures.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
fixtures:
repositories:
stdlib:
repo: 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
ref: '4.2.0'
repo: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
ref: '4.6.0'
wget:
repo: 'git://github.com/maestrodev/puppet-wget.git'
repo: 'https://github.com/maestrodev/puppet-wget.git'
ref: 'v1.2.2'
logrotate:
repo: 'git://github.com/rodjek/puppet-logrotate.git'
repo: 'https://github.com/rodjek/puppet-logrotate.git'
# The current forge release (1.1.1) of logrotate is not compatible with
# the future parser. See:
# https://github.com/rodjek/puppet-logrotate/pull/39
Expand Down
17 changes: 9 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,21 @@ else
end

group :development, :test do
gem 'rake', :require => false
gem 'rake', :require => false
# https://github.com/rspec/rspec-core/issues/1864
gem 'rspec', '< 3.2.0', {"platforms"=>["ruby_18"]}
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', '>= 1.1.0', :require => false
gem 'puppet-syntax', :require => false
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 'metadata-json-lint', :require => false
end

group :beaker do
gem 'serverspec', :require => false
gem 'beaker', :require => false
gem 'beaker-rspec', :require => false
gem 'pry', :require => false
gem 'serverspec', :require => false
gem 'beaker', :require => false
gem 'beaker-rspec', :require => false
gem 'pry', :require => false
end

# vim:ft=ruby
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PuppetLint::RakeTask.new :lint do |config|
end

task :default => [
:syntax,
:validate,
:lint,
:spec,
]
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{ "operatingsystem": "Scientific", "operatingsystemrelease": [ "5", "6", "7" ] }
],
"dependencies": [
{ "name": "puppetlabs/stdlib", "version_requirement": ">= 4.2.0 < 5.0.0" },
{ "name": "puppetlabs/stdlib", "version_requirement": ">= 4.6.0 < 5.0.0" },
{ "name": "maestrodev/wget", "version_requirement": ">= 1.2.2" },
{ "name": "rodjek/logrotate", "version_requirement": ">= 1.1.1" }
]
Expand Down