diff options
| author | Dan Gebhardt <dan@cerebris.com> | 2011-07-26 21:54:45 -0400 |
|---|---|---|
| committer | Dan Gebhardt <dan@cerebris.com> | 2011-07-28 09:58:27 -0400 |
| commit | a74e4736f95befa7a22c208019bf11a155ff7543 (patch) | |
| tree | 3c0ab47e5f6511d5f1f5597cb39a575e853d6869 | |
| parent | d9b59c341c5cc5848a42e936588a67130bf7ff4a (diff) | |
| download | rails-a74e4736f95befa7a22c208019bf11a155ff7543.tar.gz rails-a74e4736f95befa7a22c208019bf11a155ff7543.tar.bz2 rails-a74e4736f95befa7a22c208019bf11a155ff7543.zip | |
Moved dependencies from Gemfile to gemspec to eliminate redundant declarations.
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec | 11 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin_new/templates/Gemfile | 20 |
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 |