Merge branch 'release/0.9.2'

.gitignore

@@ -1,5 +1,7 @@
 # Composer
 composer.lock
+.composer
+vendor
 
 # Sass
 .sass-cache

VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

bin/grav

@@ -5,6 +5,13 @@ if (version_compare($ver = PHP_VERSION, $req = '5.4.0', '<')) {
     exit(sprintf("You are running PHP %s, but Grav needs at least PHP %s to run.\n", $ver, $req));
 }
 
+if (!file_exists(__DIR__ . '/../vendor')){
+    // Before we can even start, we need to run composer first
+    echo "Preparing to install vendor dependencies...\n\n";
+    echo system('php bin/composer.phar --working-dir="'.__DIR__.'/../" --no-interaction install -o');
+    echo "\n\n";
+}
+
 use Symfony\Component\Console\Application;
 
 require_once(__DIR__ . '/../vendor/autoload.php');

composer.json

@@ -13,16 +13,16 @@
         "symfony/console": "~2.5",
         "symfony/event-dispatcher": "~2.5",
         "doctrine/cache": "~1.3",
-        "tracy/tracy": "~2.2",
-        "gregwar/image": "~2.0",
+        "tracy/tracy": "2.3.*@dev",
+	    "gregwar/image": "~2.0",
         "ircmaxell/password-compat": "1.0.*",
         "mrclay/minify": "dev-master",
         "donatj/phpuseragentparser": "dev-master",
         "pimple/pimple": "~3.0"
     },
     "autoload": {
-        "psr-0": {
-            "Grav\\": "system/src/"
+        "psr-4": {
+            "Grav\\": "system/src/Grav"
         },
         "files": ["system/defines.php"]
     },

index.php

@@ -4,9 +4,10 @@
 if (version_compare($ver = PHP_VERSION, $req = '5.4.0', '<')) {
     exit(sprintf('You are running PHP %s, but Grav needs at least <strong>PHP %s</strong> to run.', $ver, $req));
 }
+
 $autoload = __DIR__ . '/vendor/autoload.php';
 if (!is_file($autoload)) {
-    exit('Please run: <i>composer install -o</i>');
+    exit('Please run: <i>bin/grav install</i>');
 }
 
 use Grav\Common\Grav;
@@ -20,10 +21,10 @@
 }
 
 $grav = Grav::instance(
-    [
+    array(
         'loader' => $loader,
         'debugger' => new Debugger(Debugger::PRODUCTION)
-    ]
+    )
 );
 
 try {

system/blueprints/site.yaml

@@ -1,42 +1,68 @@
-title: Site settings
-validation: strict
-
+title: Site
 form:
-  fields:
-    title:
-      type: text
-      label: Site title
-
-    description:
-      type: textarea
-      label: Description
-
-    summary.size:
-      type: text
-      label: Summary size
-      validate:
-        type: int
-        min: 0
-        max: 65536
-
-    author.name:
-      type: text
-      label: Default author
-
-    author.email:
-      type: text
-      label: Default email
-
-    taxonomies:
-      type: text
-      label: Taxonomy types
-      validate:
-        type: commalist
-
-    blog.route:
-      type: text
-      label: Blog URL
-
-    routes:
-      type: array
-      label: Custom routes
+    fields:
+
+        content:
+            type: section
+            title: Defaults
+
+            fields:
+                title:
+                    type: text
+                    label: Site Title
+                    size: large
+                    placeholder: "Site wide title"
+                    help: Default title for your site
+
+                author.name:
+                    type: text
+                    size: large
+                    label: Default Author
+
+                author.email:
+                    type: text
+                    size: large
+                    label: Default Email
+
+                taxonomies:
+                    type: text
+                    label: Taxonomy Types
+                    classes: fancy
+                    validate:
+                        type: commalist
+
+                metadata:
+                    type: array
+                    label: Metadata
+                    placeholder_key: Name
+                    placeholder_value: Content
+
+        blog:
+            type: section
+            title: Blog
+
+            fields:
+                blog.route:
+                    type: text
+                    size: large
+                    label: Blog URL
+
+                summary.size:
+                    type: text
+                    size: x-small
+                    label: Summary Size
+                    validate:
+                    type: int
+                    min: 0
+                    max: 65536
+
+        routes:
+            type: section
+            title: Routes
+
+            fields:
+                routes:
+                    type: array
+                    label: Custom
+                    placeholder_key: /your/alias
+                    placeholder_value: /your/route