-
-
Notifications
You must be signed in to change notification settings - Fork 49
Refactor compose file flag into shared OptionGroup for up, down, and build.
#98
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
Merged
Merged
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
a89ea72
Extract compose file flag into shared option group
Copilot 5608ece
Make compose file option group field public
Copilot a2111b4
Address validation review nits for compose option group
Copilot 8cabcda
Use resolved compose path in network log message
Copilot 36afd13
move build command to option group
Mcrich23 2df826e
compile fixes and validation
Mcrich23 5d4b3b8
testing fixes
Mcrich23 e4fc45a
Merge branch 'main' into copilot/fix-compose-file-option
Mcrich23 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
22 changes: 22 additions & 0 deletions
22
Sources/Container-Compose/Commands/ComposeFileOptions.swift
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| //===----------------------------------------------------------------------===// | ||
| // Copyright © 2025 Morris Richman and the Container-Compose project authors. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // https://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| import ArgumentParser | ||
|
|
||
| public struct ComposeFileOptions: ParsableArguments, Sendable { | ||
| @Option(name: [.customShort("f"), .customLong("file")], help: "The path to your Docker Compose file") | ||
| public var composeFilename: String? | ||
| } |
This file contains hidden or 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
33 changes: 33 additions & 0 deletions
33
Tests/Container-Compose-StaticTests/ComposeCommandParsingTests.swift
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| //===----------------------------------------------------------------------===// | ||
| // Copyright © 2025 Morris Richman and the Container-Compose project authors. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // https://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| import Testing | ||
| @testable import ContainerComposeCore | ||
|
|
||
| @Suite("Compose command parsing") | ||
| struct ComposeCommandParsingTests { | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These tests are kinda useless. However, check if calling "-f", "up" on the main entry point command is valid. |
||
| @Test("ComposeUp command accepts -f flag for compose file") | ||
| func composeUpCommandAcceptsFileFlag() throws { | ||
| let cmd = try ComposeUp.parse(["-f", "my-compose.yaml"]) | ||
| #expect(cmd.composeFileOptions.composeFilename == "my-compose.yaml") | ||
| } | ||
|
|
||
| @Test("ComposeDown command accepts -f flag for compose file") | ||
| func composeDownCommandAcceptsFileFlag() throws { | ||
| let cmd = try ComposeDown.parse(["-f", "my-compose.yaml"]) | ||
| #expect(cmd.composeFileOptions.composeFilename == "my-compose.yaml") | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Double check the change on this variable name