(PDK-785) Add --puppet-version and --pe-version CLI options #448
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rodjek
force-pushed
the
pdk-785
branch
3 times, most recently
from
0f95455 to
c9b9255
Compare
rodjek
changed the title
rodjek
changed the title
scotje
approved these changes
Mar 19, 2018
lib/pdk/cli/test/unit.rb
Outdated
| @@ -21,6 +22,11 @@ module PDK::CLI | |||
| run do |opts, _args, _cmd| | |||
| require 'pdk/tests/unit' | |||
|
|
|||
| if opts[:'puppet-version'] && opts[:'pe-version'] | |||
| PDK.logger.error _('You can not specify both --puppet-version and --pe-version at the same time.') | |||
| exit 1 | |||
There was a problem hiding this comment.
Should this raise PDK::CLI::ExitWithError instead?
lib/pdk/cli/validate.rb
Outdated
| @@ -32,6 +33,11 @@ module PDK::CLI | |||
| exit 0 | |||
| end | |||
|
|
|||
| if opts[:'puppet-version'] && opts[:'pe-version'] | |||
| PDK.logger.error _('You can not specify both --puppet-version and --pe-version at the same time.') | |||
| exit 1 | |||
There was a problem hiding this comment.
Should this raise PDK::CLI::ExitWithError instead?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The important bit: It adds the
--puppet-versionand--pe-versionoptions to thepdk validateandpdk test unitcommands (it's a lot of changed lines for such a simple change, but this PR lays a lot of the groundwork for the rest of the puppet & ruby version switching behaviour).GEM_PATHandGEM_HOMEhave been extracted fromPDK::CLI::Execinto a separate class, allowing them to be reused when scanning for available Puppet versions (and eventual ruby version switching).GEM_HOMEandGEM_PATHfor puppet gemspec files and parsing their contents.I would recommend not being too worried about the internals of
PDK::Util::PuppetVersionandPDK::Util::RubyVersionat this stage, as they will change as this feature evolves in further PRs.