Merge branch 'master' into change/yes-rollback

CHANGELOG.md

@@ -1,7 +1,7 @@
 #Change Log
 All notable changes to this project starting with the 0.6.0 release will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org)
 
-## MASTER
+## [0.13.0] - 2016-09-15
 ### Added
 - New rocket art available using `art rocket`. (#1148)
 

README.md

@@ -37,7 +37,7 @@ composer require pantheon-systems/terminus
 
 Run this in this in your terminal client:
 ```bash
-curl https://github.com/pantheon-systems/terminus/releases/download/0.12.0/terminus.phar -L -o /usr/local/bin/terminus && chmod +x /usr/local/bin/terminus
+curl https://github.com/pantheon-systems/terminus/releases/download/0.13.0/terminus.phar -L -o /usr/local/bin/terminus && chmod +x /usr/local/bin/terminus
 ```
 
 ####Installing with [Homebrew](http://brew.sh/)(for Macs)

composer.json

@@ -7,6 +7,7 @@
   "bin": [
     "bin/terminus.bat", "bin/terminus"
   ],
+  "minimum-stability": "beta",
   "require": {
     "php": ">=5.5.9",
     "consolidation/robo": "dev-master",

config/constants.yml

@@ -7,7 +7,7 @@
 ---
 
 # App
-TERMINUS_VERSION:       '0.12.0'
+TERMINUS_VERSION:       '0.13.0'
 
 # Connectivity
 TERMINUS_HOST:          'terminus.pantheon.io'

docs/Helpers/InputHelper.md

@@ -223,6 +223,8 @@
 
 ##### Parameters:
     [array] $arg_options Elements as follow:
+    -array  args    Parameters from the command line
+    -string key     Key to look for in args
     -string message Message to give at prompt
     -mixed  default Returned if user does not select a valid option
 
@@ -242,6 +244,8 @@
 
 ##### Parameters:
     [array] $arg_options Elements as follow:
+    -array  args    Parameters from the command line
+    -string key     Key to look for in args
     -string message Message to give at prompt
     -mixed  default Returned if user does not select a valid option
 

docs/Models/Auth.md

@@ -6,10 +6,7 @@
 
 ##### Parameters:
     [object] $attributes Attributes of this model
-    [array]  $options    Options to set as $this->key
-
-##### Return:
-    [Auth]
+    [array]  $options    Options with which to configure this model
 
 ---
 

docs/Models/Backup.md

@@ -1,5 +1,15 @@
 # Terminus\Models\Backup
 
+### __construct
+##### Description:
+    Object constructor
+
+##### Parameters:
+    [object] $attributes Attributes of this model
+    [array]  $options    Options with which to configure this model
+
+---
+
 ### backupIsFinished
 ##### Description:
     Determines whether the backup has been completed or not

docs/Models/Environment.md

@@ -6,7 +6,7 @@
 
 ##### Parameters:
     [object] $attributes Attributes of this model
-    [array]  $options    Options to set as $this->key
+    [array]  $options    Options with which to configure this model
 
 ---
 
@@ -36,7 +36,7 @@
     Clones database from this environment to another
 
 ##### Parameters:
-    [string] $to_env Environment to clone into
+    [string] $from_env Name of the environment to clone
 
 ##### Return:
     [Workflow]
@@ -48,7 +48,7 @@
     Clones files from this environment to another
 
 ##### Parameters:
-    [string] $to_env Environment to clone into
+    [string] $from_env Name of the environment to clone
 
 ##### Return:
     [Workflow]
@@ -186,6 +186,18 @@
 
 ---
 
+### import
+##### Description:
+    Imports a site archive onto Pantheon
+
+##### Parameters:
+    [string] $url URL of the archive to import
+
+##### Return:
+    [Workflow]
+
+---
+
 ### importFiles
 ##### Description:
     Imports a file archive
@@ -247,7 +259,9 @@
     Enable HTTP Basic Access authentication on the web environment
 
 ##### Parameters:
-    [array] $options Parameters to override defaults
+    [array] $params Elements as follow:
+    -string username
+    -string password
 
 ##### Return:
     [Workflow]
@@ -280,10 +294,12 @@
 
 ### mergeToDev
 ##### Description:
-    Merge code from this Multidev Environment into the Dev Environment
+    Merge code from a multidev environment into the dev environment
 
 ##### Parameters:
     [array] $options Parameters to override defaults
+    -string  from_environment Name of the multidev environment to merge
+    -boolean updatedb         True to update DB with merge
 
 ##### Return:
     [Workflow]

docs/Models/Hostname.md

@@ -1,5 +1,15 @@
 # Terminus\Models\Hostname
 
+### __construct
+##### Description:
+    Object constructor
+
+##### Parameters:
+    [object] $attributes Attributes of this model
+    [array]  $options    Options with which to configure this model
+
+---
+
 ### delete
 ##### Description:
     Delete a hostname from an environment
@@ -9,3 +19,12 @@
 
 ---
 
+### serialize
+##### Description:
+    Formats Hostname object into an associative array for output
+
+##### Return:
+    [array] $data associative array of data for output
+
+---
+

docs/Models/MachineToken.md

@@ -1,5 +1,15 @@
 # Terminus\Models\MachineToken
 
+### __construct
+##### Description:
+    Object constructor
+
+##### Parameters:
+    [object] $attributes Attributes of this model
+    [array]  $options    Options with which to configure this model
+
+---
+
 ### delete
 ##### Description:
     Deletes machine token