From 6201abe73f7100b93727c6a0d549651df737948a Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 5 Feb 2010 18:33:24 -0800 Subject: New style for path references --- railties/lib/generators/rails/app/templates/Gemfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'railties/lib/generators/rails/app/templates/Gemfile') diff --git a/railties/lib/generators/rails/app/templates/Gemfile b/railties/lib/generators/rails/app/templates/Gemfile index f51edc4d2f..1ceb5a7bcc 100644 --- a/railties/lib/generators/rails/app/templates/Gemfile +++ b/railties/lib/generators/rails/app/templates/Gemfile @@ -7,8 +7,7 @@ gem "rails", "<%= Rails::VERSION::STRING %>" ## Bundle edge rails: <%- if options.dev? -%> -path "<%= Rails::Generators::RAILS_DEV_PATH %>", :glob => "{*/,}*.gemspec" -gem "rails", "<%= Rails::VERSION::STRING %>" +gem "rails", "<%= Rails::VERSION::STRING %>", :path => "<%= Rails::Generators::RAILS_DEV_PATH %>" <%- else -%> <%= "# " unless options.edge? %>gem "rails", :git => "git://github.com/rails/rails.git" <%- end -%> -- cgit v1.2.3 From 0ce9c80c0a3a7d09ffd61f8b09093afbb6239c14 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 5 Feb 2010 18:35:19 -0800 Subject: Path approach shouldnt specify version --- railties/lib/generators/rails/app/templates/Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib/generators/rails/app/templates/Gemfile') diff --git a/railties/lib/generators/rails/app/templates/Gemfile b/railties/lib/generators/rails/app/templates/Gemfile index 1ceb5a7bcc..54aa53a181 100644 --- a/railties/lib/generators/rails/app/templates/Gemfile +++ b/railties/lib/generators/rails/app/templates/Gemfile @@ -7,7 +7,7 @@ gem "rails", "<%= Rails::VERSION::STRING %>" ## Bundle edge rails: <%- if options.dev? -%> -gem "rails", "<%= Rails::VERSION::STRING %>", :path => "<%= Rails::Generators::RAILS_DEV_PATH %>" +gem "rails", :path => "<%= Rails::Generators::RAILS_DEV_PATH %>" <%- else -%> <%= "# " unless options.edge? %>gem "rails", :git => "git://github.com/rails/rails.git" <%- end -%> -- cgit v1.2.3 From cbb0b2f6f379df85959e95dce1e7b359197489c7 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 5 Feb 2010 18:41:15 -0800 Subject: Simplify conditions for --dev and --edge --- railties/lib/generators/rails/app/templates/Gemfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'railties/lib/generators/rails/app/templates/Gemfile') diff --git a/railties/lib/generators/rails/app/templates/Gemfile b/railties/lib/generators/rails/app/templates/Gemfile index 54aa53a181..2cc257fbd8 100644 --- a/railties/lib/generators/rails/app/templates/Gemfile +++ b/railties/lib/generators/rails/app/templates/Gemfile @@ -1,15 +1,15 @@ # Edit this Gemfile to bundle your application's dependencies. source 'http://gemcutter.org' -<% if !dev_or_edge? %> -gem "rails", "<%= Rails::VERSION::STRING %>" -<% end -%> - -## Bundle edge rails: <%- if options.dev? -%> gem "rails", :path => "<%= Rails::Generators::RAILS_DEV_PATH %>" +<%- elsif options.edge? -%> +gem "rails", :git => "git://github.com/rails/rails.git" <%- else -%> -<%= "# " unless options.edge? %>gem "rails", :git => "git://github.com/rails/rails.git" +gem "rails", "<%= Rails::VERSION::STRING %>" + +# Bundle edge Rails instead +# gem "rails", :git => "git://github.com/rails/rails.git" <%- end -%> <% unless options[:skip_activerecord] -%> -- cgit v1.2.3 From 33a90f5079617f0b3422d24ef72e6c4d88552427 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 5 Feb 2010 18:41:46 -0800 Subject: Not a fan of the double ## --- railties/lib/generators/rails/app/templates/Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/lib/generators/rails/app/templates/Gemfile') diff --git a/railties/lib/generators/rails/app/templates/Gemfile b/railties/lib/generators/rails/app/templates/Gemfile index 2cc257fbd8..3148269b6d 100644 --- a/railties/lib/generators/rails/app/templates/Gemfile +++ b/railties/lib/generators/rails/app/templates/Gemfile @@ -20,13 +20,13 @@ gem "rails", "<%= Rails::VERSION::STRING %>" gem "<%= gem_for_database %>"<% if require_for_database %>, :require => "<%= require_for_database %>"<% end %> <% end -%> -## Bundle the gems you use: +# Bundle the gems you use: # gem "bj" # gem "hpricot", "0.6" # gem "sqlite3-ruby", :require => "sqlite3" # gem "aws-s3", :require => "aws/s3" -## Bundle gems used only in certain environments: +# Bundle gems used only in certain environments: # gem "rspec", :group => :test # group :test do # gem "webrat" -- cgit v1.2.3 From c76df7a2d5b630adf52f89af01fe7fe8f097d199 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 5 Feb 2010 18:45:26 -0800 Subject: Cleanup comments --- railties/lib/generators/rails/app/templates/Gemfile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'railties/lib/generators/rails/app/templates/Gemfile') diff --git a/railties/lib/generators/rails/app/templates/Gemfile b/railties/lib/generators/rails/app/templates/Gemfile index 3148269b6d..f89dbe1e63 100644 --- a/railties/lib/generators/rails/app/templates/Gemfile +++ b/railties/lib/generators/rails/app/templates/Gemfile @@ -1,4 +1,3 @@ -# Edit this Gemfile to bundle your application's dependencies. source 'http://gemcutter.org' <%- if options.dev? -%> @@ -8,25 +7,21 @@ gem "rails", :git => "git://github.com/rails/rails.git" <%- else -%> gem "rails", "<%= Rails::VERSION::STRING %>" -# Bundle edge Rails instead +# Bundle edge Rails instead: # gem "rails", :git => "git://github.com/rails/rails.git" <%- end -%> <% unless options[:skip_activerecord] -%> -<% if options[:database] == 'sqlite3' -%> -# ActiveRecord requires a database adapter. By default, -# Rails has selected sqlite3. -<% end -%> gem "<%= gem_for_database %>"<% if require_for_database %>, :require => "<%= require_for_database %>"<% end %> <% end -%> -# Bundle the gems you use: +# Bundle the extra gems: # gem "bj" # gem "hpricot", "0.6" # gem "sqlite3-ruby", :require => "sqlite3" # gem "aws-s3", :require => "aws/s3" -# Bundle gems used only in certain environments: +# Bundle gems for certain environments: # gem "rspec", :group => :test # group :test do # gem "webrat" -- cgit v1.2.3 From 834a45d8a2ae225b775c51d8ae266a4550e9fba1 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 9 Feb 2010 17:12:37 -0800 Subject: Suggest Mongrel and Capistrano in the default bundle --- .../lib/generators/rails/app/templates/Gemfile | 28 +++++++++++++--------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'railties/lib/generators/rails/app/templates/Gemfile') diff --git a/railties/lib/generators/rails/app/templates/Gemfile b/railties/lib/generators/rails/app/templates/Gemfile index f89dbe1e63..f4bce8646d 100644 --- a/railties/lib/generators/rails/app/templates/Gemfile +++ b/railties/lib/generators/rails/app/templates/Gemfile @@ -1,28 +1,34 @@ source 'http://gemcutter.org' <%- if options.dev? -%> -gem "rails", :path => "<%= Rails::Generators::RAILS_DEV_PATH %>" +gem 'rails', :path => '<%= Rails::Generators::RAILS_DEV_PATH %>' <%- elsif options.edge? -%> -gem "rails", :git => "git://github.com/rails/rails.git" +gem 'rails', :git => 'git://github.com/rails/rails.git' <%- else -%> -gem "rails", "<%= Rails::VERSION::STRING %>" +gem 'rails', '<%= Rails::VERSION::STRING %>' # Bundle edge Rails instead: -# gem "rails", :git => "git://github.com/rails/rails.git" +# gem 'rails', :git => 'git://github.com/rails/rails.git' <%- end -%> <% unless options[:skip_activerecord] -%> -gem "<%= gem_for_database %>"<% if require_for_database %>, :require => "<%= require_for_database %>"<% end %> +gem '<%= gem_for_database %>'<% if require_for_database %>, :require => '<%= require_for_database %>'<% end %> <% end -%> +# Use mongrel as the web server +# gem 'mongrel' + +# Deploy with Capistrano +# gem 'capistrano' + # Bundle the extra gems: -# gem "bj" -# gem "hpricot", "0.6" -# gem "sqlite3-ruby", :require => "sqlite3" -# gem "aws-s3", :require => "aws/s3" +# gem 'bj' +# gem 'hpricot', '0.6' +# gem 'sqlite3-ruby', :require => 'sqlite3' +# gem 'aws-s3', :require => 'aws/s3' # Bundle gems for certain environments: -# gem "rspec", :group => :test +# gem 'rspec', :group => :test # group :test do -# gem "webrat" +# gem 'webrat' # end -- cgit v1.2.3