sprout 1.1.3.pre → 1.1.4.pre

data/VERSION

@@ -1 +1 @@
-1.1.3.pre
+1.1.4.pre

data/lib/sprout/daemon.rb

@@ -193,6 +193,7 @@ module Sprout
 
     def wait
       Process.wait process_runner.pid
+    rescue Errno::ECHILD
     end
 
     ##

data/lib/sprout/executable/boolean.rb

@@ -58,11 +58,16 @@ module Sprout
         @hidden_value            = true
       end
 
+      def default_option_parser_declaration
+        return [prefix, '[no-]', option_parser_name] if default == true
+        super
+      end
+
       ##
-      # Convert string representations of truthiness
-      # to something more Booley.
+      # Convert string representations of falsiness
+      # to something more Booleaney.
       def value=(value)
-        value = (value == "true" || value === true) ? true : false 
+        value = (value == "false" || value == false) ? false : true
         super value
       end
       

data/lib/sprout/executable/param.rb

@@ -318,7 +318,7 @@ module Sprout
       # How this parameter is provided to the
       # Ruby OptionParser when being exposed as a Ruby Executable.
       def option_parser_declaration
-        declaration = [ prefix, option_parser_name ]
+        declaration = default_option_parser_declaration
         # TODO: Need to figure out how to support hidden name inputs...
         #if(hidden_name?)
           #declaration = [option_parser_type_output]
@@ -329,6 +329,10 @@ module Sprout
         declaration.join('')
       end
 
+      def default_option_parser_declaration
+        [ prefix, option_parser_name ]
+      end
+
       ##
       # The Ruby OptionParser short name with prefix.
       def option_parser_short_name

data/lib/sprout/generator/command.rb

@@ -34,7 +34,7 @@ module Sprout::Generator
       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.path      = File.join( working_dir.path, path )
@@ -44,7 +44,7 @@ module Sprout::Generator
       end
 
       def generator name, options={}
-        raise sprout::errors::generatorerror.new "Cannot call another generator with nil name" if name.nil?
+        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

data/lib/sprout/generator/directory_manifest.rb

@@ -12,9 +12,9 @@ module Sprout::Generator
     def create
       if !File.directory?(path)
         FileUtils.mkdir_p path
-        say "Created directory: #{path}"
+          say "Created directory: #{path}"
       else
-        say "Skipped existing:  #{path}" unless(path == Dir.pwd)
+          say "Skipped directory: #{path}" unless(path == Dir.pwd)
       end
       create_children
       execute_generators
@@ -26,10 +26,10 @@ module Sprout::Generator
 
       if success && can_remove?
         FileUtils.rmdir path
-        say "Removed directory: #{path}"
+        say "Removed directory:           #{path}"
         true
       else
-        say "Skipped remove directory: #{path}"
+        say "Skipped remove directory:    #{path}"
         false
       end
     end

data/lib/sprout/generator/file_manifest.rb

@@ -6,12 +6,21 @@ module Sprout::Generator
 
     def create
       content = resolve_template
-      
-      File.open path, 'w+' do |file|
-        file.write content
+
+      if File.exists?(path)
+        if generator.force
+          write_file path, content
+          say "Replaced file:     #{path}"
+          true
+        else
+          say "Skipped file:      #{path}"
+          false
+        end
+      else
+        write_file path, content
+        say "Created file:      #{path}"
+        true
       end
-      say "Created file:      #{path}"
-      true
     end
 
     def destroy
@@ -23,16 +32,22 @@ module Sprout::Generator
       actual_content = File.read path
       if generator.force || actual_content == expected_content
         FileUtils.rm path
-        say "Removed file: #{path}"
+        say "Removed file:                #{path}"
         true
       else
-        say "Skipped remove file: #{path}"
+        say "Skipped remove file:         #{path}"
         false
       end
     end
 
     protected
 
+    def write_file path, content
+      File.open path, 'w+' do |file|
+        file.write content
+      end
+    end
+
     def resolve_template
       read_source
     end

data/lib/sprout/generator/template_manifest.rb

@@ -5,8 +5,7 @@ module Sprout::Generator
     protected
 
     def resolve_template
-      template_content = read_source
-      generator.resolve_template template_content
+      generator.resolve_template read_source
     end
   end
 end

data/test/fixtures/examples/echo_inputs.rb

@@ -14,6 +14,10 @@ class EchoInputs < Sprout::Executable::Base
   #
   add_param :truthy, Boolean
 
+  add_param :long_truthy, Boolean
+
+  add_param :default_truthy, Boolean, { :default => true }
+
   ##
   # A boolean parameter that defaults to true, and must be 
   # explicitly set to false in order to turn it off.

data/test/fixtures/executable/flex3sdk_gem/fdb.bat

@@ -0,0 +1,4 @@
+
+@echo off
+ruby test\fixtures\executable\flex3sdk_gem\fdb
+

data/test/unit/boolean_param_test.rb

@@ -30,7 +30,12 @@ class BooleanParamTest < Test::Unit::TestCase
         @param.show_on_false = true
         @param.default = true
         @param.hidden_value = false
-        assert_equal "--foo [BOOL]", @param.option_parser_declaration
+        assert_equal "--[no-]foo [BOOL]", @param.option_parser_declaration
+      end
+
+      should "not insert [no] param modifier unless default true" do
+        @param.name = 'something_off'
+        assert_equal "--something-off", @param.option_parser_declaration
       end
     end
   end

data/test/unit/daemon_test.rb

@@ -61,7 +61,7 @@ class DaemonTest < Test::Unit::TestCase
       @fdb.quit
       @fdb.wait # wait for actions to finish.
 
-      assert_equal "This is an error!\nThis is more details about the error!\nHere are even more details!\n", Sprout.stderr.read
+      assert_matches /This is an error!/, Sprout.stderr.read
     end
 
     should "execute from rake task" do

data/test/unit/executable_option_parser_test.rb

@@ -28,6 +28,18 @@ class ExecutableOptionParserTest < Test::Unit::TestCase
       @exe.parse! [ '--truthy', @default_input ]
       assert @exe.truthy
     end
+
+    should "accept long boolean with hidden_value" do
+      assert !@exe.long_truthy
+      @exe.parse! [ '--long-truthy', @default_input ]
+      assert @exe.long_truthy
+    end
+
+    should "accept negative truthy" do
+      assert @exe.default_truthy, "Should default true"
+      @exe.parse! [ '--no-default-truthy', @default_input ]
+      assert !@exe.default_truthy, "Should accept no- prefix"
+    end
     
     should "always accept help option" do
       @exe.expects :puts

data/test/unit/generator_test.rb

@@ -58,6 +58,29 @@ class GeneratorTest < Test::Unit::TestCase
         end
       end
 
+      should "not clobber existing files" do
+        dir = File.join(@fixture, 'some_project', 'src')
+        FileUtils.mkdir_p dir
+        File.open File.join(dir, 'SomeProject.as'), 'w+' do |f|
+          f.write "Hello World"
+        end
+        @generator.input = 'some_project'
+        @generator.execute
+        assert_matches /Hello World/, File.read(File.join(dir, 'SomeProject.as'))
+      end
+
+      should "clobber existing files if --force" do
+        dir = File.join(@fixture, 'some_project', 'src')
+        FileUtils.mkdir_p dir
+        File.open File.join(dir, 'SomeProject.as'), 'w+' do |f|
+          f.write "Hello World"
+        end
+        @generator.input = 'some_project'
+        @generator.force = true
+        @generator.execute
+        assert_matches /public function SomeProject/, File.read(File.join(dir, 'SomeProject.as'))
+      end
+
       should "call another generator" do
         @generator.external = true
         @generator.execute
@@ -78,6 +101,7 @@ class GeneratorTest < Test::Unit::TestCase
       should "respect updates from subclasses" do
         @generator = configure_generator SubclassedGenerator.new
         @generator.input = 'some_project'
+        @generator.force = true
         @generator.execute
         assert_file File.join(@fixture, 'some_project', 'SomeFile') do |content|
           assert_matches /Living Jest enough for the City and SomeProject/, content
@@ -103,7 +127,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('Skipped directory: .')
         @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
   - 1
-  - 3
+  - 4
   - pre
-  version: 1.1.3.pre
+  version: 1.1.4.pre
 platform: ruby
 authors: 
 - Luke Bayes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-29 00:00:00 -08:00
+date: 2010-12-31 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -302,6 +302,7 @@ files:
 - test/fixtures/executable/echochamber_gem/echo_chamber.rb
 - test/fixtures/executable/fdb.rb
 - test/fixtures/executable/flex3sdk_gem/fdb
+- test/fixtures/executable/flex3sdk_gem/fdb.bat
 - test/fixtures/executable/flex3sdk_gem/flex3sdk.rb
 - test/fixtures/executable/flex3sdk_gem/mxmlc
 - test/fixtures/executable/flex3sdk_gem/mxmlc.bat