Merge pull request #83 from wagnert/master

wagnert · web-flow · commit 7b945eac1d99 · 2017-05-04T12:36:40.000+02:00
Add system-name commandline option
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# Version 1.0.0-beta8
+
+## Bugfixes
+
+* None
+
+## Features
+
+* Add system-name commandline option
+
 # Version 1.0.0-beta7
 
 ## Bugfixes
diff --git a/README.md b/README.md
@@ -96,6 +96,7 @@ The following configuration options are available:
 |:---------------------|:----------------------------------------------------------------|:--------------|
 | --configuration      | Specify the pathname to the configuration file to use | `./vendor/techdivision/import-product/etc/techdivision-import.json` |
 | --entity-type-code   | The Magento entity type code, **MUST** be one of `catalog_product` or `catalog_category`  | n/a |
+| --system-name        | The system name to be used (will added to the mail subject, if mails are configured) | n/a |
 | --installation-dir   | The Magento installation directory to which the files has to be imported | n/a |
 | --source-dir         | The directory that has to be watched for new files | n/a |
 | --target-dir         | The target directory with the files that has been imported | n/a |
diff --git a/composer.json b/composer.json
@@ -15,18 +15,18 @@
         "symfony/dependency-injection": "~2.3, !=2.7.0",
         "league/flysystem": "~1.0",
         "techdivision/import-app-simple": "1.0.0-beta2",
-        "techdivision/import-configuration-jms": "1.0.0-beta4",
-        "techdivision/import": "1.0.0-beta9",
+        "techdivision/import-configuration-jms": "1.0.0-beta5",
+        "techdivision/import": "1.0.0-beta10",
         "techdivision/import-ee": "1.0.0-beta1",
         "techdivision/import-attribute": "1.0.0-alpha3",
-        "techdivision/import-category": "1.0.0-beta1",
-        "techdivision/import-category-ee": "1.0.0-beta1",
-        "techdivision/import-product": "1.0.0-beta1",
+        "techdivision/import-category": "1.0.0-beta2",
+        "techdivision/import-category-ee": "1.0.0-beta2",
+        "techdivision/import-product": "1.0.0-beta2",
         "techdivision/import-product-link": "1.0.0-beta1",
         "techdivision/import-product-media": "1.0.0-beta1",
         "techdivision/import-product-bundle": "1.0.0-beta1",
         "techdivision/import-product-variant": "1.0.0-beta1",
-        "techdivision/import-product-ee": "1.0.0-beta1",
+        "techdivision/import-product-ee": "1.0.0-beta2",
         "techdivision/import-product-link-ee": "1.0.0-beta2",
         "techdivision/import-product-media-ee": "1.0.0-beta1",
         "techdivision/import-product-bundle-ee": "1.0.0-beta1",
diff --git a/projects/sample-data/ce/212/conf/categories/techdivision-import.json b/projects/sample-data/ce/212/conf/categories/techdivision-import.json
@@ -10,6 +10,7 @@
   "archive-dir" : "archive",
   "debug-mode" : false,
   "entity-type-code" : "catalog_category",
+  "system-name" : "local/magento-ce-2.1.6",
   "databases": [
     {
       "id": "ce",
diff --git a/projects/sample-data/ce/212/conf/products/techdivision-import.json b/projects/sample-data/ce/212/conf/products/techdivision-import.json
@@ -10,6 +10,7 @@
   "archive-dir" : "archive",
   "debug-mode" : false,
   "entity-type-code" : "catalog_product",
+  "system-name" : "local/magento-ce-2.1.6",
   "databases": [
     {
       "id": "ce",
diff --git a/projects/sample-data/ce/215/conf/categories/techdivision-import.json b/projects/sample-data/ce/215/conf/categories/techdivision-import.json
@@ -10,6 +10,7 @@
   "archive-dir" : "archive",
   "debug-mode" : false,
   "entity-type-code" : "catalog_category",
+  "system-name" : "local/magento-ce-2.1.6",
   "databases": [
     {
       "id": "ce",
diff --git a/projects/sample-data/ce/215/conf/products/techdivision-import.json b/projects/sample-data/ce/215/conf/products/techdivision-import.json
@@ -10,6 +10,7 @@
   "archive-dir" : "archive",
   "debug-mode" : false,
   "entity-type-code" : "catalog_product",
+  "system-name" : "local/magento-ce-2.1.6",
   "databases": [
     {
       "id": "ce",
diff --git a/projects/sample-data/ce/216/conf/attributes/techdivision-import.json b/projects/sample-data/ce/216/conf/attributes/techdivision-import.json
@@ -10,6 +10,7 @@
   "archive-dir" : "archive",
   "debug-mode" : false,
   "entity-type-code" : "eav_attribute",
+  "system-name" : "local/magento-ce-2.1.6",
   "databases": [
     {
       "id": "ce",
diff --git a/projects/sample-data/ce/216/conf/categories/techdivision-import.json b/projects/sample-data/ce/216/conf/categories/techdivision-import.json
@@ -10,6 +10,7 @@
   "archive-dir" : "archive",
   "debug-mode" : false,
   "entity-type-code" : "catalog_category",
+  "system-name" : "local/magento-ce-2.1.6",
   "databases": [
     {
       "id": "ce",
diff --git a/projects/sample-data/ce/216/conf/products/techdivision-import.json b/projects/sample-data/ce/216/conf/products/techdivision-import.json
@@ -10,6 +10,7 @@
   "archive-dir" : "archive",
   "debug-mode" : false,
   "entity-type-code" : "catalog_product",
+  "system-name" : "local/magento-ce-2.1.6",
   "databases": [
     {
       "id": "ce",
diff --git a/projects/sample-data/ee/212/conf/categories/techdivision-import.json b/projects/sample-data/ee/212/conf/categories/techdivision-import.json
@@ -10,6 +10,7 @@
   "archive-dir" : "archive",
   "debug-mode" : false,
   "entity-type-code" : "catalog_category",
+  "system-name" : "local/magento-ce-2.1.6",
   "databases": [
     {
       "id": "ee",
diff --git a/projects/sample-data/ee/212/conf/products/techdivision-import.json b/projects/sample-data/ee/212/conf/products/techdivision-import.json
@@ -10,6 +10,7 @@
   "archive-dir" : "archive",
   "debug-mode" : false,
   "entity-type-code" : "catalog_product",
+  "system-name" : "local/magento-ce-2.1.6",
   "databases": [
     {
       "id": "ee",
diff --git a/src/Command/AbstractImportCommand.php b/src/Command/AbstractImportCommand.php
@@ -75,6 +75,12 @@ protected function configure()
             'Specify the pathname to the configuration file to use',
             $this->getDefaultConfiguration()
         )
+        ->addOption(
+            InputOptionKeys::SYSTEM_NAME,
+            null,
+            InputOption::VALUE_REQUIRED,
+            'Specify the system name to use'
+        )
         ->addOption(
             InputOptionKeys::INSTALLATION_DIR,
             null,
@@ -295,7 +301,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             // load the factory class that creates the logger instance
             $loggerFactory = $loggerConfiguration->getFactory();
             // create the logger instance and add it to the available loggers
-            $loggers[$loggerConfiguration->getName()] = $loggerFactory::factory($loggerConfiguration);
+            $loggers[$loggerConfiguration->getName()] = $loggerFactory::factory($configuration, $loggerConfiguration);
         }
 
         // add the system loggers to the DI container
diff --git a/src/Command/InputOptionKeys.php b/src/Command/InputOptionKeys.php
@@ -49,6 +49,13 @@ private function __clone()
     {
     }
 
+    /**
+     * The input option key for the system name to use.
+     *
+     * @var string
+     */
+    const SYSTEM_NAME = 'system-name';
+
     /**
      * The input option key for the path to the configuration file to use.
      *
diff --git a/src/ConfigurationFactory.php b/src/ConfigurationFactory.php
@@ -62,6 +62,12 @@ public static function load(InputInterface $input)
             $instance->setOperationName($operationName);
         }
 
+        // query whether or not a system name has been specified as command line
+        // option, if yes override the value from the configuration file
+        if ($systemName = $input->getOption(InputOptionKeys::SYSTEM_NAME)) {
+            $instance->setSystemName($systemName);
+        }
+
         // query whether or not a Magento installation directory has been specified as command line
         // option, if yes override the value from the configuration file
         if ($installationDir = $input->getOption(InputOptionKeys::INSTALLATION_DIR)) {

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`"archive-dir" : "archive",`
`11`	`11`	`"debug-mode" : false,`
`12`	`12`	`"entity-type-code" : "catalog_category",`
	`13`	`+ "system-name" : "local/magento-ce-2.1.6",`
`13`	`14`	`"databases": [`
`14`	`15`	`{`
`15`	`16`	`"id": "ce",`