From c5772d118fec5d5b0504c08266abcfaa21228119 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy.benoist@gmail.com>
Date: Mon, 2 Feb 2015 07:48:13 +0100
Subject: [PATCH] Installation should be launch manually

Also upadte readme for v2 and define a test database (for the future)
---
 .gitignore                 |  2 +-
 README.md                  | 19 ++++++++++++++++---
 app/build.xml              | 11 +++++++++++
 app/config/config_test.yml |  4 ++++
 composer.json              |  5 ++---
 5 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 64831800..3fbe668c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,4 +35,4 @@
 
 # Data for wallabag
 data/assets/*
-data/db/poche.sqlite
\ No newline at end of file
+data/db/poche*.sqlite
diff --git a/README.md b/README.md
index 38866f7a..13e730c9 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,22 @@
-# what is wallabag ?
-wallabag is a self hostable application allowing you to not miss any content anymore. Click, save, read it when you can. It extracts content so that you can read it when you have time.
+# What is wallabag ?
+wallabag is a self hostable application allowing you to not miss any content anymore.
+Click, save, read it when you can. It extracts content so that you can read it when you have time.
 
 More informations on our website: [wallabag.org](http://wallabag.org)
 
+# Want to test the v2 ?
+
+Keep in mind it's an **instable** branch, everything can be broken :)
+
+```
+git clone https://github.com/wallabag/wallabag.git -b refactor
+cd wallabag
+composer install
+php app/console wallabag:install
+php app/console server:run
+```
+
 ## License
-Copyright © 2013-2014 Nicolas Lœuillet <nicolas@loeuillet.org>
+Copyright © 2013-2015 Nicolas Lœuillet <nicolas@loeuillet.org>
 This work is free. You can redistribute it and/or modify it under the
 terms of the MIT License. See the COPYING file for more details.
diff --git a/app/build.xml b/app/build.xml
index b3f4c13a..5300af04 100644
--- a/app/build.xml
+++ b/app/build.xml
@@ -12,6 +12,17 @@
             <arg value="--no-interaction"/>
             <arg value="--working-dir=.."/>
         </exec>
+        <exec executable="php">
+            <arg value="${basedir}/../app/console"/>
+            <arg value="doctrine:database:drop"/>
+            <arg value="--force"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/../app/console"/>
+            <arg value="doctrine:database:create"/>
+            <arg value="--env=test"/>
+        </exec>
         <exec executable="php">
             <arg value="${basedir}/../app/console"/>
             <arg value="cache:clear"/>
diff --git a/app/config/config_test.yml b/app/config/config_test.yml
index 2f6d9250..83e2922a 100644
--- a/app/config/config_test.yml
+++ b/app/config/config_test.yml
@@ -14,3 +14,7 @@ web_profiler:
 
 swiftmailer:
     disable_delivery: true
+
+doctrine:
+    dbal:
+        path: %kernel.root_dir%/../data/db/poche_test.sqlite
diff --git a/composer.json b/composer.json
index 2b22d6bd..8771ea90 100644
--- a/composer.json
+++ b/composer.json
@@ -92,8 +92,7 @@
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
-            "app/console wallabag:install --no-interaction"
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
         ],
         "post-update-cmd": [
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
@@ -112,7 +111,7 @@
         }
     },
     "autoload": {
-        "psr-0": { "": "src/", "SymfonyStandard": "app/" }
+        "psr-0": { "": "src/" }
     },
     "config": {
         "bin-dir": "bin"
-- 
2.41.0