Skip to content

Commit 11b984b

Browse files
committed
build using rails_apps_composer 2.2.34
1 parent 8d2ab69 commit 11b984b

File tree

5 files changed

+60
-74
lines changed

5 files changed

+60
-74
lines changed

.rvmrc

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
environment_id="ruby-1.9.3@rails3-devise-rspec-cucumber"
1010

1111
# Uncomment the following lines if you want to verify rvm version per project
12-
# rvmrc_rvm_version="1.14.2 (latest)" # 1.10.1 seams as a safe start
12+
# rvmrc_rvm_version="1.18.6 (latest)" # 1.10.1 seams as a safe start
1313
# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
1414
# echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
1515
# return 1
@@ -25,24 +25,14 @@ then
2525
\. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
2626
[[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
2727
\. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
28+
if [[ $- == *i* ]] # check for interactive shells
29+
then echo "Using: $(tput setaf 2)$GEM_HOME$(tput sgr0)" # show the user the ruby and gemset they are using in green
30+
else echo "Using: $GEM_HOME" # don't use colors in non-interactive shells
31+
fi
2832
else
2933
# If the environment file has not yet been created, use the RVM CLI to select.
30-
rvm --create "$environment_id" || {
34+
rvm --create use "$environment_id" || {
3135
echo "Failed to create RVM environment '${environment_id}'."
3236
return 1
3337
}
3438
fi
35-
36-
# If you use bundler, this might be useful to you:
37-
# if [[ -s Gemfile ]] && {
38-
# ! builtin command -v bundle >/dev/null ||
39-
# builtin command -v bundle | GREP_OPTIONS= \grep $rvm_path/bin/bundle >/dev/null
40-
# }
41-
# then
42-
# printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
43-
# gem install bundler
44-
# fi
45-
# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
46-
# then
47-
# bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete'
48-
# fi

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://rubygems.org'
2-
gem 'rails', '3.2.11'
2+
gem 'rails', '3.2.12'
33
gem 'sqlite3'
44
group :assets do
55
gem 'sass-rails', '~> 3.2.3'
@@ -11,11 +11,11 @@ gem "rspec-rails", ">= 2.12.2", :group => [:development, :test]
1111
gem "database_cleaner", ">= 0.9.1", :group => :test
1212
gem "email_spec", ">= 1.4.0", :group => :test
1313
gem "cucumber-rails", ">= 1.3.0", :group => :test, :require => false
14-
gem "launchy", ">= 2.1.2", :group => :test
14+
gem "launchy", ">= 2.2.0", :group => :test
1515
gem "capybara", ">= 2.0.2", :group => :test
1616
gem "factory_girl_rails", ">= 4.2.0", :group => [:development, :test]
1717
gem "devise", ">= 2.2.3"
1818
gem "quiet_assets", ">= 1.0.1", :group => :development
1919
gem "figaro", ">= 0.5.3"
20-
gem "better_errors", ">= 0.3.2", :group => :development
21-
gem "binding_of_caller", ">= 0.6.8", :group => :development
20+
gem "better_errors", ">= 0.6.0", :group => :development
21+
gem "binding_of_caller", ">= 0.7.1", :group => :development, :platforms => [:mri_19, :rbx]

Gemfile.lock

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,41 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (3.2.11)
5-
actionpack (= 3.2.11)
4+
actionmailer (3.2.12)
5+
actionpack (= 3.2.12)
66
mail (~> 2.4.4)
7-
actionpack (3.2.11)
8-
activemodel (= 3.2.11)
9-
activesupport (= 3.2.11)
7+
actionpack (3.2.12)
8+
activemodel (= 3.2.12)
9+
activesupport (= 3.2.12)
1010
builder (~> 3.0.0)
1111
erubis (~> 2.7.0)
1212
journey (~> 1.0.4)
13-
rack (~> 1.4.0)
13+
rack (~> 1.4.5)
1414
rack-cache (~> 1.2)
1515
rack-test (~> 0.6.1)
1616
sprockets (~> 2.2.1)
17-
activemodel (3.2.11)
18-
activesupport (= 3.2.11)
17+
activemodel (3.2.12)
18+
activesupport (= 3.2.12)
1919
builder (~> 3.0.0)
20-
activerecord (3.2.11)
21-
activemodel (= 3.2.11)
22-
activesupport (= 3.2.11)
20+
activerecord (3.2.12)
21+
activemodel (= 3.2.12)
22+
activesupport (= 3.2.12)
2323
arel (~> 3.0.2)
2424
tzinfo (~> 0.3.29)
25-
activeresource (3.2.11)
26-
activemodel (= 3.2.11)
27-
activesupport (= 3.2.11)
28-
activesupport (3.2.11)
25+
activeresource (3.2.12)
26+
activemodel (= 3.2.12)
27+
activesupport (= 3.2.12)
28+
activesupport (3.2.12)
2929
i18n (~> 0.6)
3030
multi_json (~> 1.0)
31-
addressable (2.3.2)
31+
addressable (2.3.3)
3232
arel (3.0.2)
3333
bcrypt-ruby (3.0.1)
34-
better_errors (0.3.2)
34+
better_errors (0.6.0)
3535
coderay (>= 1.0.0)
36-
erubis (>= 2.7.0)
37-
binding_of_caller (0.6.8)
36+
erubis (>= 2.6.6)
37+
binding_of_caller (0.7.1)
38+
debug_inspector (>= 0.0.1)
3839
builder (3.0.4)
3940
capybara (2.0.2)
4041
mime-types (>= 1.16)
@@ -43,9 +44,9 @@ GEM
4344
rack-test (>= 0.5.4)
4445
selenium-webdriver (~> 2.0)
4546
xpath (~> 1.0.0)
46-
childprocess (0.3.7)
47-
ffi (~> 1.0, >= 1.0.6)
48-
coderay (1.0.8)
47+
childprocess (0.3.8)
48+
ffi (~> 1.0, >= 1.0.11)
49+
coderay (1.0.9)
4950
coffee-rails (3.2.2)
5051
coffee-script (>= 2.2.0)
5152
railties (~> 3.2.0)
@@ -63,6 +64,7 @@ GEM
6364
cucumber (>= 1.1.8)
6465
nokogiri (>= 1.5.0)
6566
database_cleaner (0.9.1)
67+
debug_inspector (0.0.2)
6668
devise (2.2.3)
6769
bcrypt-ruby (~> 3.0)
6870
orm_adapter (~> 0.1)
@@ -77,58 +79,58 @@ GEM
7779
multi_json (~> 1.0)
7880
factory_girl (4.2.0)
7981
activesupport (>= 3.0.0)
80-
factory_girl_rails (4.2.0)
82+
factory_girl_rails (4.2.1)
8183
factory_girl (~> 4.2.0)
8284
railties (>= 3.0.0)
83-
ffi (1.3.1)
85+
ffi (1.4.0)
8486
figaro (0.5.3)
8587
rails (~> 3.0)
8688
gherkin (2.11.6)
8789
json (>= 1.7.6)
8890
hike (1.2.1)
8991
i18n (0.6.1)
9092
journey (1.0.4)
91-
jquery-rails (2.2.0)
93+
jquery-rails (2.2.1)
9294
railties (>= 3.0, < 5.0)
9395
thor (>= 0.14, < 2.0)
94-
json (1.7.6)
95-
launchy (2.1.2)
96+
json (1.7.7)
97+
launchy (2.2.0)
9698
addressable (~> 2.3)
9799
mail (2.4.4)
98100
i18n (>= 0.4.0)
99101
mime-types (~> 1.16)
100102
treetop (~> 1.4.8)
101-
mime-types (1.19)
102-
multi_json (1.5.0)
103+
mime-types (1.21)
104+
multi_json (1.6.1)
103105
nokogiri (1.5.6)
104106
orm_adapter (0.4.0)
105107
polyglot (0.3.3)
106108
quiet_assets (1.0.1)
107109
railties (~> 3.1)
108-
rack (1.4.4)
110+
rack (1.4.5)
109111
rack-cache (1.2)
110112
rack (>= 0.4)
111113
rack-ssl (1.3.3)
112114
rack
113115
rack-test (0.6.2)
114116
rack (>= 1.0)
115-
rails (3.2.11)
116-
actionmailer (= 3.2.11)
117-
actionpack (= 3.2.11)
118-
activerecord (= 3.2.11)
119-
activeresource (= 3.2.11)
120-
activesupport (= 3.2.11)
117+
rails (3.2.12)
118+
actionmailer (= 3.2.12)
119+
actionpack (= 3.2.12)
120+
activerecord (= 3.2.12)
121+
activeresource (= 3.2.12)
122+
activesupport (= 3.2.12)
121123
bundler (~> 1.0)
122-
railties (= 3.2.11)
123-
railties (3.2.11)
124-
actionpack (= 3.2.11)
125-
activesupport (= 3.2.11)
124+
railties (= 3.2.12)
125+
railties (3.2.12)
126+
actionpack (= 3.2.12)
127+
activesupport (= 3.2.12)
126128
rack-ssl (~> 1.3.2)
127129
rake (>= 0.8.7)
128130
rdoc (~> 3.4)
129131
thor (>= 0.14.6, < 2.0)
130132
rake (10.0.3)
131-
rdoc (3.12)
133+
rdoc (3.12.1)
132134
json (~> 1.4)
133135
rspec-core (2.12.2)
134136
rspec-expectations (2.12.1)
@@ -147,7 +149,7 @@ GEM
147149
railties (~> 3.2.0)
148150
sass (>= 3.1.10)
149151
tilt (~> 1.3)
150-
selenium-webdriver (2.29.0)
152+
selenium-webdriver (2.30.0)
151153
childprocess (>= 0.2.5)
152154
multi_json (~> 1.0)
153155
rubyzip
@@ -177,8 +179,8 @@ PLATFORMS
177179
ruby
178180

179181
DEPENDENCIES
180-
better_errors (>= 0.3.2)
181-
binding_of_caller (>= 0.6.8)
182+
better_errors (>= 0.6.0)
183+
binding_of_caller (>= 0.7.1)
182184
capybara (>= 2.0.2)
183185
coffee-rails (~> 3.2.1)
184186
cucumber-rails (>= 1.3.0)
@@ -188,9 +190,9 @@ DEPENDENCIES
188190
factory_girl_rails (>= 4.2.0)
189191
figaro (>= 0.5.3)
190192
jquery-rails
191-
launchy (>= 2.1.2)
193+
launchy (>= 2.2.0)
192194
quiet_assets (>= 1.0.1)
193-
rails (= 3.2.11)
195+
rails (= 3.2.12)
194196
rspec-rails (>= 2.12.2)
195197
sass-rails (~> 3.2.3)
196198
sqlite3

config/application.rb

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
require File.expand_path('../boot', __FILE__)
22

3-
# Pick the frameworks you want:
4-
require "active_record/railtie"
5-
require "action_controller/railtie"
6-
require "action_mailer/railtie"
7-
require "active_resource/railtie"
8-
require "sprockets/railtie"
9-
# require "rails/test_unit/railtie"
3+
require 'rails/all'
104

115
if defined?(Bundler)
126
# If you precompile assets before deploying to production, use this line

config/environments/test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
# Print deprecation notices to the stderr
3636
config.active_support.deprecation = :stderr
37-
37+
3838
# ActionMailer Config
3939
config.action_mailer.default_url_options = { :host => 'example.com' }
4040

0 commit comments

Comments
 (0)