Permalink
Browse files

Merge branch 'master' into sinatra

Conflicts:
	gem_template.gemspec
  • Loading branch information...
2 parents 915c30f + 3530499 commit ec586809bd899c886692797bd13319f81bb173eb @winton committed Jul 19, 2013
Showing with 28 additions and 5 deletions.
  1. +6 −0 .travis.yml
  2. +1 −1 README.md
  3. +5 −1 Rakefile
  4. +15 −3 bin/gem_template
  5. +1 −0 gem_template.gemspec
View
@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+ - 1.8.7
+ - 1.9.2
+ - 1.9.3
+ - 2.0.0
View
@@ -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
View
@@ -1 +1,5 @@
-require 'bundler/gem_tasks'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec
View
@@ -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..."
-# cd $1 && stencil $1
+echo -e "\nGemTemplate -> $2..."
+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
@@ -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"

0 comments on commit ec58680

Please sign in to comment.