The '--environment' command line option is renamed to '--assets-env'.

Because there was some conflicts with the Laravel command line option '
--env'.
And 'larasset-environment' command line option is renamed to
'--larasset-env'.

See #6 for more
information.

Author: Tortue Torche

README.md

@@ -49,13 +49,18 @@ Installation
     composer require efficiently/larasset:dev-master
     ```
 
-3. Turn on your application debug mode, in your `app/config/app.php` file:
+3. Turn on your application debug mode, create or edit the `app/config/local/app.php` file:
 
     ```php
+    <?php
+
+    return [
         'debug' => true,
+        // Others config options....
+    ];
     ```
 
-    Note: It is strongly recommended that you turn off error detail in a production environment.
+    Note: It is strongly recommended that you turn off error detail in your production environment.
 
 4. Add these two services providers to `app/config/app.php`:
 
@@ -97,7 +102,7 @@ Run:
 
     php artisan larasset:serve
 
-NOTICE: You should use it **only** in a development environment
+NOTICE: You should use it **only** in a development/local environment
 
 
 Precompiling assets (Manifest usage)
@@ -117,11 +122,19 @@ Development VS Production mode
 By default Larasset is running in _development_ mode. That means that it will
 recompile (server) any changed asset on demand. Also it's not compressing
 JavaScript and/or Stylesheets in development mode. To run Larraset's server and
-precompiler in production-ready mode, use `--environment production` command line
+precompiler in production-ready mode, use `--assets-env production` command line
 option, like so:
 
-    php artisan larasset:precompile --environment production
+    php artisan larasset:precompile --assets-env production
+
+
+Changelog
+---------
 
+### 0.9.6-dev
+  * **Breaking changes:**
+  The `--environment` command line option is renamed to `--assets-env`. Because there was some conflicts with the Laravel command line option `--env`. And `larasset-environment` command line option is renamed to `--larasset-env`.
+  See issue [#6](https://github.com/efficiently/larasset/issues/6) for more information.
 
 Credits
 -------

src/Efficiently/Larasset/Commands/PrecompileAssetsCommand.php

@@ -41,7 +41,14 @@ public function fire()
     {
         parent::fire();
 
-        $environment = $this->option('environment');
+        if ($this->option('environment')) {
+            # TODO: Remove the DEPRECATED stuff in the next minor version (0.10.0 or 1.0.0)
+            $this->comment("WARN: The '--environment' option is DEPRECATED, use '--assets-env' option instead please.");
+            $assetsEnv = $this->option('environment');
+        } else {
+            $assetsEnv = $this->option('assets-env');
+        }
+
         $packagePath = $this->packagePath();
 
         $searchPaths = array_map(
@@ -58,7 +65,7 @@ function ($path) {
             Config::get('larasset::precompile', [])
         );
         putenv('LARASSET_PRECOMPILE='.implode('|', $precompileFiles));
-        putenv('LARASSET_ENV='.$environment);
+        putenv('LARASSET_ENV='.$assetsEnv);
         putenv('LARASSET_COMMAND=precompile');
         putenv('LARASSET_PREFIX='.Config::get('larasset::prefix'));
         $assetsPrecompileCommand = "larasset";
@@ -90,7 +97,8 @@ protected function getArguments()
     protected function getOptions()
     {
         return [
-             ['environment', null, InputOption::VALUE_OPTIONAL, 'Specifies the environment to run this precompilation under.', 'development'],
+            ['assets-env', null, InputOption::VALUE_OPTIONAL, 'Specifies the assets environment to run this precompilation under.', 'development'],
+            ['environment', null, InputOption::VALUE_OPTIONAL, "DEPRECATED: Use '--assets-env' option instead."],
 
         ];
     }

src/Efficiently/Larasset/Commands/ServeAssetsCommand.php

@@ -43,7 +43,13 @@ public function fire()
 
         $serverHost = $this->option('host');
         $serverPort = $this->option('port');
-        $serverEnvironment = $this->option('environment');
+        if ($this->option('environment')) {
+            # TODO: Remove the DEPRECATED stuff in the next minor version (0.10.0 or 1.0.0)
+            $this->comment("WARN: The '--environment' option is DEPRECATED, use '--assets-env' option instead please.");
+            $serverEnv = $this->option('environment');
+        } else {
+            $serverEnv = $this->option('assets-env');
+        }
 
         $serverOptions = "--port=".$serverPort." --host=".$serverHost;
         $packagePath = $this->packagePath();
@@ -56,7 +62,7 @@ function ($path) {
         );
         putenv('LARASSET_PATH='.implode('|', $searchPaths));
         putenv('LARASSET_PREFIX='.Config::get('larasset::prefix'));
-        putenv('LARASSET_ENV='.$serverEnvironment);
+        putenv('LARASSET_ENV='.$serverEnv);
         putenv('LARASSET_COMMAND=server');
         $assetsServerCommand = "larasset ".$serverOptions;
 
@@ -86,7 +92,8 @@ protected function getOptions()
         return [
             ['host', null, InputOption::VALUE_OPTIONAL, 'The host address to serve the asset files on.', "localhost"],
             ['port', null, InputOption::VALUE_OPTIONAL, 'The port to serve the asset files on.', 3000],
-            ['environment', null, InputOption::VALUE_OPTIONAL, 'Specifies the environment to run this server under (test/development/production).', 'development'],
+            ['assets-env', null, InputOption::VALUE_OPTIONAL, 'Specifies the assets environment to run this server under (test/development/production).', 'development'],
+            ['environment', null, InputOption::VALUE_OPTIONAL, "DEPRECATED: Use '--assets-env' option instead."],
         ];
     }
 }

src/Efficiently/Larasset/Commands/ServerCommand.php

@@ -41,20 +41,27 @@ public function fire()
 
         $serverHost = $this->option('host');
         $serverPort = $this->option('port');
+        $serverEnv = $this->option('env');
         $assetsServerHost = $this->option('larasset-host');
         $assetsServerPort = $this->option('larasset-port');
-        $assetsServerEnvironment = $this->option('larasset-environment');
+        if ($this->option('larasset-environment')) {
+            # TODO: Remove the DEPRECATED stuff in the next minor version (0.10.0 or 1.0.0)
+            $this->comment("WARN: The '--larasset-environment' option is DEPRECATED, use '--larasset-env' option instead please.");
+            $assetsServerEnv = $this->option('larasset-environment');
+        } else {
+            $assetsServerEnv = $this->option('larasset-env');
+        }
 
         // Run assets server in a background process
-        $command = "php artisan larasset:serve --port=".$assetsServerPort." --host=".$assetsServerHost." --environment=".$assetsServerEnvironment;
+        $command = "php artisan larasset:serve --port=".$assetsServerPort." --host=".$assetsServerHost." --assets-env=".$assetsServerEnv;
         $this->info("Start the assets server...");
 
         $serverLogsPath = $this->normalizePath(storage_path('logs/larasset_server.log'));
         $this->line('Assets server logs are stored in "'.$serverLogsPath.'"');
         $this->execInBackground($command, $serverLogsPath);
 
         // Run PHP application server
-        $this->call('serve', ['--host' => $serverHost, '--port' => $serverPort]);
+        $this->call('serve', ['--host' => $serverHost, '--port' => $serverPort, '--env' => $serverEnv]);
     }
 
     /**
@@ -81,7 +88,9 @@ protected function getOptions()
             ['port', null, InputOption::VALUE_OPTIONAL, 'The port to serve the application on.', 8000],
             ['larasset-host', null, InputOption::VALUE_OPTIONAL, 'The host address to serve the asset files on.', "localhost"],
             ['larasset-port', null, InputOption::VALUE_OPTIONAL, 'The port to serve the asset files on.', 3000],
-            ['larasset-environment', null, InputOption::VALUE_OPTIONAL, 'Specifies the environment to run this server under (test/development/production).', 'development'],
+            ['larasset-env', null, InputOption::VALUE_OPTIONAL, 'Specifies the assets environment to run this server under (test/development/production).', 'development'],
+            ['larasset-environment', null, InputOption::VALUE_OPTIONAL, "DEPRECATED: Use '--larasset-env' option instead."],
+
         ];
     }