stencil 0.1.5 → 0.1.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: adb2323d48c908164223e12c4b935ad37c07d564
+  data.tar.gz: 2d4ceda53ffa04c9593ef4d2581b54cc70205b8c
+SHA512:
+  metadata.gz: 18e267c35e803ed9b6bf129484092400a1378d8d5be51fa78be69243ea971b5aa02644aabae6cec8e81aba296102a8dad42912a3af92cfbf00d7e006133716ae
+  data.tar.gz: 159e114fd5b0e8e3cd348bfe94f8df4385c5e3d350f07935c1a7fde896b319d093a856a9449a82ed2f63b86682028a9bfcf52ab5996c85b2fc7b07070418cac4

data/.gitignore

@@ -0,0 +1,19 @@
+*.gem
+*.rbc
+.bundle
+.config
+.DS_Store
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/fixture
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/.ruby-gemset

@@ -0,0 +1 @@
+stencil

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.0.0-p247

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+before_script:
+  - "git config --global user.email 'you@example.com'"
+  - "git config --global user.name 'Your Name'"

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2013
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,28 @@
+##Stencil
+
+Project template manager.
+
+[![Build Status](https://secure.travis-ci.org/winton/stencil.png)](http://travis-ci.org/winton/stencil)
+
+### Merge branches
+
+Stencil allows you to run a git-based project template with a [branching structure](https://github.com/winton/gem_template/branches) that allows for adding distinct features to a template.
+
+To easily merge those branches, you can do something like this:
+
+	cd gem_template
+	stencil push
+
+Remove the `push` if you do not wish to push upstream.
+
+### Contribute
+
+[Create an issue](https://github.com/winton/stencil/issues/new) to discuss template changes.
+
+Pull requests for template changes and new branches are even better.
+
+### Stay up to date
+
+[Star this project](https://github.com/winton/stencil#) on Github.
+
+[Follow Winton Welsh](http://twitter.com/intent/user?screen_name=wintonius) on Twitter.

data/Rakefile

@@ -1,2 +1,5 @@
-require "#{File.dirname(__FILE__)}/require"
-Require.rakefile!
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/lib/stencil.rb

@@ -1,50 +1,14 @@
-Dir["#{File.dirname(__FILE__)}/stencil/*.rb"].each do |path|
-  require path
-end
+$:.unshift File.dirname(__FILE__)
+
+require 'stencil/branches'
+require 'stencil/cmd'
+require 'stencil/merge'
+require 'stencil/msg'
 
 class Stencil
   
-  def initialize(args)
+  def initialize(args=[])
     path = Dir.pwd
-    name = File.basename(path).intern
-    
-    # If template, do a template merge
-    if Config.exists?(:templates, path)
-      Merge.template(path, args.include?('push'))
-    
-    # If project
-    elsif Config.exists?(:projects, path)
-      
-      # If upstream commit, merge upstream
-      if args.first == '^'
-        Merge.upstream *args[1..-1].unshift(name) and return
-      
-      # If template specified, update config
-      elsif args.first
-        Config.update(:projects => {
-          name => {
-            :template => args.shift,
-            :branches => args
-          }
-        })
-        
-      end
-      
-      # Do a project merge
-      Merge.project(name, path)
-    
-    # If not configured
-    else
-      
-      # Update config
-      Msg.is_template_or_project?(name)
-      Config.update((STDIN.gets[0..0].downcase == 't' ? :templates : :projects) => {
-        name => { :path => path }
-      })
-
-      # Re-run
-      initialize args
-      
-    end
+    Merge.template(path, args.include?('push'))
   end
 end

data/lib/stencil/branches.rb

@@ -4,31 +4,37 @@ class Stencil
   class Branches
     class <<self
       
-      def read(path)
-        branches = Cmd.run path, 'git branch'
-        branches = branches.split(/\s+/)
-        branches.delete '*'
-        branches.delete 'master'
-        branches
-      end
-      
-      def grouped(path)
-        groups, ignore = [], []
-        branches = read(path).sort { |a, b| a.length <=> b.length }
-        branches.each do |branch|
-          next if ignore.include?(branch)
-          groups << [ branch ] + group(branches, branch)
-          ignore += groups.last
+      @@branches = {}
+
+      def read(path, type=:all)
+        key = "#{type}:#{path}"
+
+        if type == :all
+          (read(path, :remote) + read(path, :local)).uniq
+        elsif type == :remote && !@@branches[key]
+          branches = Cmd.run path, 'git branch -a'
+          @@branches[key] = branches.scan(/origin\/([\w-]+\b$)/).flatten.uniq
+        elsif type == :remote
+          @@branches[key]
+        elsif !@@branches[key]
+          branches = Cmd.run path, 'git branch'
+          branches = branches.split(/[\s\*]+/)
+          branches.delete ''
+          branches.sort!
+          @@branches[key] = branches
+        else
+          @@branches[key]
         end
-        groups
       end
       
-      private
-      
-      def group(branches, branch)
-        branches.select do |b|
-          b != branch && b[0..branch.length-1] == branch
+      def grouped(path)
+        branches = (read(path) - [ 'master' ]).inject({}) do |hash, branch|
+          branch.split('-').inject(hash) do |h, b|
+            h[b] ||= {}
+          end
+          hash
         end
+        { 'master' => branches }
       end
     end
   end

data/lib/stencil/cmd.rb

@@ -8,7 +8,14 @@ class Stencil
         else
           path = "cd #{path} && "
         end
-        `#{[ path, cmd ].compact.join}`
+        
+        output = `#{[ path, cmd ].compact.join} 2>&1`
+
+        unless $?.success?
+          Msg.error "#{cmd}\n\n#{output}"
+        end
+
+        output
       end
     end
   end

data/lib/stencil/merge.rb

@@ -2,102 +2,50 @@ class Stencil
   class Merge
     class <<self
       
-      def project(name, path)
-        template = Config.read[:projects][name][:template]
-        branches = Config.read[:projects][name][:branches]
-        Msg.error_specify_template unless template
-        template = Config.read[:templates][template.intern]
-        if template && File.exists?(template[:path])
-          
-          # Add remote template to project
-          origin = get_origin template[:path]
-          Msg.template_url origin
-          add_remote 'template', path, origin
-          
-          # Pull template into master if no branches specified
-          branches = %w(master) if branches.empty?
-          
-          # Pull template into each branch
-          branches.each do |branch|
-            Msg.merge_remote_branch branch
-            Cmd.run path, "git pull template #{branch}"
-          end
-        else
-          Msg.template_not_found template
-          Msg.error_specify_template
-        end
-      end
-      
       def template(path, push)
-        Branches.grouped(path).each do |branches|
-          branches.unshift('master')
-          progressive(path, branches, push)
-        end
-        Cmd.run path, "git checkout master"
-      end
-      
-      def upstream(name, commit=nil, *branches)
-        # Project variables
-        project = Config.read[:projects][name]
-        branches = project[:branches] if branches.empty?
-        
-        # Template variables
-        template = Config.read[:templates][project[:template].intern]
-        path = template[:path]
-        
-        # Add remote project to template and fetch
-        origin = get_origin project[:path]
-        Msg.project_url origin
-        add_remote 'project', path, origin
-        Cmd.run path, "git fetch project"
-        
-        # Get last commit if none specified
-        unless commit
-          cmd = "git log HEAD~1..HEAD --pretty=format:'%H'"
-          commit = Cmd.run(template[:path], cmd).strip
+        Cmd.run(path, "git fetch --all")
+
+        Branches.grouped(path).each do |merger, mergees|
+          progressive_merge(path, merger, mergees, push)
         end
         
-        # Cherry pick commit into branches
-        branches.each do |branch|
-          output = Cmd.run path, "git checkout #{branch}"
-          Msg.error(output) if output.downcase.include?('error')
-          Msg.cherry_pick branch, commit
-          output = Cmd.run path, "git cherry-pick #{commit}"
-          Msg.error(output) if output.downcase.include?('fatal')
-        end
+        Cmd.run(path, "git checkout master")
       end
       
       private
-      
-      def add_remote(name, path, url)
-        if Cmd.run(path, "git remote").split.include?(name)
-          Cmd.run path, "git remote rm #{name}"
+
+      def checkout(path, branch)
+        locals  = Branches.read(path, :local)
+        remotes = Branches.read(path, :remote)
+
+        if locals.include?(branch)
+          Cmd.run(path, "git checkout #{branch}")
+        elsif remotes.include?(branch)
+          Cmd.run(path, "git checkout -t origin/#{branch}")
         end
-        Cmd.run path, "git remote add #{name} #{url}"
       end
       
-      def get_origin(path)
-        origin = Cmd.run path, "git remote show origin"
-        origin.match(/URL:\s+(\S+)/)[1]
-      end
-      
-      def progressive(path, branches, push)
-        merger = branches.shift
-        mergee = branches.first
-        branches.each do |mergee|
-          if merger && mergee
-            ok = mergee[0..merger.length-1] == merger || merger == 'master'
-            unless merger.empty? || mergee.empty? || !ok
-              output = Cmd.run path, "git checkout #{mergee}"
-              Msg.error(output) if output.downcase.include?('error')
-              Msg.merging_x_into_y merger, mergee
-              output = Cmd.run path, "git merge #{merger}"
-              Msg.error(output) if output.downcase.include?('conflict')
-              Cmd.run(path, "git push origin #{mergee}") if push
-            end
-          end
+      def progressive_merge(path, merger, mergees, push)
+        branches = Branches.read(path)
+        return unless branches.include?(merger)
+
+        unless mergees.empty?
+          checkout(path, merger)
+          Cmd.run(path, "git pull origin #{merger}")
+        end
+
+        mergees = mergees.sort_by { |k, v| k }
+        mergees.each do |(mergee, mergee_mergees)|
+          mergee = "#{merger}-#{mergee}" unless merger == 'master'
+
+          next unless branches.include?(mergee)
+
+          checkout(path, mergee)
+          Cmd.run(path, "git merge #{merger}")
+          Cmd.run(path, "git push origin #{mergee}") if push
+          
+          progressive_merge(path, mergee, mergee_mergees, push)
         end
-        progressive(path, branches, push) unless branches.empty?
       end
     end
   end

data/lib/stencil/msg.rb

@@ -2,56 +2,15 @@ class Stencil
   class Msg
     class <<self
       
-      def cherry_pick(branch, commit)
-        space
-        puts "Cherry picked #{commit} to \"#{branch}\""
-      end
-      
       def error(output)
         space
-        puts "Oops:\n#{output}"
-        exit
-      end
-      
-      def error_specify_template
-        space
-        puts "Please tell stencil what template you want to receive updates from:"
-        puts "  stencil TEMPLATE [BRANCH BRANCH ...]"
+        puts "Oops: #{output}"
         exit
       end
-      
-      def is_template_or_project?(name)
-        space
-        puts "Is \"#{name}\" a template or a project?"
-      end
-      
-      def merge_remote_branch(branch)
-        space
-        puts "Merging remote branch \"#{branch}\""
-      end
-      
-      def merging_x_into_y(x, y)
-        puts "Merging \"#{x}\" into \"#{y}\""
-      end
-      
-      def project_url(url)
-        space
-        puts "Found project URL: #{url}"
-      end
-      
+
       def space
         puts ''
       end
-      
-      def template_not_found(template)
-        space
-        puts "Template \"#{template}\" not found."
-      end
-      
-      def template_url(url)
-        space
-        puts "Found template URL: #{url}"
-      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../require")
-Require.spec_helper!
+unless ENV['CI']
+  require 'simplecov'
+  SimpleCov.start
+end
 
-Spec::Runner.configure do |config|
-end
+$root = File.expand_path('../../', __FILE__)
+require "#{$root}/lib/stencil"

data/spec/stencil_spec.rb

@@ -0,0 +1,145 @@
+require 'spec_helper'
+
+describe Stencil do
+  before :all do
+    @fixture = "#{$root}/spec/fixture"
+    
+    FileUtils.rm_rf(@fixture)
+    FileUtils.mkdir_p(@fixture)
+
+    Dir.chdir(@fixture)
+    FileUtils.touch("master.txt")
+    
+    `git init .`
+    `git add .`
+    `git commit -a -m "master"`
+
+    @branches = %w(
+      a
+      a-a
+      a-b
+      b
+      b-a
+      b-a-c
+    )
+
+    @branches.each do |branch|
+      `git branch #{branch}`
+    end
+
+    @branches.each do |branch|
+      `git checkout #{branch}`
+
+      FileUtils.touch("#{branch}.txt")
+
+      `git add .`
+      `git commit -m "#{branch}"`
+    end
+
+    Stencil::Branches.read(@fixture) # warm up @@branches cache
+  end
+
+  describe :initialize do
+    before :all do
+      @cmds = [
+        "git fetch --all",
+        "git checkout master",
+        "git pull origin master",
+        "git checkout a",
+        "git merge master",
+        "git push origin a",
+        "git checkout a",
+        "git pull origin a",
+        "git checkout a-a",
+        "git merge a",
+        "git push origin a-a",
+        "git checkout a-b",
+        "git merge a",
+        "git push origin a-b",
+        "git checkout b",
+        "git merge master",
+        "git push origin b",
+        "git checkout b",
+        "git pull origin b",
+        "git checkout b-a",
+        "git merge b",
+        "git push origin b-a",
+        "git checkout b-a",
+        "git pull origin b-a",
+        "git checkout b-a-c",
+        "git merge b-a",
+        "git push origin b-a-c",
+        "git checkout master"
+      ]
+    end
+
+    it "should execute correct commands" do
+      @cmds.each do |cmd|
+        if cmd == "git branch"
+          Stencil::Cmd.should_receive(:run).with(@fixture, cmd).ordered.and_call_original
+        else
+          Stencil::Cmd.should_receive(:run).with(@fixture, cmd).ordered
+        end
+      end
+      Stencil.new([ "push" ])
+    end
+
+    it "should merge properly" do
+      @cmds.each do |cmd|
+        if cmd.include?('push') || cmd.include?('pull')
+          Stencil::Cmd.should_receive(:run).with(@fixture, cmd).ordered
+        else
+          Stencil::Cmd.should_receive(:run).with(@fixture, cmd).ordered.and_call_original
+        end
+      end
+      Stencil.new([ "push" ])
+      # TODO: check merge happened
+    end
+
+    it "should exit on merge conflict" do
+      @cmds[0..@cmds.index("git push origin a")-1].each do |cmd|
+        if cmd.include?('push') || cmd.include?('pull')
+          Stencil::Cmd.should_receive(:run).with(@fixture, cmd).ordered
+        else
+          Stencil::Cmd.should_receive(:run).with(@fixture, cmd).ordered.and_call_original
+        end
+      end
+
+      `git checkout master`
+      File.open("#{@fixture}/master.txt", 'w') do |f|
+        f.write("conflict")
+      end
+      `git commit -a -m "master conflict"`
+
+      `git checkout a`
+      File.open("#{@fixture}/master.txt", 'w') do |f|
+        f.write("conflict2")
+      end
+      `git commit -a -m "a conflict"`
+
+      lambda { Stencil.new([ "push" ]) }.should raise_error SystemExit
+    end
+  end
+
+  describe Stencil::Branches do
+    it "should return branch names" do
+      Stencil::Branches.read(@fixture).should == @branches + [ 'master' ]
+    end
+
+    it "should return grouped branch names" do
+      Stencil::Branches.grouped(@fixture).should == {
+        "master" => {
+          "a" => {
+            "a" => {},
+            "b" => {}
+          },
+          "b" => {
+            "a" => {
+              "c" => {}
+            }
+          }
+        }
+      }
+    end
+  end
+end

data/stencil.gemspec

@@ -0,0 +1,24 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+Gem::Specification.new do |spec|
+  spec.name          = "stencil"
+  spec.version       = "0.1.8"
+  spec.authors       = ["Winton Welsh"]
+  spec.email         = ["mail@wintoni.us"]
+  spec.description   = %q{Project template manager}
+  spec.summary       = %q{Project template manager.}
+  spec.homepage      = "https://github.com/winton/stencil"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "simplecov"
+end

metadata

@@ -1,69 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: stencil
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.5
+version: !ruby/object:Gem::Version
+  version: 0.1.8
 platform: ruby
-authors: 
+authors:
 - Winton Welsh
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-18 00:00:00 -07:00
-default_executable: 
-dependencies: []
-
-description: 
-email: mail@wintoni.us
-executables: 
+date: 2013-11-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Project template manager
+email:
+- mail@wintoni.us
+executables:
 - stencil
 extensions: []
-
-extra_rdoc_files: 
-- README.markdown
-files: 
+extra_rdoc_files: []
+files:
+- .gitignore
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
 - bin/stencil
-- gemspec.rb
+- lib/stencil.rb
 - lib/stencil/branches.rb
 - lib/stencil/cmd.rb
-- lib/stencil/config.rb
-- lib/stencil/hash.rb
 - lib/stencil/merge.rb
 - lib/stencil/msg.rb
-- lib/stencil.rb
-- MIT-LICENSE
-- Rakefile
-- README.markdown
-- require.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: http://github.com/winton/stencil
-licenses: []
-
+- spec/stencil_spec.rb
+- stencil.gemspec
+homepage: https://github.com/winton/stencil
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: Project template manager
-test_files: []
-
+specification_version: 4
+summary: Project template manager.
+test_files:
+- spec/spec_helper.rb
+- spec/stencil_spec.rb

data/MIT-LICENSE

@@ -1,18 +0,0 @@
-Copyright (c) 2009 Winton Welsh
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of 
-this software and associated documentation files (the "Software"), to deal in 
-the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of 
-the Software, and to permit persons to whom the Software is furnished to do so, 
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all 
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS 
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR 
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.markdown

@@ -1,44 +0,0 @@
-Stencil
-=======
-
-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/gemspec.rb

@@ -1,18 +0,0 @@
-GEM_NAME = 'stencil'
-GEM_FILES = FileList['**/*'] - FileList['coverage', 'coverage/**/*', 'pkg', 'pkg/**/*']
-GEM_SPEC = Gem::Specification.new do |s|
-  # == CONFIGURE ==
-  s.author = "Winton Welsh"
-  s.email = "mail@wintoni.us"
-  s.homepage = "http://github.com/winton/#{GEM_NAME}"
-  s.summary = "Project template manager"
-  # == CONFIGURE ==
-  s.executables << GEM_NAME
-  s.extra_rdoc_files = [ "README.markdown" ]
-  s.files = GEM_FILES.to_a
-  s.has_rdoc = false
-  s.name = GEM_NAME
-  s.platform = Gem::Platform::RUBY
-  s.require_path = "lib"
-  s.version = "0.1.5"
-end

data/lib/stencil/config.rb

@@ -1,57 +0,0 @@
-require 'yaml'
-
-class Stencil
-  class Config
-    class <<self
-      
-      @@cache = nil
-      @@path = File.expand_path('~/.stencil.yml')
-      
-      def create
-        write(:projects => {}, :templates => {})
-      end
-      
-      def read
-        if @@cache
-          @@cache
-        elsif File.exists?(@@path)
-          File.open(@@path, 'r') do |f|
-            @@cache = YAML::load f
-          end
-        else
-          create
-          @@cache = read
-        end
-      end
-      
-      def update(hash)
-        write read.deep_merge(hash)
-      end
-      
-      def delete
-        @@cache = nil
-        File.unlink @@path
-      end
-      
-      def exists?(type, name)
-        read[type] &&
-        (
-          read[type][name.intern] ||
-          (
-            read[type][File.basename(name).intern] &&
-            read[type][File.basename(name).intern][:path] == name
-          )
-        )
-      end
-      
-      private
-      
-      def write(hash)
-        @@cache = nil
-        File.open(@@path, 'w') do |f|
-          f.write YAML::dump(hash)
-        end
-      end
-    end
-  end
-end

data/lib/stencil/hash.rb

@@ -1,6 +0,0 @@
-class Hash
-  def deep_merge(second)
-    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
-    self.merge(second, &merger)
-  end
-end

data/require.rb

@@ -1,30 +0,0 @@
-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.5'
-  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