Skip to content

Commit 1c5d5c1

Browse files
committed
build using rails_apps_composer 2.2.39
1 parent 056d148 commit 1c5d5c1

File tree

7 files changed

+87
-118
lines changed

7 files changed

+87
-118
lines changed

.rvmrc

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

Gemfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://rubygems.org'
2-
gem 'rails', '3.2.13.rc1'
2+
gem 'rails', '3.2.13'
33
gem 'sqlite3'
44
group :assets do
55
gem 'sass-rails', '~> 3.2.3'
@@ -8,14 +8,14 @@ group :assets do
88
end
99
gem 'jquery-rails'
1010
gem "rspec-rails", ">= 2.12.2", :group => [:development, :test]
11-
gem "database_cleaner", ">= 0.9.1", :group => :test
11+
gem "database_cleaner", ">= 1.0.0.RC1", :group => :test
1212
gem "email_spec", ">= 1.4.0", :group => :test
13-
gem "cucumber-rails", ">= 1.3.0", :group => :test, :require => false
13+
gem "cucumber-rails", ">= 1.3.1", :group => :test, :require => false
1414
gem "launchy", ">= 2.2.0", :group => :test
15-
gem "capybara", ">= 2.0.2", :group => :test
15+
gem "capybara", ">= 2.0.3", :group => :test
1616
gem "factory_girl_rails", ">= 4.2.0", :group => [:development, :test]
1717
gem "devise", ">= 2.2.3"
18-
gem "quiet_assets", ">= 1.0.1", :group => :development
19-
gem "figaro", ">= 0.5.3"
20-
gem "better_errors", ">= 0.6.0", :group => :development
21-
gem "binding_of_caller", ">= 0.7.1", :group => :development, :platforms => [:mri_19, :rbx]
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]

Gemfile.lock

Lines changed: 56 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (3.2.13.rc1)
5-
actionpack (= 3.2.13.rc1)
4+
actionmailer (3.2.13)
5+
actionpack (= 3.2.13)
66
mail (~> 2.5.3)
7-
actionpack (3.2.13.rc1)
8-
activemodel (= 3.2.13.rc1)
9-
activesupport (= 3.2.13.rc1)
7+
actionpack (3.2.13)
8+
activemodel (= 3.2.13)
9+
activesupport (= 3.2.13)
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.rc1)
18-
activesupport (= 3.2.13.rc1)
17+
activemodel (3.2.13)
18+
activesupport (= 3.2.13)
1919
builder (~> 3.0.0)
20-
activerecord (3.2.13.rc1)
21-
activemodel (= 3.2.13.rc1)
22-
activesupport (= 3.2.13.rc1)
20+
activerecord (3.2.13)
21+
activemodel (= 3.2.13)
22+
activesupport (= 3.2.13)
2323
arel (~> 3.0.2)
2424
tzinfo (~> 0.3.29)
25-
activeresource (3.2.13.rc1)
26-
activemodel (= 3.2.13.rc1)
27-
activesupport (= 3.2.13.rc1)
28-
activesupport (3.2.13.rc1)
25+
activeresource (3.2.13)
26+
activemodel (= 3.2.13)
27+
activesupport (= 3.2.13)
28+
activesupport (3.2.13)
2929
i18n (= 0.6.1)
3030
multi_json (~> 1.0)
3131
addressable (2.3.3)
3232
arel (3.0.2)
3333
bcrypt-ruby (3.0.1)
34-
better_errors (0.7.0)
34+
better_errors (0.7.2)
3535
coderay (>= 1.0.0)
3636
erubis (>= 2.6.6)
3737
binding_of_caller (0.7.1)
3838
debug_inspector (>= 0.0.1)
3939
builder (3.0.4)
40-
capybara (2.0.2)
40+
capybara (2.0.3)
4141
mime-types (>= 1.16)
4242
nokogiri (>= 1.3.3)
4343
rack (>= 1.0.0)
4444
rack-test (>= 0.5.4)
4545
selenium-webdriver (~> 2.0)
4646
xpath (~> 1.0.0)
47-
childprocess (0.3.8)
47+
childprocess (0.3.9)
4848
ffi (~> 1.0, >= 1.0.11)
4949
coderay (1.0.9)
5050
coffee-rails (3.2.2)
@@ -53,24 +53,25 @@ GEM
5353
coffee-script (2.2.0)
5454
coffee-script-source
5555
execjs
56-
coffee-script-source (1.5.0)
57-
cucumber (1.2.1)
56+
coffee-script-source (1.6.2)
57+
cucumber (1.2.3)
5858
builder (>= 2.1.2)
5959
diff-lcs (>= 1.1.3)
60-
gherkin (~> 2.11.0)
61-
json (>= 1.4.6)
62-
cucumber-rails (1.3.0)
60+
gherkin (~> 2.11.6)
61+
multi_json (~> 1.3)
62+
cucumber-rails (1.3.1)
6363
capybara (>= 1.1.2)
64-
cucumber (>= 1.1.8)
64+
cucumber (>= 1.2.0)
6565
nokogiri (>= 1.5.0)
66-
database_cleaner (0.9.1)
66+
rails (~> 3.0)
67+
database_cleaner (1.0.0.RC1)
6768
debug_inspector (0.0.2)
6869
devise (2.2.3)
6970
bcrypt-ruby (~> 3.0)
7071
orm_adapter (~> 0.1)
7172
railties (~> 3.1)
7273
warden (~> 1.2.1)
73-
diff-lcs (1.2.1)
74+
diff-lcs (1.2.2)
7475
email_spec (1.4.0)
7576
launchy (~> 2.1)
7677
mail (~> 2.2)
@@ -82,8 +83,9 @@ GEM
8283
factory_girl_rails (4.2.1)
8384
factory_girl (~> 4.2.0)
8485
railties (>= 3.0.0)
85-
ffi (1.4.0)
86-
figaro (0.6.1)
86+
ffi (1.6.0)
87+
figaro (0.6.3)
88+
bundler (~> 1.0)
8789
rails (>= 3, < 5)
8890
gherkin (2.11.6)
8991
json (>= 1.7.6)
@@ -100,9 +102,9 @@ GEM
100102
i18n (>= 0.4.0)
101103
mime-types (~> 1.16)
102104
treetop (~> 1.4.8)
103-
mime-types (1.21)
104-
multi_json (1.6.1)
105-
nokogiri (1.5.6)
105+
mime-types (1.22)
106+
multi_json (1.7.2)
107+
nokogiri (1.5.9)
106108
orm_adapter (0.4.0)
107109
polyglot (0.3.3)
108110
quiet_assets (1.0.2)
@@ -114,25 +116,25 @@ GEM
114116
rack
115117
rack-test (0.6.2)
116118
rack (>= 1.0)
117-
rails (3.2.13.rc1)
118-
actionmailer (= 3.2.13.rc1)
119-
actionpack (= 3.2.13.rc1)
120-
activerecord (= 3.2.13.rc1)
121-
activeresource (= 3.2.13.rc1)
122-
activesupport (= 3.2.13.rc1)
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)
123125
bundler (~> 1.0)
124-
railties (= 3.2.13.rc1)
125-
railties (3.2.13.rc1)
126-
actionpack (= 3.2.13.rc1)
127-
activesupport (= 3.2.13.rc1)
126+
railties (= 3.2.13)
127+
railties (3.2.13)
128+
actionpack (= 3.2.13)
129+
activesupport (= 3.2.13)
128130
rack-ssl (~> 1.3.2)
129131
rake (>= 0.8.7)
130132
rdoc (~> 3.4)
131133
thor (>= 0.14.6, < 2.0)
132-
rake (10.0.3)
134+
rake (10.0.4)
133135
rdoc (3.12.2)
134136
json (~> 1.4)
135-
rspec-core (2.13.0)
137+
rspec-core (2.13.1)
136138
rspec-expectations (2.13.0)
137139
diff-lcs (>= 1.1.3, < 2.0)
138140
rspec-mocks (2.13.0)
@@ -144,12 +146,12 @@ GEM
144146
rspec-expectations (~> 2.13.0)
145147
rspec-mocks (~> 2.13.0)
146148
rubyzip (0.9.9)
147-
sass (3.2.6)
149+
sass (3.2.7)
148150
sass-rails (3.2.6)
149151
railties (~> 3.2.0)
150152
sass (>= 3.1.10)
151153
tilt (~> 1.3)
152-
selenium-webdriver (2.30.0)
154+
selenium-webdriver (2.31.0)
153155
childprocess (>= 0.2.5)
154156
multi_json (~> 1.0)
155157
rubyzip
@@ -160,12 +162,12 @@ GEM
160162
rack (~> 1.0)
161163
tilt (~> 1.1, != 1.3.0)
162164
sqlite3 (1.3.7)
163-
thor (0.17.0)
164-
tilt (1.3.4)
165+
thor (0.18.1)
166+
tilt (1.3.6)
165167
treetop (1.4.12)
166168
polyglot
167169
polyglot (>= 0.3.1)
168-
tzinfo (0.3.35)
170+
tzinfo (0.3.37)
169171
uglifier (1.3.0)
170172
execjs (>= 0.3.0)
171173
multi_json (~> 1.0, >= 1.0.2)
@@ -179,20 +181,20 @@ PLATFORMS
179181
ruby
180182

181183
DEPENDENCIES
182-
better_errors (>= 0.6.0)
184+
better_errors (>= 0.7.2)
183185
binding_of_caller (>= 0.7.1)
184-
capybara (>= 2.0.2)
186+
capybara (>= 2.0.3)
185187
coffee-rails (~> 3.2.1)
186-
cucumber-rails (>= 1.3.0)
187-
database_cleaner (>= 0.9.1)
188+
cucumber-rails (>= 1.3.1)
189+
database_cleaner (>= 1.0.0.RC1)
188190
devise (>= 2.2.3)
189191
email_spec (>= 1.4.0)
190192
factory_girl_rails (>= 4.2.0)
191-
figaro (>= 0.5.3)
193+
figaro (>= 0.6.3)
192194
jquery-rails
193195
launchy (>= 2.2.0)
194-
quiet_assets (>= 1.0.1)
195-
rails (= 3.2.13.rc1)
196+
quiet_assets (>= 1.0.2)
197+
rails (= 3.2.13)
196198
rspec-rails (>= 2.12.2)
197199
sass-rails (~> 3.2.3)
198200
sqlite3

README.textile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ The application generator template will ask you for additional preferences:
113113
2) Haml
114114
3) Slim
115115
extras Set a robots.txt file to ban spiders? (y/n)
116-
extras Create a project-specific rvm gemset and .rvmrc? (y/n)
116+
extras Use or create a project-specific rvm gemset? (y/n)
117117
extras Create a GitHub repository? (y/n)
118118
</pre>
119119

@@ -129,7 +129,7 @@ h4. Other Choices
129129

130130
Set a robots.txt file to ban spiders if you want to keep your new site out of Google search results.
131131

132-
It is a good idea to use "rvm":https://rvm.io/, the Ruby Version Manager, and create a project-specific rvm gemset and .rvmrc file (not available on Windows). See "Installing Rails":http://railsapps.github.com/installing-rails.html.
132+
It is a good idea to use "rvm":https://rvm.io/, the Ruby Version Manager, and create a project-specific rvm gemset (not available on Windows). See "Installing Rails":http://railsapps.github.com/installing-rails.html.
133133

134134
If you choose to create a GitHub repository, the generator will prompt you for a GitHub username and password.
135135

config/application.rb

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

3-
require 'rails/all'
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"
410

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

features/support/env.rb

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
2-
# It is recommended to regenerate this file in the future when you upgrade to a
3-
# newer version of cucumber-rails. Consider adding your own code to a new file
2+
# It is recommended to regenerate this file in the future when you upgrade to a
3+
# newer version of cucumber-rails. Consider adding your own code to a new file
44
# instead of editing this one. Cucumber will automatically load all features/**/*.rb
55
# files.
66

77
require 'cucumber/rails'
88

9-
# Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
10-
# order to ease the transition to Capybara we set the default here. If you'd
11-
# prefer to use XPath just remove this line and adjust any selectors in your
12-
# steps to use the XPath syntax.
13-
Capybara.default_selector = :css
9+
# Capybara defaults to CSS3 selectors rather than XPath.
10+
# If you'd prefer to use XPath, just uncomment this line and adjust any
11+
# selectors in your step definitions to use the XPath syntax.
12+
# Capybara.default_selector = :xpath
1413

1514
# By default, any exception happening in your Rails application will bubble up
1615
# to Cucumber so that your scenario will fail. This is a different from how
@@ -42,7 +41,7 @@
4241
#
4342
# Before('@no-txn,@selenium,@culerity,@celerity,@javascript') do
4443
# # { :except => [:widgets] } may not do what you expect here
45-
# # as tCucumber::Rails::Database.javascript_strategy overrides
44+
# # as Cucumber::Rails::Database.javascript_strategy overrides
4645
# # this setting.
4746
# DatabaseCleaner.strategy = :truncation
4847
# end

lib/tasks/cucumber.rake

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
2-
# It is recommended to regenerate this file in the future when you upgrade to a
3-
# newer version of cucumber-rails. Consider adding your own code to a new file
2+
# It is recommended to regenerate this file in the future when you upgrade to a
3+
# newer version of cucumber-rails. Consider adding your own code to a new file
44
# instead of editing this one. Cucumber will automatically load all features/**/*.rb
55
# files.
66

@@ -14,19 +14,19 @@ begin
1414
require 'cucumber/rake/task'
1515

1616
namespace :cucumber do
17-
Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
17+
Cucumber::Rake::Task.new({:ok => 'test:prepare'}, 'Run features that should pass') do |t|
1818
t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
1919
t.fork = true # You may get faster startup if you set this to false
2020
t.profile = 'default'
2121
end
2222

23-
Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
23+
Cucumber::Rake::Task.new({:wip => 'test:prepare'}, 'Run features that are being worked on') do |t|
2424
t.binary = vendored_cucumber_bin
2525
t.fork = true # You may get faster startup if you set this to false
2626
t.profile = 'wip'
2727
end
2828

29-
Cucumber::Rake::Task.new({:rerun => 'db:test:prepare'}, 'Record failing features and run only them if any exist') do |t|
29+
Cucumber::Rake::Task.new({:rerun => 'test:prepare'}, 'Record failing features and run only them if any exist') do |t|
3030
t.binary = vendored_cucumber_bin
3131
t.fork = true # You may get faster startup if you set this to false
3232
t.profile = 'rerun'
@@ -50,8 +50,8 @@ begin
5050
STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
5151
end
5252

53-
# In case we don't have ActiveRecord, append a no-op task that we can depend upon.
54-
task 'db:test:prepare' do
53+
# In case we don't have the generic Rails test:prepare hook, append a no-op task that we can depend upon.
54+
task 'test:prepare' do
5555
end
5656

5757
task :stats => 'cucumber:statsetup'

0 commit comments

Comments
 (0)