Merge branch 'develop' into feature/daily-cred

Author: tansengming

.env

@@ -0,0 +1 @@
+SECRET_TOKEN: b3d179dc0a13c5a9dce314423d5711421c380447968ea8393d67d8f629cd11ff047430c22bde586ae1f3917f6e9e1d9702b4507efda0062792492e18507bedc7

.gitignore

@@ -1,5 +1,4 @@
 .rbenv-version
-config/database.yml
 bin/
 rails_best_practices_output.html
 # See http://help.github.com/ignore-files/ for more about ignoring files.

.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 2.0.0
+before_script:
+  - psql -c 'create database rails_base_test;' -U postgres
+script: 
+  - RAILS_ENV=test bundle exec rake db:migrate --trace
+  - bundle exec rake db:test:prepare
+  - bundle exec rspec spec/

Gemfile

@@ -13,6 +13,7 @@ gem "simple_form"
 gem 'unicorn'
 gem 'foreman'
 gem 'newrelic_rpm'
+gem 'app'
 
 group :test do
   gem 'rspec-rails'
@@ -30,15 +31,18 @@ group :development do
   gem 'meta_request'
   gem 'better_errors'
   gem 'binding_of_caller'
+  gem 'rollbar'
+  gem 'flog'
   gem 'kumade'
   gem 'zeus'
   gem 'wirble'
-  # gem 'debugger'
+  gem 'pry'
 end
 
 group :development, :test do
   gem "awesome_print", :require => "ap"
   gem 'tapp'
+  gem 'dotenv-rails'
 end
 
 group :assets do

Gemfile.lock

@@ -41,6 +41,7 @@ GEM
       i18n (= 0.6.1)
       multi_json (~> 1.0)
     addressable (2.3.3)
+    app (1.0.3)
     arbre (1.0.1)
       activesupport (>= 3.0.0)
     arel (3.0.2)
@@ -89,6 +90,9 @@ GEM
       railties (~> 3.1)
       warden (~> 1.2.1)
     diff-lcs (1.2.1)
+    dotenv (0.8.0)
+    dotenv-rails (0.8.0)
+      dotenv (= 0.8.0)
     erubis (2.7.0)
     eventmachine (1.0.3)
     excon (0.16.10)
@@ -101,6 +105,9 @@ GEM
       railties (>= 3.0.0)
     fastercsv (1.5.5)
     ffi (1.6.0)
+    flog (4.0.0)
+      ruby_parser (~> 3.1, > 3.1.0)
+      sexp_processor (~> 4.0)
     foreman (0.62.0)
       thor (>= 0.13.6)
     formtastic (2.2.1)
@@ -174,6 +181,10 @@ GEM
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     polyglot (0.3.3)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -221,6 +232,8 @@ GEM
       railties (~> 3.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
+    rollbar (0.9.10)
+      multi_json (~> 1.5)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -265,6 +278,7 @@ GEM
     skinny (0.2.3)
       eventmachine (~> 1.0.0)
       thin (~> 1.5.0)
+    slop (3.4.5)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -315,12 +329,15 @@ PLATFORMS
 
 DEPENDENCIES
   activeadmin
+  app
   awesome_print
   better_errors
   binding_of_caller
   bullet
   coffee-rails
+  dotenv-rails
   factory_girl_rails
+  flog
   foreman
   fuubar
   haml
@@ -331,9 +348,11 @@ DEPENDENCIES
   meta_request
   newrelic_rpm
   pg
+  pry
   rails (= 3.2.13)
   rails_best_practices
   reek
+  rollbar
   rspec-rails
   sass-rails
   simple_form

README.markdown

@@ -1,8 +1,11 @@
+[![Code Climate](https://codeclimate.com/repos/51df69fb13d6374f780068ad/badges/c76b71b4327cf8984a9f/gpa.png)](https://codeclimate.com/repos/51df69fb13d6374f780068ad/feed)
+[![Build Status](https://travis-ci.org/tansengming/rails-base.png?branch=develop)](https://travis-ci.org/tansengming/rails-base)
+
 Every Rails developer has their favorite set of tools and gems. These just happen to be mine.
 
 Setup includes:
 
 - Active Admin, together with a super admin role to administer admin users. Endpoints are at  `/admin` and `/super_admins`.
 - Deliver all your pivotal stories with `rake pivotal:deliver_all_finished`.
 - `rake code:reviews` runs Reek, rails_best_practices. Do this often.
-- RSpec, Factory Girl, Steak, Devise test helpers and Twitter Bootstrap setup and running.
+- RSpec, Factory Girl, Steak, Devise test helpers and Twitter Bootstrap setup and running.

changelog

@@ -1,8 +1,9 @@
 current
 - adds support for daily cred
 - specs for super admin login
+- travis test
 
 2013-03-28
 =======
 
-- fix deprecations
+- fix deprecations

config/app.rb

@@ -0,0 +1,6 @@
+class App < Configurable # :nodoc:
+  # Settings in config/app/* take precedence over those specified here.
+  config.name = Rails.application.class.parent.name
+
+  # config.key = "value"
+end

config/app/development.rb

@@ -0,0 +1,5 @@
+App.configure do
+  # Settings specified here will take precedence over those in config/app.rb
+
+  # config.key = "value"
+end

config/app/production.rb

@@ -0,0 +1,5 @@
+App.configure do
+  # Settings specified here will take precedence over those in config/app.rb
+
+  # config.key = "value"
+end