diff --git a/composer.json b/composer.json index 9fcf9660..62f5fd7b 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ } ], "require": { - "sculpin/sculpin": "2.0.*@dev", + "sculpin/sculpin": "dev-master", "tsphethean/sculpin-related-posts-bundle": "~0.1.0", "components/bootstrap": "3.3.5", "components/jquery": "~1.9.1", diff --git a/composer.lock b/composer.lock index 588ef146..c0143a4b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "8cbce40ebdf2e7e427958927b2b4686f", - "content-hash": "8c9a5cd90f9580e0d2d597e935372298", + "hash": "684c1a754e07028d53a166ead8a0cbe8", + "content-hash": "75bc6de9eb35b0f8ab69b9ba697001b7", "packages": [ { "name": "behat/behat", @@ -1577,16 +1577,16 @@ }, { "name": "michelf/php-markdown", - "version": "1.4.1", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/michelf/php-markdown.git", - "reference": "de9a19c7bf352d41cc99ed86c3c0ef17e87394b6" + "reference": "e1aabe18173231ebcefc90e615565742fc1c7fd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/michelf/php-markdown/zipball/de9a19c7bf352d41cc99ed86c3c0ef17e87394b6", - "reference": "de9a19c7bf352d41cc99ed86c3c0ef17e87394b6", + "url": "https://api.github.com/repos/michelf/php-markdown/zipball/e1aabe18173231ebcefc90e615565742fc1c7fd9", + "reference": "e1aabe18173231ebcefc90e615565742fc1c7fd9", "shasum": "" }, "require": { @@ -1608,23 +1608,23 @@ "BSD-3-Clause" ], "authors": [ - { - "name": "Michel Fortin", - "email": "michel.fortin@michelf.ca", - "homepage": "http://michelf.ca/", - "role": "Developer" - }, { "name": "John Gruber", "homepage": "http://daringfireball.net/" + }, + { + "name": "Michel Fortin", + "email": "michel.fortin@michelf.ca", + "homepage": "https://michelf.ca/", + "role": "Developer" } ], "description": "PHP Markdown", - "homepage": "http://michelf.ca/projects/php-markdown/", + "homepage": "https://michelf.ca/projects/php-markdown/", "keywords": [ "markdown" ], - "time": "2014-05-05 02:43:50" + "time": "2015-03-01 12:03:08" }, { "name": "netcarver/textile", @@ -1939,16 +1939,16 @@ }, { "name": "sculpin/sculpin", - "version": "v2.0.0", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/sculpin/sculpin.git", - "reference": "ba4fea7f5a0b7de61a393e82a59c8001aa025285" + "reference": "c4f0814b955af3b96d6bb4499151a4a6b7fb3f62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sculpin/sculpin/zipball/ba4fea7f5a0b7de61a393e82a59c8001aa025285", - "reference": "ba4fea7f5a0b7de61a393e82a59c8001aa025285", + "url": "https://api.github.com/repos/sculpin/sculpin/zipball/c4f0814b955af3b96d6bb4499151a4a6b7fb3f62", + "reference": "c4f0814b955af3b96d6bb4499151a4a6b7fb3f62", "shasum": "" }, "require": { @@ -1962,21 +1962,21 @@ "dflydev/symfony-finder-factory": "1.*", "doctrine/inflector": "1.0.*", "guzzle/guzzle": "~3.0", - "michelf/php-markdown": "1.4.*", + "michelf/php-markdown": "~1.5.0", "netcarver/textile": "3.5.*", - "php": ">=5.3.2", + "php": ">=5.4", "react/http": "0.2.*", "sculpin/sculpin-theme-composer-plugin": "1.0.*@dev", - "symfony/class-loader": "~2.1", - "symfony/config": "~2.1", + "symfony/class-loader": "~2.3", + "symfony/config": "~2.3", "symfony/console": "~2.3", - "symfony/dependency-injection": "~2.1", - "symfony/event-dispatcher": "~2.1", - "symfony/filesystem": "~2.1", - "symfony/finder": "~2.1", + "symfony/dependency-injection": "~2.3", + "symfony/event-dispatcher": "~2.3", + "symfony/filesystem": "~2.3", + "symfony/finder": "~2.3", "symfony/http-kernel": "~2.3", - "symfony/process": "~2.1", - "symfony/yaml": "~2.1", + "symfony/process": "~2.3", + "symfony/yaml": "~2.3", "twig/extensions": "~1.0", "twig/twig": "~1.9" }, @@ -1993,7 +1993,9 @@ "sculpin/twig-bundle": "self.version" }, "require-dev": { - "phpunit/phpunit": "3.7.*" + "phpunit/phpunit": "3.7.*", + "symfony/css-selector": "~2.6", + "symfony/dom-crawler": "~2.6" }, "bin": [ "bin/sculpin", @@ -2002,12 +2004,12 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.1.x-dev" } }, "autoload": { - "psr-0": { - "Sculpin": "src" + "psr-4": { + "Sculpin\\": "src/Sculpin/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2033,7 +2035,7 @@ "site", "static" ], - "time": "2014-12-15 17:43:46" + "time": "2015-11-04 09:28:03" }, { "name": "sculpin/sculpin-theme-composer-plugin", diff --git a/publish.sh b/publish.sh index c3981cce..2ce9c714 100755 --- a/publish.sh +++ b/publish.sh @@ -1,6 +1,6 @@ #!/bin/bash -./vendor/bin/sculpin generate --env=prod +./vendor/bin/sculpin generate --env=prod --clean --no-interaction if [ $? -ne 0 ]; then echo "Could not generate the site"; exit 1; fi rsync -av --delete output_prod/ deployment@www.oliverdavies.uk:/var/www/vhosts/oliverdavies/public diff --git a/watch.sh b/watch.sh index 9da69584..30956587 100755 --- a/watch.sh +++ b/watch.sh @@ -5,5 +5,4 @@ if [ ! -d vendor/ ]; composer install fi -rm -rf output_dev/ -./vendor/bin/sculpin generate --server --watch +./vendor/bin/sculpin generate --server --watch --clean --no-interaction