From 122e0bab1c35291e3f27668f0692b14b0b1faec4 Mon Sep 17 00:00:00 2001
From: eric-hu <hu.eric@gmail.com>
Date: Wed, 22 Jul 2015 19:11:10 +0700
Subject: [PATCH 1/2] Simplify "basic installation" notes

Use the Rails-provided rake task for creating the dev database.

Change database-schema loading instructions, which is more future-proof.  Running migrations on the latest build resulted in this schema.rb difference:

    $ git status
    On branch master
    Your branch is up-to-date with 'origin/master'.
    Changes not staged for commit:
      (use "git add <file>..." to update what will be committed)
      (use "git checkout -- <file>..." to discard changes in working directory)

      modified:   ../db/schema.rb

    no changes added to commit (use "git add" and/or "git commit -a")
    $ cd ..
    $ git diff
    diff --git a/db/schema.rb b/db/schema.rb
    index 6c263e3..904a869 100644
    --- a/db/schema.rb
    +++ b/db/schema.rb
    @@ -95,7 +95,6 @@ ActiveRecord::Schema.define(:version => 20131101180159) do
         t.datetime "created_at",                                :null => false
         t.datetime "updated_at",                                :null => false
         t.string   "handle"
    -    t.boolean  "anonymous",              :default => false
         t.boolean  "guest",                  :default => false
         t.datetime "processing_timestamp"
         t.string   "access_token"
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b0bd96a..9462591 100644
--- a/README.md
+++ b/README.md
@@ -32,8 +32,8 @@ On Mac OSX, you can use homebrew as package manager: http://mxcl.github.com/home
  * Copy and adjust database configuration (`cp config/database.yml.example config/database.yml`)
  * Copy secrets configuration (`cp config/secrets.yml.example config/secrets.yml`)
  * Copy s3 configuration (`cp config/s3.yml.example config/s3.yml`)
- * Create the database ggtracker needs (`mysql -u root` and then `create database ggtracker_development;` and then `quit`)
- * Run migrations (`bundle exec rake db:migrate`)
+ * Create the database ggtracker needs (`rake db:create`)
+ * Load the latest database schema (`bundle exec rake db:schema:load`)
 
 If you want to be able to upload replays, you'll need to have an
 Amazon S3 account.  After setting that up, edit your config/s3.yml

From fefac70c107268575c7937ae60ad15b4e874c4d5 Mon Sep 17 00:00:00 2001
From: eric-hu <hu.eric@gmail.com>
Date: Wed, 22 Jul 2015 19:48:18 +0700
Subject: [PATCH 2/2] Simplify test preparation notes

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 9462591..0d15bbc 100644
--- a/README.md
+++ b/README.md
@@ -68,9 +68,7 @@ find each other correctly.
 #### Ruby (rspec)
 
  The first time you run tests, set up the test database with:
- * `mysql -u root`
- ** `create database ggtracker_test;`
- ** `quit`
+ * `rake db:create`
  * `rake db:test:prepare`
 
  To run tests: `bundle exec rspec`