stencil 0.1.3 → 0.1.4

data/README.markdown

@@ -1,4 +1,44 @@
 Stencil
 =======
 
-Project template manager.
+Project template manager.
+
+Requirements
+------------
+
+<pre>
+sudo gem install stencil
+</pre>
+
+Setup the template
+------------------
+
+You only have to do this once.
+
+<pre>
+git clone git@github.com:winton/gem_template.git
+cd gem_template
+stencil
+</pre>
+
+Setup a new project
+-------------------
+
+Do this for every new project.
+
+<pre>
+mkdir my_project
+cd my_project
+git init
+stencil gem_template [BRANCH, BRANCH, ...]
+rake rename
+</pre>
+
+The last command does a find-replace (gem\_template -> my\_project) on files and filenames.
+
+Commit from project to template
+-------------------------------
+
+<pre>
+stencil ^ [COMMIT HASH]
+</pre>

data/Rakefile

@@ -1,52 +1,2 @@
-require 'rubygems'
-require 'rake'
-require 'rake/gempackagetask'
-require 'spec/rake/spectask'
-require 'gemspec'
-
-desc "Generate gemspec"
-task :gemspec do
-  File.open("#{Dir.pwd}/#{GEM_NAME}.gemspec", 'w') do |f|
-    f.write(GEM_SPEC.to_ruby)
-  end
-end
-
-desc "Install gem"
-task :install do
-  Rake::Task['gem'].invoke
-  `sudo gem uninstall #{GEM_NAME} -x`
-  `sudo gem install pkg/#{GEM_NAME}*.gem`
-  `rm -Rf pkg`
-end
-
-desc "Package gem"
-Rake::GemPackageTask.new(GEM_SPEC) do |pkg|
-  pkg.gem_spec = GEM_SPEC
-end
-
-desc "Rename project"
-task :rename do
-  name = ENV['NAME'] || File.basename(Dir.pwd)
-  begin
-    dir = Dir['**/gem_template*']
-    from = dir.pop
-    if from
-      rb = from.include?('.rb')
-      to = File.dirname(from) + "/#{name}#{'.rb' if rb}"
-      FileUtils.mv(from, to)
-    end
-  end while dir.length > 0
-  Dir["**/*"].each do |path|
-    next if path.include?('Rakefile')
-    if File.file?(path)
-      `sed -i "" 's/gem_template/#{name}/g' #{path}`
-    end
-  end
-end
-
-desc "Run specs"
-Spec::Rake::SpecTask.new do |t|
-  t.rcov = true
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.spec_files = FileList["spec/**/*_spec.rb"]
-end
+require "#{File.dirname(__FILE__)}/require"
+Require.rakefile!

data/lib/stencil/merge.rb

@@ -36,11 +36,10 @@ class Stencil
         Cmd.run path, "git checkout master"
       end
       
-      def upstream(name, commit=nil, branches=[])
+      def upstream(name, commit=nil, *branches)
         # Project variables
         project = Config.read[:projects][name]
-        branch = Cmd.run(project[:path], "git branch").split
-        branch = branch[branch.index('*') + 1]
+        branches = project[:branches] if branches.empty?
         
         # Template variables
         template = Config.read[:templates][project[:template].intern]
@@ -58,9 +57,6 @@ class Stencil
           commit = Cmd.run(template[:path], cmd).strip
         end
         
-        # Cherry pick into master if no branches specified
-        branches = %w(master) if branches.empty?
-        
         # Cherry pick commit into branches
         branches.each do |branch|
           output = Cmd.run path, "git checkout #{branch}"

data/require.rb

@@ -0,0 +1,30 @@
+require 'rubygems'
+gem 'require'
+require 'require'
+
+Require do
+  gem :require, '=0.2.7'
+  gem(:rake, '=0.8.7') { require 'rake' }
+  gem :rspec, '=1.3.0'
+  
+  gemspec do
+    author 'Winton Welsh'
+    email 'mail@wintoni.us'
+    name 'stencil'
+    homepage "http://github.com/winton/#{name}"
+    summary "Project template manager"
+    version '0.1.4'
+  end
+  
+  rakefile do
+    gem(:rake) { require 'rake/gempackagetask' }
+    gem(:rspec) { require 'spec/rake/spectask' }
+    require 'require/tasks'
+  end
+  
+  spec_helper do
+    require 'require/spec_helper'
+    require 'lib/gem_template'
+    require 'pp'
+  end
+end

data/spec/spec_helper.rb

@@ -1,16 +1,5 @@
-$TESTING=true
-SPEC = File.dirname(__FILE__)
-$:.unshift File.expand_path("#{SPEC}/../lib")
-
-require 'stencil'
-require 'pp'
+require File.expand_path("#{File.dirname(__FILE__)}/../require")
+Require.spec_helper!
 
 Spec::Runner.configure do |config|
-end
-
-# For use with rspec textmate bundle
-def debug(object)
-  puts "<pre>"
-  puts object.pretty_inspect.gsub('<', '&lt;').gsub('>', '&gt;')
-  puts "</pre>"
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stencil
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Winton Welsh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-09 00:00:00 -08:00
+date: 2010-05-28 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -34,7 +34,7 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.markdown
-- spec/spec.opts
+- require.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/winton/stencil

data/spec/spec.opts

@@ -1 +0,0 @@
---color