Merge pull request #522: Prepare release 0.32

* pr-522: [ReleaseTools] fixing psr4 config for module [ReleaseTools] improved make it possible to creating tags in develop branch changed version to 0.32.0-alpha1 [CI] fixed scrutinizer ocular command added default configuration template [ReleaseTools] added module into git main development [Global] preparing for release 0.32 [ReleaseTools] added module autoload config in the development section [ReleaseTools] added module into git [ReleaseTools] added ReleaseTools module for development [Core] bump version into 0.32.0-RC1 [PHPUnit] excluded ReleaseTools directory from code coverage [Core] removed subsplit command info from console usage [Core] moved subsplit controller into ReleaseTools module [Core] moved subsplit controller into ReleaseTools module
cross-solution · Nov 22, 2018 · 353f423 · 353f423
2 parents 28c2996 + 22160e5
commit 353f423
Show file tree

Hide file tree

Showing 24 changed files with 391 additions and 56 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -90,5 +90,5 @@ after_script:
         composer require php-coveralls/php-coveralls --no-scripts;
         travis_retry vendor/bin/php-coveralls -vvv;
         wget https://scrutinizer-ci.com/ocular.phar;
-        travis_retry ocular.phar code-coverage:upload --format=php-clover build/logs/clover.serialized;
+        travis_retry php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml;
     fi'
diff --git a/composer.json b/composer.json
@@ -144,7 +144,8 @@
             "OrganizationsTest\\": "module/Organizations/test",
             "PdfTest\\": "module/Pdf/test",
             "SettingsTest\\": "module/Settings/test",
-            "Yawik\\Behat\\": "module/Behat/src"
+            "Yawik\\Behat\\": "module/Behat/src",
+            "ReleaseTools\\": "module/ReleaseTools/src"
         }
     },
     "replace": {
@@ -161,6 +162,7 @@
     },
     "extra": {
         "branch-alias": {
+            "dev-develop": "0.33-dev",
             "dev-master": "0.32-dev"
         }
     }

diff --git a/config/modules.php b/config/modules.php
@@ -18,4 +18,5 @@
     'Pdf',
     'Geo',
     'Organizations',
+    'ReleaseTools'
 ];
diff --git a/module/.gitignore b/module/.gitignore
@@ -18,7 +18,7 @@
 !Pdf
 !Settings
 !Behat
-
+!ReleaseTools
 # 
 
 !README
diff --git a/module/Applications/composer.json b/module/Applications/composer.json
@@ -21,7 +21,7 @@
         "yawik", "module", "zf"
     ],
     "require": {
-        "yawik/core": "^0.32@dev"
+        "yawik/core": ">=0.32@dev"
     },
     "autoload": {
         "psr-4": {
@@ -35,7 +35,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "0.32-dev"
+            "dev-develop": "0.33-dev",
+            "dev-master": "0.32-dev"
         },
         "zf": {
             "module": "Applications"

diff --git a/module/Auth/composer.json b/module/Auth/composer.json
@@ -21,7 +21,7 @@
         "yawik", "module", "zf"
     ],
     "require": {
-        "yawik/core": "^0.32@dev",
+        "yawik/core": ">=0.32@dev",
         "hybridauth/hybridauth": "^2.10"
     },
     "autoload": {
@@ -37,7 +37,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "0.32-dev"
+            "dev-develop": "0.33-dev",
+            "dev-master": "0.32-dev"
         },
         "zf": {
             "module": "Auth"

diff --git a/module/Behat/composer.json b/module/Behat/composer.json
@@ -38,7 +38,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "0.32-dev"
+            "dev-develop": "0.33-dev",
+            "dev-master": "0.32-dev"
         }
     },
     "bin": [

diff --git a/module/Core/composer.json b/module/Core/composer.json
@@ -82,7 +82,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "0.32-dev"
+            "dev-develop": "0.33-dev",
+            "dev-master": "0.32-dev"
         },
         "zf": {
             "module": "Core"

diff --git a/module/Core/config/module.config.php b/module/Core/config/module.config.php
@@ -15,15 +15,12 @@
 
 use Core\Controller\Console\AssetsInstallController;
 use Core\Controller\Console\ClearCacheController;
-use Core\Controller\Console\SubsplitController;
 use Core\Factory\Controller\AdminControllerFactory;
 use Core\Factory\Controller\FileControllerFactory;
 use Core\Factory\Controller\LazyControllerFactory;
-use Core\Listener\ConfigListener;
 use Core\Service\ClearCacheService;
 use Core\Service\Tracy;
 use Zend\I18n\Translator\Resources;
-use Zend\Mvc\MvcEvent;
 
 $doctrineConfig = include __DIR__ . '/doctrine.config.php';
 
@@ -201,15 +198,6 @@
                         ]
                     ]
                 ],
-                'subsplit' => [
-                    'options' => [
-                        'route' => 'subsplit [--source=] [--target=] [--ansi] [--heads=] [--tags=] [--skip-update] [--dry-run] [--verbose|-v] [<module>]',
-                        'defaults' => [
-                            'controller' => SubsplitController::class,
-                            'action' => 'index'
-                        ]
-                    ]
-                ],
                 'clear-cache' => [
                     'options' => [
                         'route' => 'clear-cache',
@@ -358,7 +346,6 @@
             'Core/Content' => LazyControllerFactory::class,
             Controller\Console\PurgeController::class => Controller\Console\PurgeControllerFactory::class,
             AssetsInstallController::class => [AssetsInstallController::class,'factory'],
-            SubsplitController::class => [SubsplitController::class,'factory'],
             ClearCacheController::class => [ClearCacheController::class,'factory'],
 
         ],

diff --git a/module/Core/src/Module.php b/module/Core/src/Module.php
@@ -43,7 +43,7 @@ class Module implements
     RequireFilePermissionInterface,
     RequireDirectoryPermissionInterface
 {
-    const VERSION = '0.32-dev';
+    const VERSION = '0.32.0-alpha1';
 
     /**
      * @param ModuleOptions $options
@@ -86,7 +86,7 @@ public function getConsoleBanner(Console $console)
 
     public function getConsoleUsage(Console $console)
     {
-        $info = [
+        return [
             'purge [--no-check] [--options=] <entity> [<id>]'  => 'Purge entities',
             'This command will load entities to be purged, checks the dependency of each and removes all entities completely from the',
             'database. However, called with no <entity> and options it will output a list of all available entity loaders and its options.',
@@ -101,21 +101,6 @@ public function getConsoleUsage(Console $console)
             ['--relative','This option will install assets using relative symlink'],
             ""
         ];
-
-        if ($this->isInMainDevelopment()) {
-            $info = ArrayUtils::merge($info, [
-                // subsplit command info
-                'subsplit [--heads] [--tags] [--skip-update] [--dry-run] [--verbose|v]' => 'Subsplit development repository',
-                'The subsplit command will automatically subsplit all changes in the develop into github yawik/* repository'.PHP_EOL
-                .'This command will available only in the Yawik main development repository',
-                ['--heads','If defined then will subsplit that branch.'],
-                ['--tags','Subsplit given tags only'],
-                ['--skip-update','Directly subsplit repository without pull remote branch'],
-                ['--dry-run','Only show the list of git command that will be executed.'],
-                ['--verbose | -v', 'Show debug output.'],
-            ]);
-        }
-        return $info;
     }
 
     /**

diff --git a/module/Cv/composer.json b/module/Cv/composer.json
@@ -21,7 +21,7 @@
         "yawik", "module"
     ],
     "require": {
-        "yawik/core": "^0.32@dev"
+        "yawik/core": ">=0.32@dev"
     },
     "autoload": {
         "psr-4": {
@@ -35,7 +35,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "0.32-dev"
+            "dev-develop": "0.33-dev",
+            "dev-master": "0.32-dev"
         },
         "zf": {
             "module": "Cv"

diff --git a/module/Geo/composer.json b/module/Geo/composer.json
@@ -21,7 +21,7 @@
         "yawik", "module", "zf3"
     ],
     "require": {
-        "yawik/core": "^0.32@dev",
+        "yawik/core": ">=0.32@dev",
         "jmikola/geojson": "^1.0.0"
     },
     "autoload": {
@@ -36,7 +36,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "0.32-dev"
+            "dev-develop": "0.33-dev",
+            "dev-master": "0.32-dev"
         },
         "zf": {
             "module": "Geo"

diff --git a/module/Install/composer.json b/module/Install/composer.json
@@ -21,7 +21,7 @@
         "yawik", "module", "zf3"
     ],
     "require": {
-        "yawik/core": "^0.32@dev"
+        "yawik/core": ">=0.32@dev"
     },
     "autoload": {
         "psr-4": {
@@ -35,7 +35,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "0.32-dev"
+            "dev-develop": "0.33-dev",
+            "dev-master": "0.32-dev"
         }
     }
 }
diff --git a/module/Jobs/composer.json b/module/Jobs/composer.json
@@ -21,7 +21,7 @@
         "yawik", "module", "zf3"
     ],
     "require": {
-        "yawik/core": "^0.32@dev"
+        "yawik/core": ">=0.32@dev"
     },
     "autoload": {
         "psr-4": {
@@ -35,7 +35,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "0.32-dev"
+            "dev-develop": "0.33-dev",
+            "dev-master": "0.32-dev"
         },
         "zf": {
             "module": "Jobs"

diff --git a/module/Organizations/composer.json b/module/Organizations/composer.json
@@ -21,7 +21,7 @@
         "yawik", "module", "zf3"
     ],
     "require": {
-        "yawik/core": "^0.32@dev"
+        "yawik/core": ">=0.32@dev"
     },
     "autoload": {
         "psr-4": {
@@ -35,7 +35,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "0.32-dev"
+            "dev-develop": "0.33-dev",
+            "dev-master": "0.32-dev"
         },
         "zf": {
             "module": "Organizations"

diff --git a/module/Pdf/composer.json b/module/Pdf/composer.json
@@ -21,7 +21,7 @@
         "yawik", "module", "zf3"
     ],
     "require": {
-        "yawik/core": "^0.32@dev",
+        "yawik/core": ">=0.32@dev",
         "mpdf/mpdf": "5.7.*"
     },
     "autoload": {
@@ -36,7 +36,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "0.32-dev"
+            "dev-develop": "0.33-dev",
+            "dev-master": "0.32-dev"
         },
         "zf": {
             "module": "Pdf"

diff --git a/module/ReleaseTools/config/module.config.php b/module/ReleaseTools/config/module.config.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Yawik project.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use ReleaseTools\Console\SubsplitController;
+use ReleaseTools\Console\ReleaseController;
+
+$tempDir = sys_get_temp_dir().'/yawik/build';
+
+return [
+    'release' => [
+        'main_remote_name' => 'origin',
+        'subsplit_clone_dir' => $tempDir,
+    ],
+    'controllers' => [
+        'factories' => [
+            'release.console.subsplit' => [SubsplitController::class,'factory'],
+            'release.console.release' => [ReleaseController::class,'factory']
+
+        ]
+    ],
+    'console' => [
+        'router' => [
+            'routes' => [
+                'subsplit' => [
+                    'options' => [
+                        'route' => 'subsplit [--source=] [--target=] [--ansi] [--heads=] [--tags=] [--skip-update] [--dry-run] [--verbose|-v] [<module>]',
+                        'defaults' => [
+                            'controller' => 'release.console.subsplit',
+                            'action' => 'index'
+                        ]
+                    ]
+                ],
+                'release' => [
+                    'options' => [
+                        'route' => 'release [--dry-run] [--message=] [--branch=] <tag>',
+                        'defaults' => [
+                            'controller' => 'release.console.release',
+                            'action' => 'index'
+                        ]
+                    ]
+                ],
+            ],
+        ],
+    ],
+];
diff --git a/module/ReleaseTools/config/release.local.config.php b/module/ReleaseTools/config/release.local.config.php
@@ -0,0 +1,18 @@
+<?php
+
+return [
+    'release' => [
+        /*
+         * Change this value to match with your remote
+         * configuration that pointing to: git@github.com:cross-solution/YAWIK.git
+         * Check this value by using: git remote -v
+         */
+        'main_remote_name' => 'origin',
+
+        /*
+         * If you don't want to keep git clone for yawik/* repository
+         * in your local directories just leave this value commented.
+         */
+        //'subsplit_clone_dir' => sys_get_temp_dir().'/yawik/build',
+    ],
+];