Refactor master generator command

spec/Way/Generators/GeneratorSpec.php

@@ -23,13 +23,6 @@ function it_is_initializable()
         $this->shouldHaveType('Way\Generators\Generator');
     }
 
-    function it_creates_a_file_with_given_text($file)
-    {
-        $file->make('foo.txt', 'bar')->shouldBeCalled();
-
-        $this->generate('foo.txt', 'bar');
-    }
-
     function it_compiles_a_template(Filesystem $file, TemplateCompiler $compiler)
     {
         $template = 'class $NAME$ {}';

src/Way/Generators/Commands/GeneratorCommand.php

@@ -41,23 +41,22 @@ protected abstract function getFileGenerationPath();
      */
     public function fire()
     {
-        $templateData = $this->getTemplateData();
         $filePathToGenerate = $this->getFileGenerationPath();
 
         try
         {
-            // This section is what actually compiles the template, and generates the file
-            $this->generator->setTemplatePath($this->option('templatePath'));
-            $compiledTemplate = $this->generator->compile($templateData, new TemplateCompiler);
-            $this->generator->generate($filePathToGenerate, $compiledTemplate);
+            $this->generator->make(
+                $this->option('templatePath'),
+                $this->getTemplateData(),
+                $filePathToGenerate
+            );
 
-            // Alert user of file creation
             $this->info("Created: {$filePathToGenerate}");
         }
 
         catch (FileAlreadyExists $e)
         {
-            return $this->error("The file, {$filePathToGenerate}, already exists! I don't want to overwrite it.");
+            $this->error("The file, {$filePathToGenerate}, already exists! I don't want to overwrite it.");
         }
     }
 

src/Way/Generators/Commands/MigrationGeneratorCommand.php

@@ -70,7 +70,6 @@ public function fire()
         $this->call('dump-autoload');
     }
 
-
     /**
      * The path where the file will be created
      *

src/Way/Generators/Generator.php

@@ -1,7 +1,6 @@
 <?php namespace Way\Generators;
 
 use Way\Generators\Filesystem\Filesystem;
-use Way\Generators\Filesystem\FileAlreadyExists;
 use Way\Generators\Compilers\TemplateCompiler;
 use Way\Generators\UndefinedTemplate;
 
@@ -45,6 +44,28 @@ public function getTemplatePath()
         return $this->templatePath;
     }
 
+    /**
+     * Run the generator
+     *
+     * @param $templatePath
+     * @param $templateData
+     * @param $filePathToGenerate
+     */
+    public function make($templatePath, $templateData, $filePathToGenerate)
+    {
+        // We'll begin by setting the location
+        // of the template for this file generation
+        $this->setTemplatePath($templatePath);
+
+        // Next, we need to compile the template, according
+        // to the data that we provide it with.
+        $template = $this->compile($templateData, new TemplateCompiler);
+
+        // Now that we have the compiled template,
+        // we can actually generate the file
+        $this->file->make($filePathToGenerate, $template);
+    }
+
     /**
      * Compile the file
      *
@@ -62,16 +83,4 @@ public function compile(array $data, TemplateCompiler $compiler)
         return $compiler->compile($template, $data);
     }
 
-    /**
-     * Generate the file
-     *
-     * @param $file
-     * @param $content
-     * @throws FileAlreadyExists
-     */
-    public function generate($file, $content)
-    {
-        $this->file->make($file, $content);
-    }
-
 }

tests/features/generators.feature

@@ -9,6 +9,3 @@ Feature: Generators
       | command   | argument                  | generatedFilePath                                 |
       | model     | Order                     | app/models/Order.php                              |
       | seed      | orders                    | app/database/seeds/OrdersTableSeeder.php          |
-      | migration | create_orders_table       | app/database/migrations/CreateOrdersTable.php     |
-      | migration | delete_orders_table       | app/database/migrations/DeleteOrdersTable.php     |
-      | migration | add_title_to_orders_table | app/database/migrations/AddTitleToOrdersTable.php |