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

Puppetv4 #69

Merged
merged 2 commits into from Aug 13, 2015
Merged

Puppetv4 #69

merged 2 commits into from Aug 13, 2015

Conversation

ghoneycutt
Copy link
Contributor

No description provided.

@ghoneycutt ghoneycutt force-pushed the puppetv4 branch 4 times, most recently from 84932c9 to 4dce701 Compare August 10, 2015 16:26
PuppetLint.configuration.relative = true
PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]

desc 'Validate manifests, templates, and ruby files'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a validate task in puppetlabs_spec_helper. Why not use that?

@ghoneycutt
Copy link
Contributor Author

@ekohl I removed that bit from the Rakefile and rebased. Ready for merge?

@ekohl
Copy link
Collaborator

ekohl commented Aug 11, 2015

👍 on green tests.

@ghoneycutt
Copy link
Contributor Author

@DavidS Could you please review this PR?

@@ -23,4 +23,9 @@ else
gem 'puppet', :require => false
end

# rspec must be v2 for ruby 1.8.7
if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
gem 'rspec', '~> 2.0'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rspec 3.1 is the last rspec that works on ruby 1.8.7:

https://github.com/puppetlabs/puppetlabs-stdlib/blob/master/Gemfile#L15

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do like the basic formulation.

@DavidS
Copy link
Contributor

DavidS commented Aug 12, 2015

Please squash the two commits pertaining to the nice parameter.

@DavidS
Copy link
Contributor

DavidS commented Aug 12, 2015

Oh wow, this module does still use the serverspec things :-/

@ghoneycutt
Copy link
Contributor Author

So changing rspec from ~> 2.0 to ~> 3.1.0 seems to be causing the build failure for ruby 1.8.7. Mind if I revert that so we can get this merged?

Without this commit the range for nice is -19 to 19 which is incorrect.
nice(1) states that the valid values range from -20 to 19.
@ghoneycutt
Copy link
Contributor Author

That might of worked with stdlib though that module is fundamentally different

DavidS added a commit that referenced this pull request Aug 13, 2015
Add puppet 4 testing and document/test/fix the "nice" parameter
@DavidS DavidS merged commit bde09d8 into puppetlabs:master Aug 13, 2015
@DavidS
Copy link
Contributor

DavidS commented Aug 13, 2015

Thank you for your contribution!

@ghoneycutt
Copy link
Contributor Author

@DavidS thanks for the review

@ghoneycutt ghoneycutt deleted the puppetv4 branch August 13, 2015 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants