Skip to content

Commit 343a51d

Browse files
committed
build using rails_apps_composer 2.1.2
1 parent 21ae41b commit 343a51d

File tree

21 files changed

+108
-159
lines changed

21 files changed

+108
-159
lines changed

.gitignore

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
# minimal Rails specific artifacts
1818
db/*.sqlite3
19-
/log/*.log
20-
/tmp
19+
/log/*
20+
/tmp/*
2121

2222
# various artifacts
2323
**.war
@@ -31,24 +31,25 @@ db/*.sqlite3
3131
/coverage.data
3232
/coverage/
3333
/db/*.javadb/
34-
/db/*.sqlite3-journal
34+
/db/*.sqlite3
3535
/doc/api/
3636
/doc/app/
3737
/doc/features.html
3838
/doc/specs.html
3939
/public/cache
4040
/public/stylesheets/compiled
41-
/public/system
41+
/public/system/*
4242
/spec/tmp/*
4343
/cache
4444
/capybara*
4545
/capybara-*.html
4646
/gems
47-
/rerun.txt
4847
/spec/requests
4948
/spec/routing
5049
/spec/views
5150
/specifications
51+
rerun.txt
52+
pickle-email-*.html
5253

5354
# If you find yourself ignoring temporary files generated by your text editor
5455
# or operating system, you probably want to add a global ignore instead:

.rvmrc

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,48 @@
1-
rvm ruby-1.9.3-p194@rails323
1+
#!/usr/bin/env bash
2+
3+
# This is an RVM Project .rvmrc file, used to automatically load the ruby
4+
# development environment upon cd'ing into the directory
5+
6+
# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
7+
# Only full ruby name is supported here, for short names use:
8+
# echo "rvm use 1.9.3" > .rvmrc
9+
environment_id="ruby-1.9.3@rails3-devise-rspec-cucumber"
10+
11+
# 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
13+
# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
14+
# echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
15+
# return 1
16+
# }
17+
18+
# First we attempt to load the desired environment directly from the environment
19+
# file. This is very fast and efficient compared to running through the entire
20+
# CLI and selector. If you want feedback on which environment was used then
21+
# insert the word 'use' after --create as this triggers verbose mode.
22+
if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
23+
&& -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
24+
then
25+
\. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
26+
[[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
27+
\. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
28+
else
29+
# If the environment file has not yet been created, use the RVM CLI to select.
30+
rvm --create "$environment_id" || {
31+
echo "Failed to create RVM environment '${environment_id}'."
32+
return 1
33+
}
34+
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.6'
2+
gem 'rails', '3.2.8'
33
gem 'sqlite3'
44
group :assets do
55
gem 'sass-rails', '~> 3.2.3'
@@ -8,10 +8,10 @@ group :assets do
88
end
99
gem 'jquery-rails'
1010
gem "rspec-rails", ">= 2.11.0", :group => [:development, :test]
11-
gem "factory_girl_rails", ">= 3.5.0", :group => [:development, :test]
11+
gem "capybara", ">= 1.1.2", :group => :test
1212
gem "email_spec", ">= 1.2.1", :group => :test
1313
gem "cucumber-rails", ">= 1.3.0", :group => :test, :require => false
14-
gem "capybara", ">= 1.1.2", :group => :test
1514
gem "database_cleaner", ">= 0.8.0", :group => :test
16-
gem "launchy", ">= 2.1.0", :group => :test
15+
gem "launchy", ">= 2.1.2", :group => :test
16+
gem "factory_girl_rails", ">= 4.0.0", :group => [:development, :test]
1717
gem "devise", ">= 2.1.2"

Gemfile.lock

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (3.2.6)
5-
actionpack (= 3.2.6)
4+
actionmailer (3.2.8)
5+
actionpack (= 3.2.8)
66
mail (~> 2.4.4)
7-
actionpack (3.2.6)
8-
activemodel (= 3.2.6)
9-
activesupport (= 3.2.6)
7+
actionpack (3.2.8)
8+
activemodel (= 3.2.8)
9+
activesupport (= 3.2.8)
1010
builder (~> 3.0.0)
1111
erubis (~> 2.7.0)
12-
journey (~> 1.0.1)
12+
journey (~> 1.0.4)
1313
rack (~> 1.4.0)
1414
rack-cache (~> 1.2)
1515
rack-test (~> 0.6.1)
1616
sprockets (~> 2.1.3)
17-
activemodel (3.2.6)
18-
activesupport (= 3.2.6)
17+
activemodel (3.2.8)
18+
activesupport (= 3.2.8)
1919
builder (~> 3.0.0)
20-
activerecord (3.2.6)
21-
activemodel (= 3.2.6)
22-
activesupport (= 3.2.6)
20+
activerecord (3.2.8)
21+
activemodel (= 3.2.8)
22+
activesupport (= 3.2.8)
2323
arel (~> 3.0.2)
2424
tzinfo (~> 0.3.29)
25-
activeresource (3.2.6)
26-
activemodel (= 3.2.6)
27-
activesupport (= 3.2.6)
28-
activesupport (3.2.6)
25+
activeresource (3.2.8)
26+
activemodel (= 3.2.8)
27+
activesupport (= 3.2.8)
28+
activesupport (3.2.8)
2929
i18n (~> 0.6)
3030
multi_json (~> 1.0)
31-
addressable (2.2.8)
31+
addressable (2.3.2)
3232
arel (3.0.2)
3333
bcrypt-ruby (3.0.1)
3434
builder (3.0.0)
@@ -39,8 +39,8 @@ GEM
3939
rack-test (>= 0.5.4)
4040
selenium-webdriver (~> 2.0)
4141
xpath (~> 0.1.4)
42-
childprocess (0.3.3)
43-
ffi (~> 1.0.6)
42+
childprocess (0.3.5)
43+
ffi (~> 1.0, >= 1.0.6)
4444
coffee-rails (3.2.2)
4545
coffee-script (>= 2.2.0)
4646
railties (~> 3.2.0)
@@ -70,12 +70,12 @@ GEM
7070
erubis (2.7.0)
7171
execjs (1.4.0)
7272
multi_json (~> 1.0)
73-
factory_girl (3.5.0)
73+
factory_girl (4.0.0)
7474
activesupport (>= 3.0.0)
75-
factory_girl_rails (3.5.0)
76-
factory_girl (~> 3.5.0)
75+
factory_girl_rails (4.0.0)
76+
factory_girl (~> 4.0.0)
7777
railties (>= 3.0.0)
78-
ffi (1.0.11)
78+
ffi (1.1.5)
7979
gherkin (2.11.1)
8080
json (>= 1.4.6)
8181
hike (1.2.1)
@@ -84,10 +84,10 @@ GEM
8484
jquery-rails (2.0.2)
8585
railties (>= 3.2.0, < 5.0)
8686
thor (~> 0.14)
87-
json (1.7.3)
88-
launchy (2.1.0)
89-
addressable (~> 2.2.6)
90-
libwebsocket (0.1.3)
87+
json (1.7.4)
88+
launchy (2.1.2)
89+
addressable (~> 2.3)
90+
libwebsocket (0.1.5)
9191
addressable
9292
mail (2.4.4)
9393
i18n (>= 0.4.0)
@@ -105,17 +105,17 @@ GEM
105105
rack
106106
rack-test (0.6.1)
107107
rack (>= 1.0)
108-
rails (3.2.6)
109-
actionmailer (= 3.2.6)
110-
actionpack (= 3.2.6)
111-
activerecord (= 3.2.6)
112-
activeresource (= 3.2.6)
113-
activesupport (= 3.2.6)
108+
rails (3.2.8)
109+
actionmailer (= 3.2.8)
110+
actionpack (= 3.2.8)
111+
activerecord (= 3.2.8)
112+
activeresource (= 3.2.8)
113+
activesupport (= 3.2.8)
114114
bundler (~> 1.0)
115-
railties (= 3.2.6)
116-
railties (3.2.6)
117-
actionpack (= 3.2.6)
118-
activesupport (= 3.2.6)
115+
railties (= 3.2.8)
116+
railties (3.2.8)
117+
actionpack (= 3.2.8)
118+
activesupport (= 3.2.8)
119119
rack-ssl (~> 1.3.2)
120120
rake (>= 0.8.7)
121121
rdoc (~> 3.4)
@@ -127,22 +127,22 @@ GEM
127127
rspec-core (~> 2.11.0)
128128
rspec-expectations (~> 2.11.0)
129129
rspec-mocks (~> 2.11.0)
130-
rspec-core (2.11.0)
131-
rspec-expectations (2.11.1)
130+
rspec-core (2.11.1)
131+
rspec-expectations (2.11.2)
132132
diff-lcs (~> 1.1.3)
133-
rspec-mocks (2.11.1)
133+
rspec-mocks (2.11.2)
134134
rspec-rails (2.11.0)
135135
actionpack (>= 3.0)
136136
activesupport (>= 3.0)
137137
railties (>= 3.0)
138138
rspec (~> 2.11.0)
139139
rubyzip (0.9.9)
140-
sass (3.1.20)
140+
sass (3.2.0)
141141
sass-rails (3.2.5)
142142
railties (~> 3.2.0)
143143
sass (>= 3.1.10)
144144
tilt (~> 1.3)
145-
selenium-webdriver (2.24.0)
145+
selenium-webdriver (2.25.0)
146146
childprocess (>= 0.2.5)
147147
libwebsocket (~> 0.1.3)
148148
multi_json (~> 1.0)
@@ -158,7 +158,7 @@ GEM
158158
polyglot
159159
polyglot (>= 0.3.1)
160160
tzinfo (0.3.33)
161-
uglifier (1.2.6)
161+
uglifier (1.2.7)
162162
execjs (>= 0.3.0)
163163
multi_json (~> 1.3)
164164
warden (1.2.1)
@@ -176,10 +176,10 @@ DEPENDENCIES
176176
database_cleaner (>= 0.8.0)
177177
devise (>= 2.1.2)
178178
email_spec (>= 1.2.1)
179-
factory_girl_rails (>= 3.5.0)
179+
factory_girl_rails (>= 4.0.0)
180180
jquery-rails
181-
launchy (>= 2.1.0)
182-
rails (= 3.2.6)
181+
launchy (>= 2.1.2)
182+
rails (= 3.2.8)
183183
rspec-rails (>= 2.11.0)
184184
sass-rails (~> 3.2.3)
185185
sqlite3

app/assets/javascripts/users.js.coffee

Lines changed: 0 additions & 3 deletions
This file was deleted.

app/assets/stylesheets/users.css.scss

Lines changed: 0 additions & 3 deletions
This file was deleted.

app/helpers/users_helper.rb

Lines changed: 0 additions & 2 deletions
This file was deleted.

app/models/.gitkeep

Whitespace-only changes.

app/views/devise/confirmations/new.html.erb

Lines changed: 0 additions & 12 deletions
This file was deleted.

app/views/devise/mailer/confirmation_instructions.html.erb

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)