cleanup

laravolt · Jun 12, 2016 · c3c4a1e · c3c4a1e
1 parent 32703c7
commit c3c4a1e
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 2 deletions.
diff --git a/skeleton/README.md → skeleton/README.md.stub b/skeleton/README.md → skeleton/README.md.stub
diff --git a/skeleton/composer.json → skeleton/composer.json.stub b/skeleton/composer.json → skeleton/composer.json.stub
diff --git a/skeleton/config/config.php → skeleton/config/config.php.stub b/skeleton/config/config.php → skeleton/config/config.php.stub
diff --git a/skeleton/src/Facade.php → skeleton/src/Facade.php.stub b/skeleton/src/Facade.php → skeleton/src/Facade.php.stub
diff --git a/skeleton/src/ServiceProvider.php → skeleton/src/ServiceProvider.php.stub b/skeleton/src/ServiceProvider.php → skeleton/src/ServiceProvider.php.stub
diff --git a/src/PackerHelper.php b/src/PackerHelper.php
@@ -58,14 +58,18 @@ public function barSetup(ProgressBar $bar)
      * @param  mixed  $search  String or array to look for (the needles)
      * @param  mixed  $replace What to replace the needles for?
      * @param  string $newFile Where to save, defaults to $oldFile
+     * @param  boolean $deleteOldFile Whether to delete $oldFile or not
      * @return void
      */
-    public function replaceAndSave($oldFile, $search, $replace, $newFile = null)
+    public function replaceAndSave($oldFile, $search, $replace, $newFile = null, $deleteOldFile = false)
     {
         $newFile = ($newFile === null) ? $oldFile : $newFile ;
         $file = $this->files->get($oldFile);
         $replacing = str_replace($search, $replace, $file);
         $this->files->put($newFile, $replacing);
+
+        if($deleteOldFile)
+            $this->files->delete($oldFile);
     }
 
     /**

diff --git a/src/PackerNewCommand.php b/src/PackerNewCommand.php
@@ -95,7 +95,10 @@ public function handle()
         foreach (File::allFiles($fullPath) as $file) {
             $search = [':vendor_name', ':VendorName', ':package_name', ':PackageName'];
             $replace = [$vendor, $cVendor, $name, $cName];
-            $this->helper->replaceAndSave($file, $search, $replace);
+
+            $newfile = substr($file, 0, -5);
+
+            $this->helper->replaceAndSave($file, $search, $replace, $newfile, $deleteOldFile = true);
         }
 
         $bar->advance();