Installation should be launch manually

Also upadte readme for v2 and define a test database (for the future)

diff --git a/.gitignore b/.gitignore
index 64831800d2694c36bbefec56df501d9eb7304453..3fbe668c98cf4e3a3d926407e52ba9110961d864 100644 (file)
--- 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 38866f7af91a91cd25cc5da81c877fb96a458f24..13e730c9679aa2b3e07673fda9a758022527000c 100644 (file)
--- 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 b3f4c13a1b66c257441f3bf47ec9aaf5f1f3b6e1..5300af042f0ce1398f5509791637f22b7cd9f8ff 100644 (file)
--- 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 2f6d92503ffed30a9d0938070f8a71b07b2531b0..83e2922a27a2d98a11058a1fb1c7af9c5fceb2df 100644 (file)
--- 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 2b22d6bda6d2fee73e98c3bc8f0d6a72c269b8c8..8771ea90b69f8ac843361ac6d6ba58aa1ea0ae8c 100644 (file)
--- 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"