Merge branch 'develop'

CHANGELOG.md

@@ -4,12 +4,15 @@ CHANGELOG
 This changelog references the relevant changes (bug and security fixes) done
 in 1.x versions.
 
-To get the diff for a specific change, go to https://github.com/joomlatools/joomla-vagrant/commit/xxx where xxx is the change hash.
-To view the diff between two versions, go to https://github.com/joomlatools/joomla-vagrant/compare/v1.0.0...v1.0.1
+To get the diff for a specific change, go to https://github.com/joomlatools/joomlatools-vagrant/commit/xxx where xxx is the change hash.
+To view the diff between two versions, go to https://github.com/joomlatools/joomlatools-vagrant/compare/v1.0.0...v1.0.1
+
+* 1.4.3 (2015-12-01)
+ * Changed - Renamed `joomlatools/joomla-console` to `joomlatools/console`
 
 * 1.4.2 (2015-11-25)
  * Added - `JOOMLATOOLS_BOX` version environment variable
- * Added - Install [joomlatools/joomla-console-joomlatools](https://github.com/joomlatools/joomla-console-joomlatools) plugin by default
+ * Added - Install [joomlatools/joomla-console-joomlatools](https://github.com/joomlatools/joomlatools-console-joomlatools) plugin by default
  * Fixed - Always pass requests to /ZendServer end-point
  * Fixed - Symlink `/opt/zray` to active Z-Ray installation to fix plugin gallery
  * Fixed - Ensure that hostname is always set to `joomlatools` using Puppet configuration
@@ -41,7 +44,7 @@ To view the diff between two versions, go to https://github.com/joomlatools/joom
 
 * 1.3.1 (2015-09-03)
  * Added - Support for PHP7
- * Added - Support for [joomla-platform](https://github.com/joomlatools/joomla-platform) installations
+ * Added - Support for [joomla-platform](https://github.com/joomlatools/joomlatools-platform) installations
  * Added - Installed git-ftp
  * Added - `box server:restart` command
  * Improved - Use the async option when mounting NFS on Linux
@@ -87,7 +90,7 @@ To view the diff between two versions, go to https://github.com/joomlatools/joom
  * Fixed - Improved README, added login details + precompiled box instructions
 
 * 1.2.0 (2014-03-17)
- * Added - [Joomla console package](https://github.com/joomlatools-console) is now available in the box.
+ * Added - [Joomla console package](https://github.com/joomlatools/joomlatools-console) is now available in the box.
  * Added - phpmanager command to allow installation and management of multiple PHP versions.
  * Added - xdebug command to easily enable/disable PHP Xdebug extension.
  * Added - apc command to easily enable/disable PHP APC extension as well as clear the cache.

README.md

@@ -71,7 +71,7 @@ If you want to make changes to the box's infrastructure, you can do so by buildi
 1. Clone this repository:
 
     ```
-git clone https://github.com/joomlatools/joomla-vagrant.git
+git clone https://github.com/joomlatools/joomlatools-vagrant.git
     ```
 
 1. Install required Vagrant plugins
@@ -84,7 +84,7 @@ vagrant plugin install vagrant-vbguest
 1. Go to the repository folder and provision the box:
 
     ```
-cd joomla-vagrant
+cd joomlatools-vagrant
 vagrant up
     ```
 
@@ -102,7 +102,7 @@ We use [Packer](https://www.packer.io/) to automatically build and deploy the bo
 1. Clone this repository:
 
     ```
-git clone https://github.com/joomlatools/joomla-vagrant.git
+git clone https://github.com/joomlatools/joomlatools-vagrant.git
     ```
 
 1. Install [Packer](https://www.packer.io/)
@@ -124,7 +124,7 @@ The version number is defined in the post-processor section and can be found at
           ...
           "metadata": {
               "provider": "virtualbox",
-              "version": "1.4.2"
+              "version": "1.4.3"
           }
       }]
 ]
@@ -159,7 +159,7 @@ We have [contributing guidelines](CONTRIBUTING.md) to help you get started.
 
 ## Contributors
 
-See the list of [contributors](https://github.com/joomlatools/joomla-vagrant/contributors).
+See the list of [contributors](https://github.com/joomlatools/joomlatools-vagrant/contributors).
 
 ## License 
 

packer.json

@@ -90,7 +90,7 @@
             "artifact_type": "vagrant.box",
             "metadata": {
                 "provider": "virtualbox",
-                "version": "1.4.2"
+                "version": "1.4.3"
             }
         }]
   ]

puppet/manifests/default.pp

@@ -2,7 +2,7 @@
 Exec { path => [ '/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/', '/usr/local/bin/' ], timeout => 900 }
 File { owner => 0, group => 0, mode => 0644 }
 
-$box_version = '1.4.2'
+$box_version = '1.4.3'
 
 system::hostname { 'joomlatools':
   ip => '127.0.1.1'

puppet/modules/phpmanager/files/scripts/phpmanager

@@ -1,10 +1,10 @@
 #!/bin/bash
 ##
-# Joomlatools PHP Manager script - https://github.com/joomlatools/joomla-vagrant
+# Joomlatools PHP Manager script - https://github.com/joomlatools/joomlatools-vagrant
 #
 # @copyright	Copyright (C) 2011 - 2015 Johan Janssens and Timble CVBA. (http://www.timble.net)
 # @license		MPL 2.0 <http://www.mozilla.org/MPL/2.0/>
-# @link		    http://github.com/joomlatools/joomla-vagrant for the canonical source repository
+# @link		    http://github.com/joomlatools/joomlatools-vagrant for the canonical source repository
 ##
 
 ##

puppet/modules/scripts/files/scripts/dashboard/index.php

@@ -28,9 +28,9 @@
     if ($fileinfo->isDir() && !$fileinfo->isDot())
     {
         $files = array(
-            'joomla-cms'      => $fileinfo->getPathname() . '/libraries/cms/version/version.php',
-            'joomla-platform' => $fileinfo->getPathname() . '/lib/libraries/cms/version/version.php',
-            'joomla-1.5'      => $fileinfo->getPathname() . '/libraries/joomla/version.php'
+            'joomla-cms'           => $fileinfo->getPathname() . '/libraries/cms/version/version.php',
+            'joomlatools-platform' => $fileinfo->getPathname() . '/lib/libraries/cms/version/version.php',
+            'joomla-1.5'           => $fileinfo->getPathname() . '/libraries/joomla/version.php'
         );
 
         foreach ($files as $type => $file)
@@ -59,7 +59,7 @@
 
             $sites[] = (object) array(
                 'name'    => $fileinfo->getFilename(),
-                'docroot' => $fileinfo->getFilename() . '/' . ($application == 'joomla-platform' ? 'web' : ''),
+                'docroot' => $fileinfo->getFilename() . '/' . ($application == 'joomlatools-platform' ? 'web' : ''),
                 'type'    => $application,
                 'version' => $canonical($version)
             );
@@ -110,7 +110,7 @@
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav navbar-right">
-            <li><a href="https://github.com/joomlatools/joomla-vagrant">Contribute on GitHub</a></li>
+            <li><a href="https://github.com/joomlatools/joomlatools-vagrant">Contribute on GitHub</a></li>
             <li><a href="http://developer.joomlatools.com/tools/vagrant/introduction.html" target="_blank">Docs</a></li>
           </ul>
         </div>

puppet/modules/scripts/files/scripts/updater/login.sh

@@ -5,13 +5,13 @@ nohup /usr/bin/php5 /home/vagrant/scripts/updater/updater.php >/dev/null 2>&1 &
 if [ -f /home/vagrant/scripts/updater/UPDATE_AVAILABLE ]; then
     VERSION=`cat /home/vagrant/scripts/updater/UPDATE_AVAILABLE`
     echo ""
-    echo "New release $VERSION available for joomla-console."
+    echo "New release $VERSION available for joomlatools/console."
 
     read -r -p "${1:-Do you want to update now? [y/N]} " response
     case $response in
         [yY][eE][sS]|[yY])
             sudo composer self-update
-            composer global require joomlatools/joomla-console:$VERSION
+            composer global require joomlatools/console:$VERSION
             rm -f /home/vagrant/scripts/updater/UPDATE_AVAILABLE
             ;;
         *)

puppet/modules/scripts/files/scripts/updater/updater.php

@@ -4,7 +4,7 @@
     exit;
 }
 
-exec("composer show joomlatools/joomla-console 2>&1", $result, $code);
+exec("composer show joomlatools/console 2>&1", $result, $code);
 
 if ($code === 1) {
     exit(1); // Failed to fetch info from packagist
@@ -42,7 +42,7 @@
 $currentVersion = false;
 foreach ($manifest->packages as $package)
 {
-    if ($package->name == 'joomlatools/joomla-console')
+    if ($package->name == 'joomlatools/console')
     {
         if (substr($package->version, 0, 1) != 'v') {
             return; // Only update stable releases

puppet/modules/scripts/manifests/init.pp

@@ -19,16 +19,16 @@
   }
 
   exec { 'add-console':
-    command => 'composer global require joomlatools/joomla-console:* --no-interaction',
-    unless  => '[ -d /home/vagrant/.composer/vendor/joomlatools/joomla-console ]',
+    command => 'composer global require joomlatools/console:* --no-interaction',
+    unless  => '[ -d /home/vagrant/.composer/vendor/joomlatools/console ]',
     require => [File['/home/vagrant/scripts'], Class['Composer']],
     user    => vagrant,
     environment => 'COMPOSER_HOME=/home/vagrant/.composer'
   }
 
   exec { 'add-console-joomlatools-plugin':
-    command => 'composer --working-dir=/home/vagrant/.composer/vendor/joomlatools/joomla-console/plugins require joomlatools/joomla-console-joomlatools --no-interaction',
-    unless  => '[ -d /home/vagrant/.composer/vendor/joomlatools/joomla-console/plugins/vendor/joomlatools/joomla-console-joomlatools ]',
+    command => 'composer --working-dir=/home/vagrant/.composer/vendor/joomlatools/console/plugins require joomlatools/console-joomlatools --no-interaction',
+    unless  => '[ -d /home/vagrant/.composer/vendor/joomlatools/console/plugins/vendor/joomlatools/console-joomlatools ]',
     require => Exec['add-console'],
     user    => vagrant,
     environment => 'COMPOSER_HOME=/home/vagrant/.composer'
@@ -38,10 +38,10 @@
     ensure => file,
     owner  => vagrant,
     group  => vagrant,
-    notify => [File_line['joomla-console-updater'], File_line['cd-to-www-dir']]
+    notify => [File_line['joomlatools-console-updater'], File_line['cd-to-www-dir']]
   }
 
-  file_line { 'joomla-console-updater':
+  file_line { 'joomlatools-console-updater':
     path    => '/home/vagrant/.bash_profile',
     line    => '/home/vagrant/scripts/updater/login.sh',
     require => Exec['make-scripts-executable']