Merge branch 'release/v0.1.2'

composer.json

@@ -19,12 +19,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Dixie\\LaravelModelFuture\\": "src/"
+            "Dixie\\EloquentModelFuture\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Dixie\\LaravelModelFuture\\Tests\\": "tests/"
+            "Dixie\\EloquentModelFuture\\Tests\\": "tests/"
         }
     },
     "minimum-stability": "stable"

src/Collections/FutureCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dixie\LaravelModelFuture\Collections;
+namespace Dixie\EloquentModelFuture\Collections;
 
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 
@@ -21,7 +21,7 @@ public function original()
     /**
      * Gets the model back with all the future data filled.
      *
-     * @return Dixie\LaravelModelFuture\Contracts\ModelFuture
+     * @return Dixie\EloquentModelFuture\Contracts\ModelFuture
      */
     public function result()
     {

src/Commands/CommitToFutureCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Dixie\LaravelModelFuture\Commands;
+namespace Dixie\EloquentModelFuture\Commands;
 
 use Illuminate\Console\Command;
-use Dixie\LaravelModelFuture\Models\Future;
+use Dixie\EloquentModelFuture\Models\Future;
 use Carbon\Carbon;
 
 class CommitToFutureCommand extends Command
@@ -46,12 +46,41 @@ public function handle()
             ->uncommitted()
             ->get();
 
+
+        if($futures->isEmpty()) {
+            $this->outputMessage('No future plans for today.');
+            return;
+        }
+
         $futures->each(function(Future $future) use ($today) {
             $modelWithFuture = $future->futureable;
 
             $modelWithFuture->future()
                 ->see($today)
                 ->commit();
         });
+
+        $this->outputMessage("{$futures->count()} futures updated.");
+    }
+
+
+    /**
+     * Write a line to the commandline
+     *
+     * @return void
+     */
+    private function outputMessage($message)
+    {
+        $laravel = $this->laravel ?: false;
+
+        if( ! $laravel) {
+            return;
+        }
+
+        if( ! $laravel->runningInConsole()) {
+            return;
+        }
+
+        $this->info($message);
     }
 }

src/Contracts/ModelFuture.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dixie\LaravelModelFuture\Contracts;
+namespace Dixie\EloquentModelFuture\Contracts;
 
 interface ModelFuture
 {

src/FuturePlanner.php

@@ -1,25 +1,25 @@
 <?php
 
-namespace Dixie\LaravelModelFuture;
+namespace Dixie\EloquentModelFuture;
 
 use Illuminate\Database\Eloquent\Model;
-use Dixie\LaravelModelFuture\Models\Future;
-use Dixie\LaravelModelFuture\Contracts\ModelFuture;
+use Dixie\EloquentModelFuture\Models\Future;
+use Dixie\EloquentModelFuture\Contracts\ModelFuture;
 use Carbon\Carbon;
 
 class FuturePlanner
 {
     /**
      * The model under action.
      *
-     * @var Dixie\LaravelModelFuture\Contracts\ModelFuture
+     * @var Dixie\EloquentModelFuture\Contracts\ModelFuture
      */
     protected $model;
 
     /**
      * A new future instance that is about to get planned.
      *
-     * @var Dixie\LaravelModelFuture\Models\Future
+     * @var Dixie\EloquentModelFuture\Models\Future
      */
     protected $newFuture;
 
@@ -47,7 +47,7 @@ public function __construct(ModelFuture $model)
      *
      * @param array $attributes
      *
-     * @return Dixie\LaravelModelFuture\FuturePlanner
+     * @return Dixie\EloquentModelFuture\FuturePlanner
      */
     public function plan(array $attributes)
     {
@@ -61,7 +61,7 @@ public function plan(array $attributes)
      *
      * @param Carbon $futureDate
      *
-     * @return Dixie\LaravelModelFuture\Models\Future
+     * @return Dixie\EloquentModelFuture\Models\Future
      */
     public function for(Carbon $futureDate)
     {
@@ -82,7 +82,7 @@ public function for(Carbon $futureDate)
      *
      * @param Carbon $futureDate
      *
-     * @return Dixie\LaravelModelFuture\Contracts\ModelFuture
+     * @return Dixie\EloquentModelFuture\Contracts\ModelFuture
      */
     public function see(Carbon $futureDate)
     {
@@ -92,7 +92,7 @@ public function see(Carbon $futureDate)
     /**
      * Get all future plans for a model.
      *
-     * @return Dixie\LaravelModelFuture\Collections\FutureCollection
+     * @return Dixie\EloquentModelFuture\Collections\FutureCollection
      */
     public function getPlans()
     {
@@ -104,7 +104,7 @@ public function getPlans()
      *
      * @param Carbon $futureDate
      *
-     * @return Dixie\LaravelModelFuture\Collections\FutureCollection
+     * @return Dixie\EloquentModelFuture\Collections\FutureCollection
      */
     public function getPlansFor(Carbon $futureDate)
     {
@@ -116,7 +116,7 @@ public function getPlansFor(Carbon $futureDate)
      *
      * @param Carbon $futureDate
      *
-     * @return Dixie\LaravelModelFuture\Collections\FutureCollection
+     * @return Dixie\EloquentModelFuture\Collections\FutureCollection
      */
     public function getPlansUntil(Carbon $futureDate)
     {

src/Models/Future.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Dixie\LaravelModelFuture\Models;
+namespace Dixie\EloquentModelFuture\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use Dixie\LaravelModelFuture\Collections\FutureCollection;
+use Dixie\EloquentModelFuture\Collections\FutureCollection;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Builder;
 use Carbon\Carbon;
@@ -46,7 +46,7 @@ class Future extends Model
     /**
      * Override the original Eloquent collection.
      *
-     * @param Dixie\LaravelModelFuture\Collections\FutureCollection
+     * @param Dixie\EloquentModelFuture\Collections\FutureCollection
      */
     public function newCollection(array $models = [])
     {

src/ServiceProvider.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Dixie\LaravelModelFuture;
+namespace Dixie\EloquentModelFuture;
 
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
-use Dixie\LaravelModelFuture\Commands\CommitToFutureCommand;
+use Dixie\EloquentModelFuture\Commands\CommitToFutureCommand;
 
 
 class ServiceProvider extends BaseServiceProvider
@@ -18,7 +18,9 @@ public function boot()
     {
         $this->loadMigrationsFrom(__DIR__.'/../migrations');
 
-        $this->commands(CommitToFutureCommand::class);
+        if($this-app->runningInConsole()) {
+            $this->commands(CommitToFutureCommand::class);
+        }
     }
 
     /**

src/Traits/HasFuture.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Dixie\LaravelModelFuture\Traits;
+namespace Dixie\EloquentModelFuture\Traits;
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
-use Dixie\LaravelModelFuture\Models\Future;
-use Dixie\LaravelModelFuture\FuturePlanner;
+use Dixie\EloquentModelFuture\Models\Future;
+use Dixie\EloquentModelFuture\FuturePlanner;
 
 trait HasFuture
 {
@@ -35,7 +35,7 @@ public function uncommittedFutures()
     /**
      * Start planning the future of a model
      *
-     * @return Dixie\LaravelModelFuture\FuturePlanner
+     * @return Dixie\EloquentModelFuture\FuturePlanner
      */
     public function future()
     {

tests/Collections/FutureCollectionTest.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Dixie\LaravelModelFuture\Tests\Collections;
+namespace Dixie\EloquentModelFuture\Tests\Collections;
 
-use Dixie\LaravelModelFuture\Tests\TestCase;
+use Dixie\EloquentModelFuture\Tests\TestCase;
 use Carbon\Carbon;
-use Dixie\LaravelModelFuture\Collections\FutureCollection;
-use Dixie\LaravelModelFuture\Tests\User;
+use Dixie\EloquentModelFuture\Collections\FutureCollection;
+use Dixie\EloquentModelFuture\Tests\User;
 
 class FutureCollectionTest extends TestCase
 {

tests/Commands/CommitToFutureCommandTest.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Dixie\LaravelModelFuture\Tests\Commands;
+namespace Dixie\EloquentModelFuture\Tests\Commands;
 
-use Dixie\LaravelModelFuture\Tests\TestCase;
-use Dixie\LaravelModelFuture\Commands\CommitToFutureCommand;
+use Dixie\EloquentModelFuture\Tests\TestCase;
+use Dixie\EloquentModelFuture\Commands\CommitToFutureCommand;
 use Carbon\Carbon;
-use Dixie\LaravelModelFuture\Models\Future;
+use Dixie\EloquentModelFuture\Models\Future;
 
 class CommitToFutureCommandTest extends TestCase
 {

tests/FuturePlannerTest.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace Dixie\LaravelModelFuture\Tests;
+namespace Dixie\EloquentModelFuture\Tests;
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model as Eloquent;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
-use Dixie\LaravelModelFuture\Contracts\ModelFuture;
-use Dixie\LaravelModelFuture\Models\Future;
-use Dixie\LaravelModelFuture\Tests\TestCase;
-use Dixie\LaravelModelFuture\FuturePlan;
-use Dixie\LaravelModelFuture\Tests\User; use Dixie\LaravelModelFuture\Collections\FutureCollection; 
+use Dixie\EloquentModelFuture\Contracts\ModelFuture;
+use Dixie\EloquentModelFuture\Models\Future;
+use Dixie\EloquentModelFuture\Tests\TestCase;
+use Dixie\EloquentModelFuture\FuturePlan;
+use Dixie\EloquentModelFuture\Tests\User; use Dixie\EloquentModelFuture\Collections\FutureCollection; 
 use Illuminate\Support\Facades\Auth;
 
 class FuturePlannerTest extends TestCase
@@ -231,9 +231,9 @@ public function testItCanSeeWhatTheModelLooksLikeInTheFuture()
     }
 }
 
-namespace Dixie\LaravelModelFuture;
+namespace Dixie\EloquentModelFuture;
 
-use Dixie\LaravelModelFuture\Tests\User;
+use Dixie\EloquentModelFuture\Tests\User;
 
 function auth()
 {

tests/Models/FutureTest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Dixie\LaravelModelFuture\Tests\Models;
+namespace Dixie\EloquentModelFuture\Tests\Models;
 
-use Dixie\LaravelModelFuture\Tests\TestCase;
+use Dixie\EloquentModelFuture\Tests\TestCase;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
-use Dixie\LaravelModelFuture\Collections\FutureCollection;
-use Dixie\LaravelModelFuture\Models\Future;
+use Dixie\EloquentModelFuture\Collections\FutureCollection;
+use Dixie\EloquentModelFuture\Models\Future;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class FutureTest extends TestCase
@@ -91,9 +91,9 @@ public function testItHasACommittedScope()
     }
 }
 
-namespace Dixie\LaravelModelFuture\Models;
+namespace Dixie\EloquentModelFuture\Models;
 
-use Dixie\LaravelModelFuture\Tests\User;
+use Dixie\EloquentModelFuture\Tests\User;
 
 function config($args)
 {

tests/TestCase.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Dixie\LaravelModelFuture\Tests;
+namespace Dixie\EloquentModelFuture\Tests;
 
 use Illuminate\Database\Capsule\Manager as DB;
 use Illuminate\Database\Eloquent\Model as Eloquent;
 use PHPUnit_Framework_TestCase;
-use Dixie\LaravelModelFuture\Contracts\ModelFuture;
+use Dixie\EloquentModelFuture\Contracts\ModelFuture;
 use Carbon\Carbon;
 use Mockery;
 use Illuminate\Support\Facades\Config;
@@ -95,6 +95,6 @@ protected function createUser(array $data = [], $shouldOverride = false)
 
 class User extends Eloquent implements ModelFuture
 {
-    use \Dixie\LaravelModelFuture\Traits\HasFuture;
+    use \Dixie\EloquentModelFuture\Traits\HasFuture;
 }
 

tests/Traits/HasFutureTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Dixie\LaravelModelFuture\Tests\Traits;
+namespace Dixie\EloquentModelFuture\Tests\Traits;
 
-use Dixie\LaravelModelFuture\Tests\TestCase;
+use Dixie\EloquentModelFuture\Tests\TestCase;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
-use Dixie\LaravelModelFuture\FuturePlanner;
+use Dixie\EloquentModelFuture\FuturePlanner;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Relations\HasMany;