Skip to content

Commit 2776cfe

Browse files
committed
build using rails_apps_composer 2.4.6
1 parent 2c68c5c commit 2776cfe

File tree

12 files changed

+154
-146
lines changed

12 files changed

+154
-146
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby-2.0.0-p0
1+
2.0.0

Gemfile

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
11
source 'https://rubygems.org'
2-
gem 'rails', '3.2.13'
2+
ruby '2.0.0'
3+
gem 'rails', '3.2.14'
34
gem 'sqlite3'
45
group :assets do
56
gem 'sass-rails', '~> 3.2.3'
67
gem 'coffee-rails', '~> 3.2.1'
78
gem 'uglifier', '>= 1.0.3'
89
end
910
gem 'jquery-rails'
10-
gem "rspec-rails", ">= 2.12.2", :group => [:development, :test]
11-
gem "database_cleaner", ">= 1.0.0.RC1", :group => :test
12-
gem "email_spec", ">= 1.4.0", :group => :test
13-
gem "cucumber-rails", ">= 1.3.1", :group => :test, :require => false
14-
gem "launchy", ">= 2.2.0", :group => :test
15-
gem "capybara", ">= 2.0.3", :group => :test
16-
gem "factory_girl_rails", ">= 4.2.0", :group => [:development, :test]
17-
gem "devise", ">= 2.2.3"
18-
gem "quiet_assets", ">= 1.0.2", :group => :development
19-
gem "figaro", ">= 0.6.3"
20-
gem "better_errors", ">= 0.7.2", :group => :development
21-
gem "binding_of_caller", ">= 0.7.1", :group => :development, :platforms => [:mri_19, :rbx]
11+
gem 'devise'
12+
gem 'figaro'
13+
group :development do
14+
gem 'better_errors'
15+
gem 'binding_of_caller', :platforms=>[:mri_19, :mri_20, :rbx]
16+
gem 'quiet_assets'
17+
end
18+
group :development, :test do
19+
gem 'factory_girl_rails'
20+
gem 'rspec-rails'
21+
end
22+
group :test do
23+
gem 'capybara'
24+
gem 'cucumber-rails', :require=>false
25+
gem 'database_cleaner', '1.0.1'
26+
gem 'email_spec'
27+
gem 'launchy'
28+
end

Gemfile.lock

Lines changed: 89 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,108 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (3.2.13)
5-
actionpack (= 3.2.13)
6-
mail (~> 2.5.3)
7-
actionpack (3.2.13)
8-
activemodel (= 3.2.13)
9-
activesupport (= 3.2.13)
4+
actionmailer (3.2.14)
5+
actionpack (= 3.2.14)
6+
mail (~> 2.5.4)
7+
actionpack (3.2.14)
8+
activemodel (= 3.2.14)
9+
activesupport (= 3.2.14)
1010
builder (~> 3.0.0)
1111
erubis (~> 2.7.0)
1212
journey (~> 1.0.4)
1313
rack (~> 1.4.5)
1414
rack-cache (~> 1.2)
1515
rack-test (~> 0.6.1)
1616
sprockets (~> 2.2.1)
17-
activemodel (3.2.13)
18-
activesupport (= 3.2.13)
17+
activemodel (3.2.14)
18+
activesupport (= 3.2.14)
1919
builder (~> 3.0.0)
20-
activerecord (3.2.13)
21-
activemodel (= 3.2.13)
22-
activesupport (= 3.2.13)
20+
activerecord (3.2.14)
21+
activemodel (= 3.2.14)
22+
activesupport (= 3.2.14)
2323
arel (~> 3.0.2)
2424
tzinfo (~> 0.3.29)
25-
activeresource (3.2.13)
26-
activemodel (= 3.2.13)
27-
activesupport (= 3.2.13)
28-
activesupport (3.2.13)
29-
i18n (= 0.6.1)
25+
activeresource (3.2.14)
26+
activemodel (= 3.2.14)
27+
activesupport (= 3.2.14)
28+
activesupport (3.2.14)
29+
i18n (~> 0.6, >= 0.6.4)
3030
multi_json (~> 1.0)
31-
addressable (2.3.3)
31+
addressable (2.3.5)
3232
arel (3.0.2)
33-
bcrypt-ruby (3.0.1)
34-
better_errors (0.7.2)
33+
bcrypt-ruby (3.1.1)
34+
better_errors (0.9.0)
3535
coderay (>= 1.0.0)
3636
erubis (>= 2.6.6)
37-
binding_of_caller (0.7.1)
37+
binding_of_caller (0.7.2)
3838
debug_inspector (>= 0.0.1)
3939
builder (3.0.4)
40-
capybara (2.0.3)
40+
capybara (2.1.0)
4141
mime-types (>= 1.16)
4242
nokogiri (>= 1.3.3)
4343
rack (>= 1.0.0)
4444
rack-test (>= 0.5.4)
45-
selenium-webdriver (~> 2.0)
46-
xpath (~> 1.0.0)
47-
childprocess (0.3.9)
48-
ffi (~> 1.0, >= 1.0.11)
45+
xpath (~> 2.0)
4946
coderay (1.0.9)
5047
coffee-rails (3.2.2)
5148
coffee-script (>= 2.2.0)
5249
railties (~> 3.2.0)
5350
coffee-script (2.2.0)
5451
coffee-script-source
5552
execjs
56-
coffee-script-source (1.6.2)
57-
cucumber (1.2.3)
53+
coffee-script-source (1.6.3)
54+
cucumber (1.3.6)
5855
builder (>= 2.1.2)
5956
diff-lcs (>= 1.1.3)
60-
gherkin (~> 2.11.6)
61-
multi_json (~> 1.3)
62-
cucumber-rails (1.3.1)
57+
gherkin (~> 2.12.0)
58+
multi_json (~> 1.7.5)
59+
multi_test (>= 0.0.2)
60+
cucumber-rails (1.4.0)
6361
capybara (>= 1.1.2)
6462
cucumber (>= 1.2.0)
6563
nokogiri (>= 1.5.0)
66-
rails (~> 3.0)
67-
database_cleaner (1.0.0.RC1)
64+
rails (>= 3.0.0)
65+
database_cleaner (1.0.1)
6866
debug_inspector (0.0.2)
69-
devise (2.2.3)
67+
devise (3.0.3)
7068
bcrypt-ruby (~> 3.0)
7169
orm_adapter (~> 0.1)
72-
railties (~> 3.1)
73-
warden (~> 1.2.1)
74-
diff-lcs (1.2.2)
75-
email_spec (1.4.0)
70+
railties (>= 3.2.6, < 5)
71+
warden (~> 1.2.3)
72+
diff-lcs (1.2.4)
73+
email_spec (1.5.0)
7674
launchy (~> 2.1)
7775
mail (~> 2.2)
7876
erubis (2.7.0)
79-
execjs (1.4.0)
80-
multi_json (~> 1.0)
77+
execjs (2.0.0)
8178
factory_girl (4.2.0)
8279
activesupport (>= 3.0.0)
8380
factory_girl_rails (4.2.1)
8481
factory_girl (~> 4.2.0)
8582
railties (>= 3.0.0)
86-
ffi (1.6.0)
87-
figaro (0.6.3)
83+
figaro (0.7.0)
8884
bundler (~> 1.0)
8985
rails (>= 3, < 5)
90-
gherkin (2.11.6)
91-
json (>= 1.7.6)
92-
hike (1.2.1)
93-
i18n (0.6.1)
86+
gherkin (2.12.1)
87+
multi_json (~> 1.3)
88+
hike (1.2.3)
89+
i18n (0.6.5)
9490
journey (1.0.4)
95-
jquery-rails (2.2.1)
91+
jquery-rails (3.0.4)
9692
railties (>= 3.0, < 5.0)
9793
thor (>= 0.14, < 2.0)
98-
json (1.7.7)
99-
launchy (2.2.0)
94+
json (1.8.0)
95+
launchy (2.3.0)
10096
addressable (~> 2.3)
101-
mail (2.5.3)
102-
i18n (>= 0.4.0)
97+
mail (2.5.4)
10398
mime-types (~> 1.16)
10499
treetop (~> 1.4.8)
105-
mime-types (1.22)
106-
multi_json (1.7.2)
107-
nokogiri (1.5.9)
100+
mime-types (1.24)
101+
mini_portile (0.5.1)
102+
multi_json (1.7.9)
103+
multi_test (0.0.2)
104+
nokogiri (1.6.0)
105+
mini_portile (~> 0.5.0)
108106
orm_adapter (0.4.0)
109107
polyglot (0.3.3)
110108
quiet_assets (1.0.2)
@@ -116,86 +114,79 @@ GEM
116114
rack
117115
rack-test (0.6.2)
118116
rack (>= 1.0)
119-
rails (3.2.13)
120-
actionmailer (= 3.2.13)
121-
actionpack (= 3.2.13)
122-
activerecord (= 3.2.13)
123-
activeresource (= 3.2.13)
124-
activesupport (= 3.2.13)
117+
rails (3.2.14)
118+
actionmailer (= 3.2.14)
119+
actionpack (= 3.2.14)
120+
activerecord (= 3.2.14)
121+
activeresource (= 3.2.14)
122+
activesupport (= 3.2.14)
125123
bundler (~> 1.0)
126-
railties (= 3.2.13)
127-
railties (3.2.13)
128-
actionpack (= 3.2.13)
129-
activesupport (= 3.2.13)
124+
railties (= 3.2.14)
125+
railties (3.2.14)
126+
actionpack (= 3.2.14)
127+
activesupport (= 3.2.14)
130128
rack-ssl (~> 1.3.2)
131129
rake (>= 0.8.7)
132130
rdoc (~> 3.4)
133131
thor (>= 0.14.6, < 2.0)
134-
rake (10.0.4)
132+
rake (10.1.0)
135133
rdoc (3.12.2)
136134
json (~> 1.4)
137-
rspec-core (2.13.1)
138-
rspec-expectations (2.13.0)
135+
rspec-core (2.14.5)
136+
rspec-expectations (2.14.2)
139137
diff-lcs (>= 1.1.3, < 2.0)
140-
rspec-mocks (2.13.0)
141-
rspec-rails (2.13.0)
138+
rspec-mocks (2.14.3)
139+
rspec-rails (2.14.0)
142140
actionpack (>= 3.0)
143141
activesupport (>= 3.0)
144142
railties (>= 3.0)
145-
rspec-core (~> 2.13.0)
146-
rspec-expectations (~> 2.13.0)
147-
rspec-mocks (~> 2.13.0)
148-
rubyzip (0.9.9)
149-
sass (3.2.7)
143+
rspec-core (~> 2.14.0)
144+
rspec-expectations (~> 2.14.0)
145+
rspec-mocks (~> 2.14.0)
146+
sass (3.2.10)
150147
sass-rails (3.2.6)
151148
railties (~> 3.2.0)
152149
sass (>= 3.1.10)
153150
tilt (~> 1.3)
154-
selenium-webdriver (2.31.0)
155-
childprocess (>= 0.2.5)
156-
multi_json (~> 1.0)
157-
rubyzip
158-
websocket (~> 1.0.4)
159151
sprockets (2.2.2)
160152
hike (~> 1.2)
161153
multi_json (~> 1.0)
162154
rack (~> 1.0)
163155
tilt (~> 1.1, != 1.3.0)
164-
sqlite3 (1.3.7)
156+
sqlite3 (1.3.8)
165157
thor (0.18.1)
166-
tilt (1.3.6)
167-
treetop (1.4.12)
158+
tilt (1.4.1)
159+
treetop (1.4.15)
168160
polyglot
169161
polyglot (>= 0.3.1)
170162
tzinfo (0.3.37)
171-
uglifier (1.3.0)
163+
uglifier (2.2.0)
172164
execjs (>= 0.3.0)
173165
multi_json (~> 1.0, >= 1.0.2)
174-
warden (1.2.1)
166+
warden (1.2.3)
175167
rack (>= 1.0)
176-
websocket (1.0.7)
177-
xpath (1.0.0)
168+
xpath (2.0.0)
178169
nokogiri (~> 1.3)
179170

180171
PLATFORMS
181172
ruby
182173

183174
DEPENDENCIES
184-
better_errors (>= 0.7.2)
185-
binding_of_caller (>= 0.7.1)
186-
capybara (>= 2.0.3)
175+
better_errors
176+
binding_of_caller
177+
capybara
187178
coffee-rails (~> 3.2.1)
188-
cucumber-rails (>= 1.3.1)
189-
database_cleaner (>= 1.0.0.RC1)
190-
devise (>= 2.2.3)
191-
email_spec (>= 1.4.0)
192-
factory_girl_rails (>= 4.2.0)
193-
figaro (>= 0.6.3)
179+
cucumber-rails
180+
database_cleaner (= 1.0.1)
181+
devise
182+
email_spec
183+
factory_girl_rails
184+
figaro
194185
jquery-rails
195-
launchy (>= 2.2.0)
196-
quiet_assets (>= 1.0.2)
197-
rails (= 3.2.13)
198-
rspec-rails (>= 2.12.2)
186+
launchy
187+
quiet_assets
188+
rails (= 3.2.14)
189+
rspec-rails
199190
sass-rails (~> 3.2.3)
200191
sqlite3
201192
uglifier (>= 1.0.3)

app/views/devise/registrations/edit.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
44
<%= devise_error_messages! %>
5-
<div><%= f.label :name %><br />
6-
<%= f.text_field :name %></div>
5+
<p><%= f.label :name %><br />
6+
<%= f.text_field :name %></p>
77

88
<div><%= f.label :email %><br />
99
<%= f.email_field :email %></div>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
44
<%= devise_error_messages! %>
5-
<div><%= f.label :name %><br />
6-
<%= f.text_field :name %></div>
5+
<p><%= f.label :name %><br />
6+
<%= f.text_field :name %></p>
77

88
<div><%= f.label :email %><br />
99
<%= f.email_field :email %></div>

app/views/home/index.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<h3>Home</h3>
22
<% @users.each do |user| %>
3-
<p>User: <%= link_to user.name, user %></p>
3+
<p>User: <%=link_to user.name, user %></p>
44
<% end %>

config/environments/development.rb

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,6 @@
2121
config.action_mailer.raise_delivery_errors = true
2222
config.action_mailer.default :charset => "utf-8"
2323

24-
config.action_mailer.smtp_settings = {
25-
address: "smtp.gmail.com",
26-
port: 587,
27-
domain: "example.com",
28-
authentication: "plain",
29-
enable_starttls_auto: true,
30-
user_name: ENV["GMAIL_USERNAME"],
31-
password: ENV["GMAIL_PASSWORD"]
32-
}
33-
34-
3524

3625
# Print deprecation notices to the Rails logger
3726
config.active_support.deprecation = :log
@@ -51,4 +40,15 @@
5140

5241
# Expands the lines which load the assets
5342
config.assets.debug = true
43+
44+
config.action_mailer.smtp_settings = {
45+
address: "smtp.gmail.com",
46+
port: 587,
47+
domain: ENV["DOMAIN_NAME"],
48+
authentication: "plain",
49+
enable_starttls_auto: true,
50+
user_name: ENV["GMAIL_USERNAME"],
51+
password: ENV["GMAIL_PASSWORD"]
52+
}
53+
5454
end

0 commit comments

Comments
 (0)