Merge pull request #81 from lukecav/master

Include support for TB and GB size formats

Author: schlessera

features/db-size.feature

@@ -49,3 +49,15 @@ Feature: Display database size
 
     When I run `wp db size --size_format=mb`
     Then STDOUT should be a number
+    
+  Scenario: Display only database size in gigabytes for a WordPress install
+    Given a WP install
+
+    When I run `wp db size --size_format=gb`
+    Then STDOUT should be a number
+    
+  Scenario: Display only database size in terabytes for a WordPress install
+    Given a WP install
+
+    When I run `wp db size --size_format=tb`
+    Then STDOUT should be a number

src/DB_Command.php

@@ -590,6 +590,8 @@ public function tables( $args, $assoc_args ) {
 	 *  - b (bytes)
 	 *  - kb (kilobytes)
 	 *  - mb (megabytes)
+	 *  - gb (gigabytes)
+	 *  - tb (terabytes)
 	 *  ---
 	 *
 	 * [--tables]
@@ -722,9 +724,23 @@ public function size( $args, $assoc_args ) {
 					if ( ! defined( 'MB_IN_BYTES' ) ) {
 						define( 'MB_IN_BYTES', 1024 * KB_IN_BYTES );
 					}
+				        if ( ! defined( 'GB_IN_BYTES' ) ) {
+						define( 'GB_IN_BYTES', 1024 * MB_IN_BYTES );
+					}
+				        if ( ! defined( 'TB_IN_BYTES' ) ) {
+						define( 'TB_IN_BYTES', 1024 * GB_IN_BYTES );
+					}
 
 					// Display the database size as a number.
 					switch( $size_format ) {
+						case 'tb':
+						         $divisor = TB_IN_BYTES;
+							 break;
+							
+						case 'gb':
+						         $divisor = GB_IN_BYTES;
+							 break;
+							
 						case 'mb':
 							$divisor = MB_IN_BYTES;
 							break;