tap-gen 0.2.0 → 0.3.0

data/History

@@ -1,3 +1,9 @@
+== 0.3.0 / 2009-12-05
+
+Updates for Tap-0.19.0
+
+* manifest for resource generator now returns const
+
 == 0.2.0 / 2009-06-17
 
 Updates for Tap-0.18.0

data/MIT-LICENSE

@@ -1,22 +1,21 @@
 Copyright (c) 2009, Regents of the University of Colorado.
 
-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:
+Copyright (c) 2009, Simon Chiang.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+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 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.
+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

@@ -13,7 +13,6 @@ easy to configure, subclass, and distribute.
 documentation, development, and bug tracking.
 
 * Website[http://tap.rubyforge.org]
-* Lighthouse[http://bahuvrihi.lighthouseapp.com/projects/9908-tap-task-application/tickets]
 * Github[http://github.com/bahuvrihi/tap/tree/master]
 * {Google Group}[http://groups.google.com/group/ruby-on-tap]
 
@@ -44,14 +43,11 @@ Roll it back:
 
 == Installation
 
-Tap-Generator is available as a gem on
-RubyForge[http://rubyforge.org/projects/tap]. Use:
+Tap-Generator is available as a gem on Gemcutter[http://gemcutter.org/gems/tap-gen].
 
   % gem install tap-gen
   
 == Info
 
-Copyright (c) 2009, Regents of the University of Colorado.
-Developer:: {Simon Chiang}[http://bahuvrihi.wordpress.com], {Biomolecular Structure Program}[http://biomol.uchsc.edu/], {Hansen Lab}[http://hsc-proteomics.uchsc.edu/hansenlab/] 
-Support:: CU Denver School of Medicine Deans Academic Enrichment Fund
+Developer:: {Simon Chiang}[http://bahuvrihi.wordpress.com]
 License:: {MIT-Style}[link:files/MIT-LICENSE.html]

data/cmd/destroy.rb

@@ -6,16 +6,22 @@
 #   % tap generate root --help
 #
 
-require 'tap/generator/exe'
-require 'tap/generator/destroy'
+require 'tap/generator/base'
 
-env = Tap::Env.instance
-env.extend Tap::Generator::Exe
+app = Tap::App.instance
 
-env.run(Tap::Generator::Destroy, ARGV) do
+if ARGV.empty? || ARGV == ['--help']
+  constants = app.env.constants
+  generators = constants.summarize do |constant|
+    constant.types['generator']
+  end
+  
   puts Lazydoc.usage(__FILE__)
   puts
-  puts "generators:"
-  puts env.manifest('generator').summarize
+  puts generators
   exit(1)
 end
+
+generator = app.build('class' => ARGV.shift, 'spec' => ARGV)
+generator.signal(:set).call([Tap::Generator::Destroy])
+generator.call(*ARGV)

data/cmd/generate.rb

@@ -6,16 +6,22 @@
 #   % tap generate root --help
 #
 
-require 'tap/generator/exe'
-require 'tap/generator/generate'
+require 'tap/generator/base'
 
-env = Tap::Env.instance
-env.extend Tap::Generator::Exe
+app = Tap::App.instance
 
-env.run(Tap::Generator::Generate, ARGV) do
+if ARGV.empty? || ARGV == ['--help']
+  constants = app.env.constants
+  generators = constants.summarize do |constant|
+    constant.types['generator']
+  end
+  
   puts Lazydoc.usage(__FILE__)
   puts
-  puts "generators:"
-  puts env.manifest('generator').summarize
+  puts generators
   exit(1)
-end
+end
+
+generator = app.build('class' => ARGV.shift, 'spec' => ARGV)
+generator.signal(:set).call([Tap::Generator::Generate])
+generator.call(*ARGV)

data/lib/tap/generator/base.rb

@@ -1,6 +1,8 @@
 require 'tap'
 require 'tap/generator/manifest'
 require 'tap/generator/arguments'
+require 'tap/generator/generate'
+require 'tap/generator/destroy'
 
 module Tap
   module Generator
@@ -73,11 +75,15 @@ module Tap
       lazy_attr :args, :manifest
       lazy_register :manifest, Arguments
       
-      config :destination_root, Dir.pwd       # The destination root directory
+      config :destination_root, Dir.pwd,      # The destination root directory
+        :long => :destination,
+        :short => :d
       config :pretend, false, &c.flag         # Run but rollback any changes.
       config :force, false, &c.flag           # Overwrite files that already exist.
       config :skip, false, &c.flag            # Skip files that already exist.
       
+      signal :set                             # Set this generator to generate or destroy
+      
       # The generator-specific templates directory.  By default:
       # 'templates/path/to/name' for 'lib/path/to/name.rb'
       attr_accessor :template_dir
@@ -95,6 +101,12 @@ module Tap
         @template_dir = File.expand_path("templates/#{self.class.to_s.underscore}")
       end
       
+      def set(mod)
+        mod = app.env[mod] unless mod.class == Module
+        extend(mod)
+        self
+      end
+      
       # Builds the manifest, then executes the actions of the manifest.
       # Process returns the results of iterate, which normally will be
       # an array of files and directories created (or destroyed) by self.

data/lib/tap/generator/destroy.rb

@@ -1,7 +1,7 @@
 module Tap
   module Generator
     
-    # A mixin defining how to run manifest actions in reverse.
+    # :startdoc::module A mixin defining how to run manifest actions in reverse.
     module Destroy
       
       # Iterates over the actions in reverse, and collects the results.

data/lib/tap/generator/generate.rb

@@ -3,7 +3,7 @@ require 'tempfile'
 module Tap
   module Generator
     
-    # A mixin defining how to run manifest actions.
+    # :startdoc::module A mixin defining how to run manifest actions.
     module Generate
       
       # Creates the target directory if it doesn't exist.  When pretend is

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

@@ -16,15 +16,15 @@ module Tap::Generator::Generators
   #
   class Config < Tap::Generator::Base
     
-    dump_delegates = lambda do |leader, delegate, block|
-      nested_delegates = delegate.default(false).delegates
-      indented_dump = Configurable::Utils.dump(nested_delegates, &block).gsub(/^/, "  ")
+    dump_nest_configs = lambda do |leader, nest_config, block|
+      configurations = nest_config.nest_class.configurations
+      indented_dump = Configurable::Utils.dump(configurations, &block).gsub(/^/, "  ")
       "#{leader}: \n#{indented_dump}"
     end
     
-    doc_format = lambda do |key, delegate|
+    doc_format = lambda do |key, config|
       # get the description
-      desc = delegate.attributes[:desc]
+      desc = config.attributes[:desc]
       doc = desc.to_s
       doc = desc.comment if doc.empty?
     
@@ -32,11 +32,11 @@ module Tap::Generator::Generators
       lines = Lazydoc::Utils.wrap(doc, 50).collect {|line| "# #{line}"}
       lines << "" unless lines.empty?
       
-      if delegate.is_nest?
+      if config.kind_of?(Configurable::NestConfig)
         leader = "#{lines.join("\n")}#{key}"
-        DUMP_DELEGATES[leader, delegate, DOC_FORMAT]
+        DUMP_NEST_CONFIGS[leader, config, DOC_FORMAT]
       else
-        default = delegate.default
+        default = config.default
         
         # setup formatting
         leader = default == nil ? '# ' : ''
@@ -45,11 +45,11 @@ module Tap::Generator::Generators
       end
     end
     
-    nodoc_format = lambda do |key, delegate|
-      if delegate.is_nest?
-        DUMP_DELEGATES[key, delegate, NODOC_FORMAT]
+    nodoc_format = lambda do |key, config|
+      if config.kind_of?(Configurable::NestConfig)
+        DUMP_NEST_CONFIGS[key, config, NODOC_FORMAT]
       else
-        default = delegate.default
+        default = config.default
       
         # setup formatting
         leader = default == nil ? '# ' : ''
@@ -58,8 +58,8 @@ module Tap::Generator::Generators
       end
     end
     
-    # Dumps a nested configuration.
-    DUMP_DELEGATES = dump_delegates
+    # Dumps nested configurations.
+    DUMP_NEST_CONFIGS = dump_nest_configs
     
     # Dumps configurations as YAML with documentation,
     # used when the doc config is true.

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

@@ -8,9 +8,7 @@ module Tap::Generator::Generators
   class Generator < Resource
     
     def manifest(m, const_name)
-      super
-      
-      const = Tap::Env::Constant.new(const_name.camelize)
+      const = super
       
       # make the templates directory
       m.directory path('templates', const.path)
@@ -21,6 +19,8 @@ module Tap::Generator::Generators
       m.file path('templates', const.path, 'template_file.erb') do |file|
         file << "# A sample template file.\nkey: <%= key %>\n"
       end
+      
+      const
     end
   end
 end

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

@@ -18,6 +18,8 @@ module Tap::Generator::Generators
         m.directory File.dirname(test_path)
         m.template test_path, "test.erb", :const => const
       end
+      
+      const
     end
   end
 end

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

@@ -36,7 +36,7 @@ module Tap::Generator::Generators
     
     # ::args ROOT, PROJECT_NAME=basename(ROOT)
     def manifest(m, root, project_name=nil)
-      r = Tap::Root.new(root)
+      r = Tap::Root.new(File.expand_path(root, destination_root))
       project_name = File.basename(r.root) if project_name == nil
       
       m.directory r.root
@@ -69,11 +69,9 @@ module Tap::Generator::Generators
       
       m.file(r['History']) if history
       m.file(r['tap.yml']) do |file|
-        Configurable::Utils.dump(Tap::Env.configurations, file) do |key, delegate|
-          default = delegate.default(false)
-          
+        Configurable::Utils.dump(Tap::Env.configurations, file) do |key, config|
           # get the description
-          desc = delegate.attributes[:desc]
+          desc = config.attributes[:desc]
           doc = desc.to_s
           doc = desc.comment if doc.empty?
           
@@ -81,10 +79,8 @@ module Tap::Generator::Generators
           lines = Lazydoc::Utils.wrap(doc, 78).collect {|line| "# #{line}"}
           lines << "" unless lines.empty?
           
-          # note: this causes order to be lost...
-          default = default.to_hash if delegate.is_nest?
-
           # 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"

data/lib/tap/generator/version.rb

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

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

@@ -4,8 +4,7 @@
 # and application information, then exits.
 #
 
-env = Tap::Env.instance
-app = Tap::App.new
+app = Tap::App.instance
 
 #
 # handle options

data/templates/tap/generator/generators/root/Rapfile

@@ -3,7 +3,7 @@ require 'tap/declarations'
 module <%= project_name.camelize %>
   extend Rap::Declarations
   
-  # ::desc your basic goodnight moon task
+  # :: your basic goodnight moon task
   # Says goodnight with a configurable message.
   task(:goodnight, :obj, :message => 'goodnight') do |task, args|
     puts "#{task.message} #{args.obj}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tap-gen
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Simon Chiang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-17 00:00:00 -06:00
+date: 2009-12-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.18.0
+        version: 0.19.0
     version: 
 description: 
 email: simon.a.chiang@gmail.com
@@ -38,7 +38,6 @@ files:
 - lib/tap/generator/arguments.rb
 - lib/tap/generator/base.rb
 - lib/tap/generator/destroy.rb
-- lib/tap/generator/exe.rb
 - lib/tap/generator/generate.rb
 - lib/tap/generator/generators/command.rb
 - lib/tap/generator/generators/config.rb
@@ -49,6 +48,7 @@ files:
 - lib/tap/generator/generators/task.rb
 - lib/tap/generator/manifest.rb
 - lib/tap/generator/preview.rb
+- lib/tap/generator/version.rb
 - tap.yml
 - templates/tap/generator/generators/command/command.erb
 - templates/tap/generator/generators/generator/resource.erb
@@ -68,6 +68,8 @@ files:
 - MIT-LICENSE
 has_rdoc: true
 homepage: http://tap.rubyforge.org/tap-gen
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -93,9 +95,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tap
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Generators for Tap
 test_files: []
 

data/lib/tap/generator/exe.rb

@@ -1,33 +0,0 @@
-require 'tap/generator/base'
-
-module Tap
-  module Generator
-    
-    # Methods used by the generate and destroy commands.
-    module Exe
-      
-      def run(mod, argv=ARGV)
-        if argv.empty? || argv == ['--help']
-          yield
-        end
-        
-        name = argv.shift
-        env, const = seek('generator', name, false)
-        
-        unless const
-          raise "unknown generator: #{name}"
-        end
-        
-        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
-  end
-end