diff --git a/README b/README index 9dc3925e..ca1cb320 100644 --- a/README +++ b/README @@ -9,7 +9,7 @@ Have a look on README_DEVEL. == License FoodSoft - a webbased foodcoop management software -Copyright (C) 2009 Benni and Lasse +Copyright (C) 2011 Benni and Lasse This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/README_DEVEL b/README_DEVEL index 363b31e4..6451250f 100644 --- a/README_DEVEL +++ b/README_DEVEL @@ -14,11 +14,6 @@ Create the database configuration from the default: If you are fine with using a file-based sqlite database you are all set. The sqlite files (development/test/production) will reside in the "db" directory. -You might still need to install sqlite and the respective gem, i.e. on Ubuntu do: - - sudo aptitude install sqlite3 libsqlite3-dev - sudo gem install sqlite3-ruby - Otherwise you would want to edit database.yml to suit your needs (MySQL whatever). @@ -41,26 +36,26 @@ You need to create your own copy of the foodsoft configuration settings: Edit app_config.yml to suit your needs or just keep the defaults for now. -(4) Required gems +(4) Required ruby and gems ------------------- -In addition to the standard Ruby on Rails gems you will need to install -the additional gems required by running: +We reccomend the using of rvm (https://rvm.beginrescueend.com/). Install rvm and get the lates ruby (1.8.7). +If installed you only need to install the gem bundler: - sudo gem sources -a http://gems.github.com - sudo gem install haml fastercsv prawn rubyist-aasm + gem install bundler + +After that you get the other gems easily with (from project root): + + bundle install -(5) Create database schema +(5) Create database (schema) and load defaults -------------------------- - rake db:schema:load + rake db:create + +With this, you also get a ready to go user with username 'admin' and password 'secret'. -(6) Create user "admin" with password "secret" ----------------------------------------------- - rake foodsoft:create_admin - - -(7) Try it out! +(6) Try it out! --------------- Start the WEBrick server to try it out: diff --git a/config/database.yml.SAMPLE b/config/database.yml.SAMPLE index aaffdb92..94d78fa1 100644 --- a/config/database.yml.SAMPLE +++ b/config/database.yml.SAMPLE @@ -1,11 +1,20 @@ # SQLite version 3.x -# gem install sqlite3-ruby (not necessary on OS X Leopard) development: adapter: sqlite3 database: db/development.sqlite3 pool: 5 timeout: 5000 +# Mysql config instead +# database: foodsoft_development +# username: root +# password: +# host: localhost +# encoding: utf8 +# Define a socket, if youre not using standard linux socket, like lampp.. +# socket: /opt/lampp/var/mysql/mysql.sock + + # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". # Do not set this db to the same as development or production.