Added CombinedCmd and removed EnvCmd #628
Merged
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
I added CombinedCmd for ONBUILD instruction and possible future commands that will be added that will have a similar form. For readability I made it so that it uses a CmdLike object as an argument. Cmd could also be used with an extra argument but it would degrade readability. Removed ENV because it introduced an inconsistency with ADD and COPY. Made `Cmd` accept multiple arguments because this solves the ADD and ENV issue. This fix won't break the old api because a string with a space in the middle is still acceptable only less readable.
| * }}} | ||
| */ | ||
| case class Cmd(cmd: String, arg: String) extends CmdLike { | ||
| def makeContent = "%s %s\n" format (cmd, arg) | ||
| case class Cmd(cmd: String, args: String*) extends CmdLike { |
There was a problem hiding this comment.
I'm not 100% sure about this. Cmd(cmd: String, first: String, rest: String*) would represent the old interface more correctly. However with your suggestion zero-argument commands would be possible.
@jsuereth what about binary compatibility?
|
I'm merging this at this point as it's about time to release a small RC with some fixes. Would you mind making another pull request if we would break binary compatibility? thanks a lot for you help :) (and for the nice docs!) |
muuki88
added a commit
that referenced
this pull request
Jul 24, 2015
Added CombinedCmd and removed EnvCmd
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.
I added
CombinedCmdforONBUILDinstruction and possible future commands that will be added that will have a similar form. For readability I made it so that it uses aCmdLikeobject as an argument.Cmdcould also be used with an extra argument but it would degrade readability. RemovedEnvCmdbecause it introduced an inconsistency in the API withADDandCOPY. MadeCmdaccept multiple arguments because this solves theADDandENVinconsistency. This fix won't break the old API because a string with a space in the middle is still acceptable only less readable.