Skip to content

Commit 797d748

Browse files
committed
Merge pull request #150 from pantheon-systems/version
Increment Version to 0.5.0
2 parents 0cd8b38 + 54d22b4 commit 797d748

File tree

5 files changed

+30
-9
lines changed

5 files changed

+30
-9
lines changed

CONTRIBUTING.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,32 @@ Or to test a single feature:
6868

6969
More info can be found from `php behat.phar --help`.
7070

71+
Versioning ...
72+
--------------
73+
74+
### Versions
75+
76+
In keeping with the standards of semantic versioning, backward-incompatible fixes will be targeted to "Major" versions. "Minor" versions will be reserved for significant feature/bug releases needed between major versions. "Patch" releases will be reserved only for critical security issues and other bugs critical to stabilizing the release.
77+
78+
After a new major version is released, previous major versions will be actively supported for 1 year.
79+
80+
What qualifies as a backward incompatible change?
81+
82+
Our initial commitment will be to command compatibility and parameter compatibility. However, since on the command line STDOUT and STDERR are essentially APIs we will make a best effort to keep machine-readable output compatibility, meaning if your code interfaces with Terminus via --json or --bash formats we will try our best to ensure these are stable and compatible between minor release. However, changes to the STDOUT, like success and fail messages, will not be consider incompatible.
83+
84+
### Version branches
85+
86+
If you are using terminus in a production environment you should be deploying the executable for the latest release. ( github.com/pantheon-systems/cli/releases )
87+
88+
Ongoing development on the next planned release will be on the master branch and should not be considered stable as changes will be taking place on a daily basis.
89+
90+
We will maintain a separate branch for all minor point releases going forward, i.e. 1.0.x, 0.5.x. Any critical patches should be submitted against those branches. If the fix is applicable to master a separate pull request can be made.
91+
92+
### What this means for users ?
93+
94+
0.5.0 will include only changes that are backward incompatible. After it's released we will create a 0.5.x branch that will be used for any critical bugs or patches that need to be addressed. All other bugs/features/issues will be addressed in the next major point release 1.0.0. The master branch will effectively become the 1.0.x branch. There is currently no plan for a version 0.6.x.
95+
96+
7197
Finally...
7298
----------
7399

php/commands/cli.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ private function command_to_array( $command ) {
3131
* Print Terminus version.
3232
*/
3333
function version() {
34-
Terminus::line( 'Terminus ' . TERMINUS_VERSION );
34+
Terminus::line('Terminus version: ' . TERMINUS_VERSION . "\nTerminus script: ".TERMINUS_SCRIPT);
3535
}
3636

3737
/**

php/commands/site.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,6 @@ public function connection_mode($args, $assoc_args) {
223223
Terminus::success("Successfully changed connection mode to $mode");
224224
break;
225225
}
226-
if(!empty($data)) {
227-
$this->handleDisplay($data, array(), $headers);
228-
}
229226
return $data;
230227
}
231228

php/terminus.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
// Can be used by plugins/themes to check if Terminus is running or not
33
define( 'Terminus', true );
4-
define( 'TERMINUS_VERSION', '0.4-beta');
4+
define( 'TERMINUS_VERSION', '0.5.0');
55
$source = 'unknown';
66
if ('cli' === PHP_SAPI && isset($argv)) {
77
$source = explode('/',$argv[0]);

scripts/build_fixtures.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,20 @@
88
php php/boot-fs.php products all || echo "ERROR LINE" $LINENO
99
php php/boot-fs.php sites create --name=behat-test --label=behattest --product='wordpress' --org='d59379eb-0c23-429c-a7bc-ff51e0a960c2' || echo "ERROR LINE" $LINENO
1010
php php/boot-fs.php site info --site=behat-test --nocache=1 || echo "ERROR LINE" $LINENO
11-
php php/boot-fs.php site backup create --site=behat-test --env=dev || echo "ERROR LINE" $LINENO
11+
php php/boot-fs.php site backup create --site=behat-test --env=dev --element=all || echo "ERROR LINE" $LINENO
1212
php php/boot-fs.php site environments --site=behat-test || echo "ERROR LINE" $LINENO
1313
php php/boot-fs.php site backup get --site=behat-test --env=dev --element=files --latest || echo "ERROR LINE" $LINENO
1414
php php/boot-fs.php site code log --site=behat-test --env=dev || echo "ERROR LINE" $LINENO
1515
php php/boot-fs.php site connection-mode --site=behat-test --env=dev || echo "ERROR LINE" $LINENO
1616
php php/boot-fs.php site connection-mode --site=behat-test --env=dev --set=git || echo "ERROR LINE" $LINENO
17-
php php/boot-fs.php site connection-mode --site=behat-test --env=dev | grep "git" || echo "ERROR LINE" $LINENO
17+
php php/boot-fs.php site connection-mode --site=behat-test --env=dev | grep -i "git" || echo "ERROR LINE" $LINENO
1818
php php/boot-fs.php site connection-mode --site=behat-test --env=dev --set=sftp || echo "ERROR LINE" $LINENO
1919
php php/boot-fs.php site mount --site=behat-test --destination=/home/vagrant/mount --env=dev
2020
echo "//testing" >> /home/vagrant/mount/code/index.php || echo "ERROR LINE" $LINENO
2121
php php/boot-fs.php site code commit --site=behat-test --env=dev --message='Testing onserver code' --yes
2222
php php/boot-fs.php site connection-mode --site=behat-test --env=dev --set=git || echo "ERROR LINE" $LINENO
2323
php php/boot-fs.php site service-level --site=behat-test || echo "ERROR LINE" $LINENO
2424
php php/boot-fs.php site service-level --site=behat-test --set=pro || echo "ERROR LINE" $LINENO
25-
php php/boot-fs.php site redis clear --site=behat-test --env=dev || echo "ERROR LINE" $LINENO
26-
php php/boot-fs.php site new-relic --site=behat-test || echo "ERROR LINE" $LINENO
2725
php php/boot-fs.php site lock info --site=behat-test --env=dev || echo "ERROR LINE" $LINENO
2826
php php/boot-fs.php site lock add --site=behat-test --env=dev --username=test --password=test || echo "ERROR LINE" $LINENO
2927
php php/boot-fs.php site lock remove --site=behat-test --env=dev --username=test --password=test || echo "ERROR LINE" $LINENO

0 commit comments

Comments
 (0)