Skip to content

Commit

Permalink
Updating bootstraped files
Browse files Browse the repository at this point in the history
  • Loading branch information
danielweinmann committed Jan 26, 2012
1 parent 6831472 commit be4f3b6
Show file tree
Hide file tree
Showing 14 changed files with 87 additions and 113 deletions.
2 changes: 1 addition & 1 deletion .rvmrc
@@ -1 +1 @@
rvm 1.9.3
rvm 1.9.3@tangopoa --create
10 changes: 5 additions & 5 deletions Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

gem 'rails', '3.1.1'
gem 'rails', '3.2.0'
gem "inherited_resources"

# Database
Expand All @@ -16,8 +16,8 @@ gem "slim-rails"
group :assets do
gem "compass", "~> 0.12.alpha.2"
gem "compass-960-plugin"
gem 'sass-rails', '~> 3.1.4'
gem 'coffee-rails', '~> 3.1.1'
gem 'sass-rails', '~> 3.2.0'
gem 'coffee-rails', '~> 3.2.0'
gem 'uglifier', '>= 1.0.3'
end

Expand All @@ -31,15 +31,15 @@ end

group :test do
# Pretty printed test output
gem "rspec", "~> 2.6.0"
gem "rspec", "~> 2.8.0"
gem "machinist", ">= 2.0.0.beta2"
gem "database_cleaner", "~> 0.6.7"
gem "ffaker", "~> 1.8.1"
gem "shoulda-matchers", "~> 1.0.0.beta3"
end

group :development, :test do
gem "rspec-rails", "~> 2.6.0"
gem "rspec-rails", "~> 2.8.0"
gem "silent-postgres"
gem "silent-postgres"
gem "jasmine"
Expand Down
139 changes: 68 additions & 71 deletions Gemfile.lock
@@ -1,42 +1,41 @@
GEM
remote: http://rubygems.org/
specs:
actionmailer (3.1.1)
actionpack (= 3.1.1)
mail (~> 2.3.0)
actionpack (3.1.1)
activemodel (= 3.1.1)
activesupport (= 3.1.1)
actionmailer (3.2.0)
actionpack (= 3.2.0)
mail (~> 2.4.0)
actionpack (3.2.0)
activemodel (= 3.2.0)
activesupport (= 3.2.0)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
rack (~> 1.3.2)
journey (~> 1.0.0)
rack (~> 1.4.0)
rack-cache (~> 1.1)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
sprockets (~> 2.0.2)
activemodel (3.1.1)
activesupport (= 3.1.1)
sprockets (~> 2.1.2)
activemodel (3.2.0)
activesupport (= 3.2.0)
builder (~> 3.0.0)
i18n (~> 0.6)
activerecord (3.1.1)
activemodel (= 3.1.1)
activesupport (= 3.1.1)
arel (~> 2.2.1)
activerecord (3.2.0)
activemodel (= 3.2.0)
activesupport (= 3.2.0)
arel (~> 3.0.0)
tzinfo (~> 0.3.29)
activeresource (3.1.1)
activemodel (= 3.1.1)
activesupport (= 3.1.1)
activesupport (3.1.1)
activeresource (3.2.0)
activemodel (= 3.2.0)
activesupport (= 3.2.0)
activesupport (3.2.0)
i18n (~> 0.6)
multi_json (~> 1.0)
arel (2.2.1)
arel (3.0.0)
builder (3.0.0)
childprocess (0.2.7)
childprocess (0.3.0)
ffi (~> 1.0.6)
chunky_png (1.2.5)
coffee-rails (3.1.1)
coffee-rails (3.2.1)
coffee-script (>= 2.2.0)
railties (~> 3.1.0)
railties (~> 3.2.0.beta)
coffee-script (2.2.0)
coffee-script-source
execjs
Expand All @@ -47,12 +46,12 @@ GEM
sass (~> 3.1)
compass-960-plugin (0.10.4)
compass (>= 0.10.0)
daemons (1.1.5)
daemons (1.1.6)
database_cleaner (0.6.7)
diff-lcs (1.1.3)
erubis (2.7.0)
eventmachine (0.12.10)
execjs (1.2.13)
execjs (1.3.0)
multi_json (~> 1.0)
ffaker (1.8.1)
ffi (1.0.11)
Expand All @@ -72,12 +71,13 @@ GEM
rspec (>= 1.3.1)
selenium-webdriver (>= 0.1.3)
jasmine-core (1.1.0)
jquery-rails (1.0.19)
railties (~> 3.0)
journey (1.0.0)
jquery-rails (2.0.0)
railties (>= 3.2.0.beta, < 5.0)
thor (~> 0.14)
json (1.6.4)
machinist (2.0.0.beta2)
mail (2.3.0)
json (1.6.5)
machinist (2.0)
mail (2.4.1)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
Expand All @@ -94,57 +94,54 @@ GEM
multi_json (1.0.4)
pg (0.12.2)
polyglot (0.3.3)
rack (1.3.6)
rack (1.4.1)
rack-cache (1.1)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-protection (1.2.0)
rack
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
rails (3.1.1)
actionmailer (= 3.1.1)
actionpack (= 3.1.1)
activerecord (= 3.1.1)
activeresource (= 3.1.1)
activesupport (= 3.1.1)
rails (3.2.0)
actionmailer (= 3.2.0)
actionpack (= 3.2.0)
activerecord (= 3.2.0)
activeresource (= 3.2.0)
activesupport (= 3.2.0)
bundler (~> 1.0)
railties (= 3.1.1)
railties (3.1.1)
actionpack (= 3.1.1)
activesupport (= 3.1.1)
railties (= 3.2.0)
railties (3.2.0)
actionpack (= 3.2.0)
activesupport (= 3.2.0)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
responders (0.6.4)
rspec (2.6.0)
rspec-core (~> 2.6.0)
rspec-expectations (~> 2.6.0)
rspec-mocks (~> 2.6.0)
rspec-core (2.6.4)
rspec-expectations (2.6.0)
responders (0.6.5)
rspec (2.8.0)
rspec-core (~> 2.8.0)
rspec-expectations (~> 2.8.0)
rspec-mocks (~> 2.8.0)
rspec-core (2.8.0)
rspec-expectations (2.8.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.6.0)
rspec-rails (2.6.1)
actionpack (~> 3.0)
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.6.0)
rspec-mocks (2.8.0)
rspec-rails (2.8.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec (~> 2.8.0)
rubyzip (0.9.5)
sass (3.1.12)
sass-rails (3.1.5)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
sass (~> 3.1.10)
tilt (~> 1.3.2)
selenium-webdriver (2.16.0)
sass-rails (3.2.3)
railties (~> 3.2.0.beta)
sass (>= 3.1.10)
tilt (~> 1.3)
selenium-webdriver (2.17.0)
childprocess (>= 0.2.5)
ffi (~> 1.0.9)
multi_json (~> 1.0.4)
Expand All @@ -163,7 +160,7 @@ GEM
tilt (~> 1.3.2)
slim-rails (0.2.1)
slim (>= 0.9.2)
sprockets (2.0.3)
sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
Expand All @@ -179,15 +176,15 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.31)
uglifier (1.2.1)
uglifier (1.2.2)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)

PLATFORMS
ruby

DEPENDENCIES
coffee-rails (~> 3.1.1)
coffee-rails (~> 3.2.0)
compass (~> 0.12.alpha.2)
compass-960-plugin
database_cleaner (~> 0.6.7)
Expand All @@ -199,10 +196,10 @@ DEPENDENCIES
machinist (>= 2.0.0.beta2)
mailcatcher
pg
rails (= 3.1.1)
rspec (~> 2.6.0)
rspec-rails (~> 2.6.0)
sass-rails (~> 3.1.4)
rails (= 3.2.0)
rspec (~> 2.8.0)
rspec-rails (~> 2.8.0)
sass-rails (~> 3.2.0)
shoulda-matchers (~> 1.0.0.beta3)
silent-postgres
slim (~> 1.0.2)
Expand Down
25 changes: 1 addition & 24 deletions README.md
@@ -1,24 +1 @@
# Rails 3.1 Project Bootstrap
To start a new project just:

git clone git@github.com:softa/bootstrap-31.git cool_name_of_my_new_project

Then you'll need to replace the Bootstrap application name for your app name.
And then just change the origin ref in .git/config and push it to your new repo.
You still need to rename the Bootstrap31 app name manually in all source files where it appears, we'll automated this soon.

## Features

* Gemfile with slim, pg, jasmine, rspec, should-matchers and lots of goodies
* Rspec installed and configured
* Machinist installed and configured
* Jasmine installed and configured
* Mailcatcher installed and configured (in development environment)
* Miv controller already created
* Underscore.js and Backbone.js installed and loaded by default
* JS loader for Backbone views and a sample application layout to enable it
* render_404 method already coded in ApplicationController
* Initial stylesheets structure in place (work in progress)


== Agenda do Tango em Porto Alegre
2 changes: 1 addition & 1 deletion config.ru
@@ -1,4 +1,4 @@
# This file is used by Rack-based servers to start the application.

require ::File.expand_path('../config/environment', __FILE__)
run Bootstrap31::Application
run TangoPoa::Application
2 changes: 1 addition & 1 deletion config/application.rb
Expand Up @@ -9,7 +9,7 @@
# Bundler.require(:default, :assets, Rails.env)
end

module Bootstrap31
module TangoPoa
class Application < Rails::Application
# Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers
Expand Down
6 changes: 3 additions & 3 deletions config/database.yml
@@ -1,17 +1,17 @@
development:
adapter: postgresql
database: engage_development
database: tangopoa_development
pool: 5
timeout: 5000

test:
adapter: postgresql
database: engage_test
database: tangopoa_test
pool: 5
timeout: 5000

production:
adapter: postgresql
database: engage_production
database: tangopoa_production
pool: 5
timeout: 5000
2 changes: 1 addition & 1 deletion config/environment.rb
Expand Up @@ -2,4 +2,4 @@
require File.expand_path('../application', __FILE__)

# Initialize the rails application
Bootstrap31::Application.initialize!
TangoPoa::Application.initialize!
2 changes: 1 addition & 1 deletion config/environments/development.rb
@@ -1,4 +1,4 @@
Bootstrap31::Application.configure do
TangoPoa::Application.configure do
# Settings specified here will take precedence over those in config/application.rb

# In the development environment your application's code is reloaded on
Expand Down
2 changes: 1 addition & 1 deletion config/environments/production.rb
@@ -1,4 +1,4 @@
Bootstrap31::Application.configure do
TangoPoa::Application.configure do
# Settings specified here will take precedence over those in config/application.rb

# Code is not reloaded between requests
Expand Down
2 changes: 1 addition & 1 deletion config/environments/test.rb
@@ -1,4 +1,4 @@
Bootstrap31::Application.configure do
TangoPoa::Application.configure do
# Settings specified here will take precedence over those in config/application.rb

# The test environment is used exclusively to run your application's
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/secret_token.rb
Expand Up @@ -4,4 +4,4 @@
# If you change this key, all old signed cookies will become invalid!
# Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks.
Bootstrap31::Application.config.secret_token = '0199f0b96694576e2c748ce616e750994da5e6be9b6b3d18e5a7fc86efa3c1615c7e2f274704aed4d3993a54dcc73d84d9daefcd24c35d0da993938cfaf4f477'
TangoPoa::Application.config.secret_token = '0199f0b96694576e2c748ce616e750994da5e6be9b6b3d18e5a7fc86efa3c1615c7e2f274704aed4d3993a54dcc73d84d9daefcd24c35d0da993938cfaf4f477'
2 changes: 1 addition & 1 deletion config/initializers/session_store.rb
@@ -1,6 +1,6 @@
# Be sure to restart your server when you modify this file.

Bootstrap31::Application.config.session_store :cookie_store, key: '_bootstrap-31_session'
TangoPoa::Application.config.session_store :cookie_store, key: '_bootstrap-31_session'

# Use the database for sessions instead of the cookie-based default,
# which shouldn't be used to store highly confidential information
Expand Down
2 changes: 1 addition & 1 deletion config/routes.rb
@@ -1,4 +1,4 @@
Bootstrap31::Application.routes.draw do
TangoPoa::Application.routes.draw do
if Rails.env.development?
get "/miv", to: "miv#index"
end
Expand Down

0 comments on commit be4f3b6

Please sign in to comment.