tap-gen 0.3.1 → 0.7.0

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

@@ -7,14 +7,14 @@ module Tap::Generator::Generators
     config :test, true, &c.switch            # Specifies creation of a test file
     
     def manifest(m, const_name)
-      const = Tap::Env::Constant.new(const_name.camelize)
+      const = ::Tap::Env::Constant.new(const_name.camelize)
       
-      task_path = path('lib', "#{const.path}.rb")
+      task_path = path('lib', "#{const.relative_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")
+        test_path = path('test', "#{const.relative_path}_test.rb")
         m.directory File.dirname(test_path)
         m.template test_path, "test.erb", :const => const
       end

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

@@ -11,12 +11,12 @@ module Tap::Generator::Generators
   #   project
   #   |- MIT-LICENSE
   #   |- README
-  #   |- Rakefile
   #   |- lib
   #   |- project.gemspec
   #   |- tap.yml
+  #   |- tapfile
   #   `- test
-  #       `- tap_test_helper.rb
+  #       `- test_helper.rb
   #
   class Root < Tap::Generator::Base
     
@@ -28,25 +28,32 @@ module Tap::Generator::Generators
       config :summary, ""                          # The project summary
     end
     
-    config :env, false, &c.switch          # Create a full tap.yml file
-    config :license, true, &c.switch       # Create an MIT-LICENSE
-    config :history, true, &c.switch       # Create History file
-    config :rapfile, false, &c.switch      # Create a Rapfile
-    config :rakefile, true, &c.switch      # Create a Rakefile
+    config :env, false, &c.switch                  # Create a full tap.yml file
+    config :license, true, &c.switch               # Create an MIT-LICENSE
+    config :history, true, &c.switch               # Create History file
+    config :tapfile, true, &c.switch               # Create a Tapfile
+    
+    helper do
+      def titleize(str)
+        str.split(/[-_]+/).collect do |sub|
+          sub.capitalize
+        end.join('-')
+      end
+    end
     
     # ::args ROOT, PROJECT_NAME=basename(ROOT)
     def manifest(m, root, project_name=nil)
-      r = Tap::Root.new(File.expand_path(root, destination_root))
-      project_name = File.basename(r.root) if project_name == nil
+      r = destination_root.root(root)
+      project_name = File.basename(r.path) if project_name == nil
       
-      m.directory r.root
-      m.directory r['lib']
-      m.directory r['test']
+      m.directory r.path
+      m.directory r.path('lib')
+      m.directory r.path('test')
       
       template_files do |source, target|
         case
         when File.directory?(source)
-          m.directory r[target]
+          m.directory r.path(target)
           next
         when source =~ /gemspec$/
           locals = gemspec.config.to_hash.merge(
@@ -54,38 +61,18 @@ module Tap::Generator::Generators
             :license => license,
             :history => history
           )
-          m.template r[project_name + '.gemspec'], source, locals
+          m.template r.path("#{project_name}.gemspec"), source, locals
           next
-        when source =~ /Rakefile$/
-          next unless rakefile
-        when source =~ /Rapfile$/
-          next unless rapfile
+        when source =~ /tapfile$/
+          next unless tapfile
         when source =~ /MIT-LICENSE$/
           next unless license
         end
         
-        m.template r[target], source, :project_name => project_name, :license => license
+        m.template r.path(target), source, :project_name => project_name, :license => license
       end
       
-      m.file(r['History']) if history
-      m.file(r['tap.yml']) do |file|
-        Configurable::Utils.dump(Tap::Env.configurations, file) do |key, config|
-          # get the description
-          desc = config.attributes[:desc]
-          doc = desc.to_s
-          doc = desc.comment if doc.empty?
-          
-          # wrap as lines
-          lines = Lazydoc::Utils.wrap(doc, 78).collect {|line| "# #{line}"}
-          lines << "" unless lines.empty?
-          
-          # setup formatting
-          default = config.default
-          leader = key == 'root' || default == nil ? '# ' : ''
-          config = YAML.dump({key => default})[5..-1].strip.gsub(/\n+/, "\n#{leader}")
-          "#{lines.join("\n")}#{leader}#{config}\n\n"
-        end if env
-      end
+      m.file(r.path('History')) if history
     end
     
   end

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

@@ -0,0 +1,49 @@
+require 'tap/generator/base'
+
+module Tap
+  module Generator
+    module Generators
+      # :startdoc::generator make a faster tap
+      class Tap < Tap::Generator::Base
+        
+        config :name, 'tap', &c.string            # sets the tap executable name
+        config :profile, 'profile.sh', &c.string  # sets the profile script name
+        
+        def manifest(m)
+          load_paths = load_paths('lazydoc', 'configurable', 'tap')
+          bin_path = File.join(load_paths.last.chomp('lib'), 'bin/tapexe')
+          
+          m.template name, 'tap.erb', {
+            :load_paths => load_paths,
+            :bin_path => bin_path
+          }
+          
+          m.on(:generate) do 
+            log :chmod, "0755 #{name}"
+            FileUtils.chmod(0755, name)
+          end
+          
+          m.template profile, 'profile.erb', {
+            :generator => self.class,
+            :filename => profile
+          }
+        end
+        
+        def load_paths(*gem_names)
+          gem_names.collect! do |gem_name|
+            load_path = $LOAD_PATH.find do |path|
+              path =~ /\/#{gem_name}[-\d\.]*\/lib$/
+            end
+            
+            if load_path.nil?
+              raise "could not determine load path for: #{gem_name}"
+            end
+            
+            File.expand_path(load_path)
+          end
+        end
+        
+      end 
+    end
+  end
+end

data/lib/tap/generator/helpers.rb

@@ -0,0 +1,49 @@
+module Tap
+  module Generator
+    module Helpers
+      attr_reader :helper_registry
+    
+      def helpers
+        return @helpers if @helpers
+      
+        helpers = []
+        ancestors.each do |ancestor|
+          next unless ancestor.kind_of?(Helpers)
+          helpers.concat ancestor.helper_registry
+        end
+      
+        helpers
+      end
+    
+      def cache_helpers(on=true)
+        @helpers = nil
+        @helpers = self.helpers if on
+      end
+    
+      protected
+    
+      def helper(const_name='helper', &block)
+        helper = Module.new(&block)
+        const_set(const_name.to_s.camelize, helper) if const_name
+        helper_registry << helper
+        helper
+      end
+    
+      private
+    
+      def self.initialize(base)
+        base.instance_variable_set(:@helper_registry, [])
+        base.instance_variable_set(:@helpers, nil)
+      end
+    
+      def self.extended(base)
+        Helpers.initialize(base)
+      end
+    
+      def inherited(base)
+        super
+        Helpers.initialize(base)
+      end
+    end
+  end
+end

data/lib/tap/generator/preview.rb

@@ -45,7 +45,7 @@ module Tap
       # Returns the path of path, relative to destination_root.  If path
       # is destination_root, '.' will be returned.
       def relative_path(path)
-        path = Root::Utils.relative_path(destination_root, path, destination_root) || path
+        path = destination_root.relative_path(path) || path
         path.empty? ? "." : path
       end
       

data/lib/tap/generator/version.rb

@@ -1,7 +1,7 @@
 module Tap
   module Generator
     MAJOR = 0
-    MINOR = 3
+    MINOR = 7
     TINY = 0
 
     VERSION="#{MAJOR}.#{MINOR}.#{TINY}"

data/tap-gen.gemspec

@@ -0,0 +1,67 @@
+$:.unshift File.expand_path('../../tap/lib', __FILE__)
+$:.unshift File.expand_path('../../tap-test/lib', __FILE__)
+$:.unshift File.expand_path('../../tap-gen/lib', __FILE__)
+
+require 'tap/version'
+require 'tap/test/version'
+require 'tap/generator/version'
+
+Gem::Specification.new do |s|
+  s.name = 'tap-gen'
+  s.version = Tap::Generator::VERSION
+  s.author = 'Simon Chiang'
+  s.email = 'simon.a.chiang@gmail.com'
+  s.homepage = File.join(Tap::WEBSITE, 'tap-gen')
+  s.platform = Gem::Platform::RUBY
+  s.summary = 'Generators for Tap'
+  s.require_path = 'lib'
+  s.rubyforge_project = 'tap'
+  s.add_dependency('tap', ">= #{Tap::VERSION}")
+  s.add_development_dependency('tap-test', ">= #{Tap::Test::VERSION}")
+  s.has_rdoc = true
+  s.rdoc_options.concat %W{--main README -S -N --title Tap-Generator}
+  
+  # list extra rdoc files here.
+  s.extra_rdoc_files = %W{
+    History
+    README
+    MIT-LICENSE
+  }
+  
+  # list the files you want to include here. you can
+  # check this manifest using 'rap print_manifest'
+  s.files = %W{
+    lib/tap/generator/arguments.rb
+    lib/tap/generator/base.rb
+    lib/tap/generator/destroy.rb
+    lib/tap/generator/generate.rb
+    lib/tap/generator/generators/config.rb
+    lib/tap/generator/generators/env.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/tap.rb
+    lib/tap/generator/generators/task.rb
+    lib/tap/generator/helpers.rb
+    lib/tap/generator/manifest.rb
+    lib/tap/generator/preview.rb
+    lib/tap/generator/version.rb
+    tap-gen.gemspec
+    tap.yml
+    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/gemspec
+    templates/tap/generator/generators/root/tap.yml
+    templates/tap/generator/generators/root/tapfile
+    templates/tap/generator/generators/root/test/test_helper.rb
+    templates/tap/generator/generators/tap/profile.erb
+    templates/tap/generator/generators/tap/tap.erb
+    templates/tap/generator/generators/task/resource.erb
+    templates/tap/generator/generators/task/test.erb
+  }
+end

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

@@ -13,17 +13,20 @@ class <%= const.name %> < Tap::Generator::Base
   def manifest(m, *inputs)
 
     # make a directory
-    # m.directory path
+    # m.directory 'path'
 
     # make a file
-    # m.file path do |file|
+    # m.file 'path' do |file|
     #   file << content
     # end
 
     # template a file in the templates directory using ERB.
     # The last argument defines a hash of local variables
     # for use in the template (here config is used).
-    m.template "<%= const.const_name.underscore %>_file.txt", "template_file.erb", config.to_hash
+    m.template "<%= const.const_name.underscore %>_file.txt", 'template_file.erb', config.to_hash
+    
+    # do something only on generate/destroy
+    # on(:generate) {}
   end
   
 end <% module_nest(const.nesting, '  ') { target } end %>

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

@@ -1,6 +1,6 @@
-require File.join(File.dirname(__FILE__), '<%= '../' * const.nesting_depth %>tap_test_helper.rb') 
-require '<%= const.path %>'
-require 'tap/generator/preview.rb'
+require File.expand_path('<%= '../' * const.nesting_depth %>../test_helper', __FILE__) 
+require '<%= const.relative_path %>'
+require 'tap/generator/preview'
 
 class <%= const.name %>Test < Test::Unit::TestCase
 

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

@@ -1,5 +1,5 @@
-require File.join(File.dirname(__FILE__), '<%= '../' * const.nesting_depth %>tap_test_helper.rb') 
-require '<%= const.path %>'
+require File.expand_path('<%= '../' * const.nesting_depth %>../test_helper', __FILE__) 
+require '<%= const.relative_path %>'
 
 class <%= const.name %>Test < Test::Unit::TestCase
   acts_as_tap_test

data/templates/tap/generator/generators/root/README

@@ -1,4 +1,4 @@
-= <%= project_name.capitalize %>
+= <%= titleize project_name %>
 
 == Description
 

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

@@ -1,17 +1,17 @@
 Gem::Specification.new do |s|
-  s.name = "<%= project_name %>"
-  s.version = "0.0.1"
-  s.author = "<%= name %>"
-  s.email = "<%= email %>"
-  s.homepage = "<%= homepage %>"
+  s.name = '<%= project_name %>'
+  s.version = '0.0.1'
+  s.author = '<%= name %>'
+  s.email = '<%= email %>'
+  s.homepage = '<%= homepage %>'
   s.platform = Gem::Platform::RUBY
-  s.summary = "<%= summary %>"
-  s.require_path = "lib"
-  s.rubyforge_project = "<%= rubyforge_project %>"
-  s.add_dependency("tap", "= <%= Tap::VERSION %>")
-  s.add_development_dependency("tap-test")
+  s.summary = '<%= summary %>'
+  s.require_path = 'lib'
+  s.rubyforge_project = '<%= rubyforge_project %>'
+  s.add_dependency('tap', '= <%= Tap::VERSION %>')
+  s.add_development_dependency('tap-test')
   s.has_rdoc = true
-  s.rdoc_options.concat %W{--main README -S -N --title <%= project_name.capitalize %>}
+  s.rdoc_options.concat %W{--main README -S -N --title <%= titleize(project_name) %>}
   
   # list extra rdoc files here.
   s.extra_rdoc_files = %W{

data/templates/tap/generator/generators/root/{Rakefile → tapfile}

@@ -1,21 +1,18 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-
 #
 # Gem specification
 #
 
 def gemspec
-  data = File.read('<%= project_name %>.gemspec')
-  spec = nil
-  Thread.new { spec = eval("$SAFE = 3\n#{data}") }.join
-  spec
+  @gemspec ||= TOPLEVEL_BINDING.eval(File.read('<%= project_name %>.gemspec'))
 end
 
-Rake::GemPackageTask.new(gemspec) do |pkg|
-  pkg.need_tar = true
+desc 'build the gem'
+task :gem, :dir => 'pkg' do |config|
+  output = `gem build '<%= project_name %>.gemspec'`
+  output =~ /File: (.*)$/
+
+  FileUtils.mkdir_p(config.dir) unless File.exists?(config.dir)
+  FileUtils.mv($1, File.join(config.dir, $1), :force => true)
 end
 
 desc 'Prints the gemspec manifest.'
@@ -27,18 +24,18 @@ task :print_manifest do
     files[File.expand_path(file)] = [File.exists?(file), file]
     files
   end
-  
+
   # gather non-rdoc/pkg files for the project
   # and add to the files list if they are not
   # included already (marking by the absence
   # of a label)
   Dir.glob("**/*").each do |file|
-    next if file =~ /^(rdoc|pkg|backup)/ || File.directory?(file)
-    
+    next if file =~ /^(rdoc|pkg|test)/ || File.directory?(file)
+  
     path = File.expand_path(file)
     files[path] = ["", file] unless files.has_key?(path)
   end
-  
+
   # sort and output the results
   files.values.sort_by {|exists, file| file }.each do |entry| 
     puts "%-5s %s" % entry
@@ -50,36 +47,31 @@ end
 #
 
 desc 'Generate documentation.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  spec = gemspec
+task :rdoc, :rebuild => false, :dir => 'rdoc' do |config|
+  require 'rdoc/rdoc'
+  require 'cdoc'
   
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.options.concat(spec.rdoc_options)
-  rdoc.rdoc_files.include( spec.extra_rdoc_files )
+  if config.rebuild && File.directory?(config.dir)
+    FileUtils.rm_r(config.dir)
+  end
   
-  files = spec.files.select {|file| file =~ /^lib.*\.rb$/}
-  rdoc.rdoc_files.include( files )
+  files = gemspec.files.select {|file| file =~ /^lib.*\.rb$/ }.uniq
+  files += gemspec.extra_rdoc_files
   
   # Using CDoc to template your RDoc will result in configurations being
   # listed with documentation in a subsection following attributes.  Not
   # necessary, but nice.
-  require 'cdoc'
-  rdoc.template = 'cdoc/cdoc_html_template' 
-  rdoc.options << '--fmt' << 'cdoc'
+  cdoc_options = ['--fmt', 'cdoc', '--template', 'cdoc/cdoc_html_template']
+  args = ['-o', config.dir] + cdoc_options + gemspec.rdoc_options + files
+  RDoc::RDoc.new.document(args)
 end
 
 #
 # Test tasks
 #
 
-desc 'Default: Run tests.'
-task :default => :test
-
-desc 'Run tests.'
-Rake::TestTask.new(:test) do |t|
-  t.test_files = Dir.glob( File.join('test', ENV['pattern'] || '**/*_test.rb') )
-  t.ruby_opts = ['-rubygems']
-  t.verbose = true
-  t.warning = true
-end
-
+desc 'Run the tests'
+task :test do
+  tests = Dir.glob('test/**/*_test.rb')
+  sh('ruby', '-w', '-e', 'ARGV.dup.each {|test| load test}', *tests)
+end