Updated dynamic gemspecs to retrieve external dependencies from Gemfile

CHANGES.rdoc

@@ -9,6 +9,7 @@
 * Added provides in controller level App.controller :provides => [:json, :xml]
 * Added compatibility with AS 3.0
 * Fixed compatibility with DM 1.0
+* Improves dependencies in a Gemfile and autoinjected into gemspecs
 * Allow models to be generated in subapps with --app flag
 * Added bundler support also for testing [Thanks to Ryanfitz]
 * Updated I18n dependency to version > 0.4.0

Gemfile

@@ -1,27 +1,44 @@
+require File.expand_path("../padrino-core/lib/padrino-core/version.rb", __FILE__)
+
 source :rubygems
 
-gem "sinatra", ">= 1.0.0"
-gem "http_router", ">= 0.2.3"
-gem "thor", ">= 0.13.0"
-
-# If you want try our test on AS edge.
-# $ AS=edge bundle install
-# $ AS=edge rake test
-if ENV['AS'] == "edge"
-  puts "Using ActiveSupport 3.0.0.beta4"
-  gem "activesupport", ">= 3.0.0.beta4", :require => nil
-  gem "tzinfo"
-else
-  puts "Using ActiveSupport 2.3.8"
-  gem "activesupport", ">= 2.3.8", :require => nil
+group :core do
+  gem "sinatra", ">= 1.0.0"
+  gem "http_router", ">= 0.2.3"
+  gem "thor", ">= 0.13.0"
+  # If you want try our test on AS edge.
+  # $ AS=edge bundle install
+  # $ AS=edge rake test
+  if ENV['AS'] == "edge"
+    puts "Using ActiveSupport 3.0.0.beta4"
+    gem "activesupport", ">= 3.0.0.beta4", :require => nil
+    gem "tzinfo"
+  else
+    puts "Using ActiveSupport 2.3.8"
+    gem "activesupport", ">= 2.3.8", :require => nil
+  end
 end
 
-gem "tlsmail" if RUBY_VERSION == "1.8.6"
+group :cache do
+  gem "sinatra", ">= 0.9.2"
+end
 
-gem "shoulda", ">= 2.10.3"
-gem "i18n", ">=0.4.1"
-gem "mail", ">= 2.2.0"
-gem "builder", ">= 2.1.2"
+group :gen do
+  gem "bundler", ">= 0.9.7"
+end
+
+group :helpers do
+  gem "i18n", ">=0.4.1"
+end
+
+group :mailer do
+  gem "mail", ">= 2.2.0"
+  gem "tlsmail" if RUBY_VERSION == "1.8.6"
+end
+
+group :other do
+  gem "builder", ">= 2.1.2"
+end
 
 group :db do
   gem "dm-core", ">= 1.0"
@@ -31,8 +48,11 @@ group :db do
   gem "dm-sqlite-adapter", ">= 1.0"
 end
 
-gem "rake",  ">= 0.8.7"
-gem "mocha", ">= 0.9.8"
-gem "rack-test", ">= 0.5.0"
-gem "webrat", ">= 0.5.1"
-gem "haml", ">= 2.2.22"
+group :development do
+  gem "rake",  ">= 0.8.7"
+  gem "mocha", ">= 0.9.8"
+  gem "rack-test", ">= 0.5.0"
+  gem "webrat", ">= 0.5.1"
+  gem "haml", ">= 2.2.22"
+  gem "shoulda", ">= 2.10.3"
+end

padrino-admin/padrino-admin.gemspec

@@ -1,6 +1,6 @@
-# -*- encoding: utf-8 -*-
-#
 require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FILE__)
+require 'rubygems'
+require 'bundler'
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-admin}
@@ -20,9 +20,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<padrino-core>, ["= #{Padrino.version}"])
   s.add_runtime_dependency(%q<padrino-gen>, ["= #{Padrino.version}"])
   s.add_runtime_dependency(%q<padrino-helpers>, ["= #{Padrino.version}"])
-  s.add_development_dependency(%q<haml>, [">= 2.2.1"])
-  s.add_development_dependency(%q<shoulda>, [">= 0"])
-  s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
-  s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
-  s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
+  s.add_bundler_dependencies :development
 end

padrino-cache/padrino-cache.gemspec

@@ -1,6 +1,6 @@
-# -*- encoding: utf-8 -*-
-
 require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FILE__)
+require 'rubygems'
+require 'bundler'
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-cache}
@@ -17,11 +17,6 @@ Gem::Specification.new do |s|
   s.files = %w(.document .gitignore LICENSE README.rdoc Rakefile padrino-cache.gemspec) + Dir.glob("{bin,lib,test}/**/*")
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_path = 'lib'
-  s.add_runtime_dependency(%q<sinatra>, [">= 0.9.2"])
   s.add_runtime_dependency(%q<padrino-core>, ["= #{Padrino.version}"])
-  s.add_development_dependency(%q<haml>, [">= 2.2.1"])
-  s.add_development_dependency(%q<shoulda>, [">= 0"])
-  s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
-  s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
-  s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
+  s.add_bundler_dependencies :cache, :development
 end

padrino-core/padrino-core.gemspec

@@ -1,5 +1,6 @@
-# -*- encoding: utf-8 -*-
 require File.expand_path("../lib/padrino-core/version.rb", __FILE__)
+require 'rubygems'
+require 'bundler'
 
 Gem::Specification.new do |s|
   s.name = "padrino-core"
@@ -18,13 +19,5 @@ Gem::Specification.new do |s|
   s.files = %w(.document .gitignore LICENSE README.rdoc Rakefile padrino-core.gemspec) + Dir.glob("{bin,lib,test}/**/*")
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_path = 'lib'
-  s.add_runtime_dependency(%q<sinatra>, [">= 1.0.0"])
-  s.add_runtime_dependency(%q<http_router>, [">= 0.2.3"])
-  s.add_runtime_dependency(%q<thor>, [">= 0.13.0"])
-  s.add_runtime_dependency(%q<activesupport>, [">= 2.3.8"])
-  s.add_development_dependency(%q<shoulda>, [">= 2.10.3"])
-  s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
-  s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
-  s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
-  s.add_development_dependency(%q<haml>, [">= 2.2.22"])
+  s.add_bundler_dependencies :core, :development
 end

padrino-gen/padrino-gen.gemspec

@@ -1,6 +1,6 @@
-# -*- encoding: utf-8 -*-
-
 require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FILE__)
+require 'rubygems'
+require 'bundler'
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-gen}
@@ -20,11 +20,5 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_path = 'lib'
   s.add_runtime_dependency(%q<padrino-core>, ["= #{Padrino.version}"])
-  s.add_runtime_dependency(%q<bundler>, [">= 0.9.7"])
-  s.add_development_dependency(%q<haml>, [">= 2.2.1"])
-  s.add_development_dependency(%q<shoulda>, [">= 2.10.3"])
-  s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
-  s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
-  s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
-  s.add_development_dependency(%q<fakeweb>, [">= 1.2.3"])
+  s.add_bundler_dependencies :gen, :development
 end

padrino-helpers/padrino-helpers.gemspec

@@ -1,6 +1,6 @@
-# -*- encoding: utf-8 -*-
-
 require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FILE__)
+require 'rubygems'
+require 'bundler'
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-helpers}
@@ -18,10 +18,5 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_path = 'lib'
   s.add_runtime_dependency(%q<padrino-core>, ["= #{Padrino.version}"])
-  s.add_runtime_dependency(%q<i18n>, [">= 0.4.1"])
-  s.add_development_dependency(%q<haml>, [">= 2.2.1"])
-  s.add_development_dependency(%q<shoulda>, [">= 2.10.3"])
-  s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
-  s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
-  s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
+  s.add_bundler_dependencies :helpers, :development
 end

padrino-mailer/padrino-mailer.gemspec

@@ -1,6 +1,6 @@
-# -*- encoding: utf-8 -*-
-
 require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FILE__)
+require 'rubygems'
+require 'bundler'
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-mailer}
@@ -18,10 +18,5 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_path = 'lib'
   s.add_runtime_dependency(%q<padrino-core>, ["= #{Padrino.version}"])
-  s.add_runtime_dependency(%q<mail>, [">= 2.2.3"])
-  s.add_development_dependency(%q<shoulda>, [">= 2.10.3"])
-  s.add_development_dependency(%q<haml>, [">= 2.2.1"])
-  s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
-  s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
-  s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
+  s.add_bundler_dependencies :mailer, :development
 end

padrino/padrino.gemspec

@@ -1,5 +1,6 @@
-# -*- encoding: utf-8 -*-
 require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FILE__)
+require 'rubygems'
+require 'bundler'
 
 Gem::Specification.new do |s|
   s.name = %q{padrino}
@@ -17,14 +18,10 @@ Gem::Specification.new do |s|
   s.files = %w(.document .gitignore LICENSE README.rdoc Rakefile padrino.gemspec) + Dir.glob("{bin,lib,test}/**/*")
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_path = 'lib'
-  s.add_development_dependency(%q<haml>, [">= 2.2.1"])
-  s.add_development_dependency(%q<shoulda>, [">= 2.10.3"])
-  s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
-  s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
-  s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
   s.add_runtime_dependency(%q<padrino-core>, ["= #{Padrino.version}"])
   s.add_runtime_dependency(%q<padrino-helpers>, ["= #{Padrino.version}"])
   s.add_runtime_dependency(%q<padrino-mailer>, ["= #{Padrino.version}"])
   s.add_runtime_dependency(%q<padrino-gen>, ["= #{Padrino.version}"])
   s.add_runtime_dependency(%q<padrino-admin>, ["= #{Padrino.version}"])
+  s.add_bundler_dependencies :development
 end