rubigen 1.3.2 → 1.3.3

data/History.txt

@@ -1,3 +1,7 @@
+== 1.3.3 2008-10-21
+
+* prepend_sources correctly places arguments at start of sources list
+
 == 1.3.2 2008-05-19
 
 * app_gen/bin - includes #!/usr/bin/env ruby

data/Manifest.txt

@@ -32,7 +32,6 @@ lib/rubigen/scripts/generate.rb
 lib/rubigen/scripts/update.rb
 lib/rubigen/simple_logger.rb
 lib/rubigen/spec.rb
-lib/rubigen/version.rb
 rubygems_generators/application_generator/USAGE
 rubygems_generators/application_generator/application_generator_generator.rb
 rubygems_generators/application_generator/templates/bin
@@ -52,14 +51,10 @@ rubygems_generators/component_generator/templates/usage
 script/destroy
 script/generate
 script/txt2html
-script/txt2js
 setup.rb
 tasks/deployment.rake
 tasks/environment.rake
 tasks/website.rake
-test/examples_from_rails/generator_test_helper.rb
-test/examples_from_rails/test_rails_resource_generator.rb
-test/examples_from_rails/test_rails_scaffold_generator.rb
 test/test_application_generator_generator.rb
 test/test_component_generator_generator.rb
 test/test_generate_builtin_application.rb

data/README.txt

@@ -107,7 +107,7 @@ The `bin/newgem` script is very simple, and looks like:
 
     if %w(-v --version).include? ARGV.first
       require 'newgem/version'
-      puts "#{File.basename($0)} #{Newgem::VERSION::STRING}"
+      puts "#{File.basename($0)} #{Newgem::VERSION}"
       exit(0)
     end
 

data/bin/install_rubigen_scripts

@@ -5,7 +5,7 @@ require 'rubigen'
 
 if %w(-v --version).include? ARGV.first
   require 'rubigen/version'
-  puts "#{File.basename($0)} (via rubigen - #{Rubigen::VERSION::STRING})"
+  puts "#{File.basename($0)} (via rubigen - #{RubiGen::VERSION})"
   exit(0)
 end
 

data/bin/ruby_app

@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/../lib/rubigen/version'
 if %w(--version -v).include? ARGV.first
-  puts "Rails #{RubiGen::VERSION::STRING}"
+  puts "Rails #{RubiGen::VERSION}"
   exit(0)
 end
 

data/config/hoe.rb

@@ -1,4 +1,4 @@
-require 'rubigen/version'
+require 'rubigen'
 
 AUTHOR = ['Dr Nic Williams', 'Jeremy Kemper']  # can also be an array of Authors
 EMAIL = "drnicwilliams@gmail.com"
@@ -34,7 +34,7 @@ end
 REV = nil 
 # UNCOMMENT IF REQUIRED: 
 # REV = `svn info`.each {|line| if line =~ /^Revision:/ then k,v = line.split(': '); break v.chomp; else next; end} rescue nil
-VERS = Rubigen::VERSION::STRING + (REV ? ".#{REV}" : "")
+VERS = RubiGen::VERSION
 RDOC_OPTS = ['--quiet', '--title', 'rubigen documentation',
     "--opname", "index.html",
     "--line-numbers", 
@@ -62,7 +62,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.extra_deps = [ ['activesupport', '>= 1.4.4'] ]     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
+  p.extra_deps = [ [ 'activesupport', '>= 1.4.4'] ]     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
   
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
   

data/lib/rubigen/lookup.rb

@@ -84,6 +84,8 @@ module RubiGen
 
       # Add a source to the beginning of the list.
       def prepend_sources(*args)
+        sources = self.sources
+        reset_sources
         write_inheritable_array(:sources, args.flatten + sources)
         invalidate_cache!
       end
@@ -151,7 +153,7 @@ module RubiGen
         unless @found[generator_name] 
           chars = generator_name.scan(/./).map{|c|"#{c}.*?"}
           rx = /^#{chars}$/
-          gns = cache.select{|spec| spec.name =~ rx }
+          gns = cache.select {|spec| spec.name =~ rx }
           @found[generator_name] ||= gns.first if gns.length == 1
           raise GeneratorError, "Pattern '#{generator_name}' matches more than one generator: #{gns.map{|sp|sp.name}.join(', ')}" if gns.length > 1
         end

data/lib/rubigen.rb

@@ -8,6 +8,10 @@ rescue LoadError
   require 'active_support' 
 end
 
+module RubiGen
+  VERSION = '1.3.3'
+end
+
 require 'rubigen/base'
 require 'rubigen/lookup'
 require 'rubigen/commands'

data/rubygems_generators/application_generator/templates/bin

@@ -5,7 +5,7 @@ require 'rubigen'
 
 if %w(-v --version).include? ARGV.first
   require '<%= name %>/version'
-  puts "#{File.basename($0)} #{<%= app_model_name %>::VERSION::STRING}"
+  puts "#{File.basename($0)} #{<%= app_model_name %>::VERSION}"
   exit(0)
 end
 

data/rubygems_generators/component_generator/templates/generator.rb

@@ -17,10 +17,12 @@ class <%= class_name %> < <%= superclass_name %>
       m.directory 'some_folder'
 
       # Create stubs
-      # m.template "template.rb",  "some_file_after_erb.rb"
+      # m.template           "template.rb.erb", "some_file_after_erb.rb"
       # m.template_copy_each ["template.rb", "template2.rb"]
-      # m.file     "file",         "some_file_copied"
+      # m.template_copy_each ["template.rb", "template2.rb"], "some/path"
+      # m.file           "file", "some_file_copied"
       # m.file_copy_each ["path/to/file", "path/to/file2"]
+      # m.file_copy_each ["path/to/file", "path/to/file2"], "some/path"
     end
   end
 

data/rubygems_generators/component_generator/templates/test.rb

@@ -32,7 +32,8 @@ class Test<%= class_name %> < Test::Unit::TestCase
   def test_generator_without_options
     name = "myapp"
     run_generator('<%= name %>', [name], sources)
-    assert_generated_file("some_file")
+    assert_directory_exists "some/directory"
+    assert_generated_file   "some_file"
   end
 
   private

data/script/txt2html

@@ -11,9 +11,9 @@ end
 require 'redcloth'
 require 'syntax/convertors/html'
 require 'erb'
-require File.dirname(__FILE__) + '/../lib/rubigen/version.rb'
+require File.dirname(__FILE__) + '/../lib/rubigen'
 
-version  = Rubigen::VERSION::STRING
+version  = RubiGen::VERSION
 download = 'http://rubyforge.org/projects/rubigen'
 
 class Fixnum

data/tasks/website.rake

@@ -3,8 +3,6 @@ task :website_generate => :ruby_env do
   (Dir['website/**/*.txt'] - Dir['website/version*.txt']).each do |txt|
     sh %{ #{RUBY_APP} script/txt2html #{txt} > #{txt.gsub(/txt$/,'html')} }
   end
-  sh %{ #{RUBY_APP} script/txt2js website/version.txt > website/version.js }
-  sh %{ #{RUBY_APP} script/txt2js website/version-raw.txt > website/version-raw.js }
 end
 
 desc 'Upload website files to rubyforge'

data/website/index.html

@@ -23,179 +23,124 @@
       }
       var versionBox = new curvyCorners(settings, document.getElementById("version"));
       versionBox.applyCornersToAll();
+
+      var twitterBox = new curvyCorners(settings, document.getElementById("twitter_search"));
+      twitterBox.applyCornersToAll();
     }
   </script>
 </head>
 <body>
 <div id="main">
     <h1>rubigen</h1>
-    <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.2</a>
+    <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.3</a>
+      </div>
+      
+      <div id="twitter_search">
+        <h3>Heard on twitter ('rubigen')...</h3>
+        <!-- HELP FILE -  http://twitterwidget.jazzychad.com/tw/ -->
+        <script language           = "javascript">
+        	var jtw_search            = 'rubigen';
+        	var jtw_widget_background = 'd77';
+        	var jtw_widget_border     = '0';
+        	var jtw_tweet_textcolor   = 'fff';
+          var jtw_tweet_background  = '000';
+          var jtw_tweet_border      = '0px';
+        </script>
+        <script src="http://twitterwidget.jazzychad.com/tw/searchwidget.js" type="text/javascript"></script>
+      </div>
+      
     </div>
     <h1>Ruby Generator Framework</h1>
-
-
-	<h2>What</h2>
-
-
-	<p>A framework to allow Ruby applications to generate file/folder stubs 
-(like the <code>rails</code> command does for Ruby on Rails, and the &#8216;script/generate&#8217;
-command within a Rails application during development).</p>
-
-
-	<p>The RubyConf 2007 presentation is now <a href="http://rubyconf2007.confreaks.com/d3t1p1_rubigen.html">online</a> together with the theme from the A-Team.</p>
-
-
-	<h2>Background</h2>
-
-
-	<p>RubiGen is originally extracted from Ruby on Rails (specifically the rails_generator
-from its railties gem).</p>
-
-
-	<p>The rails_generator was hardcoded with Rails-specific dependencies (<code>RAILS_ROOT</code>), 
-Rails generators (&#8216;app&#8217; = Rails application; &#8216;model&#8217; = Rails model+tests+migration),
-and generally assumed it was the only generator framework within the Ruby world (it was).
-So, any RubyGem whose name ended with &#8216;_generator&#8217; was assumed to be a generator for
-a Rails application.</p>
-
-
-	<p>But if you are developing a Merb application, then you may want a different set of generators.
+<h2>What</h2>
+<p>A framework to allow Ruby applications to generate file/folder stubs (like the <code>rails</code> command does for Ruby on Rails, and the &#8216;script/generate&#8217; command within a Rails application during development).</p>
+<p>The RubyConf 2007 presentation is now <a href="http://rubyconf2007.confreaks.com/d3t1p1_rubigen.html">online</a> together with the theme from the A-Team.</p>
+<h2>Background</h2>
+<p>RubiGen is originally extracted from Ruby on Rails (specifically the rails_generator from its railties gem).</p>
+<p>The rails_generator was hardcoded with Rails-specific dependencies (<code>RAILS_ROOT</code>), Rails generators (&#8216;app&#8217; = Rails application; &#8216;model&#8217; = Rails model+tests+migration), and generally assumed it was the only generator framework within the Ruby world (it was). So, any RubyGem whose name ended with &#8216;_generator&#8217; was assumed to be a generator for a Rails application.</p>
+<p>But if you are developing a Merb application, then you may want a different set of generators.<br />
 If you are developing a RubyGem, then you will want a different set of generators.</p>
-
-
-	<p>RubiGen exists to give different development environments their own generator framework.</p>
-
-
-	<h2>Installing</h2>
-
-
-	<p>RubiGen is only required at development time, and normally isn&#8217;t required at deployment time
-(unless your application uses it to generate files etc for its users).</p>
-
-
-	<p>On your development machine:</p>
-
-
-	<p><pre class='syntax'><span class="ident">sudo</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="ident">rubigen</span></pre></p>
-
-
-	<h2>Usage</h2>
-
-
-	<p>RubiGen will be normally integrated into another RubyGem, such as <code>newgem</code> or <code>merb</code> or <code>camping</code>,
-rather than be used on its own.</p>
-
-
-	<p>These frameworks might use RubiGen for two reasons:</p>
-
-
-	<ol>
-	<li>To generate an initial stub for developers, e.g. <code>rails</code> generated a stub to write a Rails application. <code>newgem</code> generates a stub to write a RubyGem. <br/>
+<p>RubiGen exists to give different development environments their own generator framework.</p>
+<h2>Installing</h2>
+<p>RubiGen is only required at development time, and normally isn&#8217;t required at deployment time (unless your application uses it to generate files etc for its users).</p>
+<p>On your development machine:</p>
+<p><pre class='syntax'><span class="ident">sudo</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="ident">rubigen</span></pre></p>
+<h2>Usage</h2>
+<p>RubiGen will be normally integrated into another RubyGem, such as <code>newgem</code> or <code>merb</code> or <code>camping</code>, rather than be used on its own.</p>
+<p>These frameworks might use RubiGen for two reasons:</p>
+<ol>
+	<li>To generate an initial stub for developers, e.g. <code>rails</code> generated a stub to write a Rails application. <code>newgem</code> generates a stub to write a RubyGem. <br/><br />
   <span class="caps">BTW</span> &#8211; RubiGen has a builtin application <code>ruby_app</code> which generates a bare-bones Ruby application stub (lib, test, and script folders, plus a Rakefile, and a script/generate script)</li>
-		<li>To generate components within their development areas, e.g. Rails had its <code>script/generate</code> script within each Rails application, which hooked back into the rails_generator to lookup and execute generators.</li>
-	</ol>
-
-
-	<p>So, there are two steps to integrating RubiGen into your framework:</p>
-
-
-	<ol>
-	<li>Use it to generate an initial stub for the developers of your framework. This would create the folders 
-   (<code>lib/app</code>, <code>test</code>, <code>script</code>, <code>doc</code>, <code>log</code>, etc) and starting files (<code>Rakefile</code>, 
-   <code>README.txt</code>, <code>test/test_helper.rb</code> etc). Importantly, it would generate a <code>script/generate</code> file.
-   The <code>script/generate</code> file (example below) will allow developers of your framework to 
-   generate components/extensions within the framework. <br />
-   RubiGen allows you to restrict which generators are available. For example, within
-   RubyGem development environment (as generated by <code>newgem</code>), the <code>script/generator</code>
-   only shows <code>rubygem</code>-related generators. Merb could restrict <code>script/generator</code>
+	<li>To generate components within their development areas, e.g. Rails had its <code>script/generate</code> script within each Rails application, which hooked back into the rails_generator to lookup and execute generators.</li>
+</ol>
+<p>So, there are two steps to integrating RubiGen into your framework:</p>
+<ol>
+	<li>Use it to generate an initial stub for the developers of your framework. This would create the folders <br />
+   (<code>lib/app</code>, <code>test</code>, <code>script</code>, <code>doc</code>, <code>log</code>, etc) and starting files (<code>Rakefile</code>, <br />
+   <code>README.txt</code>, <code>test/test_helper.rb</code> etc). Importantly, it would generate a <code>script/generate</code> file.<br />
+   The <code>script/generate</code> file (example below) will allow developers of your framework to <br />
+   generate components/extensions within the framework. <br /><br />
+   RubiGen allows you to restrict which generators are available. For example, within<br />
+   RubyGem development environment (as generated by <code>newgem</code>), the <code>script/generator</code><br />
+   only shows <code>rubygem</code>-related generators. Merb could restrict <code>script/generator</code><br />
    to only show Merb related generators (or perhaps Merb and/or Rails generators)</li>
-		<li>Your framework RubyGem (e.g. <code>newgem</code> or <code>merb</code> RubyGems) needs to add <code>rubigen</code> as a 
+	<li>Your framework RubyGem (e.g. <code>newgem</code> or <code>merb</code> RubyGems) needs to add <code>rubigen</code> as a <br />
    dependency, so that users of your RubyGem can access the generator framework.</li>
-	</ol>
-
-
-	<h1>Creating generators</h1>
-
-
-	<p>There are two types of generators:</p>
-
-
-	<ol>
-	<li>Application Generators &#8211; used by developers of your framework to get started. 
-   Generally, you will create one Application Generator for your framework.
-   It generates a base stub (such as the <code>rails</code> stub for new Rails applications)
+</ol>
+<h1>Creating generators</h1>
+<p>There are two types of generators:</p>
+<ol>
+	<li>Application Generators &#8211; used by developers of your framework to get started. <br />
+   Generally, you will create one Application Generator for your framework.<br />
+   It generates a base stub (such as the <code>rails</code> stub for new Rails applications)<br />
    for your framework users.</li>
-		<li>Component Generators &#8211; used by developers to extend their application.
-   You may include 1+ built-in generators with your framework.
-   Developers can also write generators for your framework, and like Rails&#8217; generator
+	<li>Component Generators &#8211; used by developers to extend their application.<br />
+   You may include 1+ built-in generators with your framework.<br />
+   Developers can also write generators for your framework, and like Rails&#8217; generator<br />
    install them in various places and have access to their via RubiGen.</li>
-	</ol>
-
-
-	<h2>Creating an Application Generator for your Framework</h2>
-
-
-	<h3>Easy way</h3>
-
-
-	<p><a href="http://newgem.rubyforge.org/">newgem</a> (v0.13.0+) can generate an Application Generator
+</ol>
+<h2>Creating an Application Generator for your Framework</h2>
+<h3>Easy way</h3>
+<p><a href="http://newgem.rubyforge.org/">newgem</a> (v0.13.0+) can generate an Application Generator<br />
 for a RubyGem.</p>
-
-
-	<ol>
+<ol>
 	<li>Create new RubyGem: <code>newgem foobar</code></li>
-		<li>Create generator: <code>script/generator application_generator foobar</code></li>
-		<li>Update tests + generator</li>
-		<li>Install</li>
-		<li>Run with: foobar</li>
-	</ol>
-
-
-	<p>For more documentation, run <code>script/generator application_generator</code></p>
-
-
-	<h3><span class="caps">DIY</span></h3>
-
-
-	<p>Without RubiGen, to give your users a head start and create a stub for them, you will 
-copiously use <code>mkdir_p</code> and <code>File.open</code>. Your script will either be primitive (only
-create the bare folders and very few files) or it will be very long and unreadable
-(ok, perhaps I&#8217;m just talking about the <code>newgem</code> script, which I am dubiously responsible
+	<li>Create generator: <code>script/generator application_generator foobar</code></li>
+	<li>Update tests + generator</li>
+	<li>Install</li>
+	<li>Run with: foobar</li>
+</ol>
+<p>For more documentation, run <code>script/generator application_generator</code></p>
+<h3><span class="caps">DIY</span></h3>
+<p>Without RubiGen, to give your users a head start and create a stub for them, you will <br />
+copiously use <code>mkdir_p</code> and <code>File.open</code>. Your script will either be primitive (only<br />
+create the bare folders and very few files) or it will be very long and unreadable<br />
+(ok, perhaps I&#8217;m just talking about the <code>newgem</code> script, which I am dubiously responsible<br />
 for&#8230; :P).</p>
-
-
-	<p>With RubiGen, you can create stubs using powerful, yet simple, syntax. Templates are
-extracted into a <code>templates</code> folder, and activating the generator from a script requires
+<p>With RubiGen, you can create stubs using powerful, yet simple, syntax. Templates are<br />
+extracted into a <code>templates</code> folder, and activating the generator from a script requires<br />
 only a few lines of code.</p>
-
-
-	<p>These are the <code>newgem</code> files related to its Application Generator.</p>
-
-
-	<pre><code>bin/
-  bin/newgem        # Appliction Generator script; Usage: newgem gemname [options]
+<p>These are the <code>newgem</code> files related to its Application Generator.</p>
+bin/
+bin/newgem        # Appliction Generator script; Usage: newgem gemname [options]
 app_generators/
-  app_generators/newgem/
-    app_generators/newgem/newgem_generator.rb
-    app_generators/newgem/USAGE
-    app_generators/newgem/templates/
-      app_generators/newgem/templates/app.rb
-      app_generators/newgem/templates/History.txt
-      app_generators/newgem/templates/... lots and lots of templates</code></pre>
-
-
-	<p>The <code>bin/newgem</code> script is very simple, and looks like:</p>
-
-
-	<p><pre class='syntax'>
+app_generators/newgem/
+app_generators/newgem/newgem_generator.rb
+app_generators/newgem/<span class="caps">USAGE</span>
+app_generators/newgem/templates/
+app_generators/newgem/templates/app.rb
+app_generators/newgem/templates/History.txt
+app_generators/newgem/templates/&#8230; lots and lots of templates
+<p>The <code>bin/newgem</code> script is very simple, and looks like:</p>
+<p><pre class='syntax'>
 <span class="ident">require</span> <span class="punct">'</span><span class="string">rubygems</span><span class="punct">'</span>
 <span class="ident">require</span> <span class="punct">'</span><span class="string">rubigen</span><span class="punct">'</span>
 
 <span class="keyword">if</span> <span class="punct">%w(</span><span class="string">-v --version</span><span class="punct">).</span><span class="ident">include?</span> <span class="constant">ARGV</span><span class="punct">.</span><span class="ident">first</span>
   <span class="ident">require</span> <span class="punct">'</span><span class="string">newgem/version</span><span class="punct">'</span>
-  <span class="ident">puts</span> <span class="punct">&quot;</span><span class="string"><span class="expr">#{File.basename($0)}</span> <span class="expr">#{Newgem::VERSION::STRING}</span></span><span class="punct">&quot;</span>
+  <span class="ident">puts</span> <span class="punct">&quot;</span><span class="string"><span class="expr">#{File.basename($0)}</span> <span class="expr">#{Newgem::VERSION}</span></span><span class="punct">&quot;</span>
   <span class="ident">exit</span><span class="punct">(</span><span class="number">0</span><span class="punct">)</span>
 <span class="keyword">end</span>
 
@@ -203,26 +148,16 @@ app_generators/
 <span class="constant">RubiGen</span><span class="punct">::</span><span class="constant">Base</span><span class="punct">.</span><span class="ident">use_application_sources!</span>
 <span class="constant">RubiGen</span><span class="punct">::</span><span class="constant">Scripts</span><span class="punct">::</span><span class="constant">Generate</span><span class="punct">.</span><span class="ident">new</span><span class="punct">.</span><span class="ident">run</span><span class="punct">(</span><span class="constant">ARGV</span><span class="punct">,</span> <span class="symbol">:generator</span> <span class="punct">=&gt;</span> <span class="punct">'</span><span class="string">newgem</span><span class="punct">')</span>
 </pre></p>
-
-
-	<p>You can copy and paste this for your own generator script, and place it in your RubyGem&#8217;s <code>bin</code> folder.
+<p>You can copy and paste this for your own generator script, and place it in your RubyGem&#8217;s <code>bin</code> folder.<br />
 Change <code>newgem</code> to your RubyGem&#8217;s name in the script above (and in all the folders listed above too)</p>
-
-
-	<p><span class="caps">NOTE</span>: If you leave <code>newgem</code> there, then it will execute the <code>newgem_generator.rb</code> generator; 
+<p><span class="caps">NOTE</span>: If you leave <code>newgem</code> there, then it will execute the <code>newgem_generator.rb</code> generator; <br />
 as the generators are loaded from all RubyGem&#8217;s having <code>/app_generators</code> folders.</p>
-
-
-	<p>So, for your RubyGem, you need to keep the <code>/app_generators</code> folder (as you are creating an 
-Application Generator, not a Component Generator), but change <code>newgem</code> to <code>your gem name</code> in
-all the subfolders and files. <span class="caps">ESPECIALLY</span> <code>newgem_generator.rb</code> -&gt; <code>yourgem_generator.rb</code>,
+<p>So, for your RubyGem, you need to keep the <code>/app_generators</code> folder (as you are creating an <br />
+Application Generator, not a Component Generator), but change <code>newgem</code> to <code>your gem name</code> in<br />
+all the subfolders and files. <span class="caps">ESPECIALLY</span> <code>newgem_generator.rb</code> &#8594; <code>yourgem_generator.rb</code>,<br />
 as this is how the generator is discovered (via <code>RubiGen::Base.use_application_sources!</code>).</p>
-
-
-	<p>All the generator work is performed within <code>yourgem_generator.rb</code>. A stub for it will be:</p>
-
-
-	<p><pre class='syntax'>
+<p>All the generator work is performed within <code>yourgem_generator.rb</code>. A stub for it will be:</p>
+<p><pre class='syntax'>
 <span class="ident">require</span> <span class="punct">'</span><span class="string">rbconfig</span><span class="punct">'</span>
 
 <span class="keyword">class </span><span class="class">YourgemGenerator</span> <span class="punct">&lt;</span> <span class="constant">RubiGen</span><span class="punct">::</span><span class="constant">Base</span>
@@ -297,78 +232,37 @@ Usage: <span class="expr">#{File.basename $0}</span> /path/to/your/app [options]
   </span><span class="punct">)</span>
 <span class="keyword">end</span>
 </pre></p>
-
-
-	<p>Easy peasy.</p>
-
-
-	<h2>Creating a Component Generator for your Framework</h2>
-
-
-	<p>You can include Component Generators in RubyGems, and they will be automatially picked up
+<p>Easy peasy.</p>
+<h2>Creating a Component Generator for your Framework</h2>
+<p>You can include Component Generators in RubyGems, and they will be automatially picked up<br />
 by your framework&#8217;s <code>script/generate</code> script.</p>
-
-
-	<h3>Easy way</h3>
-
-
-	<p>Use <a href="http://newgem.rubyforge.org/">newgem</a>, (v0.13.0+), and run:</p>
-
-
+<h3>Easy way</h3>
+<p>Use <a href="http://newgem.rubyforge.org/">newgem</a>, (v0.13.0+), and run:</p>
 <pre>
 script/generate component_generator
 </pre>
-
-	<p>and follow the instructions.</p>
-
-
-	<h2>Live at RubyConf 2007</h2>
-
-
-	<p>RubiGen had the 9am, Sunday timeslot at RubyConf 2007 and was <a href="http://rubyconf2007.confreaks.com/d3t1p1_rubigen.html">recorded for your viewing pleasure</a>.</p>
-
-
-	<h2>Forum</h2>
-
-
-	<p><a href="http://groups.google.com/group/rubigen">http://groups.google.com/group/rubigen</a></p>
-
-
-	<h2>How to submit patches</h2>
-
-
-	<p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
-
-
-	<p>The source for this project is available via git. You can <a href="http://github.com/drnic/rubigen/tree/master">browse and/or fork the source</a>, or to clone the project locally:</p>
-
-
-<pre>git clone git://github.com/drnic/rubigen.git</pre>
-
-	<p>The original Subversion repository is <code>svn://rubyforge.org/var/svn/rubigen/trunk</code> for anonymous access.</p>
-
-
-	<h2>Thanks go to&#8230;</h2>
-
-
-	<p><a href="http://bitsweat.net/">Jeremy Kemper</a> (bitsweat) who wrote the original <a href="http://dev.rubyonrails.org">Rails Generator</a>.</p>
-
-
-	<h2>License</h2>
-
-
-	<p>This code is free to use under the terms of the <span class="caps">MIT</span> license.</p>
-
-
-	<h2>Contact</h2>
-
-
-	<p>Comments are welcome. Send an email to <a href="mailto:drnicwilliams@gmail.com">Dr Nic Williams</a> via the <a href="http://groups.google.com/group/rubigen">forum</a></p>
+<p>and follow the instructions.</p>
+<h2>Live at RubyConf 2007</h2>
+<p>RubiGen had the 9am, Sunday timeslot at RubyConf 2007 and was <a href="http://rubyconf2007.confreaks.com/d3t1p1_rubigen.html">recorded for your viewing pleasure</a>.</p>
+<h2>Forum</h2>
+<p><a href="http://groups.google.com/group/rubigen">http://groups.google.com/group/rubigen</a></p>
+<h2>How to submit patches</h2>
+<p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
+<p>The source for this project is available via git. You can <a href="http://github.com/drnic/rubigen/tree/master">browse and/or fork the source</a>, or to clone the project locally:<br />
+  <br />
+<pre>git clone git://github.com/drnic/rubigen.git</pre></p>
+<p>The original Subversion repository is <code>svn://rubyforge.org/var/svn/rubigen/trunk</code> for anonymous access.</p>
+<h2>Thanks go to&#8230;</h2>
+<p><a href="http://bitsweat.net/">Jeremy Kemper</a> (bitsweat) who wrote the original <a href="http://dev.rubyonrails.org">Rails Generator</a>.</p>
+<h2>License</h2>
+<p>This code is free to use under the terms of the <span class="caps">MIT</span> license.</p>
+<h2>Contact</h2>
+<p>Comments are welcome. Send an email to <a href="mailto:drnicwilliams@gmail.com">Dr Nic Williams</a> via the <a href="http://groups.google.com/group/rubigen">forum</a></p>
     <p class="coda">
-      <a href="drnicwilliams@gmail.com">Dr Nic Williams</a>, 19th May 2008<br>
+      <a href="drnicwilliams@gmail.com">Dr Nic Williams</a>, 26th October 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>
 <!-- insert site tracking codes here, like Google Urchin -->
 </body>
-</html>
+</html>