move dependencies into Gemfile

datenimperator · Mar 5, 2012 · 7afc76e · 7afc76e
1 parent 24739dd
commit 7afc76e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/Gemfile b/Gemfile
@@ -13,10 +13,19 @@ gem "sqlite3", "1.3.4", :group => [:development, :test]
 # When radiant is installed as a gem you can run all of
 # its tests and specs from an instance. If you're working
 # on radiant itself and you want to run specs from the 
-# radiant root directory, uncomment the line below and 
+# radiant root directory, uncomment the lines below and
 # run `bundle install`.
 
 # gemspec
+# gem "radiant-archive-extension",             "~> 1.0.7"
+# gem "radiant-clipped-extension",             "~> 1.0.16"
+# gem "radiant-debug-extension",               "~> 1.0.2"
+# gem "radiant-exporter-extension",            "~> 1.0.2"
+# gem "radiant-markdown_filter-extension",     "~> 1.0.2"
+# gem "radiant-sheets-extension",              "~> 1.0.9"
+# gem "radiant-site_templates-extension",      "~> 1.0.4"
+# gem "radiant-smarty_pants_filter-extension", "~> 1.0.2"
+# gem "radiant-textile_filter-extension",      "~> 1.0.4"
 
 if ENV['TRAVIS']
   gemspec :development_group => :test

diff --git a/lib/generators/instance/templates/instance_gemfile b/lib/generators/instance/templates/instance_gemfile
@@ -32,6 +32,17 @@ gem "radiant", "~> <%= radiant_version %>"
 <%= '# ' unless db == 'sqlserver' %>gem "tiny_tds"
 <%= '# ' unless db == 'sqlserver' %>gem "activerecord-sqlserver-adapter", "~> 3.1.0"
 
+# Default Extensions
+gem "radiant-archive-extension",             "~> 1.0.7"
+gem "radiant-clipped-extension",             "~> 1.0.16"
+gem "radiant-debug-extension",               "~> 1.0.2"
+gem "radiant-exporter-extension",            "~> 1.0.2"
+gem "radiant-markdown_filter-extension",     "~> 1.0.2"
+gem "radiant-sheets-extension",              "~> 1.0.9"
+gem "radiant-site_templates-extension",      "~> 1.0.4"
+gem "radiant-smarty_pants_filter-extension", "~> 1.0.2"
+gem "radiant-textile_filter-extension",      "~> 1.0.4"
+
 # Language packs
 # gem "radiant-dutch_language_pack-extension",    "~> 1.0.0"
 # gem "radiant-french_language_pack-extension",   "~> 1.0.0"

diff --git a/radiant.gemspec b/radiant.gemspec
@@ -40,16 +40,6 @@ a general purpose content managment system--not merely a blogging engine.}
   s.add_dependency "will_paginate", "~> 2.3.11"
   s.add_dependency "stringex",      "~> 1.3.0"
 
-  s.add_dependency "radiant-archive-extension",             "~> 1.0.7"
-  s.add_dependency "radiant-clipped-extension",             "~> 1.0.16"
-  s.add_dependency "radiant-debug-extension",               "~> 1.0.2"
-  s.add_dependency "radiant-exporter-extension",            "~> 1.0.2"
-  s.add_dependency "radiant-markdown_filter-extension",     "~> 1.0.2"
-  s.add_dependency "radiant-sheets-extension",              "~> 1.0.9"
-  s.add_dependency "radiant-site_templates-extension",      "~> 1.0.4"
-  s.add_dependency "radiant-smarty_pants_filter-extension", "~> 1.0.2"
-  s.add_dependency "radiant-textile_filter-extension",      "~> 1.0.4"
-
   s.add_development_dependency "cucumber-rails",    "~> 0.3.2"
   s.add_development_dependency "database_cleaner",  "~> 0.6.5"
   s.add_development_dependency "hoe",               "1.5.1"