Remove comment from destination file

Tekill · Tekill · commit 3af11946f381 · 2017-06-05T02:36:12.000+03:00
diff --git a/src/Console/Application.php b/src/Console/Application.php
@@ -13,10 +13,12 @@ class Application extends BaseApplication
      */
     public function __construct()
     {
-        parent::__construct('Env diff', '1.0.1');
+        parent::__construct('Env diff', '1.0.2');
 
         $this->setAutoExit(true);
         $this->add(new DiffCommand('diff'));
         $this->add(new ActualizeCommand('actualize'));
+
+        $this->setDefaultCommand('actualize');
     }
 }
diff --git a/src/Processor.php b/src/Processor.php
@@ -53,12 +53,9 @@ public function actualizeEnv(Config $config)
         }
 
         ksort($actualEnv);
-        file_put_contents(
-            $target,
-            '# This file is auto-generated during the composer install' . PHP_EOL . Env::dump($actualEnv)
-        );
+        file_put_contents($target, Env::dump($actualEnv));
 
-        $this->io->write(sprintf('<info>%s has been %s</info>', $target, $exists ? 'updated' : 'created'));
+        $this->io->write(sprintf('<info>"%s" has been %s</info>', $target, $exists ? 'updated' : 'created'));
 
         return false;
     }
@@ -94,7 +91,7 @@ public function showDifference(Config $config)
             return false;
         }
 
-        $this->io->write(sprintf('Diff between %s and %s files:', $target, $dist));
+        $this->io->write(sprintf('Diff between "%s" and "%s" files:', $target, $dist));
         $this->io->write('');
 
         foreach ($missingEnv as $env => $value) {
diff --git a/tests/fixtures/actualize/delete-old-variable/.env b/tests/fixtures/actualize/delete-old-variable/.env
@@ -1,3 +1,2 @@
-# This file is auto-generated during the composer install
 FOO='bar'
 SOME_VARIABLE='old'
diff --git a/tests/fixtures/actualize/delete-old-variable/.expected b/tests/fixtures/actualize/delete-old-variable/.expected
@@ -1,2 +1 @@
-# This file is auto-generated during the composer install
 FOO='bar'
diff --git a/tests/fixtures/actualize/subdirectory/.expected b/tests/fixtures/actualize/subdirectory/.expected
@@ -1,3 +1,2 @@
-# This file is auto-generated during the composer install
 APPEND='new line'
 FOO='bar'
diff --git a/tests/fixtures/actualize/valid/append-new-variable/.env b/tests/fixtures/actualize/valid/append-new-variable/.env
@@ -1,2 +1 @@
-# This file is auto-generated during the composer install
 FOO='bar'
diff --git a/tests/fixtures/actualize/valid/append-new-variable/.expected b/tests/fixtures/actualize/valid/append-new-variable/.expected
@@ -1,3 +1,2 @@
-# This file is auto-generated during the composer install
 APPEND='new line'
 FOO='bar'
diff --git a/tests/fixtures/actualize/valid/create-new-env-file/.expected b/tests/fixtures/actualize/valid/create-new-env-file/.expected
@@ -1,4 +1,3 @@
-# This file is auto-generated during the composer install
 BOOLEAN=true
 FOO='bar'
 NUMBER=123
diff --git a/tests/fixtures/actualize/valid/do-not-delete-old-variable/.env b/tests/fixtures/actualize/valid/do-not-delete-old-variable/.env
@@ -1,3 +1,2 @@
-# This file is auto-generated during the composer install
 FOO='bar'
 SOME_VARIABLE='old'
diff --git a/tests/fixtures/actualize/valid/do-not-delete-old-variable/.expected b/tests/fixtures/actualize/valid/do-not-delete-old-variable/.expected
@@ -1,3 +1,2 @@
-# This file is auto-generated during the composer install
 FOO='bar'
 SOME_VARIABLE='old'
diff --git a/tests/fixtures/actualize/valid/do-not-replace-old-variable/.env b/tests/fixtures/actualize/valid/do-not-replace-old-variable/.env
@@ -1,2 +1 @@
-# This file is auto-generated during the composer install
 FOO='old'
diff --git a/tests/fixtures/actualize/valid/do-not-replace-old-variable/.expected b/tests/fixtures/actualize/valid/do-not-replace-old-variable/.expected
@@ -1,2 +1 @@
-# This file is auto-generated during the composer install
 FOO='old'
diff --git a/tests/fixtures/actualize/valid/remove-comments/.env b/tests/fixtures/actualize/valid/remove-comments/.env
@@ -1,2 +1 @@
-# This file is auto-generated during the composer install
 FOO='bar'
diff --git a/tests/fixtures/actualize/valid/remove-comments/.expected b/tests/fixtures/actualize/valid/remove-comments/.expected
@@ -1,2 +1 @@
-# This file is auto-generated during the composer install
 FOO='bar'
diff --git a/tests/fixtures/actualize/valid/trim-spaces/.env b/tests/fixtures/actualize/valid/trim-spaces/.env
@@ -1,2 +1 @@
-# This file is auto-generated during the composer install
 FOO='bar'
diff --git a/tests/fixtures/actualize/valid/trim-spaces/.expected b/tests/fixtures/actualize/valid/trim-spaces/.expected
@@ -1,3 +1,2 @@
-# This file is auto-generated during the composer install
 APPEND='new line'
 FOO='bar'
diff --git a/tests/fixtures/difference/valid/changed-values/expected.log b/tests/fixtures/difference/valid/changed-values/expected.log
@@ -1,3 +1,3 @@
-Diff between .env and .env.dist files:
+Diff between ".env" and ".env.dist" files:
 
 <fg=cyan>@ APPEND='new' ('new line')</>
diff --git a/tests/fixtures/difference/valid/extra-values/expected.log b/tests/fixtures/difference/valid/extra-values/expected.log
@@ -1,3 +1,3 @@
-Diff between .env and .env.dist files:
+Diff between ".env" and ".env.dist" files:
 
 <fg=green>+ EXTRA=true</>
diff --git a/tests/fixtures/difference/valid/identical/.env b/tests/fixtures/difference/valid/identical/.env
@@ -1,3 +1,2 @@
-# This file is auto-generated during the composer install
 APPEND='new line'
 FOO='bar'
diff --git a/tests/fixtures/difference/valid/missed-values/expected.log b/tests/fixtures/difference/valid/missed-values/expected.log
@@ -1,3 +1,3 @@
-Diff between .env and .env.dist files:
+Diff between ".env" and ".env.dist" files:
 
 <fg=red>- APPEND='new line'</>
diff --git a/tests/fixtures/difference/valid/mixed/expected.log b/tests/fixtures/difference/valid/mixed/expected.log
@@ -1,4 +1,4 @@
-Diff between .env and .env.dist files:
+Diff between ".env" and ".env.dist" files:
 
 <fg=red>- MISSED=true</>
 <fg=green>+ EXTRA=true</>

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,12 @@ class Application extends BaseApplication`
`13`	`13`	`*/`
`14`	`14`	`public function __construct()`
`15`	`15`	`{`
`16`		`- parent::__construct('Env diff', '1.0.1');`
	`16`	`+ parent::__construct('Env diff', '1.0.2');`
`17`	`17`
`18`	`18`	`$this->setAutoExit(true);`
`19`	`19`	`$this->add(new DiffCommand('diff'));`
`20`	`20`	`$this->add(new ActualizeCommand('actualize'));`
	`21`	`+`
	`22`	`+ $this->setDefaultCommand('actualize');`
`21`	`23`	`}`
`22`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,12 +53,9 @@ public function actualizeEnv(Config $config)`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`ksort($actualEnv);`
`56`		`- file_put_contents(`
`57`		`- $target,`
`58`		`- '# This file is auto-generated during the composer install' . PHP_EOL . Env::dump($actualEnv)`
`59`		`- );`
	`56`	`+ file_put_contents($target, Env::dump($actualEnv));`
`60`	`57`
`61`		`- $this->io->write(sprintf('<info>%s has been %s</info>', $target, $exists ? 'updated' : 'created'));`
	`58`	`+ $this->io->write(sprintf('<info>"%s" has been %s</info>', $target, $exists ? 'updated' : 'created'));`
`62`	`59`
`63`	`60`	`return false;`
`64`	`61`	`}`
`@@ -94,7 +91,7 @@ public function showDifference(Config $config)`
`94`	`91`	`return false;`
`95`	`92`	`}`
`96`	`93`
`97`		`- $this->io->write(sprintf('Diff between %s and %s files:', $target, $dist));`
	`94`	`+ $this->io->write(sprintf('Diff between "%s" and "%s" files:', $target, $dist));`
`98`	`95`	`$this->io->write('');`
`99`	`96`
`100`	`97`	`foreach ($missingEnv as $env => $value) {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`		`-# This file is auto-generated during the composer install`
`2`	`1`	`FOO='bar'`
`3`	`2`	`SOME_VARIABLE='old'`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-# This file is auto-generated during the composer install`
`2`	`1`	`FOO='bar'`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`		`-# This file is auto-generated during the composer install`
`2`	`1`	`APPEND='new line'`
`3`	`2`	`FOO='bar'`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-# This file is auto-generated during the composer install`
`2`	`1`	`FOO='old'`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-Diff between .env and .env.dist files:`
	`1`	`+Diff between ".env" and ".env.dist" files:`
`2`	`2`
`3`	`3`	`<fg=cyan>@ APPEND='new' ('new line')</>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Diff between .env and .env.dist files:`
	`1`	`+Diff between ".env" and ".env.dist" files:`
`2`	`2`
`3`	`3`	`<fg=red>- MISSED=true</>`
`4`	`4`	`<fg=green>+ EXTRA=true</>`