Merge pull request #9 from kenlck/master

Update .gitignore to add bin folder

.gitignore

@@ -5,7 +5,7 @@
 #   git config --global core.excludesfile '~/.gitignore_global'
 
 # Ignore bundler config.
-/bin
+/.bundle
 
 # Ignore the default SQLite database.
 /db/*.sqlite3
@@ -24,5 +24,5 @@
 
 *.iml
 
-*.keep 
+*.keep
 app/assets/images/.keep

README.md

@@ -14,9 +14,7 @@ Setup:
 
  5. bundle install
 
- 6. rake rails:update:bin
+ 6. rails s
-
- 7. rails s
 
 That's it!
 
@@ -41,4 +39,4 @@ In the spirit of [free software](http://www.fsf.org/licensing/essays/free-sw.htm
  - Report bugs or issues
  - Fix bugs and submit pull requests.
  - Write, clarify or fix documentation.
- - Refactor code.
+ - Refactor code.

bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end