aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorDan Gebhardt <dan@cerebris.com>2011-07-26 21:54:45 -0400
committerXavier Noria <fxn@hashref.com>2011-08-13 16:22:22 -0700
commit47cc214600b9f099140a1df34bc68432ad1d2b23 (patch)
tree4881935582993e783688cb03d52dfe58e3654510 /railties/lib
parentf9eadb8b432f220865c5205a81e6dd5af90f35b5 (diff)
downloadrails-47cc214600b9f099140a1df34bc68432ad1d2b23.tar.gz
rails-47cc214600b9f099140a1df34bc68432ad1d2b23.tar.bz2
rails-47cc214600b9f099140a1df34bc68432ad1d2b23.zip
Moved dependencies from Gemfile to gemspec to eliminate redundant declarations.
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec11
-rw-r--r--railties/lib/rails/generators/rails/plugin_new/templates/Gemfile20
2 files changed, 24 insertions, 7 deletions
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
index 736d114901..b8d68ad0bc 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
@@ -17,4 +17,15 @@ Gem::Specification.new do |s|
<% unless options.skip_test_unit? -%>
s.test_files = Dir["test/**/*"]
<% end -%>
+
+ # If your gem is dependent on a specific version (or higher) of Rails:
+ <%= '# ' if options.dev? || options.edge? -%>s.add_dependency "rails", ">= <%= Rails::VERSION::STRING %>"
+
+<% unless options[:skip_javascript] || !full? -%>
+ # If your gem contains any <%= "#{options[:javascript]}-specific" %> javascript:
+ # s.add_dependency "<%= "#{options[:javascript]}-rails" %>"
+
+<% end -%>
+ # Declare development-specific dependencies:
+ s.add_development_dependency "<%= gem_for_database %>"
end
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile b/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
index 7e6eb18341..160baa6906 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
@@ -1,14 +1,20 @@
source "http://rubygems.org"
-<%= rails_gemfile_entry -%>
+# Declare your gem's dependencies in <%= name %>.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
+gemspec
-<% if full? -%>
-<%= database_gemfile_entry -%>
-<% end -%>
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.
-<% if mountable? -%>
-<%= javascript_gemfile_entry -%>
-<% end -%>
+<% if options.dev? || options.edge? -%>
+# Your gem is dependent on dev or edge Rails. Once you can lock this
+# dependency down to a specific version, move it to your gemspec.
+<%= rails_gemfile_entry -%>
+<% end -%>
# To use debugger
# <%= ruby_debugger_gemfile_entry %> \ No newline at end of file