From 1a3d0b5cea30dc6d82b1584f4fc8b55824fbea35 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 7 May 2015 13:58:17 +0930 Subject: [PATCH] Update deps, vagrant install --- system/composer.lock | 158 +++++++++++++++++----------------- system/vagrant/aliases | 7 +- system/vagrant/environment.sh | 20 ++--- 3 files changed, 91 insertions(+), 94 deletions(-) diff --git a/system/composer.lock b/system/composer.lock index f3a51ad..ea51e80 100644 --- a/system/composer.lock +++ b/system/composer.lock @@ -8,20 +8,20 @@ "packages": [ { "name": "classpreloader/classpreloader", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/ClassPreloader/ClassPreloader.git", - "reference": "f0bfbf71fb3335c9473f695d4d966ba2fb879a9f" + "reference": "0544616ba33fb2a6b792b3a7822650810c6d65d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ClassPreloader/ClassPreloader/zipball/f0bfbf71fb3335c9473f695d4d966ba2fb879a9f", - "reference": "f0bfbf71fb3335c9473f695d4d966ba2fb879a9f", + "url": "https://api.github.com/repos/ClassPreloader/ClassPreloader/zipball/0544616ba33fb2a6b792b3a7822650810c6d65d9", + "reference": "0544616ba33fb2a6b792b3a7822650810c6d65d9", "shasum": "" }, "require": { - "nikic/php-parser": "~1.0", + "nikic/php-parser": "^1.2.2", "php": ">=5.3.3", "symfony/console": "~2.1", "symfony/filesystem": "~2.1", @@ -36,7 +36,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -64,7 +64,7 @@ "class", "preload" ], - "time": "2015-01-26 22:06:19" + "time": "2015-04-15 21:59:30" }, { "name": "danielstjules/stringy", @@ -410,16 +410,16 @@ }, { "name": "laravel/framework", - "version": "v5.0.23", + "version": "v5.0.28", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "59219f7afb60be05d74ce01fcb5d2440f7a1b13d" + "reference": "06a09429322cf53e5bd4587db1060f02a291562e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/59219f7afb60be05d74ce01fcb5d2440f7a1b13d", - "reference": "59219f7afb60be05d74ce01fcb5d2440f7a1b13d", + "url": "https://api.github.com/repos/laravel/framework/zipball/06a09429322cf53e5bd4587db1060f02a291562e", + "reference": "06a09429322cf53e5bd4587db1060f02a291562e", "shasum": "" }, "require": { @@ -489,7 +489,7 @@ "predis/predis": "~1.0" }, "suggest": { - "aws/aws-sdk-php": "Required to use the SQS queue driver (~2.4).", + "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~2.4).", "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.4).", "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers (~5.0).", "iron-io/iron_mq": "Required to use the iron queue driver (~1.5).", @@ -532,7 +532,7 @@ "framework", "laravel" ], - "time": "2015-03-28 16:56:59" + "time": "2015-04-21 01:44:32" }, { "name": "league/flysystem", @@ -783,16 +783,16 @@ }, { "name": "nikic/php-parser", - "version": "v1.2.1", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "dba7524b3724f25b947cd26a580787c55c8a6f9b" + "reference": "dff239267fd1befa1cd40430c9ed12591aa720ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dba7524b3724f25b947cd26a580787c55c8a6f9b", - "reference": "dba7524b3724f25b947cd26a580787c55c8a6f9b", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dff239267fd1befa1cd40430c9ed12591aa720ca", + "reference": "dff239267fd1befa1cd40430c9ed12591aa720ca", "shasum": "" }, "require": { @@ -802,7 +802,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -824,7 +824,7 @@ "parser", "php" ], - "time": "2015-03-24 19:10:28" + "time": "2015-05-02 15:40:40" }, { "name": "psr/log", @@ -989,17 +989,17 @@ }, { "name": "symfony/console", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/Console", "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "53f86497ccd01677e22435cfb7262599450a90d1" + "reference": "5b91dc4ed5eb08553f57f6df04c4730a73992667" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/53f86497ccd01677e22435cfb7262599450a90d1", - "reference": "53f86497ccd01677e22435cfb7262599450a90d1", + "url": "https://api.github.com/repos/symfony/Console/zipball/5b91dc4ed5eb08553f57f6df04c4730a73992667", + "reference": "5b91dc4ed5eb08553f57f6df04c4730a73992667", "shasum": "" }, "require": { @@ -1043,21 +1043,21 @@ ], "description": "Symfony Console Component", "homepage": "http://symfony.com", - "time": "2015-03-13 17:37:22" + "time": "2015-03-30 15:54:10" }, { "name": "symfony/debug", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/Debug", "source": { "type": "git", "url": "https://github.com/symfony/Debug.git", - "reference": "5c1570dea188ade0c6c5e874c2f0a6570587aa1c" + "reference": "d49a46a20a8f0544aedac54466750ad787d3d3e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Debug/zipball/5c1570dea188ade0c6c5e874c2f0a6570587aa1c", - "reference": "5c1570dea188ade0c6c5e874c2f0a6570587aa1c", + "url": "https://api.github.com/repos/symfony/Debug/zipball/d49a46a20a8f0544aedac54466750ad787d3d3e3", + "reference": "d49a46a20a8f0544aedac54466750ad787d3d3e3", "shasum": "" }, "require": { @@ -1104,11 +1104,11 @@ ], "description": "Symfony Debug Component", "homepage": "http://symfony.com", - "time": "2015-03-13 17:37:22" + "time": "2015-03-22 16:55:57" }, { "name": "symfony/event-dispatcher", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", @@ -1167,17 +1167,17 @@ }, { "name": "symfony/filesystem", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/Filesystem", "source": { "type": "git", "url": "https://github.com/symfony/Filesystem.git", - "reference": "fdc5f151bc2db066b51870d5bea3773d915ced0b" + "reference": "4983964b3693e4f13449cb3800c64a9112c301b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/fdc5f151bc2db066b51870d5bea3773d915ced0b", - "reference": "fdc5f151bc2db066b51870d5bea3773d915ced0b", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/4983964b3693e4f13449cb3800c64a9112c301b4", + "reference": "4983964b3693e4f13449cb3800c64a9112c301b4", "shasum": "" }, "require": { @@ -1213,21 +1213,21 @@ ], "description": "Symfony Filesystem Component", "homepage": "http://symfony.com", - "time": "2015-03-12 10:28:44" + "time": "2015-03-22 16:55:57" }, { "name": "symfony/finder", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/Finder", "source": { "type": "git", "url": "https://github.com/symfony/Finder.git", - "reference": "bebc7479c566fa4f14b9bcef9e32e719eabec74e" + "reference": "5dbe2e73a580618f5b4880fda93406eed25de251" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/bebc7479c566fa4f14b9bcef9e32e719eabec74e", - "reference": "bebc7479c566fa4f14b9bcef9e32e719eabec74e", + "url": "https://api.github.com/repos/symfony/Finder/zipball/5dbe2e73a580618f5b4880fda93406eed25de251", + "reference": "5dbe2e73a580618f5b4880fda93406eed25de251", "shasum": "" }, "require": { @@ -1263,21 +1263,21 @@ ], "description": "Symfony Finder Component", "homepage": "http://symfony.com", - "time": "2015-03-12 10:28:44" + "time": "2015-03-30 15:54:10" }, { "name": "symfony/http-foundation", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "d527885e37b55ec0e3dc6f4b70566d0f9b2f2388" + "reference": "8a6337233f08f7520de97f4ffd6f00e947d892f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/d527885e37b55ec0e3dc6f4b70566d0f9b2f2388", - "reference": "d527885e37b55ec0e3dc6f4b70566d0f9b2f2388", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/8a6337233f08f7520de97f4ffd6f00e947d892f9", + "reference": "8a6337233f08f7520de97f4ffd6f00e947d892f9", "shasum": "" }, "require": { @@ -1317,21 +1317,21 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "http://symfony.com", - "time": "2015-03-13 17:37:22" + "time": "2015-04-01 16:50:12" }, { "name": "symfony/http-kernel", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/HttpKernel", "source": { "type": "git", "url": "https://github.com/symfony/HttpKernel.git", - "reference": "6f7b2d3ba8bf02cf77edb399696e85ef24a888a4" + "reference": "3829cacfe21eaf3f73604a62d79183d1f6e792c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/6f7b2d3ba8bf02cf77edb399696e85ef24a888a4", - "reference": "6f7b2d3ba8bf02cf77edb399696e85ef24a888a4", + "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/3829cacfe21eaf3f73604a62d79183d1f6e792c4", + "reference": "3829cacfe21eaf3f73604a62d79183d1f6e792c4", "shasum": "" }, "require": { @@ -1395,21 +1395,21 @@ ], "description": "Symfony HttpKernel Component", "homepage": "http://symfony.com", - "time": "2015-03-17 14:58:46" + "time": "2015-04-01 16:55:26" }, { "name": "symfony/process", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/Process", "source": { "type": "git", "url": "https://github.com/symfony/Process.git", - "reference": "4d717f34f3d1d6ab30fbe79f7132960a27f4a0dc" + "reference": "a8bebaec1a9dc6cde53e0250e32917579b0be552" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/4d717f34f3d1d6ab30fbe79f7132960a27f4a0dc", - "reference": "4d717f34f3d1d6ab30fbe79f7132960a27f4a0dc", + "url": "https://api.github.com/repos/symfony/Process/zipball/a8bebaec1a9dc6cde53e0250e32917579b0be552", + "reference": "a8bebaec1a9dc6cde53e0250e32917579b0be552", "shasum": "" }, "require": { @@ -1445,21 +1445,21 @@ ], "description": "Symfony Process Component", "homepage": "http://symfony.com", - "time": "2015-03-12 10:28:44" + "time": "2015-03-30 15:54:10" }, { "name": "symfony/routing", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/Routing", "source": { "type": "git", "url": "https://github.com/symfony/Routing.git", - "reference": "a7f3eb540e5c553c3c95993c6fc2e7edb2f3b9d2" + "reference": "4e173a645b63ff60a124f3741b4f15feebd908fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/a7f3eb540e5c553c3c95993c6fc2e7edb2f3b9d2", - "reference": "a7f3eb540e5c553c3c95993c6fc2e7edb2f3b9d2", + "url": "https://api.github.com/repos/symfony/Routing/zipball/4e173a645b63ff60a124f3741b4f15feebd908fa", + "reference": "4e173a645b63ff60a124f3741b4f15feebd908fa", "shasum": "" }, "require": { @@ -1514,21 +1514,21 @@ "uri", "url" ], - "time": "2015-03-13 17:37:22" + "time": "2015-03-30 15:54:10" }, { "name": "symfony/security-core", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/Security/Core", "source": { "type": "git", "url": "https://github.com/symfony/security-core.git", - "reference": "889290a5c00d3f174cc73ce13a11a0a6406939e9" + "reference": "d25c17db741f58c0f615e52006a47f6fb23cd9b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-core/zipball/889290a5c00d3f174cc73ce13a11a0a6406939e9", - "reference": "889290a5c00d3f174cc73ce13a11a0a6406939e9", + "url": "https://api.github.com/repos/symfony/security-core/zipball/d25c17db741f58c0f615e52006a47f6fb23cd9b3", + "reference": "d25c17db741f58c0f615e52006a47f6fb23cd9b3", "shasum": "" }, "require": { @@ -1578,21 +1578,21 @@ ], "description": "Symfony Security Component - Core Library", "homepage": "http://symfony.com", - "time": "2015-03-13 17:37:22" + "time": "2015-03-30 15:54:10" }, { "name": "symfony/translation", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/Translation", "source": { "type": "git", "url": "https://github.com/symfony/Translation.git", - "reference": "043db5f1eef9598d1bc1d75b93304984c003d7d9" + "reference": "bd939f05cdaca128f4ddbae1b447d6f0203b60af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Translation/zipball/043db5f1eef9598d1bc1d75b93304984c003d7d9", - "reference": "043db5f1eef9598d1bc1d75b93304984c003d7d9", + "url": "https://api.github.com/repos/symfony/Translation/zipball/bd939f05cdaca128f4ddbae1b447d6f0203b60af", + "reference": "bd939f05cdaca128f4ddbae1b447d6f0203b60af", "shasum": "" }, "require": { @@ -1637,21 +1637,21 @@ ], "description": "Symfony Translation Component", "homepage": "http://symfony.com", - "time": "2015-03-14 11:42:25" + "time": "2015-03-30 15:54:10" }, { "name": "symfony/var-dumper", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/VarDumper", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "61ee6c848fd2c623e13f59df48833f8b8bad7fda" + "reference": "aafae00236e147568832de3c65ccb94cfc836278" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/61ee6c848fd2c623e13f59df48833f8b8bad7fda", - "reference": "61ee6c848fd2c623e13f59df48833f8b8bad7fda", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/aafae00236e147568832de3c65ccb94cfc836278", + "reference": "aafae00236e147568832de3c65ccb94cfc836278", "shasum": "" }, "require": { @@ -1697,7 +1697,7 @@ "debug", "dump" ], - "time": "2015-03-06 16:45:31" + "time": "2015-03-31 08:12:29" }, { "name": "vlucas/phpdotenv", @@ -1758,12 +1758,12 @@ "source": { "type": "git", "url": "https://github.com/franzliedke/studio.git", - "reference": "b79a1c0da01580f33ff663ce7954c371a22a0c35" + "reference": "57149538080b08d6ea74f2a97f566cfb30aaa5e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/franzliedke/studio/zipball/b79a1c0da01580f33ff663ce7954c371a22a0c35", - "reference": "b79a1c0da01580f33ff663ce7954c371a22a0c35", + "url": "https://api.github.com/repos/franzliedke/studio/zipball/57149538080b08d6ea74f2a97f566cfb30aaa5e3", + "reference": "57149538080b08d6ea74f2a97f566cfb30aaa5e3", "shasum": "" }, "require": { @@ -1805,7 +1805,7 @@ "development", "workflow" ], - "time": "2015-04-01 09:35:30" + "time": "2015-04-09 14:52:10" } ], "aliases": [], diff --git a/system/vagrant/aliases b/system/vagrant/aliases index 2b79136..7c9fa30 100644 --- a/system/vagrant/aliases +++ b/system/vagrant/aliases @@ -32,9 +32,6 @@ alias cca='./vendor/bin/codecept Acceptance' alias ccf='./vendor/bin/codecept Functional' alias ccu='./vendor/bin/codecept run Unit' -#ember/js stuff -alias ember='/vagrant/flarum/core/ember/forum/node_modules/ember-cli/bin/ember' - #function aliases alias ghc=ghc alias grl=grl @@ -67,6 +64,6 @@ gulpac() { gulp && git add -A && git commit -m "$1" } -grl() { - grep -rl "$1" * +grl() { + grep -rl "$1" * } diff --git a/system/vagrant/environment.sh b/system/vagrant/environment.sh index 28f636f..8cc4c2e 100644 --- a/system/vagrant/environment.sh +++ b/system/vagrant/environment.sh @@ -4,7 +4,6 @@ su - vagrant ### Setup NPM globals and create necessary directories ### sudo apt-get install -y phantomjs zsh exuberant-ctags mkdir /home/vagrant/npm -mkdir -p /vagrant/flarum/core sudo chown -R vagrant:vagrant /home/vagrant cp /vagrant/scripts/aliases ~/.aliases @@ -18,24 +17,25 @@ else fi ### Set up environment files and database ### -cp /vagrant/.env.example /vagrant/.env +cp /vagrant/system/.env.example /vagrant/system/.env mysql -u root -proot -e 'create database flarum' ### Setup flarum/core and install dependencies ### -cd /vagrant/core +cd /vagrant/system/core composer install --prefer-dist -cd /vagrant +cd /vagrant/system composer install --prefer-dist composer dump-autoload -mkdir /vagrant/core/public -cd /vagrant/core/ember/forum -npm install +cd /vagrant/core/js bower install -cd /vagrant/core/ember/admin +cd /vagrant/core/js/forum npm install -bower install +gulp +cd /vagrant/core/js/admin +npm install +gulp -### Prepare the database +php artisan vendor:publish php artisan flarum:install php artisan flarum:seed