Merge pull request #129 from joomlatools/feature/128-v1.5.1

Merge feature/128-v1.5.1

CHANGELOG.md

@@ -7,6 +7,16 @@ in 1.x versions.
 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.5.1 (2018-06-19)
+  * Added - Install php-ldap extension [#123](https://github.com/joomlatools/joomlatools-vagrant/issues/123)
+  * Added - Install `tmate` to share terminal [#120](https://github.com/joomlatools/joomlatools-vagrant/issues/120)
+  * Fixed - Prevent updater from running simultaneously [#121](https://github.com/joomlatools/joomlatools-vagrant/issues/121)
+  * Fixed - Make sure auto-updater updates dependencies too [#126](https://github.com/joomlatools/joomlatools-vagrant/issues/126)
+  * Fixed - Restart Nginx in box command [#118](https://github.com/joomlatools/joomlatools-vagrant/issues/118)
+  * Fixed - Fix scrolling in site list [#113](https://github.com/joomlatools/joomlatools-vagrant/issues/113)
+  * Improved - Update phing/phing to 3.x [#124](https://github.com/joomlatools/joomlatools-vagrant/issues/124)
+  * Removed - `vagrant-triggers` for backup and restore [#125](https://github.com/joomlatools/joomlatools-vagrant/issues/125)
+
 * 1.5.0 (2017-11-06)
   * Improved - Use PHP-FPM instead of mod_php [#28](https://github.com/joomlatools/joomlatools-vagrant/issues/28)
   * Improved - New joomla.box dashboard design [#13](https://github.com/joomlatools/joomlatools-vagrant/issues/13)

README.md

@@ -83,9 +83,9 @@ vagrant share --http 80
 
 For more options and background please refer to the [Vagrant docs](https://docs.vagrantup.com/v2/share/index.html).
 
-### SSH
+### Terminal
 
-You can also share SSH access. There are two methods:
+You can also share access to the terminal via SSH. There are two methods:
 
 1. With [tmate](https://tmate.io/): run the `tmate` command on the box and share the resulting ssh connection string. 
 1. Using Vagrant's built-in [SSH sharing](https://www.vagrantup.com/docs/share/ssh.html) feature.

packer.json

@@ -1,8 +1,8 @@
 {
   "variables": {
-    "guest_additions_url": "http://download.virtualbox.org/virtualbox/5.1.30/VBoxGuestAdditions_5.1.30.iso",
-    "guest_additions_sha256": "631ca8e8d513acf43a75de56a71a31aaffb5624864c57d10346ba657d991ec1e",
-    "version": "1.5.0"
+    "guest_additions_url": "https://download.virtualbox.org/virtualbox/5.2.12/VBoxGuestAdditions_5.2.12.iso",
+    "guest_additions_sha256": "b81d283d9ef88a44e7ac8983422bead0823c825cbfe80417423bd12de91b8046",
+    "version": "1.5.1"
   },
   "push": {
     "name": "joomlatools/box",

packer/scripts/serverspec.sh

@@ -13,7 +13,8 @@ gem install bundler --no-ri --no-rdoc
 
 cd /tmp/tests
 
-sudo chown vagrant:vagrant /var/www
+sudo chown vagrant:www-data /var/www
+sudo chmod a=rx,ug+w /var/www
 
 bundle install
 BACKEND=exec bundle exec rake spec

packer/scripts/vagrant.sh

@@ -4,7 +4,8 @@ set -e
 
 date > /etc/vagrant_box_build_time
 
-mkdir /home/vagrant/.ssh
+mkdir -p /home/vagrant/.ssh
+
 wget --no-check-certificate \
     'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \
     -O /home/vagrant/.ssh/authorized_keys

puppet/manifests/default.pp

@@ -2,4 +2,4 @@
 Exec { path => [ '/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/', '/usr/local/bin/' ], timeout => 900 }
 File { owner => 0, group => 0, backup => false }
 
-$box_version = '1.5.0'
+$box_version = '1.5.1'

puppet/modules/custom/profiles/manifests/box/scripts.pp

@@ -28,7 +28,7 @@
     environment => 'COMPOSER_HOME=/home/vagrant/.composer'
   }
 
-  file { '/home/vagrant/.joomlatools/plugins':
+  file { ['/home/vagrant/.joomlatools/', '/home/vagrant/.joomlatools/plugins']:
     ensure => directory,
     owner  => vagrant,
     group  => vagrant

puppet/modules/custom/profiles/manifests/mailcatcher.pp

@@ -1,5 +1,7 @@
 class profiles::mailcatcher {
 
+  require ::profiles::rvm
+
   package { ["sqlite3", "libsqlite3-dev"]: }
 
   exec {'install-mailcatcher-gem':
@@ -8,7 +10,7 @@
         environment => ['HOME=/home/vagrant'],
         creates => '/home/vagrant/.rvm/gems/ruby-2.2.6/bin/mailcatcher',
         timeout => 900,
-        require => [Package['sqlite3'], Package['libsqlite3-dev']]
+        require => [Package['sqlite3'], Package['libsqlite3-dev'], Exec['set-default-ruby-for-vagrant']]
   }
 
   file { '/etc/init/mailcatcher.conf':

puppet/modules/custom/profiles/manifests/nginx.pp

@@ -12,6 +12,7 @@
     }
 
     file { ['/etc/nginx/sites-available/conf.d', '/etc/nginx/sites-available', '/etc/nginx/sites-enabled']:
+        purge   => true, # This is important: we want to make sure the sample vhosts are removed, as they run on port 80 by default!
         recurse => true,
         require => Package['nginx'],
         notify  => Service['nginx'],

tests/spec/default/joomlatools.rb

@@ -6,7 +6,7 @@
     describe '### joomlatools-console' do
 
         describe command('joomla -V') do
-          its(:stdout) { should match /Joomla Console tools version \d\.\d+\.\d+/ }
+          its(:stdout) { should match /Joomla Console tools \d\.\d+\.\d+/ }
         end
 
         describe command('joomla site:create serverspectest') do