Merge branch 'master' into sinatra

Conflicts: gem_template.gemspec
winton · Jul 19, 2013 · ec58680 · ec58680
2 parents 915c30f + 3530499
commit ec58680
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ A gem template for new projects.
 
 ###Create a new project
 
-	gem_template <project_name> <branch>
+	gem_template [project_name] [ProjectName] [branch...]
 
 ###Available branches
 

diff --git a/Rakefile b/Rakefile
@@ -1 +1,5 @@
-require 'bundler/gem_tasks'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec
diff --git a/bin/gem_template b/bin/gem_template
@@ -15,11 +15,23 @@ git fetch
 echo -e "\nWriting .ruby-gemset..."
 echo $1 > .ruby-gemset
 
-echo -e "\nInstalling gems..."
+echo -e "\nInstalling base gems..."
 gem install bundler && bundle
 
-# echo "\ngem_template -> $1..."
+echo -e "\nGemTemplate -> $2..."
-# cd $1 && stencil $1
+namer gem_template:$1 GemTemplate:$2
+
+echo ""
+echo $'\e[1;31m'"To finish setting up your project:"
+echo $'\e[0m'
+echo "    cd $1"
+
+for i in ${@:3}; do
+	echo "    git merge origin/$i"
+done
+
+echo "    bundle"
+echo ""
 
 # -- replace
 # #!/usr/bin/env ruby

diff --git a/gem_template.gemspec b/gem_template.gemspec
@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "redis"
   spec.add_dependency "sinatra"
 
+  spec.add_development_dependency "namer"
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"