Merge pull request #79 from willemvb/master

Improve console output
spatie · Mar 9, 2016 · 0aaca21 · 0aaca21
2 parents ef6e3fc + aa996a2
commit 0aaca21
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/src/BackupDestination/Backup.php b/src/BackupDestination/Backup.php
@@ -67,6 +67,6 @@ public function size()
     public function delete()
     {
         $this->disk->delete($this->path);
-        consoleOutput()->info("Deleted backup {$this->path}");
+        consoleOutput()->info("Deleted backup {$this->path}.");
     }
 }
diff --git a/src/Commands/BackupCommand.php b/src/Commands/BackupCommand.php
@@ -21,7 +21,7 @@ class BackupCommand extends BaseCommand
 
     public function handle()
     {
-        consoleOutput()->comment('Starting backup.');
+        consoleOutput()->comment('Starting backup...');
 
         try {
             $this->guardAgainstInvalidOptions();
@@ -40,7 +40,7 @@ public function handle()
 
             consoleOutput()->comment('Backup completed!');
         } catch (Exception $exception) {
-            consoleOutput()->error("Backup failed because: {$exception->getMessage()}");
+            consoleOutput()->error("Backup failed because: {$exception->getMessage()}.");
 
             event(new BackupHasFailed($exception));
 

diff --git a/src/Commands/CleanupCommand.php b/src/Commands/CleanupCommand.php
@@ -21,7 +21,7 @@ class CleanupCommand extends BaseCommand
 
     public function handle()
     {
-        consoleOutput()->comment('Starting cleanup.');
+        consoleOutput()->comment('Starting cleanup...');
 
         try {
             $config = config('laravel-backup');

diff --git a/src/Tasks/Backup/BackupJob.php b/src/Tasks/Backup/BackupJob.php
@@ -100,7 +100,7 @@ public function run()
 
             $this->temporaryDirectory->delete();
         } catch (Exception $exception) {
-            consoleOutput()->error("Backup failed because {$exception->getMessage()}");
+            consoleOutput()->error("Backup failed because {$exception->getMessage()}.");
 
             event(new BackupHasFailed($exception));
         }
@@ -149,8 +149,6 @@ protected function addDatabaseDumpsToZip(Zip $zip)
             $temporaryFile = $this->temporaryDirectory->getPath($fileName);
             $dbDumper->dumpToFile($temporaryFile);
 
-            consoleOutput()->info("Dumped database {$dbDumper->getDbName()}");
-
             $zip->add($temporaryFile, $fileName);
         });
     }
@@ -175,11 +173,11 @@ protected function copyToBackupDestinations(Zip $zip)
 
                 $backupDestination->write($zip->getPath());
 
-                consoleOutput()->info("Successfully copied zip to {$backupDestination->getFilesystemType()}-filesystem");
+                consoleOutput()->info("Successfully copied .zip file to {$backupDestination->getFilesystemType()}-filesystem.");
 
                 event(new BackupWasSuccessful($backupDestination));
             } catch (Exception $exception) {
-                consoleOutput()->error("Copying zip-file failed because: {$exception->getMessage()}");
+                consoleOutput()->error("Copying .zip file failed because: {$exception->getMessage()}.");
 
                 event(new BackupHasFailed($exception));
             }

diff --git a/src/Tasks/Cleanup/CleanupJob.php b/src/Tasks/Cleanup/CleanupJob.php
@@ -36,15 +36,15 @@ public function run()
                     throw new Exception("Could not connect to {$backupDestination->getFilesystemType()} because: {$backupDestination->getConnectionError()}");
                 };
 
-                consoleOutput()->info("Cleaning backups of {$backupDestination->getBackupName()} on {$backupDestination->getFilesystemType()}-filesystem");
+                consoleOutput()->info("Cleaning backups of {$backupDestination->getBackupName()} on {$backupDestination->getFilesystemType()}-filesystem...");
 
                 $this->strategy->deleteOldBackups($backupDestination->getBackups());
                 event(new CleanupWasSuccessFul($backupDestination));
 
                 $usedStorage = Format::getHumanReadableSize($backupDestination->getUsedStorage());
-                consoleOutput()->info("Used storage after cleanup: {$usedStorage}");
+                consoleOutput()->info("Used storage after cleanup: {$usedStorage}.");
             } catch (Exception $exception) {
-                consoleOutput()->error("Cleanup failed because: {$exception->getMessage()}");
+                consoleOutput()->error("Cleanup failed because: {$exception->getMessage()}.");
 
                 event(new CleanupHasFailed($exception));
             }