rubigen 1.3.4 → 1.4.0

data/History.txt

@@ -1,3 +1,8 @@
+== 1.4.0 2008-12-11 NOT RELEASED
+
+* rubigen tests now pass against ruby 1.9.0 and ruby 1.9.1(prerelease 2)
+* puts are sent to an explicit #stdout which can be STDOUT or a StringIO passed from tests; test output is now clean!
+
 == 1.3.4 2008-11-12
 
 * ruby_app: fixed reference to non-existent version.rb [jperkins]

data/app_generators/ruby_app/ruby_app_generator.rb

@@ -56,7 +56,7 @@ class RubyAppGenerator < RubiGen::Base
       opts.separator 'Options:'
       opts.on("-r", "--ruby=path", String,
              "Path to the Ruby binary of your choice (otherwise scripts use env, dispatchers current path).",
-             "Default: #{DEFAULT_SHEBANG}") { |options[:shebang]| }
+             "Default: #{DEFAULT_SHEBANG}") { |v| options[:shebang] = v }
     end
     
 

data/lib/rubigen/base.rb

@@ -81,7 +81,7 @@ module RubiGen
 
     # Declare default options for the generator.  These options
     # are inherited to subclasses.
-    default_options :collision => :ask, :quiet => false
+    default_options :collision => :ask, :quiet => false, :stdout => STDOUT
 
     # A logger instance available everywhere in the generator.
     cattr_accessor :logger
@@ -90,7 +90,7 @@ module RubiGen
     # Spec describing where it was found.
     class_inheritable_accessor :spec
 
-    attr_reader :source_root, :destination_root, :args
+    attr_reader :source_root, :destination_root, :args, :stdout
 
     def initialize(runtime_args, runtime_options = {})
       @args = runtime_args
@@ -106,6 +106,8 @@ module RubiGen
 
       # Silence the logger if requested.
       logger.quiet = options[:quiet]
+      
+      @stdout = options[:stdout]
 
       # Raise usage error if help is requested.
       usage if options[:help]
@@ -161,7 +163,6 @@ module RubiGen
       name
     end
     
-
     protected
       # Convenience method for generator subclasses to record a manifest.
       def record

data/lib/rubigen/commands.rb

@@ -99,18 +99,18 @@ module RubiGen
               Tempfile.open(File.basename(destination), File.dirname(dst)) do |temp|
                 temp.write render_file(src, file_options, &block)
                 temp.rewind
-                $stdout.puts `#{diff_cmd} #{dst} #{temp.path}`
+                $stdout.stdout.puts `#{diff_cmd} #{dst} #{temp.path}`
               end
-              puts "retrying"
+              stdout.puts "retrying"
               raise 'retry diff'
             when /a/i
-              $stdout.puts "forcing #{spec.name}"
+              $stdout.stdout.puts "forcing #{spec.name}"
               options[:collision] = :force
             when /i/i
-              $stdout.puts "ignoring #{spec.name}"
+              $stdout.stdout.puts "ignoring #{spec.name}"
               options[:collision] = :skip
             when /q/i
-              $stdout.puts "aborting #{spec.name}"
+              $stdout.stdout.puts "aborting #{spec.name}"
               raise SystemExit
             when /n/i then :skip
             when /y/i then :force
@@ -352,7 +352,7 @@ module RubiGen
       def readme(*relative_sources)
         relative_sources.flatten.each do |relative_source|
           logger.readme relative_source
-          puts File.read(source_path(relative_source)) unless options[:pretend]
+          stdout.puts File.read(source_path(relative_source)) unless options[:pretend]
         end
       end
 
@@ -545,7 +545,7 @@ end_message
 
         migration_file_name = template_options[:migration_file_name] || file_name
         unless migration_exists?(migration_file_name)
-          puts "There is no migration named #{migration_file_name}"
+          stdout.puts "There is no migration named #{migration_file_name}"
           return
         end
 

data/lib/rubigen/helpers/generator_test_helper.rb

@@ -1,3 +1,5 @@
+require 'stringio'
+
 module RubiGen
   module GeneratorTestHelper
     # Runs the create command (like the command line does)
@@ -11,7 +13,9 @@ module RubiGen
 
     # Instatiates the Generator
     def build_generator(name, params, sources, options)
+      @stdout ||= StringIO.new
       options.merge!(:collision => :force)  # so no questions are prompted
+      options.merge!(:stdout => @stdout)  # so stdout is piped to a StringIO
       if sources.is_a?(Symbol)
         if sources == :app
           RubiGen::Base.use_application_sources!
@@ -27,13 +31,11 @@ module RubiGen
 
     # Silences the logger temporarily and returns the output as a String
     def silence_generator
-      logger_original=RubiGen::Base.logger
-      myout=StringIO.new
-      RubiGen::Base.logger=RubiGen::SimpleLogger.new(myout)
-      # TODO redirect $stdout to myout
+      logger_original      = RubiGen::Base.logger
+      myout                = StringIO.new
+      RubiGen::Base.logger = RubiGen::SimpleLogger.new(myout)
       yield if block_given?
-      RubiGen::Base.logger=logger_original
-      # TODO fix $stdout again
+      RubiGen::Base.logger = logger_original
       myout.string
     end
 
@@ -120,6 +122,7 @@ module RubiGen
   
     def bare_setup
       FileUtils.mkdir_p(APP_ROOT)
+      @stdout = StringIO.new
     end
   
     def bare_teardown
@@ -127,4 +130,4 @@ module RubiGen
     end
   
   end
-end
+end

data/lib/rubigen/lookup.rb

@@ -168,7 +168,7 @@ module RubiGen
       private
         # Lookup and cache every generator from the source list.
         def cache
-          @cache ||= sources.inject([]) { |cache, source| cache + source.map }
+          @cache ||= sources.inject([]) { |cache, source| cache + source.to_a }
         end
 
         # Clear the cache whenever the source list changes.

data/lib/rubigen/spec.rb

@@ -6,7 +6,7 @@ module RubiGen
     attr_reader :name, :path, :source
 
     def initialize(name, path, source)
-      @name, @path, @source = name, path, source
+      @name, @path, @source, @klass = name, path, source, nil
     end
 
     # Look up the generator class.  Require its class file, find the class

data/lib/rubigen.rb

@@ -1,4 +1,5 @@
-$:.unshift(File.dirname(__FILE__))
+$:.unshift(File.dirname(__FILE__)) unless
+  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 begin
   require 'active_support' 
@@ -9,7 +10,7 @@ rescue LoadError
 end
 
 module RubiGen
-  VERSION = '1.3.4'
+  VERSION = '1.4.0'
 end
 
 require 'rubigen/base'

data/test/test_generate_builtin_application.rb

@@ -25,7 +25,8 @@ class TestGenerateBuiltinApplication < Test::Unit::TestCase
 
   private
   def sources
-    [RubiGen::PathSource.new(:test, File.join(File.dirname(__FILE__),"..", generator_path))
+    [RubiGen::PathSource.new(:test, File.join(File.dirname(__FILE__),"..", generator_path)),
+     RubiGen::PathSource.new(:test, File.join(File.dirname(__FILE__),"..", "generators"))
     ]
   end
   

data/test/test_install_rubigen_scripts_generator.rb

@@ -34,7 +34,8 @@ class TestInstallRubigenScriptsGenerator < Test::Unit::TestCase
   
   private
   def sources
-    [RubiGen::PathSource.new(:test, File.join(File.dirname(__FILE__),"..", generator_path))
+    [RubiGen::PathSource.new(:test, File.join(File.dirname(__FILE__),"..", generator_path)),
+     RubiGen::PathSource.new(:test, File.join(File.dirname(__FILE__),"..", "generators"))
     ]
   end
   

data/test/test_lookup.rb

@@ -8,7 +8,7 @@ class TestLookup < Test::Unit::TestCase
   end
   
   def test_lookup_component
-    assert_nothing_raised(GeneratorError, "Could not find test_unit generator") { Base.lookup('test_unit') }
+    assert_nothing_raised(GeneratorError, "Could not find install_rubigen_scripts generator") { Base.lookup('install_rubigen_scripts') }
   end
   
   def test_lookup_unknown_component

data/website/index.html

@@ -35,7 +35,7 @@
     <div class="sidebar">
       <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/rubigen"; return false'>
         <p>Get Version</p>
-        <a href="http://rubyforge.org/projects/rubigen" class="numbers">1.3.4</a>
+        <a href="http://rubyforge.org/projects/rubigen" class="numbers">1.4.0</a>
       </div>
       
       <div id="twitter_search">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubigen
 version: !ruby/object:Gem::Version 
-  version: 1.3.4
+  version: 1.4.0
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-12 00:00:00 +10:00
+date: 2008-12-11 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency