basis 1.0.0 → 1.1.0

data/CHANGELOG.rdoc

@@ -1,3 +1,18 @@
+=== 1.1.0 / 2011-01-03
+
+* Add 1.x rationale.
+* Store original git URL and SHA in rendered projects.
+* Add ill-conceived stab at hooks.
+* Fix pattern matching on update and list.
+* 'Improve' error handling.
+* Don't require RubyGems.
+* Use open4.
+* Require Ruby >= 1.8.7.
+* Update examples in --help.
+* Add rename/mv.
+* Remove useless colonification.
+* Ignore coverage info.
+
 === 1.0.0 / 2010-07-21
 
 * Birthday!

data/Manifest.txt

@@ -6,6 +6,7 @@ Rakefile
 bin/basis
 lib/basis.rb
 lib/basis/context.rb
+lib/basis/hooks.rb
 lib/basis/my.rb
 lib/basis/repo.rb
 lib/basis/template.rb

data/README.rdoc

@@ -6,7 +6,8 @@
 
 Basis is a project skeleton generator.
 
-It'll have more docs at some point.
+It'll have more docs at some point. 1.x releases of Basis are
+primarily experiments in anticipation of a 2.0.
 
 == Examples
 

data/Rakefile

@@ -1,14 +1,17 @@
 require "hoe"
 
-Hoe.plugin :doofus, :git
+Hoe.plugin :doofus, :git, :isolate
 
 Hoe.spec "basis" do
   developer "John Barnette", "jbarnette@gmail.com"
 
+  require_ruby_version ">= 1.8.7"
+  
   self.extra_rdoc_files = Dir["*.rdoc"]
   self.history_file     = "CHANGELOG.rdoc"
   self.readme_file      = "README.rdoc"
   self.testlib          = :minitest
 
-  extra_deps << ["erubis", ">= 2", "< 3"]
+  extra_deps << ["erubis", "~> 2.0"]
+  extra_deps << ["open4",  "~> 1.0"]
 end

data/bin/basis

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-require "rubygems"
 require "basis"
 require "basis/context"
+require "basis/hooks"
 require "basis/my"
 require "basis/repo"
 require "optparse"
@@ -17,13 +17,14 @@ require "optparse"
       add <git-url> [name]             Register a template locally
       list, ls [pattern]               List available templates
       remove, rm <name>                Remove a template
+      rename, mv <old> <new>           Rename a template
       update [pattern]                 Update local templates
 
-      # add the 'gem:hoe' template
+      # add the 'gem-hoe' template
       $ basis add git://github.com/jbarnette/basis-gem-hoe.git
 
-      # start a new project `foo' using the `gem:hoe' template
-      $ basis gem:hoe foo
+      # start a new project `foo' using the `gem-hoe' template
+      $ basis gem-hoe foo
 
   Switches:
 END
@@ -36,7 +37,11 @@ def help
 end
 
 def help! message = nil
-  warn "fatal: #{message}" if message
+  if message
+    message = "fatal: #{message}" if /^fatal/ !~ message
+    warn message
+  end
+
   abort @options.help
 end
 
@@ -61,34 +66,62 @@ rescue OptionParser::ParseError => e
   help! e.message
 end
 
+
+if File.file?(hooks = File.expand_path("~/.basis/hooks.rb"))
+  Basis::Hooks.module_eval File.read(hooks), hooks, 1
+end
+
 @repo = Basis::Repo.new
 
-# FIX: rescue
+begin
+  case command = ARGV.shift
+  when "add" then
+    url, name = ARGV
+    help! "Need a url" unless url
+    @repo.add url, name
+
+  when "ls", "list" then
+    templates = @repo.templates ARGV.shift
+    width     = templates.keys.map(&:length).max || 0
+    max       = 80 - width - 5
+
+    templates.keys.sort.each do |name|
+      template = templates[name]
+      desc     = template.description
+
+      if desc.length > max
+        desc = desc[0, max - 3] + "..."
+      end
 
-case command = ARGV.shift
-when "add" then
-  url, name = ARGV
-  help! "Need a url" unless url
-  @repo.add url, name
+      printf "%-#{width}s   # #{desc}\n", name
+    end
 
-when "ls", "list" then
-  @repo.templates(ARGV.shift).each { |name, template| puts name }
+  when "mv", "rename" then
+    old, new = ARGV
 
-when "rm", "remove" then
-  help! "Need a name" unless name = ARGV.shift
-  @repo.remove name
+    help! "Need names!" unless old && new
+    @repo.rename old, new
 
-when "update" then
-  @repo.update ARGV.shift
+  when "rm", "remove" then
+    help! "Need a name" unless name = ARGV.shift
+    @repo.remove name
 
-else
-  template = @repo.templates[command]
+  when "update" then
+    @repo.update ARGV.shift
 
-  help! "Unknown command or template: #{command}" unless template
-  help! "Need a destination directory" unless destdir = ARGV.shift
+  else
+    help! unless command
+    template = @repo.templates[command]
 
-  my  = Basis::My.new File.basename(destdir)
-  ctx = Basis::Context.new my, @overrides
+    help! "Unknown command or template: #{command}" unless template
+    help! "Need a destination directory" unless destdir = ARGV.shift
 
-  template.render destdir, ctx
+    my  = Basis::My.new File.basename(destdir)
+    ctx = Basis::Context.new my, @overrides
+
+    template.render destdir, ctx
+    Basis::Hooks.fire :rendered, destdir
+  end
+rescue Basis::Oops => e
+  help! e.message
 end

data/lib/basis.rb

@@ -1,3 +1,4 @@
 module Basis
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
+  class Oops < StandardError; end
 end

data/lib/basis/hooks.rb

@@ -0,0 +1,15 @@
+module Basis
+  module Hooks
+    def self.fire name, *args
+      hooks[name].each { |h| h.call *args }
+    end
+
+    def self.hooks
+      @hooks ||= Hash.new { |h, k| h[k] = [] }
+    end
+
+    def self.on name, &block
+      hooks[name] << block
+    end
+  end
+end

data/lib/basis/repo.rb

@@ -1,5 +1,7 @@
+require "basis"
 require "basis/template"
 require "fileutils"
+require "open4"
 
 module Basis
   class Repo
@@ -10,11 +12,10 @@ module Basis
     end
 
     def add url, name = nil
-      name ||= File.basename(url, ".git").
-        downcase.sub(/^basis[-_]/, "").tr "-", ":"
+      name ||= File.basename(url, ".git").downcase.sub(/^basis[-_]/, "")
 
       if templates.keys.include? name
-        raise "Template '#{name}' already exists!"
+        raise Basis::Oops, "Template '#{name}' already exists!"
       end
 
       FileUtils.mkdir_p template_path
@@ -29,6 +30,14 @@ module Basis
       @templates = nil
     end
 
+    def rename old, new
+      unless File.directory? template_path(old)
+        raise Basis::Oops, "Unknown template: #{old}"
+      end
+
+      FileUtils.mv template_path(old), template_path(new)
+    end
+
     def templates pattern = nil
       unless @templates
         @templates = {}
@@ -41,20 +50,27 @@ module Basis
         end
       end
 
-      Hash[@templates.select { |n, t| pattern.nil? || pattern =~ n }]
+      Hash[@templates.select { |n, t| pattern.nil? || /#{pattern}/ =~ n }]
     end
 
     def update pattern = nil
       templates.each do |name, template|
-        next unless pattern.nil? || pattern =~ name
+        next unless pattern.nil? || /#{pattern}/ =~ name
         Dir.chdir(template.srcdir) { git :pull }
       end
     end
 
     private
 
-    def git *args # FIX
-      system "git", *args.map(&:to_s)
+    def git *args
+      out, err = nil
+
+      status = Open4.popen4 "git", *args.map(&:to_s) do |pid, sin, sout, serr|
+        out = sout.read.chomp
+        err = serr.read.chomp
+      end
+
+      raise Basis::Oops, err if 0 != status.exitstatus
     end
 
     def template_path *args

data/lib/basis/template.rb

@@ -4,12 +4,34 @@ require "fileutils"
 module Basis
   class Template
     attr_reader :srcdir
+    attr_reader :origin
 
     def initialize srcdir
       @srcdir = File.expand_path srcdir
+
+      Dir.chdir @srcdir do
+        remote  = `git remote -v`.split(/\s/)[1]
+        rev     = `git rev-parse HEAD`
+        @origin = "#{remote}@#{rev}"
+      end
+
+      if File.exist?(template = "#@srcdir/.basis/template.rb")
+        src = IO.read template
+        extend eval("Module.new do;#{src};end", nil, template, 1)
+      end
+    end
+
+    def description
+      "An awesome template."
     end
 
     def render destdir, context
+      FileUtils.mkdir_p File.join(destdir, ".basis")
+
+      File.open File.join(destdir, ".basis", "origin"), "wb" do |f|
+        f.puts origin
+      end
+
       Dir.glob("#{srcdir}/**/*", File::FNM_DOTMATCH).each do |src|
         next unless File.file? src
 

data/test/test_basis_template.rb

@@ -3,7 +3,7 @@ require "basis/template"
 
 class BasisTemplateTest < MiniTest::Unit::TestCase
   def test_initialize
-    t = Basis::Template.new "foo/bar"
-    assert_equal "#{File.expand_path '.'}/foo/bar", t.srcdir
+    t = Basis::Template.new "test/fixtures/empty"
+    assert_equal "#{File.expand_path '.'}/test/fixtures/empty", t.srcdir
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: basis
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - John Barnette
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 -07:00
+date: 2011-01-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,35 +23,27 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 2
-        version: "2"
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        version: "3"
+        - 0
+        version: "2.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: open4
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
-        - 2
+        - 1
         - 0
-        - 4
-        version: 2.0.4
-  type: :development
+        version: "1.0"
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -62,18 +53,18 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 2
-        - 6
-        - 1
-        version: 2.6.1
+        - 8
+        - 0
+        version: 2.8.0
   type: :development
   version_requirements: *id003
 description: |-
   Basis is a project skeleton generator.
   
-  It'll have more docs at some point.
+  It'll have more docs at some point. 1.x releases of Basis are
+  primarily experiments in anticipation of a 2.0.
 email: 
 - jbarnette@gmail.com
 executables: 
@@ -93,6 +84,7 @@ files:
 - bin/basis
 - lib/basis.rb
 - lib/basis/context.rb
+- lib/basis/hooks.rb
 - lib/basis/my.rb
 - lib/basis/repo.rb
 - lib/basis/template.rb
@@ -114,16 +106,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"