From 607318a2a4cf85ba17eae46a5f6997d7a3ec4604 Mon Sep 17 00:00:00 2001 From: Yves Hoppe Date: Fri, 6 Nov 2015 10:13:28 +0100 Subject: [PATCH 1/3] Updated namespaces to joomla_projects\jorobo --- README.md | 11 ++++---- RoboFile.php | 8 +++--- composer.json | 4 +-- jbuild.dist.ini => jorobo.dist.ini | 0 jorobo.ini | 12 +++++++++ src/Tasks/Build.php | 4 +-- src/Tasks/Build/Base.php | 6 ++--- src/Tasks/Build/CBPlugin.php | 6 ++--- src/Tasks/Build/Cli.php | 6 ++--- src/Tasks/Build/Component.php | 6 ++--- src/Tasks/Build/Extension.php | 6 ++--- src/Tasks/Build/Language.php | 6 ++--- src/Tasks/Build/Library.php | 6 ++--- src/Tasks/Build/Media.php | 6 ++--- src/Tasks/Build/Module.php | 6 ++--- src/Tasks/Build/Plugin.php | 6 ++--- src/Tasks/Build/Template.php | 6 ++--- src/Tasks/Build/buildTasks.php | 6 ++--- src/Tasks/Deploy/Base.php | 4 +-- src/Tasks/Deploy/Package.php | 4 +-- src/Tasks/Deploy/Release.php | 4 +-- src/Tasks/Deploy/Zip.php | 4 +-- src/Tasks/Deploy/deployTasks.php | 6 ++--- src/Tasks/Generate.php | 4 +-- src/Tasks/Generate/Base.php | 6 ++--- src/Tasks/Generate/Module.php | 4 +-- src/Tasks/Generate/generateTasks.php | 2 +- src/Tasks/JTask.php | 39 +++++++++++++++++++--------- src/Tasks/Map.php | 4 +-- src/Tasks/Metrics/Metrics.php | 4 +-- src/Tasks/Metrics/loadTasks.php | 4 +-- src/Tasks/loadTasks.php | 4 +-- 32 files changed, 115 insertions(+), 89 deletions(-) rename jbuild.dist.ini => jorobo.dist.ini (100%) create mode 100644 jorobo.ini diff --git a/README.md b/README.md index 649c288..6262455 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ -# jorobo (Robo.li tasks for Joomla! extensions) +# JoRobo (Robo.li tasks for Joomla!) [![Latest Stable Version](https://poser.pugx.org/joomla-projects/jorobo/v/stable)](https://packagist.org/packages/joomla-projects/jorobo) [![Total Downloads](https://poser.pugx.org/joomla-projects/jorobo/downloads)](https://packagist.org/packages/joomla-projects/jorobo) [![Latest Unstable Version](https://poser.pugx.org/joomla-projects/jorobo/v/unstable)](https://packagist.org/packages/joomla-projects/jorobo) [![License](https://poser.pugx.org/yvesh/jbuild/license)](https://packagist.org/packages/joomla-projects/jorobo) #### Warning: Currently in alpha stage! -Tool and Task based on Robo.li to manage Joomla Extension Development and Releases +Tools and Tasks based on Robo.li for Joomla Extension Development and Releases ## Installation (Standalone): * composer install - * configure jbuild.ini + * configure jorobo.ini * vendor/bin/robo @@ -17,7 +17,6 @@ Tool and Task based on Robo.li to manage Joomla Extension Development and Releas * vendor/bin/robo map destination - Symlinks an extension into an Joomla installation (WIP @rdeutz working solution) * vendor/bin/robo build - Builds your extension into an installable Joomla package or zip file including replacements - * vendor/bin/robo generate [--mod_xy --com_xy --plg_system_xy] (not integrated yet) ## How-to use in your own extension @@ -32,7 +31,7 @@ require 'vendor/autoload.php'; class RoboFile extends \Robo\Tasks { - use \JBuild\Tasks\loadTasks; + use \joomla_projects\jorobo\Tasks\loadTasks; .. ``` @@ -44,7 +43,7 @@ or `$this->taskBuild($params)->run()` -Look at the RoboFile.php in the library root for a sample file +Look at the RoboFile.php in the library root for a sample file. ## Usage in your own extension diff --git a/RoboFile.php b/RoboFile.php index 8ed9677..b6ec81c 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -6,7 +6,7 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -use JBuild\Tasks\loadTasks; +use joomla_projects\jorobo\Tasks\loadTasks; if (!defined('JPATH_BASE')) { @@ -40,7 +40,7 @@ public function __construct() */ public function map($target) { - (new \JBuild\Tasks\Map($target))->run(); + (new \joomla_projects\jorobo\Tasks\Map($target))->run(); } /** @@ -52,7 +52,7 @@ public function map($target) */ public function build($params = ['dev' => false]) { - (new \JBuild\Tasks\Build($params))->run(); + (new \joomla_projects\jorobo\Tasks\Build($params))->run(); } /** @@ -64,6 +64,6 @@ public function build($params = ['dev' => false]) */ public function generate($extensions) { - (new \JBuild\Tasks\Generate($extensions))->run(); + (new \joomla_projects\jorobo\Tasks\Generate($extensions))->run(); } } diff --git a/composer.json b/composer.json index 9acf7bf..c5edc54 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "joomla-projects/jorobo", - "description": "Tool and Task based on Robo.li to manage Joomla Extension Development and Releases", + "description": "Tools and Tasks based on Robo.li for Joomla Extension Development and Releases", "license": "GPL-2.0+", "authors": [ { @@ -17,7 +17,7 @@ } ], "autoload": { - "psr-4": {"JBuild\\": "src"} + "psr-4": {"joomla_projects\\jorobo\\": "src"} }, "require" : { "php": ">=5.4.0", diff --git a/jbuild.dist.ini b/jorobo.dist.ini similarity index 100% rename from jbuild.dist.ini rename to jorobo.dist.ini diff --git a/jorobo.ini b/jorobo.ini new file mode 100644 index 0000000..2de5d50 --- /dev/null +++ b/jorobo.ini @@ -0,0 +1,12 @@ +extension = +version = +source = src +target = zip + +[github] +remote = origin +branch = develop +token = +owner = joomla-projects +repository = weblinks +changelog_source = commits \ No newline at end of file diff --git a/src/Tasks/Build.php b/src/Tasks/Build.php index 41a12a6..cd9446e 100644 --- a/src/Tasks/Build.php +++ b/src/Tasks/Build.php @@ -6,7 +6,7 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks; +namespace joomla_projects\jorobo\Tasks; use Robo\Result; use Robo\Task\BaseTask; @@ -16,7 +16,7 @@ /** * Class Build * - * @package JBuild\Tasks + * @package joomla_projects\jorobo\Tasks */ class Build extends JTask implements TaskInterface { diff --git a/src/Tasks/Build/Base.php b/src/Tasks/Build/Base.php index a082b4a..28141b0 100644 --- a/src/Tasks/Build/Base.php +++ b/src/Tasks/Build/Base.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks\Build; +namespace joomla_projects\jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use JBuild\Tasks\JTask; +use joomla_projects\jorobo\Tasks\JTask; /** * Build base - contains methods / data used in multiple build tasks * - * @package JBuild\Tasks\Build + * @package joomla_projects\jorobo\Tasks\Build */ class Base extends JTask implements TaskInterface { diff --git a/src/Tasks/Build/CBPlugin.php b/src/Tasks/Build/CBPlugin.php index 617168c..1247483 100644 --- a/src/Tasks/Build/CBPlugin.php +++ b/src/Tasks/Build/CBPlugin.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks\Build; +namespace joomla_projects\jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use JBuild\Tasks\JTask; +use joomla_projects\jorobo\Tasks\JTask; /** * Community Builder build class * - * @package JBuild\Tasks\Build + * @package joomla_projects\jorobo\Tasks\Build */ class CBPlugin extends Base implements TaskInterface { diff --git a/src/Tasks/Build/Cli.php b/src/Tasks/Build/Cli.php index a991ef7..71b3b40 100644 --- a/src/Tasks/Build/Cli.php +++ b/src/Tasks/Build/Cli.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks\Build; +namespace joomla_projects\jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use JBuild\Tasks\JTask; +use joomla_projects\jorobo\Tasks\JTask; /** * Build Cli * - * @package JBuild\Tasks\Build + * @package joomla_projects\jorobo\Tasks\Build */ class Cli extends Base implements TaskInterface { diff --git a/src/Tasks/Build/Component.php b/src/Tasks/Build/Component.php index d753b7f..e1d9668 100644 --- a/src/Tasks/Build/Component.php +++ b/src/Tasks/Build/Component.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks\Build; +namespace joomla_projects\jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use JBuild\Tasks\JTask; +use joomla_projects\jorobo\Tasks\JTask; /** * Class Component * - * @package JBuild\Tasks\Build + * @package joomla_projects\jorobo\Tasks\Build */ class Component extends Base implements TaskInterface { diff --git a/src/Tasks/Build/Extension.php b/src/Tasks/Build/Extension.php index eb76aed..3fad6b6 100644 --- a/src/Tasks/Build/Extension.php +++ b/src/Tasks/Build/Extension.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks\Build; +namespace joomla_projects\jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use JBuild\Tasks\JTask; +use joomla_projects\jorobo\Tasks\JTask; /** * The supervisor * - * @package JBuild\Tasks\Build + * @package joomla_projects\jorobo\Tasks\Build */ class Extension extends Base implements TaskInterface { diff --git a/src/Tasks/Build/Language.php b/src/Tasks/Build/Language.php index d94f3e4..d2ee9bd 100644 --- a/src/Tasks/Build/Language.php +++ b/src/Tasks/Build/Language.php @@ -5,19 +5,19 @@ * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks\Build; +namespace joomla_projects\jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use JBuild\Tasks\JTask; +use joomla_projects\jorobo\Tasks\JTask; /** * Class Language * - * @package JBuild\Tasks\Build + * @package joomla_projects\jorobo\Tasks\Build */ class Language extends Base implements TaskInterface { diff --git a/src/Tasks/Build/Library.php b/src/Tasks/Build/Library.php index 37326b3..61f3669 100644 --- a/src/Tasks/Build/Library.php +++ b/src/Tasks/Build/Library.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks\Build; +namespace joomla_projects\jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use JBuild\Tasks\JTask; +use joomla_projects\jorobo\Tasks\JTask; /** * Build Library * - * @package JBuild\Tasks\Build + * @package joomla_projects\jorobo\Tasks\Build */ class Library extends Base implements TaskInterface { diff --git a/src/Tasks/Build/Media.php b/src/Tasks/Build/Media.php index 758c302..81b8c26 100644 --- a/src/Tasks/Build/Media.php +++ b/src/Tasks/Build/Media.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks\Build; +namespace joomla_projects\jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use JBuild\Tasks\JTask; +use joomla_projects\jorobo\Tasks\JTask; /** * Class Media * - * @package JBuild\Tasks\Build + * @package joomla_projects\jorobo\Tasks\Build */ class Media extends Base implements TaskInterface { diff --git a/src/Tasks/Build/Module.php b/src/Tasks/Build/Module.php index f2089b0..ee8977c 100644 --- a/src/Tasks/Build/Module.php +++ b/src/Tasks/Build/Module.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks\Build; +namespace joomla_projects\jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use JBuild\Tasks\JTask; +use joomla_projects\jorobo\Tasks\JTask; /** * Class Module * - * @package JBuild\Tasks\Build + * @package joomla_projects\jorobo\Tasks\Build */ class Module extends Base implements TaskInterface { diff --git a/src/Tasks/Build/Plugin.php b/src/Tasks/Build/Plugin.php index fa86247..a487cb3 100644 --- a/src/Tasks/Build/Plugin.php +++ b/src/Tasks/Build/Plugin.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks\Build; +namespace joomla_projects\jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use JBuild\Tasks\JTask; +use joomla_projects\jorobo\Tasks\JTask; /** * Class Plugin * - * @package JBuild\Tasks\Build + * @package joomla_projects\jorobo\Tasks\Build */ class Plugin extends Base implements TaskInterface { diff --git a/src/Tasks/Build/Template.php b/src/Tasks/Build/Template.php index cc88754..c9273d7 100644 --- a/src/Tasks/Build/Template.php +++ b/src/Tasks/Build/Template.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks\Build; +namespace joomla_projects\jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use JBuild\Tasks\JTask; +use joomla_projects\jorobo\Tasks\JTask; /** * Class Template * - * @package JBuild\Tasks\Build + * @package joomla_projects\jorobo\Tasks\Build */ class Template extends Base implements TaskInterface { diff --git a/src/Tasks/Build/buildTasks.php b/src/Tasks/Build/buildTasks.php index 68e48c6..da340dc 100644 --- a/src/Tasks/Build/buildTasks.php +++ b/src/Tasks/Build/buildTasks.php @@ -6,10 +6,10 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks\Build; +namespace joomla_projects\jorobo\Tasks\Build; -use JBuild\Tasks\Build\Component; -use JBuild\Tasks\Build\Media; +use joomla_projects\jorobo\Tasks\Build\Component; +use joomla_projects\jorobo\Tasks\Build\Media; trait buildTasks { diff --git a/src/Tasks/Deploy/Base.php b/src/Tasks/Deploy/Base.php index f746ed5..a3e68a0 100644 --- a/src/Tasks/Deploy/Base.php +++ b/src/Tasks/Deploy/Base.php @@ -6,14 +6,14 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks\Deploy; +namespace joomla_projects\jorobo\Tasks\Deploy; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use JBuild\Tasks\JTask; +use joomla_projects\jorobo\Tasks\JTask; /** * Deployment base - contains methods / data used in multiple build tasks diff --git a/src/Tasks/Deploy/Package.php b/src/Tasks/Deploy/Package.php index 42c1dd6..bf65828 100644 --- a/src/Tasks/Deploy/Package.php +++ b/src/Tasks/Deploy/Package.php @@ -6,14 +6,14 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks\Deploy; +namespace joomla_projects\jorobo\Tasks\Deploy; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use JBuild\Tasks\JTask; +use joomla_projects\jorobo\Tasks\JTask; /** * Deploy project as Package file diff --git a/src/Tasks/Deploy/Release.php b/src/Tasks/Deploy/Release.php index f6fe8dd..88fa0e4 100644 --- a/src/Tasks/Deploy/Release.php +++ b/src/Tasks/Deploy/Release.php @@ -6,7 +6,7 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks\Deploy; +namespace joomla_projects\jorobo\Tasks\Deploy; use Joomla\Registry\Registry; use Joomla\Github\Github; @@ -16,7 +16,7 @@ use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use JBuild\Tasks\JTask; +use joomla_projects\jorobo\Tasks\JTask; /** diff --git a/src/Tasks/Deploy/Zip.php b/src/Tasks/Deploy/Zip.php index 55aba7e..69246d5 100644 --- a/src/Tasks/Deploy/Zip.php +++ b/src/Tasks/Deploy/Zip.php @@ -6,14 +6,14 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks\Deploy; +namespace joomla_projects\jorobo\Tasks\Deploy; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use JBuild\Tasks\JTask; +use joomla_projects\jorobo\Tasks\JTask; /** * Deploy project as Zip diff --git a/src/Tasks/Deploy/deployTasks.php b/src/Tasks/Deploy/deployTasks.php index 74beae4..24ad2ad 100644 --- a/src/Tasks/Deploy/deployTasks.php +++ b/src/Tasks/Deploy/deployTasks.php @@ -5,10 +5,10 @@ * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks\Deploy; +namespace joomla_projects\jorobo\Tasks\Deploy; -use JBuild\Tasks\Build\Component; -use JBuild\Tasks\Build\Media; +use joomla_projects\jorobo\Tasks\Build\Component; +use joomla_projects\jorobo\Tasks\Build\Media; trait deployTasks { diff --git a/src/Tasks/Generate.php b/src/Tasks/Generate.php index 9c7f705..3542491 100644 --- a/src/Tasks/Generate.php +++ b/src/Tasks/Generate.php @@ -6,7 +6,7 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks; +namespace joomla_projects\jorobo\Tasks; use Robo\Result; use Robo\Task\BaseTask; @@ -16,7 +16,7 @@ /** * Building class for extensions * - * @package JBuild\Tasks + * @package joomla_projects\jorobo\Tasks */ class Generate extends JTask implements TaskInterface { diff --git a/src/Tasks/Generate/Base.php b/src/Tasks/Generate/Base.php index 194cef0..c4f9a4d 100644 --- a/src/Tasks/Generate/Base.php +++ b/src/Tasks/Generate/Base.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks\Generate; +namespace joomla_projects\jorobo\Tasks\Generate; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use JBuild\Tasks\JTask; +use joomla_projects\jorobo\Tasks\JTask; /** * Generate base class - contains methods / data used in multiple generateion tasks * - * @package JBuild\Generate\Base + * @package joomla_projects\jorobo\Generate\Base */ class Base extends JTask implements TaskInterface { diff --git a/src/Tasks/Generate/Module.php b/src/Tasks/Generate/Module.php index b6c9895..1fac4c1 100644 --- a/src/Tasks/Generate/Module.php +++ b/src/Tasks/Generate/Module.php @@ -6,7 +6,7 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks\Generate; +namespace joomla_projects\jorobo\Tasks\Generate; use Robo\Result; use Robo\Task\BaseTask; @@ -16,7 +16,7 @@ /** * Generate a module skeleton * - * @package JBuild\Tasks\Generate + * @package joomla_projects\jorobo\Tasks\Generate */ class Module extends Base implements TaskInterface { diff --git a/src/Tasks/Generate/generateTasks.php b/src/Tasks/Generate/generateTasks.php index 6cb7e08..b3e9940 100644 --- a/src/Tasks/Generate/generateTasks.php +++ b/src/Tasks/Generate/generateTasks.php @@ -6,7 +6,7 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks\Generate; +namespace joomla_projects\jorobo\Tasks\Generate; trait generateTasks { diff --git a/src/Tasks/JTask.php b/src/Tasks/JTask.php index b9344c5..507722b 100644 --- a/src/Tasks/JTask.php +++ b/src/Tasks/JTask.php @@ -6,7 +6,7 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks; +namespace joomla_projects\jorobo\Tasks; use Robo\Contract\TaskInterface; use Symfony\Component\Filesystem\Exception\FileNotFoundException; @@ -14,7 +14,7 @@ /** * Class JTask - Base class for our tasks * - * @package JBuild\Tasks + * @package joomla_projects\jorobo\Tasks */ abstract class JTask extends \Robo\Tasks implements TaskInterface { @@ -50,7 +50,7 @@ abstract class JTask extends \Robo\Tasks implements TaskInterface /** * Construct * - * @param Array $params Opt params + * @param array $params Opt params */ public function __construct($params = array()) { @@ -62,7 +62,7 @@ public function __construct($params = array()) /** * Function to check if folders are existing / writable (Code Base etc.) * - * @return bool + * @return bool */ public function checkFolders() { @@ -128,20 +128,28 @@ public function getBuildFolder() return $this->getConfig()->buildFolder; } + /** + * Sets the source folder + */ private function determineSourceFolder() { $this->sourceFolder = JPATH_BASE . "/" . $this->getConfig()->source; - if (!is_dir($this->sourceFolder)) { + if (!is_dir($this->sourceFolder)) + { $this->say('Warning - Directory: ' . $this->sourceFolder . ' is not available'); } } + /** + * Sets the operating system + */ private function determineOperatingSystem() { $this->os = strtoupper(substr(PHP_OS, 0, 3)); - if ($this->os === 'WIN') { + if ($this->os === 'WIN') + { $this->fileExtension = '.exe'; } } @@ -154,26 +162,30 @@ private function determineOperatingSystem() */ private function loadConfiguration($params) { - if (!is_null(self::$config)) { + if (!is_null(self::$config)) + { return true; } // Load config as object - $config = json_decode(json_encode(parse_ini_file(JPATH_BASE . '/jbuild.ini', true)), false); + $config = json_decode(json_encode(parse_ini_file(JPATH_BASE . '/jorobo.ini', true)), false); - if (!$config) { + if (!$config) + { $this->say('Error: Config file jbuild.ini not available'); throw new FileNotFoundException('Config file jbuild.ini not available'); } // Are we building a git / dev release? - if ($this->isDevelopmentVersion($params)) { + if ($this->isDevelopmentVersion($params)) + { $res = $this->_exec('git rev-parse --short HEAD'); $version = trim($res->getMessage()); - if ($version) { + if ($version) + { $this->say("Changing version to development version " . $version); $config->version = $version; } @@ -209,10 +221,13 @@ private function determineTarget($config) } $target = "/dist/" . $config->extension; - if (!empty($config->version)) { + + if (!empty($config->version)) + { $target = "/dist/" . $config->extension . "-" . $config->version; return $target; } + return $target; } } diff --git a/src/Tasks/Map.php b/src/Tasks/Map.php index 58e7f60..d10b9fd 100644 --- a/src/Tasks/Map.php +++ b/src/Tasks/Map.php @@ -6,7 +6,7 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks; +namespace joomla_projects\jorobo\Tasks; use Robo\Result; use Robo\Task\BaseTask; @@ -16,7 +16,7 @@ /** * Map extension into an Joomla installation * - * @package JBuild\Tasks\Component + * @package joomla_projects\jorobo\Tasks\Component */ class Map extends JTask implements TaskInterface { diff --git a/src/Tasks/Metrics/Metrics.php b/src/Tasks/Metrics/Metrics.php index c984e4a..176a2ce 100644 --- a/src/Tasks/Metrics/Metrics.php +++ b/src/Tasks/Metrics/Metrics.php @@ -6,7 +6,7 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks; +namespace joomla_projects\jorobo\Tasks; use Robo\Result; use Robo\Task\BaseTask; @@ -16,7 +16,7 @@ /** * Class Metrics * - * @package JBuild\Tasks + * @package joomla_projects\jorobo\Tasks */ class Metrics extends JTask { diff --git a/src/Tasks/Metrics/loadTasks.php b/src/Tasks/Metrics/loadTasks.php index 175f279..d1da869 100644 --- a/src/Tasks/Metrics/loadTasks.php +++ b/src/Tasks/Metrics/loadTasks.php @@ -8,9 +8,9 @@ * @license GNU General Public License version 2 or later; see LICENSE */ -namespace JBuild\Tasks\Metrics; +namespace joomla_projects\jorobo\Tasks\Metrics; -use JBuild\Tasks\Metrics; +use joomla_projects\jorobo\Tasks\Metrics; trait loadTasks { diff --git a/src/Tasks/loadTasks.php b/src/Tasks/loadTasks.php index 9e3477f..f9a7d87 100644 --- a/src/Tasks/loadTasks.php +++ b/src/Tasks/loadTasks.php @@ -6,9 +6,9 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace JBuild\Tasks; +namespace joomla_projects\jorobo\Tasks; -use JBuild\Tasks\Metrics\loadTasks as metricsTasks; +use joomla_projects\jorobo\Tasks\Metrics\loadTasks as metricsTasks; trait loadTasks { From 3681475520843119b6fbcd93a97e5eb6603ecc26 Mon Sep 17 00:00:00 2001 From: Yves Hoppe Date: Fri, 6 Nov 2015 10:18:52 +0100 Subject: [PATCH 2/3] Updated namespaces to joomla_projects\jorobo --- .gitignore | 3 ++- README.md | 2 +- src/Tasks/JTask.php | 9 +++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f534052..4828c71 100644 --- a/.gitignore +++ b/.gitignore @@ -42,8 +42,9 @@ selenium-server-standalone.jar codecept.phar selenium.log -# JBuild related files +# JoRobo related files /dist /jbuild.ini +/jorobo.ini /source /build diff --git a/README.md b/README.md index 6262455..50f4e17 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # JoRobo (Robo.li tasks for Joomla!) -[![Latest Stable Version](https://poser.pugx.org/joomla-projects/jorobo/v/stable)](https://packagist.org/packages/joomla-projects/jorobo) [![Total Downloads](https://poser.pugx.org/joomla-projects/jorobo/downloads)](https://packagist.org/packages/joomla-projects/jorobo) [![Latest Unstable Version](https://poser.pugx.org/joomla-projects/jorobo/v/unstable)](https://packagist.org/packages/joomla-projects/jorobo) [![License](https://poser.pugx.org/yvesh/jbuild/license)](https://packagist.org/packages/joomla-projects/jorobo) +[![Latest Stable Version](https://poser.pugx.org/joomla-projects/jorobo/v/stable)](https://packagist.org/packages/joomla-projects/jorobo) [![Total Downloads](https://poser.pugx.org/joomla-projects/jorobo/downloads)](https://packagist.org/packages/joomla-projects/jorobo) [![Latest Unstable Version](https://poser.pugx.org/joomla-projects/jorobo/v/unstable)](https://packagist.org/packages/joomla-projects/jorobo) [![License](https://poser.pugx.org/joomla-projects/jorobo/license)](https://packagist.org/packages/joomla-projects/jorobo) #### Warning: Currently in alpha stage! diff --git a/src/Tasks/JTask.php b/src/Tasks/JTask.php index 507722b..9690db0 100644 --- a/src/Tasks/JTask.php +++ b/src/Tasks/JTask.php @@ -157,8 +157,9 @@ private function determineOperatingSystem() /** * Load config * - * @param $params - * @return bool + * @param array $params Optional Params + * + * @return bool */ private function loadConfiguration($params) { @@ -172,9 +173,9 @@ private function loadConfiguration($params) if (!$config) { - $this->say('Error: Config file jbuild.ini not available'); + $this->say('Error: Config file jorobo.ini not available'); - throw new FileNotFoundException('Config file jbuild.ini not available'); + throw new FileNotFoundException('Config file jorobo.ini not available'); } // Are we building a git / dev release? From 4976c70abf7cc159787e73525730b6fe7e6aa1ed Mon Sep 17 00:00:00 2001 From: Yves Hoppe Date: Fri, 1 Jan 2016 18:33:25 +0100 Subject: [PATCH 3/3] Changed namespace to Joomla\Jorobo --- README.md | 7 ++----- RoboFile.php | 8 ++++---- composer.json | 2 +- src/Tasks/Build.php | 4 ++-- src/Tasks/Build/Base.php | 6 +++--- src/Tasks/Build/CBPlugin.php | 6 +++--- src/Tasks/Build/Cli.php | 6 +++--- src/Tasks/Build/Component.php | 6 +++--- src/Tasks/Build/Extension.php | 6 +++--- src/Tasks/Build/Language.php | 6 +++--- src/Tasks/Build/Library.php | 6 +++--- src/Tasks/Build/Media.php | 6 +++--- src/Tasks/Build/Module.php | 6 +++--- src/Tasks/Build/Plugin.php | 6 +++--- src/Tasks/Build/Template.php | 6 +++--- src/Tasks/Build/buildTasks.php | 6 +++--- src/Tasks/Deploy/Base.php | 4 ++-- src/Tasks/Deploy/Package.php | 4 ++-- src/Tasks/Deploy/Release.php | 4 ++-- src/Tasks/Deploy/Zip.php | 4 ++-- src/Tasks/Deploy/deployTasks.php | 6 +++--- src/Tasks/Generate.php | 4 ++-- src/Tasks/Generate/Base.php | 6 +++--- src/Tasks/Generate/Module.php | 4 ++-- src/Tasks/Generate/generateTasks.php | 2 +- src/Tasks/JTask.php | 4 ++-- src/Tasks/Map.php | 4 ++-- src/Tasks/Metrics/Metrics.php | 4 ++-- src/Tasks/Metrics/loadTasks.php | 4 ++-- src/Tasks/loadTasks.php | 4 ++-- 30 files changed, 74 insertions(+), 77 deletions(-) diff --git a/README.md b/README.md index 50f4e17..1d61f13 100644 --- a/README.md +++ b/README.md @@ -12,13 +12,10 @@ Tools and Tasks based on Robo.li for Joomla Extension Development and Releases * configure jorobo.ini * vendor/bin/robo - ## Function overview: - * vendor/bin/robo map destination - Symlinks an extension into an Joomla installation (WIP @rdeutz working solution) * vendor/bin/robo build - Builds your extension into an installable Joomla package or zip file including replacements - ## How-to use in your own extension Do a composer require joomla-projects/jorobo:dev @@ -31,7 +28,7 @@ require 'vendor/autoload.php'; class RoboFile extends \Robo\Tasks { - use \joomla_projects\jorobo\Tasks\loadTasks; + use \Joomla\Jorobo\Tasks\loadTasks; .. ``` @@ -49,7 +46,7 @@ Look at the RoboFile.php in the library root for a sample file. ### Directory setup -In order to use Jorobo you should use the following directory structure (it's like the "common" joomla one) +In order to use JoRobo you should use the following directory structure (it's like the "common" joomla one) ####Components diff --git a/RoboFile.php b/RoboFile.php index b6ec81c..4084cec 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -6,7 +6,7 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -use joomla_projects\jorobo\Tasks\loadTasks; +use Joomla\Jorobo\Tasks\loadTasks; if (!defined('JPATH_BASE')) { @@ -40,7 +40,7 @@ public function __construct() */ public function map($target) { - (new \joomla_projects\jorobo\Tasks\Map($target))->run(); + (new \Joomla\Jorobo\Tasks\Map($target))->run(); } /** @@ -52,7 +52,7 @@ public function map($target) */ public function build($params = ['dev' => false]) { - (new \joomla_projects\jorobo\Tasks\Build($params))->run(); + (new \Joomla\Jorobo\Tasks\Build($params))->run(); } /** @@ -64,6 +64,6 @@ public function build($params = ['dev' => false]) */ public function generate($extensions) { - (new \joomla_projects\jorobo\Tasks\Generate($extensions))->run(); + (new \Joomla\Jorobo\Tasks\Generate($extensions))->run(); } } diff --git a/composer.json b/composer.json index c5edc54..6e8b5ae 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ } ], "autoload": { - "psr-4": {"joomla_projects\\jorobo\\": "src"} + "psr-4": {"Joomla\\Jorobo\\": "src"} }, "require" : { "php": ">=5.4.0", diff --git a/src/Tasks/Build.php b/src/Tasks/Build.php index cd9446e..97f07cf 100644 --- a/src/Tasks/Build.php +++ b/src/Tasks/Build.php @@ -6,7 +6,7 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks; +namespace Joomla\Jorobo\Tasks; use Robo\Result; use Robo\Task\BaseTask; @@ -16,7 +16,7 @@ /** * Class Build * - * @package joomla_projects\jorobo\Tasks + * @package Joomla\Jorobo\Tasks */ class Build extends JTask implements TaskInterface { diff --git a/src/Tasks/Build/Base.php b/src/Tasks/Build/Base.php index 28141b0..5276e31 100644 --- a/src/Tasks/Build/Base.php +++ b/src/Tasks/Build/Base.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks\Build; +namespace Joomla\Jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use joomla_projects\jorobo\Tasks\JTask; +use Joomla\Jorobo\Tasks\JTask; /** * Build base - contains methods / data used in multiple build tasks * - * @package joomla_projects\jorobo\Tasks\Build + * @package Joomla\Jorobo\Tasks\Build */ class Base extends JTask implements TaskInterface { diff --git a/src/Tasks/Build/CBPlugin.php b/src/Tasks/Build/CBPlugin.php index 1247483..850d744 100644 --- a/src/Tasks/Build/CBPlugin.php +++ b/src/Tasks/Build/CBPlugin.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks\Build; +namespace Joomla\Jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use joomla_projects\jorobo\Tasks\JTask; +use Joomla\Jorobo\Tasks\JTask; /** * Community Builder build class * - * @package joomla_projects\jorobo\Tasks\Build + * @package Joomla\Jorobo\Tasks\Build */ class CBPlugin extends Base implements TaskInterface { diff --git a/src/Tasks/Build/Cli.php b/src/Tasks/Build/Cli.php index 71b3b40..b49e1e2 100644 --- a/src/Tasks/Build/Cli.php +++ b/src/Tasks/Build/Cli.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks\Build; +namespace Joomla\Jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use joomla_projects\jorobo\Tasks\JTask; +use Joomla\Jorobo\Tasks\JTask; /** * Build Cli * - * @package joomla_projects\jorobo\Tasks\Build + * @package Joomla\Jorobo\Tasks\Build */ class Cli extends Base implements TaskInterface { diff --git a/src/Tasks/Build/Component.php b/src/Tasks/Build/Component.php index e1d9668..14ca437 100644 --- a/src/Tasks/Build/Component.php +++ b/src/Tasks/Build/Component.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks\Build; +namespace Joomla\Jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use joomla_projects\jorobo\Tasks\JTask; +use Joomla\Jorobo\Tasks\JTask; /** * Class Component * - * @package joomla_projects\jorobo\Tasks\Build + * @package Joomla\Jorobo\Tasks\Build */ class Component extends Base implements TaskInterface { diff --git a/src/Tasks/Build/Extension.php b/src/Tasks/Build/Extension.php index 3fad6b6..2653d67 100644 --- a/src/Tasks/Build/Extension.php +++ b/src/Tasks/Build/Extension.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks\Build; +namespace Joomla\Jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use joomla_projects\jorobo\Tasks\JTask; +use Joomla\Jorobo\Tasks\JTask; /** * The supervisor * - * @package joomla_projects\jorobo\Tasks\Build + * @package Joomla\Jorobo\Tasks\Build */ class Extension extends Base implements TaskInterface { diff --git a/src/Tasks/Build/Language.php b/src/Tasks/Build/Language.php index d2ee9bd..599a22b 100644 --- a/src/Tasks/Build/Language.php +++ b/src/Tasks/Build/Language.php @@ -5,19 +5,19 @@ * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks\Build; +namespace Joomla\Jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use joomla_projects\jorobo\Tasks\JTask; +use Joomla\Jorobo\Tasks\JTask; /** * Class Language * - * @package joomla_projects\jorobo\Tasks\Build + * @package Joomla\Jorobo\Tasks\Build */ class Language extends Base implements TaskInterface { diff --git a/src/Tasks/Build/Library.php b/src/Tasks/Build/Library.php index 61f3669..1897c0d 100644 --- a/src/Tasks/Build/Library.php +++ b/src/Tasks/Build/Library.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks\Build; +namespace Joomla\Jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use joomla_projects\jorobo\Tasks\JTask; +use Joomla\Jorobo\Tasks\JTask; /** * Build Library * - * @package joomla_projects\jorobo\Tasks\Build + * @package Joomla\Jorobo\Tasks\Build */ class Library extends Base implements TaskInterface { diff --git a/src/Tasks/Build/Media.php b/src/Tasks/Build/Media.php index 81b8c26..249d7e4 100644 --- a/src/Tasks/Build/Media.php +++ b/src/Tasks/Build/Media.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks\Build; +namespace Joomla\Jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use joomla_projects\jorobo\Tasks\JTask; +use Joomla\Jorobo\Tasks\JTask; /** * Class Media * - * @package joomla_projects\jorobo\Tasks\Build + * @package Joomla\Jorobo\Tasks\Build */ class Media extends Base implements TaskInterface { diff --git a/src/Tasks/Build/Module.php b/src/Tasks/Build/Module.php index ee8977c..1368b3c 100644 --- a/src/Tasks/Build/Module.php +++ b/src/Tasks/Build/Module.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks\Build; +namespace Joomla\Jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use joomla_projects\jorobo\Tasks\JTask; +use Joomla\Jorobo\Tasks\JTask; /** * Class Module * - * @package joomla_projects\jorobo\Tasks\Build + * @package Joomla\Jorobo\Tasks\Build */ class Module extends Base implements TaskInterface { diff --git a/src/Tasks/Build/Plugin.php b/src/Tasks/Build/Plugin.php index a487cb3..8dd5ea5 100644 --- a/src/Tasks/Build/Plugin.php +++ b/src/Tasks/Build/Plugin.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks\Build; +namespace Joomla\Jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use joomla_projects\jorobo\Tasks\JTask; +use Joomla\Jorobo\Tasks\JTask; /** * Class Plugin * - * @package joomla_projects\jorobo\Tasks\Build + * @package Joomla\Jorobo\Tasks\Build */ class Plugin extends Base implements TaskInterface { diff --git a/src/Tasks/Build/Template.php b/src/Tasks/Build/Template.php index c9273d7..c96d735 100644 --- a/src/Tasks/Build/Template.php +++ b/src/Tasks/Build/Template.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks\Build; +namespace Joomla\Jorobo\Tasks\Build; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use joomla_projects\jorobo\Tasks\JTask; +use Joomla\Jorobo\Tasks\JTask; /** * Class Template * - * @package joomla_projects\jorobo\Tasks\Build + * @package Joomla\Jorobo\Tasks\Build */ class Template extends Base implements TaskInterface { diff --git a/src/Tasks/Build/buildTasks.php b/src/Tasks/Build/buildTasks.php index da340dc..4160cc8 100644 --- a/src/Tasks/Build/buildTasks.php +++ b/src/Tasks/Build/buildTasks.php @@ -6,10 +6,10 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks\Build; +namespace Joomla\Jorobo\Tasks\Build; -use joomla_projects\jorobo\Tasks\Build\Component; -use joomla_projects\jorobo\Tasks\Build\Media; +use Joomla\Jorobo\Tasks\Build\Component; +use Joomla\Jorobo\Tasks\Build\Media; trait buildTasks { diff --git a/src/Tasks/Deploy/Base.php b/src/Tasks/Deploy/Base.php index a3e68a0..750ca7d 100644 --- a/src/Tasks/Deploy/Base.php +++ b/src/Tasks/Deploy/Base.php @@ -6,14 +6,14 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks\Deploy; +namespace Joomla\Jorobo\Tasks\Deploy; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use joomla_projects\jorobo\Tasks\JTask; +use Joomla\Jorobo\Tasks\JTask; /** * Deployment base - contains methods / data used in multiple build tasks diff --git a/src/Tasks/Deploy/Package.php b/src/Tasks/Deploy/Package.php index bf65828..b85efea 100644 --- a/src/Tasks/Deploy/Package.php +++ b/src/Tasks/Deploy/Package.php @@ -6,14 +6,14 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks\Deploy; +namespace Joomla\Jorobo\Tasks\Deploy; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use joomla_projects\jorobo\Tasks\JTask; +use Joomla\Jorobo\Tasks\JTask; /** * Deploy project as Package file diff --git a/src/Tasks/Deploy/Release.php b/src/Tasks/Deploy/Release.php index 88fa0e4..d5eb604 100644 --- a/src/Tasks/Deploy/Release.php +++ b/src/Tasks/Deploy/Release.php @@ -6,7 +6,7 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks\Deploy; +namespace Joomla\Jorobo\Tasks\Deploy; use Joomla\Registry\Registry; use Joomla\Github\Github; @@ -16,7 +16,7 @@ use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use joomla_projects\jorobo\Tasks\JTask; +use Joomla\Jorobo\Tasks\JTask; /** diff --git a/src/Tasks/Deploy/Zip.php b/src/Tasks/Deploy/Zip.php index 69246d5..696b01b 100644 --- a/src/Tasks/Deploy/Zip.php +++ b/src/Tasks/Deploy/Zip.php @@ -6,14 +6,14 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks\Deploy; +namespace Joomla\Jorobo\Tasks\Deploy; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use joomla_projects\jorobo\Tasks\JTask; +use Joomla\Jorobo\Tasks\JTask; /** * Deploy project as Zip diff --git a/src/Tasks/Deploy/deployTasks.php b/src/Tasks/Deploy/deployTasks.php index 24ad2ad..6438444 100644 --- a/src/Tasks/Deploy/deployTasks.php +++ b/src/Tasks/Deploy/deployTasks.php @@ -5,10 +5,10 @@ * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks\Deploy; +namespace Joomla\Jorobo\Tasks\Deploy; -use joomla_projects\jorobo\Tasks\Build\Component; -use joomla_projects\jorobo\Tasks\Build\Media; +use Joomla\Jorobo\Tasks\Build\Component; +use Joomla\Jorobo\Tasks\Build\Media; trait deployTasks { diff --git a/src/Tasks/Generate.php b/src/Tasks/Generate.php index 3542491..ec8f69d 100644 --- a/src/Tasks/Generate.php +++ b/src/Tasks/Generate.php @@ -6,7 +6,7 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks; +namespace Joomla\Jorobo\Tasks; use Robo\Result; use Robo\Task\BaseTask; @@ -16,7 +16,7 @@ /** * Building class for extensions * - * @package joomla_projects\jorobo\Tasks + * @package Joomla\Jorobo\Tasks */ class Generate extends JTask implements TaskInterface { diff --git a/src/Tasks/Generate/Base.php b/src/Tasks/Generate/Base.php index c4f9a4d..312952c 100644 --- a/src/Tasks/Generate/Base.php +++ b/src/Tasks/Generate/Base.php @@ -6,19 +6,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks\Generate; +namespace Joomla\Jorobo\Tasks\Generate; use Robo\Result; use Robo\Task\BaseTask; use Robo\Contract\TaskInterface; use Robo\Exception\TaskException; -use joomla_projects\jorobo\Tasks\JTask; +use Joomla\Jorobo\Tasks\JTask; /** * Generate base class - contains methods / data used in multiple generateion tasks * - * @package joomla_projects\jorobo\Generate\Base + * @package Joomla\Jorobo\Generate\Base */ class Base extends JTask implements TaskInterface { diff --git a/src/Tasks/Generate/Module.php b/src/Tasks/Generate/Module.php index 1fac4c1..cac8237 100644 --- a/src/Tasks/Generate/Module.php +++ b/src/Tasks/Generate/Module.php @@ -6,7 +6,7 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks\Generate; +namespace Joomla\Jorobo\Tasks\Generate; use Robo\Result; use Robo\Task\BaseTask; @@ -16,7 +16,7 @@ /** * Generate a module skeleton * - * @package joomla_projects\jorobo\Tasks\Generate + * @package Joomla\Jorobo\Tasks\Generate */ class Module extends Base implements TaskInterface { diff --git a/src/Tasks/Generate/generateTasks.php b/src/Tasks/Generate/generateTasks.php index b3e9940..91b9562 100644 --- a/src/Tasks/Generate/generateTasks.php +++ b/src/Tasks/Generate/generateTasks.php @@ -6,7 +6,7 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks\Generate; +namespace Joomla\Jorobo\Tasks\Generate; trait generateTasks { diff --git a/src/Tasks/JTask.php b/src/Tasks/JTask.php index 9690db0..46bbccd 100644 --- a/src/Tasks/JTask.php +++ b/src/Tasks/JTask.php @@ -6,7 +6,7 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks; +namespace Joomla\Jorobo\Tasks; use Robo\Contract\TaskInterface; use Symfony\Component\Filesystem\Exception\FileNotFoundException; @@ -14,7 +14,7 @@ /** * Class JTask - Base class for our tasks * - * @package joomla_projects\jorobo\Tasks + * @package Joomla\Jorobo\Tasks */ abstract class JTask extends \Robo\Tasks implements TaskInterface { diff --git a/src/Tasks/Map.php b/src/Tasks/Map.php index d10b9fd..4383120 100644 --- a/src/Tasks/Map.php +++ b/src/Tasks/Map.php @@ -6,7 +6,7 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks; +namespace Joomla\Jorobo\Tasks; use Robo\Result; use Robo\Task\BaseTask; @@ -16,7 +16,7 @@ /** * Map extension into an Joomla installation * - * @package joomla_projects\jorobo\Tasks\Component + * @package Joomla\Jorobo\Tasks\Component */ class Map extends JTask implements TaskInterface { diff --git a/src/Tasks/Metrics/Metrics.php b/src/Tasks/Metrics/Metrics.php index 176a2ce..a723ddf 100644 --- a/src/Tasks/Metrics/Metrics.php +++ b/src/Tasks/Metrics/Metrics.php @@ -6,7 +6,7 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks; +namespace Joomla\Jorobo\Tasks; use Robo\Result; use Robo\Task\BaseTask; @@ -16,7 +16,7 @@ /** * Class Metrics * - * @package joomla_projects\jorobo\Tasks + * @package Joomla\Jorobo\Tasks */ class Metrics extends JTask { diff --git a/src/Tasks/Metrics/loadTasks.php b/src/Tasks/Metrics/loadTasks.php index d1da869..d957ac1 100644 --- a/src/Tasks/Metrics/loadTasks.php +++ b/src/Tasks/Metrics/loadTasks.php @@ -8,9 +8,9 @@ * @license GNU General Public License version 2 or later; see LICENSE */ -namespace joomla_projects\jorobo\Tasks\Metrics; +namespace Joomla\Jorobo\Tasks\Metrics; -use joomla_projects\jorobo\Tasks\Metrics; +use Joomla\Jorobo\Tasks\Metrics; trait loadTasks { diff --git a/src/Tasks/loadTasks.php b/src/Tasks/loadTasks.php index f9a7d87..8c9522c 100644 --- a/src/Tasks/loadTasks.php +++ b/src/Tasks/loadTasks.php @@ -6,9 +6,9 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -namespace joomla_projects\jorobo\Tasks; +namespace Joomla\Jorobo\Tasks; -use joomla_projects\jorobo\Tasks\Metrics\loadTasks as metricsTasks; +use Joomla\Jorobo\Tasks\Metrics\loadTasks as metricsTasks; trait loadTasks {