From e699cc33566861ce19325c82533612020129ae85 Mon Sep 17 00:00:00 2001
From: Ivan Gavryshko <igavryshko@ebay.com>
Date: Thu, 23 Apr 2015 11:56:25 -0500
Subject: [PATCH] MAGETWO-36078: Move
dev/tools/Magento/Tools/Webdev/file_assembler.php
- chnages according to CR
---
.../Magento/Developer/Console/Command/CssDeployCommand.php | 7 ++++---
.../Test/Unit/Console/Command/CssDeployCommandTest.php | 3 +--
dev/tools/grunt/configs/combo.js | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/code/Magento/Developer/Console/Command/CssDeployCommand.php b/app/code/Magento/Developer/Console/Command/CssDeployCommand.php
index 11961852dbb..1d8d859956e 100644
--- a/app/code/Magento/Developer/Console/Command/CssDeployCommand.php
+++ b/app/code/Magento/Developer/Console/Command/CssDeployCommand.php
@@ -22,7 +22,7 @@ use Magento\Framework\View\Asset\PreProcessor\ChainFactoryInterface;
use Magento\Framework\App\Filesystem\DirectoryList;
/**
- * Class CssDeployCommand
+ * Class CssDeployCommand - collects, processes and publishes source files like LESS or SASS
* @SuppressWarnings("PMD.CouplingBetweenObjects")
*/
class CssDeployCommand extends Command
@@ -174,6 +174,7 @@ class CssDeployCommand extends Command
/**
* {@inheritdoc}
+ * @throws \InvalidArgumentException
*/
protected function execute(InputInterface $input, OutputInterface $output)
{
@@ -198,7 +199,7 @@ class CssDeployCommand extends Command
foreach ($input->getArgument(self::FILES_ARGUMENT) as $file) {
$file .= '.' . $type;
- $output->writeln("Gathering {$file} sources.");
+ $output->writeln("<info>Gathering {$file} sources.</info>");
$asset = $this->assetRepo->createAsset(
$file,
@@ -228,7 +229,7 @@ class CssDeployCommand extends Command
$destination = $asset->getPath();
$rootDir->copyFile($source, $destination, $targetDir);
- $output->writeln("Done");
+ $output->writeln("<info>Successfully processed LESS and/or SASS files</info>");
}
}
}
diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/CssDeployCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/CssDeployCommandTest.php
index 93f545aefe3..445ac332fbc 100644
--- a/app/code/Magento/Developer/Test/Unit/Console/Command/CssDeployCommandTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Console/Command/CssDeployCommandTest.php
@@ -14,14 +14,13 @@ use Magento\Framework\ObjectManagerInterface;
use Magento\Framework\App\ObjectManager\ConfigLoader;
use Magento\Framework\View\Asset\SourceFileGeneratorPool;
use Magento\Framework\View\Asset\PreProcessor\ChainFactoryInterface;
-use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Developer\Console\Command\CssDeployCommand;
use Symfony\Component\Console\Tester\CommandTester;
class CssDeployCommandTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var DevTestsRunCommand
+ * @var CssDeployCommand
*/
private $command;
diff --git a/dev/tools/grunt/configs/combo.js b/dev/tools/grunt/configs/combo.js
index cb80592c980..cd3484eee78 100644
--- a/dev/tools/grunt/configs/combo.js
+++ b/dev/tools/grunt/configs/combo.js
@@ -16,7 +16,7 @@ module.exports = {
var cmdPlus = /^win/.test(process.platform) ? ' & ' : ' && ',
command = 'grunt --force clean:' + themeName + cmdPlus;
- command = command + 'bin/magento dev:css:deploy ' + theme[themeName].dsl + ' ' + theme[themeName].files.join(' ') +
+ command = command + 'php bin/magento dev:css:deploy ' + theme[themeName].dsl + ' ' + theme[themeName].files.join(' ') +
' --locale=' + theme[themeName].locale +
' --area=' + theme[themeName].area +
' --theme=' + theme[themeName].name;
--
GitLab