tap-gen 0.1.3 → 0.2.0

data/History

@@ -1,3 +1,14 @@
+== 0.2.0 / 2009-06-17
+
+Updates for Tap-0.18.0
+
+* added actions to generators (via on)
+* fixed handling of generators with no template dir
+* fixed logging of paths not relative to pwd
+* reworked task, generator generators as variations of
+  a resource generator
+* added middleware generator
+
 == 0.1.3 / 2009-06-06
 
 * bug fix for tap-0.17.1

data/lib/tap/generator/base.rb

@@ -142,38 +142,61 @@ module Tap
       # Makes (or destroys) the root and each of the targets, relative
       # to root.  Options are passed onto directory.
       def directories(root, targets, options={})
-        directory(root, options)
+        results = [directory(root, options)]
         targets.each do |target|
-          directory(File.join(root, target), options)
+          results << directory(File.join(root, target), options)
         end
+        results
       end
       
       # Makes (or destroys) the target by templating the source using
       # the specified attributes.  Source is expanded relative to
       # template_dir.  Options are passed onto file.
       def template(target, source, attributes={}, options={})
+        raise "no template dir is set" unless template_dir
+        
         template_path = File.expand_path(source, template_dir)
-        templater = Support::Templater.new(File.read(template_path), attributes)
+        templater = Templater.new(File.read(template_path), attributes)
         
         file(target, options) do |file| 
-          file << templater.build
+          file << templater.build(nil, template_path)
         end
       end
       
       # Yields each source file under template_dir to the block, with
       # a target path of the source relative to template_dir.
       def template_files
+        raise "no template dir is set" unless template_dir
+        
+        targets = []
         Dir.glob(template_dir + "/**/*").sort.each do |source|
           next unless File.file?(source)
           
           target = Tap::Root::Utils.relative_path(template_dir, source)
           yield(source, target)
+          targets << target
+        end
+        targets
+      end
+      
+      # Calls the block when specified by the action for self.
+      def on(*actions, &block)
+        if actions.include?(action)
+          block.call
+        else
+          nil
         end
       end
       
+      # Returns the action for self (ie :generate or :destroy)
+      def action
+        raise NotImplementedError
+      end
+      
       # Logs the action with the relative filepath from Dir.pwd to path.
       def log_relative(action, path)
-        log(action, Tap::Root::Utils.relative_path(Dir.pwd, path))
+        relative_path = Tap::Root::Utils.relative_path(Dir.pwd, path)
+        log(action, relative_path || path)
       end
     end
   end

data/lib/tap/generator/destroy.rb

@@ -55,6 +55,11 @@ module Tap
         target
       end
       
+      # Returns :destroy
+      def action
+        :destroy
+      end
+      
     end
   end
 end

data/lib/tap/generator/exe.rb

@@ -12,14 +12,20 @@ module Tap
         end
         
         name = argv.shift
-        env, const = eeek('generator', name)
+        env, const = seek('generator', name, false)
         
         unless const
           raise "unknown generator: #{name}"
         end
         
-        generator = const.constantize.parse(argv)
-        generator.template_dir = env.class_path(:templates, generator) {|dir| File.directory?(dir) }
+        generator = const.constantize.parse!(argv)
+        
+        # do not reassign dir unless a template directory
+        # is found, otherwise you get an error
+        if template_dir = env.class_path(:templates, generator) {|dir| File.directory?(dir) }        
+          generator.template_dir = template_dir
+        end
+        
         generator.extend(mod).process(*argv)
       end
     end

data/lib/tap/generator/generate.rb

@@ -1,4 +1,4 @@
-autoload(:Tempfile, 'tempfile')
+require 'tempfile'
 
 module Tap
   module Generator
@@ -62,6 +62,11 @@ module Tap
         target
       end
       
+      # Returns :generate
+      def action
+        :generate
+      end
+      
       protected
       
       # Ask the user interactively whether to force collision.

data/lib/tap/generator/generators/command.rb

@@ -1,3 +1,5 @@
+require 'tap/generator/base'
+
 module Tap::Generator::Generators
   
   # :startdoc::generator a new tap command

data/lib/tap/generator/generators/config.rb

@@ -1,3 +1,5 @@
+require 'tap/generator/base'
+
 module Tap::Generator::Generators
   
   # :startdoc::generator a config file generator

data/lib/tap/generator/generators/generator.rb

@@ -1,11 +1,11 @@
-require 'tap/generator/generators/task'
+require 'tap/generator/generators/resource'
 
 module Tap::Generator::Generators
   
   # :startdoc::generator a generator task and test
   #
   # Generates a new generator.
-  class Generator < Tap::Generator::Generators::Task
+  class Generator < Resource
     
     def manifest(m, const_name)
       super

data/lib/tap/generator/generators/middleware.rb

@@ -0,0 +1,10 @@
+require 'tap/generator/generators/resource'
+
+module Tap::Generator::Generators
+  
+  # :startdoc::generator middleware and a test
+  #
+  # Generates a new Tap::Middleware and an associated test file.
+  class Middleware < Resource
+  end
+end

data/lib/tap/generator/generators/resource.rb

@@ -0,0 +1,23 @@
+require 'tap/generator/base'
+require 'tap/env'
+
+module Tap::Generator::Generators
+  class Resource < Tap::Generator::Base
+    
+    config :test, true, &c.switch            # Specifies creation of a test file
+    
+    def manifest(m, const_name)
+      const = Tap::Env::Constant.new(const_name.camelize)
+      
+      task_path = path('lib', "#{const.path}.rb")
+      m.directory File.dirname(task_path)
+      m.template task_path, "resource.erb", :const => const
+      
+      if test
+        test_path = path('test', "#{const.path}_test.rb")
+        m.directory File.dirname(test_path)
+        m.template test_path, "test.erb", :const => const
+      end
+    end
+  end
+end

data/lib/tap/generator/generators/root.rb

@@ -1,5 +1,5 @@
 require 'tap/generator/base'
-require 'tap/constants'
+require 'tap/version'
 
 module Tap::Generator::Generators
   

data/lib/tap/generator/generators/task.rb

@@ -1,27 +1,10 @@
-require 'tap/env'
+require 'tap/generator/generators/resource'
 
 module Tap::Generator::Generators
   
   # :startdoc::generator a task and test
   #
   # Generates a new Tap::Task and an associated test file.
-  class Task < Tap::Generator::Base
-    
-    config :test, true, &c.switch            # Specifies creation of a test file
-    
-    def manifest(m, const_name)
-      const = Tap::Env::Constant.new(const_name.camelize)
-      
-      task_path = path('lib', "#{const.path}.rb")
-      m.directory File.dirname(task_path)
-      m.template task_path, "task.erb", :const => const
-      
-      if test
-        test_path = path('test', "#{const.path}_test.rb")
-        m.directory File.dirname(test_path)
-        m.template test_path, "test.erb", :const => const
-      end
-    end
-
+  class Task < Resource
   end
 end

data/lib/tap/generator/preview.rb

@@ -34,8 +34,12 @@ module Tap
       # content built to files.
       attr_accessor :preview
       
+      # The action for self (default :preview)
+      attr_accessor :action
+      
       def self.extended(base) # :nodoc:
         base.instance_variable_set(:@preview, {})
+        base.instance_variable_set(:@action, :preview)
       end
       
       # Returns the path of path, relative to destination_root.  If path

data/templates/tap/generator/generators/generator/{task.erb → resource.erb}

@@ -1,7 +1,7 @@
 require 'tap/generator/base'
 
-<% redirect do |target| %># :startdoc::generator <replace with manifest summary>
-# <replace with command line description>
+<% redirect do |target| %># :startdoc::generator <replace with summary>
+# <replace with description>
 
 # <%= const.name %> Documentation
 class <%= const.name %> < Tap::Generator::Base

data/templates/tap/generator/generators/middleware/resource.erb

@@ -0,0 +1,18 @@
+require 'tap/middleware'
+
+<% redirect do |target| %># :startdoc::middleware <replace with summary>
+# <replace with description>
+
+# <%= const.name %> Documentation
+class <%= const.name %> < Tap::Middleware
+
+  attr_reader :stack
+  
+  def initialize(stack)
+    @stack = stack
+  end
+  
+  def call(node, inputs=[])
+    stack.call(node, inputs)
+  end
+end <% module_nest(const.nesting, '  ') { target } end %>

data/templates/tap/generator/generators/middleware/test.erb

@@ -0,0 +1,15 @@
+require File.join(File.dirname(__FILE__), '<%= '../' * const.nesting_depth %>tap_test_helper.rb') 
+require '<%= const.path %>'
+
+class <%= const.name %>Test < Test::Unit::TestCase
+  acts_as_tap_test
+  
+  def test_<%= const.basename %>_calls_stack
+    runlist = []
+    n = app.node {|input| runlist << input}
+    m = app.use(<%= const.const_name %>)
+    
+    m.call(n, ['input'])
+    assert_equal ['input'], runlist
+  end
+end

data/templates/tap/generator/generators/root/gemspec

@@ -20,8 +20,7 @@ Gem::Specification.new do |s|
 <%= license ? "    MIT-LICENSE\n" : '' %>
   }
   
-  # list the files you want to include here. you can
-  # check this manifest using 'rap print_manifest'
+  # list the files you want to include here.
   s.files = %W{
     tap.yml
   }

data/templates/tap/generator/generators/task/resource.erb

@@ -0,0 +1,15 @@
+require 'tap/task'
+
+<% redirect do |target| %># :startdoc::task <replace with summary>
+# <replace with description>
+
+# <%= const.name %> Documentation
+class <%= const.name %> < Tap::Task
+
+  config :message, 'goodnight'           # A sample config
+  
+  def process(name)
+    log message, name
+    "#{message} #{name}"
+  end
+end <% module_nest(const.nesting, '  ') { target } end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tap-gen
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Simon Chiang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-06 00:00:00 -06:00
+date: 2009-06-17 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.17.1
+        version: 0.18.0
     version: 
 description: 
 email: simon.a.chiang@gmail.com
@@ -43,21 +43,25 @@ files:
 - lib/tap/generator/generators/command.rb
 - lib/tap/generator/generators/config.rb
 - lib/tap/generator/generators/generator.rb
+- lib/tap/generator/generators/middleware.rb
+- lib/tap/generator/generators/resource.rb
 - lib/tap/generator/generators/root.rb
 - lib/tap/generator/generators/task.rb
 - lib/tap/generator/manifest.rb
 - lib/tap/generator/preview.rb
 - tap.yml
 - templates/tap/generator/generators/command/command.erb
-- templates/tap/generator/generators/generator/task.erb
+- templates/tap/generator/generators/generator/resource.erb
 - templates/tap/generator/generators/generator/test.erb
+- templates/tap/generator/generators/middleware/resource.erb
+- templates/tap/generator/generators/middleware/test.erb
 - templates/tap/generator/generators/root/MIT-LICENSE
 - templates/tap/generator/generators/root/README
 - templates/tap/generator/generators/root/Rakefile
 - templates/tap/generator/generators/root/Rapfile
 - templates/tap/generator/generators/root/gemspec
 - templates/tap/generator/generators/root/test/tap_test_helper.rb
-- templates/tap/generator/generators/task/task.erb
+- templates/tap/generator/generators/task/resource.erb
 - templates/tap/generator/generators/task/test.erb
 - History
 - README

data/templates/tap/generator/generators/task/task.erb

@@ -1,16 +0,0 @@
-require 'tap/task'
-
-<% redirect do |target| %># :startdoc::task <replace with manifest summary>
-# <replace with command line description>
-
-# <%= const.name %> Documentation
-class <%= const.name %> < Tap::Task
-
-  # <config file documentation>
-  config :message, 'goodnight'           # a sample config
-  
-  def process(name)
-    log message, name
-    "#{message} #{name}"
-  end
-end <% module_nest(const.nesting, '  ') { target } end %>