Merge branch 'master' into sinatra

Conflicts:
	.gitignore
	bin/gem_template
	config/gemsets.yml
	config/gemspec.yml
	lib/gem_template.rb
	spec/spec_helper.rb

.gitignore

@@ -3,8 +3,6 @@
 *.log
 config/database.yml
 config/deploy.rb
-config/mail.yml
-coverage
 log
 pkg
 tmp

Gemfile

@@ -0,0 +1,11 @@
+source "http://rubygems.org"
+
+gem 'rake', '>=0.8.7', :group => :rakefile
+gem 'rspec', '~>1.0', :group => [ :rakefile, :spec ]
+
+gem 'rack-test', '=0.6.1', :group => :spec
+
+gem 'haml', '=3.1.2'
+gem 'lilypad', '=0.3.1'
+gem 'redis', '=2.2.2'
+gem 'sinatra', '=1.2.6'

Gemfile.lock

@@ -0,0 +1,12 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    rake (0.9.2)
+    rspec (1.3.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake (>= 0.8.7)
+  rspec (~> 1.0)

Rakefile

@@ -1,6 +1,7 @@
-require File.dirname(__FILE__) + '/lib/gem_template/gems'
+require 'rubygems'
+require 'bundler'
 
-GemTemplate::Gems.activate %w(rake rspec)
+Bundler.require(:rakefile)
 
 require 'rake'
 
@@ -36,16 +37,11 @@ end
 
 desc "Build gem(s)"
 task :gem do
-  old_gemset = ENV['GEMSET']
   root = File.expand_path('../', __FILE__)
   pkg = "#{root}/pkg"
   system "rm -Rf #{pkg}"
-  GemTemplate::Gems.gemset_names.each do |gemset|
-    ENV['GEMSET'] = gemset.to_s
-    system "cd #{root} && gem build gem_template.gemspec"
-    system "mkdir -p #{pkg} && mv *.gem pkg"
-  end
-  ENV['GEMSET'] = old_gemset
+  system "cd #{root} && gem build gem_template.gemspec"
+  system "mkdir -p #{pkg} && mv *.gem pkg"
 end
 
 namespace :gem do
@@ -66,35 +62,6 @@ namespace :gem do
   end
 end
 
-namespace :gems do
-  desc "Install gem dependencies (DEV=0 DOCS=0 GEMSPEC=default SUDO=0)"
-  task :install do
-    dev = ENV['DEV'] == '1'
-    docs = ENV['DOCS'] == '1' ? '' : '--no-ri --no-rdoc'
-    gemset = ENV['GEMSET']
-    sudo = ENV['SUDO'] == '1' ? 'sudo' : ''
-
-    GemTemplate::Gems.gemset = gemset if gemset
-
-    if dev
-      gems = GemTemplate::Gems.gemspec.development_dependencies
-    else
-      gems = GemTemplate::Gems.gemspec.dependencies
-    end
-
-    gems.each do |name|
-      name = name.to_s
-      version = GemTemplate::Gems.versions[name.to_sym]
-      if Gem.source_index.find_name(name, version).empty?
-        version = version ? "-v #{version}" : ''
-        system "#{sudo} gem install #{name} #{version} #{docs}"
-      else
-        puts "already installed: #{name} #{version}"
-      end
-    end
-  end
-end
-
 desc "Validate the gemspec"
 task :gemspec do
   gemspec.validate

bin/gem_template

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+require File.expand_path("../../lib/gem_template", __FILE__)

gem_template.gemspec

@@ -1,29 +1,18 @@
 # -*- encoding: utf-8 -*-
 root = File.expand_path('../', __FILE__)
 lib = "#{root}/lib"
+
 $:.unshift lib unless $:.include?(lib)
-
-require 'gem_template/gems'
-GemTemplate::Gems.gemset ||= ENV['GEMSET'] || :default
 
 Gem::Specification.new do |s|
-  GemTemplate::Gems.gemspec.hash.each do |key, value|
-    if key == 'name' && GemTemplate::Gems.gemset != :default
-      s.name = "#{value}-#{GemTemplate::Gems.gemset}"
-    elsif key == 'summary' && GemTemplate::Gems.gemset == :solo
-      s.summary = value + " (no dependencies)"
-    elsif !%w(dependencies development_dependencies).include?(key)
-      s.send "#{key}=", value
-    end
-  end
-
-  GemTemplate::Gems.dependencies.each do |g|
-    s.add_dependency g.to_s, GemTemplate::Gems.versions[g]
-  end
-
-  GemTemplate::Gems.development_dependencies.each do |g|
-    s.add_development_dependency g.to_s, GemTemplate::Gems.versions[g]
-  end
+  s.name        = "gem_template"
+  s.version     = '0.1.0'
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = []
+  s.email       = []
+  s.homepage    = "http://"
+  s.summary     = %q{}
+  s.description = %q{}
 
   s.executables = `cd #{root} && git ls-files bin/*`.split("\n").collect { |f| File.basename(f) }
   s.files = `cd #{root} && git ls-files`.split("\n")

lib/gem_template.rb

@@ -1,6 +1,7 @@
-require File.dirname(__FILE__) + '/gem_template/gems'
+require "rubygems"
+require "bundler"
 
-GemTemplate::Gems.activate %w(haml lilypad sinatra)
+Bundler.require(:default)
 
 $:.unshift File.dirname(__FILE__)
 
@@ -12,4 +13,4 @@
 require 'gem_template/boot/lilypad'
 require 'gem_template/boot/redis'
 require 'gem_template/boot/controller'
-require 'gem_template/boot/helper'
+require 'gem_template/boot/helper'