Make directory for nested paths

jasonmccreary · jasonmccreary · commit 888c49317fd5 · 2020-03-25T20:50:52.000-04:00
diff --git a/src/Commands/EraseCommand.php b/src/Commands/EraseCommand.php
@@ -69,10 +69,7 @@ public function handle()
         unset($generated['created']);
         unset($generated['updated']);
 
-        $this->files->put(
-            '.blueprint',
-            $blueprint->dump($generated)
-        );
+        $this->files->put('.blueprint', $blueprint->dump($generated));
     }
 
     /**
diff --git a/src/Commands/TraceCommand.php b/src/Commands/TraceCommand.php
@@ -70,10 +70,7 @@ public function handle()
 
         $cache['models'] = $definitions;
 
-        $this->files->put(
-            '.blueprint',
-            $blueprint->dump($cache)
-        );
+        $this->files->put('.blueprint', $blueprint->dump($cache));
 
         $this->info('Traced ' . count($definitions) . ' ' . Str::plural('model', count($definitions)));
     }
diff --git a/src/Generators/ControllerGenerator.php b/src/Generators/ControllerGenerator.php
@@ -39,11 +39,14 @@ public function output(array $tree): array
         /** @var \Blueprint\Models\Controller $controller */
         foreach ($tree['controllers'] as $controller) {
             $this->addImport($controller, 'Illuminate\\Http\\Request');
+
             $path = $this->getPath($controller);
-            $this->files->put(
-                $path,
-                $this->populateStub($stub, $controller)
-            );
+
+            if (!$this->files->exists(dirname($path))) {
+                $this->files->makeDirectory(dirname($path), 0755, true);
+            }
+
+            $this->files->put($path, $this->populateStub($stub, $controller));
 
             $output['created'][] = $path;
         }
diff --git a/src/Generators/ModelGenerator.php b/src/Generators/ModelGenerator.php
@@ -27,6 +27,11 @@ public function output(array $tree): array
         /** @var \Blueprint\Models\Model $model */
         foreach ($tree['models'] as $model) {
             $path = $this->getPath($model);
+
+            if (!$this->files->exists(dirname($path))) {
+                $this->files->makeDirectory(dirname($path), 0755, true);
+            }
+
             $this->files->put($path, $this->populateStub($stub, $model));
 
             $output['created'][] = $path;
diff --git a/src/Generators/Statements/EventGenerator.php b/src/Generators/Statements/EventGenerator.php
@@ -45,15 +45,13 @@ public function output(array $tree): array
                         $this->files->makeDirectory(dirname($path), 0755, true);
                     }
 
-                    $this->files->put(
-                        $path,
-                        $this->populateStub($stub, $statement)
-                    );
+                    $this->files->put($path, $this->populateStub($stub, $statement));
 
                     $output['created'][] = $path;
                 }
             }
         }
+
         return $output;
     }
 
diff --git a/src/Generators/Statements/FormRequestGenerator.php b/src/Generators/Statements/FormRequestGenerator.php
@@ -52,10 +52,7 @@ public function output(array $tree): array
                         $this->files->makeDirectory(dirname($path), 0755, true);
                     }
 
-                    $this->files->put(
-                        $path,
-                        $this->populateStub($stub, $name, $context, $statement, $controller)
-                    );
+                    $this->files->put($path, $this->populateStub($stub, $name, $context, $statement, $controller));
 
                     $output['created'][] = $path;
                 }
diff --git a/src/Generators/Statements/JobGenerator.php b/src/Generators/Statements/JobGenerator.php
@@ -41,15 +41,13 @@ public function output(array $tree): array
                         $this->files->makeDirectory(dirname($path), 0755, true);
                     }
 
-                    $this->files->put(
-                        $path,
-                        $this->populateStub($stub, $statement)
-                    );
+                    $this->files->put($path, $this->populateStub($stub, $statement));
 
                     $output['created'][] = $path;
                 }
             }
         }
+
         return $output;
     }
 
diff --git a/src/Generators/Statements/MailGenerator.php b/src/Generators/Statements/MailGenerator.php
@@ -41,15 +41,13 @@ public function output(array $tree): array
                         $this->files->makeDirectory(dirname($path), 0755, true);
                     }
 
-                    $this->files->put(
-                        $path,
-                        $this->populateStub($stub, $statement)
-                    );
+                    $this->files->put($path, $this->populateStub($stub, $statement));
 
                     $output['created'][] = $path;
                 }
             }
         }
+
         return $output;
     }
 
diff --git a/src/Generators/Statements/ViewGenerator.php b/src/Generators/Statements/ViewGenerator.php
@@ -42,15 +42,13 @@ public function output(array $tree): array
                         $this->files->makeDirectory(dirname($path), 0755, true);
                     }
 
-                    $this->files->put(
-                        $path,
-                        $this->populateStub($stub, $statement)
-                    );
+                    $this->files->put($path, $this->populateStub($stub, $statement));
 
                     $output['created'][] = $path;
                 }
             }
         }
+
         return $output;
     }
 
diff --git a/src/Generators/TestGenerator.php b/src/Generators/TestGenerator.php
@@ -54,10 +54,7 @@ public function output(array $tree): array
                 $this->files->makeDirectory(dirname($path), 0755, true);
             }
 
-            $this->files->put(
-                $path,
-                $this->populateStub($stub, $controller)
-            );
+            $this->files->put($path, $this->populateStub($stub, $controller));
 
             $output['created'][] = $path;
         }
diff --git a/tests/Feature/Generator/ControllerGeneratorTest.php b/tests/Feature/Generator/ControllerGeneratorTest.php
@@ -54,11 +54,13 @@ public function output_writes_migration_for_controller_tree($definition, $path,
         $this->files->expects('stub')
             ->with('controller/class.stub')
             ->andReturn(file_get_contents('stubs/controller/class.stub'));
-
         $this->files->expects('stub')
             ->with('controller/method.stub')
             ->andReturn(file_get_contents('stubs/controller/method.stub'));
 
+        $this->files->expects('exists')
+            ->with(dirname($path))
+            ->andReturnTrue();
         $this->files->expects('put')
             ->with($path, $this->fixture($controller));
 
@@ -80,11 +82,15 @@ public function output_respects_configuration()
         $this->files->expects('stub')
             ->with('controller/class.stub')
             ->andReturn(file_get_contents('stubs/controller/class.stub'));
-
         $this->files->expects('stub')
             ->with('controller/method.stub')
             ->andReturn(file_get_contents('stubs/controller/method.stub'));
 
+        $this->files->expects('exists')
+            ->with('src/path/Other/Http')
+            ->andReturnFalse();
+        $this->files->expects('makeDirectory')
+            ->with('src/path/Other/Http', 0755, true);
         $this->files->expects('put')
             ->with('src/path/Other/Http/UserController.php', $this->fixture('controllers/controller-configured.php'));
 
diff --git a/tests/Feature/Generator/ModelGeneratorTest.php b/tests/Feature/Generator/ModelGeneratorTest.php
@@ -69,6 +69,9 @@ public function output_generates_models($definition, $path, $model)
             ->with('model/method.stub')
             ->andReturn(file_get_contents('stubs/model/method.stub'));
 
+        $this->files->expects('exists')
+            ->with(dirname($path))
+            ->andReturnTrue();
         $this->files->expects('put')
             ->with($path, $this->fixture($model));
 
@@ -86,19 +89,19 @@ public function output_generates_relationships()
         $this->files->expects('stub')
             ->with('model/class.stub')
             ->andReturn(file_get_contents('stubs/model/class.stub'));
-
         $this->files->expects('stub')
             ->with('model/fillable.stub')
             ->andReturn(file_get_contents('stubs/model/fillable.stub'));
-
         $this->files->expects('stub')
             ->with('model/casts.stub')
             ->andReturn(file_get_contents('stubs/model/casts.stub'));
-
         $this->files->expects('stub')
             ->with('model/method.stub')
             ->andReturn(file_get_contents('stubs/model/method.stub'));
 
+        $this->files->expects('exists')
+            ->with('app')
+            ->andReturnTrue();
         $this->files->expects('put')
             ->with('app/Subscription.php', $this->fixture('models/model-relationships.php'));
 
@@ -133,6 +136,11 @@ public function output_respects_configuration()
             ->with('model/method.stub')
             ->andReturn(file_get_contents('stubs/model/method.stub'));
 
+        $this->files->expects('exists')
+            ->with('src/path/Models')
+            ->andReturnFalse();
+        $this->files->expects('makeDirectory')
+            ->with('src/path/Models', 0755, true);
         $this->files->expects('put')
             ->with('src/path/Models/Comment.php', $this->fixture('models/model-configured.php'));
 
@@ -172,6 +180,9 @@ public function output_generates_phpdoc_for_model($definition, $path, $model)
             ->with('model/method.stub')
             ->andReturn(file_get_contents('stubs/model/method.stub'));
 
+        $this->files->expects('exists')
+            ->with(dirname($path))
+            ->andReturnTrue();
         $this->files->expects('put')
             ->with($path, $this->fixture($model));
 

Original file line number	Diff line number	Diff line change
`@@ -70,10 +70,7 @@ public function handle()`
`70`	`70`
`71`	`71`	`$cache['models'] = $definitions;`
`72`	`72`
`73`		`- $this->files->put(`
`74`		`- '.blueprint',`
`75`		`- $blueprint->dump($cache)`
`76`		`- );`
	`73`	`+ $this->files->put('.blueprint', $blueprint->dump($cache));`
`77`	`74`
`78`	`75`	`$this->info('Traced ' . count($definitions) . ' ' . Str::plural('model', count($definitions)));`
`79`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,15 +45,13 @@ public function output(array $tree): array`
`45`	`45`	`$this->files->makeDirectory(dirname($path), 0755, true);`
`46`	`46`	`}`
`47`	`47`
`48`		`- $this->files->put(`
`49`		`- $path,`
`50`		`- $this->populateStub($stub, $statement)`
`51`		`- );`
	`48`	`+ $this->files->put($path, $this->populateStub($stub, $statement));`
`52`	`49`
`53`	`50`	`$output['created'][] = $path;`
`54`	`51`	`}`
`55`	`52`	`}`
`56`	`53`	`}`
	`54`	`+`
`57`	`55`	`return $output;`
`58`	`56`	`}`
`59`	`57`
Original file line number	Diff line number	Diff line change
`@@ -52,10 +52,7 @@ public function output(array $tree): array`
`52`	`52`	`$this->files->makeDirectory(dirname($path), 0755, true);`
`53`	`53`	`}`
`54`	`54`
`55`		`- $this->files->put(`
`56`		`- $path,`
`57`		`- $this->populateStub($stub, $name, $context, $statement, $controller)`
`58`		`- );`
	`55`	`+ $this->files->put($path, $this->populateStub($stub, $name, $context, $statement, $controller));`
`59`	`56`
`60`	`57`	`$output['created'][] = $path;`
`61`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,15 +41,13 @@ public function output(array $tree): array`
`41`	`41`	`$this->files->makeDirectory(dirname($path), 0755, true);`
`42`	`42`	`}`
`43`	`43`
`44`		`- $this->files->put(`
`45`		`- $path,`
`46`		`- $this->populateStub($stub, $statement)`
`47`		`- );`
	`44`	`+ $this->files->put($path, $this->populateStub($stub, $statement));`
`48`	`45`
`49`	`46`	`$output['created'][] = $path;`
`50`	`47`	`}`
`51`	`48`	`}`
`52`	`49`	`}`
	`50`	`+`
`53`	`51`	`return $output;`
`54`	`52`	`}`
`55`	`53`
Original file line number	Diff line number	Diff line change
`@@ -42,15 +42,13 @@ public function output(array $tree): array`
`42`	`42`	`$this->files->makeDirectory(dirname($path), 0755, true);`
`43`	`43`	`}`
`44`	`44`
`45`		`- $this->files->put(`
`46`		`- $path,`
`47`		`- $this->populateStub($stub, $statement)`
`48`		`- );`
	`45`	`+ $this->files->put($path, $this->populateStub($stub, $statement));`
`49`	`46`
`50`	`47`	`$output['created'][] = $path;`
`51`	`48`	`}`
`52`	`49`	`}`
`53`	`50`	`}`
	`51`	`+`
`54`	`52`	`return $output;`
`55`	`53`	`}`
`56`	`54`
Original file line number	Diff line number	Diff line change
`@@ -54,10 +54,7 @@ public function output(array $tree): array`
`54`	`54`	`$this->files->makeDirectory(dirname($path), 0755, true);`
`55`	`55`	`}`
`56`	`56`
`57`		`- $this->files->put(`
`58`		`- $path,`
`59`		`- $this->populateStub($stub, $controller)`
`60`		`- );`
	`57`	`+ $this->files->put($path, $this->populateStub($stub, $controller));`
`61`	`58`
`62`	`59`	`$output['created'][] = $path;`
`63`	`60`	`}`