Skip to content
This repository has been archived by the owner on Jul 14, 2021. It is now read-only.

chef --version should print the Delivery CLI version #853

Merged
merged 1 commit into from
May 20, 2016

Conversation

schisamo
Copy link
Contributor

@schisamo schisamo commented May 19, 2016

The change properly handles the two different version string formats a delivery --version command can return:

$ delivery --version
delivery master (454c3f37819ed508a49c971f38e42267ce8a47de)

$ delivery --version
delivery 0.0.15 (454c3f37819ed508a49c971f38e42267ce8a47de)

The updated ChefDK version output looks like:

$ chef --version
Chef Development Kit Version: 0.14.25
chef-client version: 12.10.24
delivery version: master (454c3f37819ed508a49c971f38e42267ce8a47de)
berks version: 4.3.3
kitchen version: 1.8.0

/cc @charlesjohnson @tyler-ball @ksubrama

The change properly handles the two different version string formats a
`delivery --version` command can return:

```
$ delivery --version
delivery master (454c3f37819ed508a49c971f38e42267ce8a47de)

$ delivery --version
delivery 0.0.15 (454c3f37819ed508a49c971f38e42267ce8a47de)
```

The updated ChefDK version output looks like:

```
$ chef --version
Chef Development Kit Version: 0.14.25
chef-client version: 12.10.24
delivery version: master (454c3f37819ed508a49c971f38e42267ce8a47de)
berks version: 4.3.3
kitchen version: 1.8.0
```
@tyler-ball
Copy link
Contributor

tyler-ball commented May 19, 2016

How do we get it to return 0.0.15 instead of master? Thats the output that I would like to see. Is that completely dependent on the behavior of Delivery CLI?

@schisamo
Copy link
Contributor Author

schisamo commented May 19, 2016

@tyler-ball We set an override like this:

diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 96fca8d..d0f76ce 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -17,3 +17,4 @@ override "util-macros", version: "1.19.0"
 override "xproto", version: "7.0.28"
 override "zlib", version: "1.2.8"
 override "libzmq", version: "4.0.5"
+override "delivery-cli", version: "0.0.15"

Delivery CLI gets its versioning from the DELIV_CLI_VERSION value at compile time:
/~https://github.com/chef/omnibus-software/blob/d4c40493369dfd7365bdd97328aa010fd8c77123/config/software/delivery-cli.rb#L38-L40
chef-boneyard/delivery-cli@bf2e4eb

@schisamo schisamo merged commit 8447d0a into master May 20, 2016
@schisamo schisamo deleted the schisamo/version-output branch May 20, 2016 18:08
@thommay thommay added Type: Enhancement Adds new functionality. and removed Enhancement labels Feb 1, 2017
@chef-boneyard chef-boneyard locked and limited conversation to collaborators Feb 14, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Type: Enhancement Adds new functionality.
Development

Successfully merging this pull request may close these issues.

5 participants