Skip to content

Commit

Permalink
Upgraded to rails 4.1. Added spring. Generated binstubs
Browse files Browse the repository at this point in the history
  • Loading branch information
VitorHP committed Apr 20, 2015
1 parent 434af08 commit c5265aa
Show file tree
Hide file tree
Showing 5 changed files with 112 additions and 67 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '~> 4.0.0'
gem 'rails', '~> 4.1.0'

# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
Expand Down Expand Up @@ -32,6 +32,7 @@ gem 'bcrypt'

group :development do
gem 'guard-livereload'
gem 'spring'

# Gems used for comment import from WordPress
# gem 'htmlentities'
Expand Down
144 changes: 78 additions & 66 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,35 +1,37 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.0.13)
actionpack (= 4.0.13)
actionmailer (4.1.10)
actionpack (= 4.1.10)
actionview (= 4.1.10)
mail (~> 2.5, >= 2.5.4)
actionpack (4.0.13)
activesupport (= 4.0.13)
builder (~> 3.1.0)
erubis (~> 2.7.0)
actionpack (4.1.10)
actionview (= 4.1.10)
activesupport (= 4.1.10)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.13)
activesupport (= 4.0.13)
builder (~> 3.1.0)
activerecord (4.0.13)
activemodel (= 4.0.13)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.13)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.4)
activesupport (4.0.13)
actionview (4.1.10)
activesupport (= 4.1.10)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.10)
activesupport (= 4.1.10)
builder (~> 3.1)
activerecord (4.1.10)
activemodel (= 4.1.10)
activesupport (= 4.1.10)
arel (~> 5.0.0)
activesupport (4.1.10)
i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2)
multi_json (~> 1.3)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
addressable (2.3.6)
arel (4.0.2)
tzinfo (~> 1.1)
addressable (2.3.8)
arel (5.0.1.20140414130214)
bcrypt (3.1.10)
bluecloth (2.2.0)
builder (3.1.4)
builder (3.2.2)
cancan (1.6.10)
capybara (2.2.1)
mime-types (>= 1.16)
Expand All @@ -43,11 +45,8 @@ GEM
capybara-webkit (1.3.1)
capybara (>= 2.0.2, < 2.5.0)
json
celluloid (0.15.2)
timers (~> 1.1.0)
celluloid-io (0.15.0)
celluloid (>= 0.15.0)
nio4r (>= 0.5.0)
celluloid (0.16.0)
timers (~> 4.0.0)
coderay (1.1.0)
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
Expand All @@ -58,8 +57,8 @@ GEM
coffee-script-source (1.9.1.1)
css3buttons (1.0.1)
actionpack (>= 3.0.0)
database_cleaner (1.2.0)
default_value_for (3.0.0)
database_cleaner (1.4.1)
default_value_for (3.0.1)
activerecord (>= 3.2.0, < 5.0)
devise (3.4.1)
bcrypt (~> 3.0)
Expand All @@ -73,77 +72,85 @@ GEM
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
erubis (2.7.0)
eventmachine (1.0.3)
eventmachine (1.0.7)
execjs (2.5.2)
factory_girl (4.4.0)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.4.1)
factory_girl (~> 4.4.0)
factory_girl_rails (4.5.0)
factory_girl (~> 4.5.0)
railties (>= 3.0.0)
ffi (1.9.8)
formatador (0.2.4)
guard (2.6.0)
formatador (0.2.5)
guard (2.12.5)
formatador (>= 0.2.4)
listen (~> 2.7)
lumberjack (~> 1.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12)
shellany (~> 0.0)
thor (>= 0.18.1)
guard-livereload (2.1.2)
guard-livereload (2.4.0)
em-websocket (~> 0.5)
guard (~> 2.0)
guard (~> 2.8)
multi_json (~> 1.8)
hitimes (1.2.2)
http_parser.rb (0.6.0)
i18n (0.7.0)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.2)
launchy (2.4.2)
launchy (2.4.3)
addressable (~> 2.3)
listen (2.7.4)
celluloid (>= 0.15.2)
celluloid-io (>= 0.15.0)
listen (2.10.0)
celluloid (~> 0.16.0)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
lumberjack (1.0.5)
lumberjack (1.0.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (2.4.3)
mini_portile (0.6.2)
minitest (4.7.5)
minitest (5.6.0)
multi_json (1.11.0)
mysql2 (0.3.15)
nio4r (1.0.0)
mysql2 (0.3.18)
nenv (0.2.0)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
notiffany (0.0.6)
nenv (~> 0.1)
shellany (~> 0.0)
orm_adapter (0.5.0)
pg (0.17.1)
pg (0.18.1)
protected_attributes (1.0.9)
activemodel (>= 4.0.1, < 5.0)
pry (0.9.12.6)
coderay (~> 1.0)
method_source (~> 0.8)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
rack (1.5.2)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.0.13)
actionmailer (= 4.0.13)
actionpack (= 4.0.13)
activerecord (= 4.0.13)
activesupport (= 4.0.13)
rails (4.1.10)
actionmailer (= 4.1.10)
actionpack (= 4.1.10)
actionview (= 4.1.10)
activemodel (= 4.1.10)
activerecord (= 4.1.10)
activesupport (= 4.1.10)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.13)
railties (= 4.1.10)
sprockets-rails (~> 2.0)
railties (4.0.13)
actionpack (= 4.0.13)
activesupport (= 4.0.13)
railties (4.1.10)
actionpack (= 4.1.10)
activesupport (= 4.1.10)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
rb-fsevent (0.9.4)
rb-inotify (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
responders (1.1.2)
railties (>= 3.2, < 4.2)
Expand Down Expand Up @@ -177,27 +184,31 @@ GEM
schema_plus (1.8.8)
activerecord (>= 3.2, <= 4.2.0)
valuable
slop (3.5.0)
shellany (0.0.1)
slop (3.6.0)
spork (0.9.0.rc9)
spring (1.3.4)
sprockets (3.0.1)
rack (~> 1.0)
sprockets-rails (2.2.4)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.9)
sqlite3 (1.3.10)
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
timers (1.1.0)
tzinfo (0.3.43)
uglifier (2.5.0)
timers (4.0.1)
hitimes
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.7.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
valuable (0.9.9)
warden (1.2.3)
rack (>= 1.0)
will_paginate (3.0.5)
will_paginate (3.0.7)
xpath (2.0.0)
nokogiri (~> 1.3)

Expand Down Expand Up @@ -226,12 +237,13 @@ DEPENDENCIES
protected_attributes
pry
rack
rails (~> 4.0.0)
rails (~> 4.1.0)
rspec-activemodel-mocks
rspec-rails (~> 3.0.0)
sass-rails
schema_plus
spork (= 0.9.0.rc9)
spring
sqlite3
uglifier
will_paginate
10 changes: 10 additions & 0 deletions bin/rails
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/usr/bin/env ruby
begin
load File.expand_path("../spring", __FILE__)
rescue LoadError
end
# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.

APP_PATH = File.expand_path('../../config/application', __FILE__)
require File.expand_path('../../config/boot', __FILE__)
require 'rails/commands'
7 changes: 7 additions & 0 deletions bin/rake
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/env ruby
begin
load File.expand_path("../spring", __FILE__)
rescue LoadError
end
require 'bundler/setup'
load Gem.bin_path('rake', 'rake')
15 changes: 15 additions & 0 deletions bin/spring
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/usr/bin/env ruby

# This file loads spring without using Bundler, in order to be fast.
# It gets overwritten when you run the `spring binstub` command.

unless defined?(Spring)
require "rubygems"
require "bundler"

if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m)
Gem.paths = { "GEM_PATH" => [Bundler.bundle_path.to_s, *Gem.path].uniq }
gem "spring", match[1]
require "spring/binstub"
end
end

0 comments on commit c5265aa

Please sign in to comment.