sprout 1.0.20.pre → 1.0.22.pre

data/lib/sprout/generator/base.rb

@@ -213,6 +213,7 @@ module Sprout
       def prepare_command
         @logger ||= $stdout
         @command = Command.new self
+        @command.logger = logger
         manifest
         @command
       end
@@ -230,10 +231,7 @@ module Sprout
       end
 
       def generator name, options={}
-        instance = Sprout::Generator.create_instance name, options
-        instance.from_hash to_hash.merge(options)
-        instance.logger = logger
-        instance.execute
+        @command.generator name, to_hash.merge(options)
       end
 
       private

data/lib/sprout/generator/command.rb

@@ -4,8 +4,6 @@ module Sprout::Generator
       attr_accessor :logger
       attr_accessor :working_dir
 
-      attr_reader :generator
-
       def initialize generator
         @generator             = generator
         @working_dir           = DirectoryManifest.new
@@ -16,42 +14,49 @@ module Sprout::Generator
       def directory path, &block
         raise Sprout::Errors::GeneratorError.new "Cannot create directory with nil path" if path.nil?
         manifest           = DirectoryManifest.new
-        manifest.generator = generator
+        manifest.generator = @generator
         manifest.path      = File.join(@working_dir.path, path)
         @working_dir.children << manifest
-        parent = @working_dir
-        @working_dir = manifest
+        parent             = @working_dir
+        @working_dir       = manifest
         yield if block_given?
-        @working_dir = parent
+        @working_dir       = parent
       end
 
       def template path, template=nil
         raise Sprout::Errors::GeneratorError.new "Cannot create file with nil path" if path.nil?
         manifest           = TemplateManifest.new
-        manifest.generator = generator
+        manifest.generator = @generator
         manifest.path      = File.join( working_dir.path, path )
         manifest.template  = template
-        manifest.templates = generator.template_paths
+        manifest.templates = @generator.template_paths
         working_dir.children << manifest
       end
 
       def file path, template=nil
-        raise Sprout::Errors::GeneratorError.new "Cannot create file with nil path" if path.nil?
+        raise sprout::errors::generatorerror.new "Cannot create file with nil path" if path.nil?
         manifest           = FileManifest.new
-        manifest.generator = generator
+        manifest.generator = @generator
         manifest.path      = File.join( working_dir.path, path )
         manifest.template  = template
-        manifest.templates = generator.template_paths
+        manifest.templates = @generator.template_paths
         working_dir.children << manifest
       end
 
+      def generator name, options={}
+        raise sprout::errors::generatorerror.new "Cannot call another generator with nil name" if name.nil?
+        instance        = Sprout::Generator.create_instance name, options
+        instance.logger = logger
+        instance.path   = working_dir.path
+        instance.from_hash options
+        working_dir.generators << instance
+      end
+
       def execute
         begin
-          working_dir.children.each do |child|
-            child.create
-          end
+          working_dir.create
         rescue StandardError => e
-          generator.say "[#{e.class}] #{e.message}"
+          @generator.say "[#{e.class}] #{e.message}"
           working_dir.children.each do |child|
             child.destroy
           end

data/lib/sprout/generator/directory_manifest.rb

@@ -1,10 +1,12 @@
 module Sprout::Generator
   class DirectoryManifest < Manifest
     attr_reader :children
+    attr_reader :generators
 
     def initialize
       super
       @children = []
+      @generators = []
     end
 
     def create
@@ -12,12 +14,14 @@ module Sprout::Generator
         FileUtils.mkdir_p path
         say "Created directory: #{path}"
       else
-        say "Skipped existing:  #{path}"
+        say "Skipped existing:  #{path}" unless(path == Dir.pwd)
       end
       create_children
+      execute_generators
     end
 
     def destroy
+      unexecute_generators
       success = destroy_children
 
       if success && can_remove?
@@ -45,5 +49,18 @@ module Sprout::Generator
       destroyed = children.reverse.select { |child| child.destroy }
       return (destroyed.size == children.size)
     end
+
+    def execute_generators
+      generators.each do |generator|
+        generator.execute
+      end
+    end
+
+    def unexecute_generators
+      generators.each do |generator|
+        generator.unexecute
+      end
+    end
+
   end
 end

data/lib/sprout/generators/generator/templates/generator_test.rb

@@ -30,7 +30,6 @@ class <%= input.camel_case %>GeneratorTest < Test::Unit::TestCase
       assert_file input_file do |content|
         assert_matches /Your content to assert here/, content
       end
-
     end
 
   end

data/lib/sprout/version.rb

@@ -6,7 +6,7 @@ module Sprout
     module VERSION #:nodoc:
       MAJOR = 1
       MINOR = 0
-      TINY  = 20
+      TINY  = 22
       RELEASE = 'pre'
 
       STRING = [MAJOR, MINOR, TINY, RELEASE].join('.')

data/test/unit/generator_test.rb

@@ -103,6 +103,7 @@ class GeneratorTest < Test::Unit::TestCase
 
       should "notify user of all files created" do
         @generator.input = 'some_project'
+        @string_io.expects(:puts).with('Skipped existing:  .')
         @string_io.expects(:puts).with('Created directory: ./some_project')
         @string_io.expects(:puts).with('Created file:      ./some_project/SomeFile')
         @string_io.expects(:puts).with('Created file:      ./some_project/SomeOtherFile')

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 20
+  - 22
   - pre
-  version: 1.0.20.pre
+  version: 1.0.22.pre
 platform: ruby
 authors: 
 - Luke Bayes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-04 00:00:00 -07:00
+date: 2010-07-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -270,7 +270,6 @@ files:
 - script/console
 - script/destroy
 - script/generate
-- sprout-1.0.20.pre.gem
 - sprout.gemspec
 - test/fixtures/archive_unpacker/copyable/some_file.exe
 - test/fixtures/archive_unpacker/copyable/some_file.rb