rubigen 1.2.4 → 1.3.0

data/History.txt

@@ -1,3 +1,8 @@
+== 1.3.0 2008-04-25
+
+* component_generator: specific subclasses for rails + merb generators,
+  not the generic RubiGen::Base
+
 == 1.2.3 2008-02-22
 
 * Remove -wKU flags from install_rubigen_scripts + ruby_app apps

data/Manifest.txt

@@ -8,7 +8,6 @@ app_generators/ruby_app/USAGE
 app_generators/ruby_app/ruby_app_generator.rb
 app_generators/ruby_app/templates/README.txt
 app_generators/ruby_app/templates/Rakefile
-app_generators/ruby_app/templates/configs/empty_log
 app_generators/ruby_app/templates/lib/module.rb
 app_generators/ruby_app/templates/test/test_helper.rb.erb
 bin/install_rubigen_scripts
@@ -34,7 +33,6 @@ lib/rubigen/scripts/update.rb
 lib/rubigen/simple_logger.rb
 lib/rubigen/spec.rb
 lib/rubigen/version.rb
-log/debug.log
 rubygems_generators/application_generator/USAGE
 rubygems_generators/application_generator/application_generator_generator.rb
 rubygems_generators/application_generator/templates/bin

data/config/requirements.rb

@@ -2,7 +2,7 @@ require 'fileutils'
 include FileUtils
 
 require 'rubygems'
-%w[rake hoe newgem rubigen].each do |req_gem|
+%w[rake hoe].each do |req_gem|
   begin
     require req_gem
   rescue LoadError

data/lib/rubigen/version.rb

@@ -1,8 +1,8 @@
 module Rubigen #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 2
-    TINY  = 4
+    MINOR = 3
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/rubygems_generators/application_generator/application_generator_generator.rb

@@ -1,9 +1,9 @@
 class ApplicationGeneratorGenerator < RubiGen::Base
 
-  default_options 
-  
+  default_options
+
   attr_reader :name, :class_name, :app_model_name, :generator_path, :scopes, :scope_str
-  
+
   def initialize(runtime_args, runtime_options = {})
     super
     usage if args.empty?
@@ -48,7 +48,7 @@ that are useful to developers.
 USAGE: #{$0} #{spec.name} name
 EOS
     end
-    
+
     def add_options!(opts)
       # opts.separator ''
       # opts.separator 'Options:'
@@ -56,7 +56,7 @@ EOS
       #         "Generated app file will include your name.",
       #         "Default: none") { |options[:author]| }
     end
-    
+
     def extract_options
     end
 

data/rubygems_generators/application_generator/templates/test_generator_helper.rb

@@ -1,4 +1,8 @@
-require File.dirname(__FILE__) + '/test_helper'
+begin
+  require File.dirname(__FILE__) + '/test_helper'
+rescue LoadError
+  require 'test/unit'
+end
 require 'fileutils'
 
 # Must set before requiring generator libs.

data/rubygems_generators/component_generator/component_generator_generator.rb

@@ -1,9 +1,10 @@
 class ComponentGeneratorGenerator < RubiGen::Base
-  
-  default_options 
-  
-  attr_reader :name, :class_name, :generator_type, :generator_path
-  
+
+  default_options
+
+  attr_reader :name, :class_name
+  attr_reader :generator_type, :generator_path
+
   def initialize(runtime_args, runtime_options = {})
     super
     usage if args.empty?
@@ -30,6 +31,17 @@ class ComponentGeneratorGenerator < RubiGen::Base
     end
   end
 
+  def superclass_name
+    case (generator_type.to_sym rescue nil)
+    when :rails
+      "Rails::Generator::NamedBase"
+    when :merb
+      "Merb::GeneratorBase"
+    else
+      "RubiGen::Base"
+    end
+  end
+
   protected
     def banner
       <<-EOS
@@ -46,7 +58,7 @@ EOS
       #         "Generated app file will include your name.",
       #         "Default: none") { |options[:author]| }
     end
-    
+
     def extract_options
     end
 end

data/rubygems_generators/component_generator/templates/generator.rb

@@ -1,9 +1,9 @@
-class <%= class_name %> < RubiGen::Base
-  
+class <%= class_name %> < <%= superclass_name %>
+
   default_options :author => nil
-  
+
   attr_reader :name
-  
+
   def initialize(runtime_args, runtime_options = {})
     super
     usage if args.empty?
@@ -41,7 +41,7 @@ EOS
       #         "Default: none") { |options[:author]| }
       # opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
     end
-    
+
     def extract_options
       # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
       # Templates can access these value via the attr_reader-generated methods, but not the

data/rubygems_generators/component_generator/templates/test.rb

@@ -1,16 +1,26 @@
 require File.join(File.dirname(__FILE__), "test_generator_helper.rb")
 
+<% if generator_type.to_sym == :rails -%>
+module Rails; module Generator; end; end
+<% elsif generator_type.to_sym == :merb -%>
+module Merb; end
+<% end -%>
+<% if superclass_name != "RubiGen::Base" -%>
+class <%= superclass_name %> < RubiGen::Base
+end
+<% end -%>
+
 class Test<%= class_name %> < Test::Unit::TestCase
   include RubiGen::GeneratorTestHelper
 
   def setup
     bare_setup
   end
-  
+
   def teardown
     bare_teardown
   end
-  
+
   # Some generator-related assertions:
   #   assert_generated_file(name, &block) # block passed the file contents
   #   assert_directory_exists(name)
@@ -24,19 +34,19 @@ class Test<%= class_name %> < Test::Unit::TestCase
   #   app_root_files - put this in teardown to show files generated by the test method (e.g. p app_root_files)
   #   bare_setup - place this in setup method to create the APP_ROOT folder for each test
   #   bare_teardown - place this in teardown method to destroy the TMP_ROOT or APP_ROOT folder after each test
-  
+
   def test_generator_without_options
     name = "myapp"
     run_generator('<%= name %>', [name], sources)
     assert_generated_file("some_file")
   end
-  
+
   private
   def sources
     [RubiGen::PathSource.new(:test, File.join(File.dirname(__FILE__),"..", generator_path))
     ]
   end
-  
+
   def generator_path
     "<%= generator_path %>"
   end

data/rubygems_generators/component_generator/templates/test_generator_helper.rb

@@ -1,4 +1,8 @@
-require File.dirname(__FILE__) + '/test_helper'
+begin
+  require File.dirname(__FILE__) + '/test_helper'
+rescue LoadError
+  require 'test/unit'
+end
 require 'fileutils'
 
 # Must set before requiring generator libs.

data/test/test_component_generator_generator.rb

@@ -6,11 +6,11 @@ class TestGenerateComponentGenerator < Test::Unit::TestCase
   def setup
     bare_setup
   end
-  
+
   def teardown
     bare_teardown
   end
-  
+
   def test_generator_without_options
     name = "genname"
     run_generator('component_generator', [name], sources)
@@ -22,6 +22,10 @@ class TestGenerateComponentGenerator < Test::Unit::TestCase
     assert_generated_class("generators/#{name}/#{name}_generator") do |body|
       # assert_has_method body, "initialize" # as_has_m cannot pickup initialize(...) only initialize
       assert_has_method body, "manifest"
+
+      gen_class, superclass = body.match(%r{class ([\w:_]+) < ([\w:_]+)})[1..2]
+      assert_equal("GennameGenerator", gen_class)
+      assert_equal("RubiGen::Base", superclass)
     end
     assert_generated_class("test/test_#{name}_generator") do |body|
       assert_has_method body, "setup"
@@ -36,7 +40,7 @@ class TestGenerateComponentGenerator < Test::Unit::TestCase
     name = "genname"
     gen_type = "fooapp"
     run_generator('component_generator', [name, gen_type], sources)
-    
+
     assert_generated_file   "#{gen_type}_generators/#{name}/#{name}_generator.rb"
     assert_generated_file   "#{gen_type}_generators/#{name}/USAGE"
     assert_generated_file   "test/test_#{name}_generator.rb"
@@ -45,6 +49,61 @@ class TestGenerateComponentGenerator < Test::Unit::TestCase
     assert_generated_class  "#{gen_type}_generators/#{name}/#{name}_generator" do |body|
       # assert_has_method body, "initialize" # as_has_m cannot pickup initialize(...) only initialize
       assert_has_method body, "manifest"
+      gen_class, superclass = body.match(%r{class ([\w:_]+) < ([\w:_]+)})[1..2]
+      assert_equal("GennameGenerator", gen_class)
+      assert_equal("RubiGen::Base", superclass)
+    end
+    assert_generated_class "test/test_#{name}_generator" do |body|
+      assert_has_method body, "setup"
+      assert_has_method body, "teardown"
+      assert_has_method body, "test_generator_without_options"
+      assert_has_method body, "sources"
+      assert_has_method body, "generator_path"
+    end
+  end
+
+  def test_generator_with_rails_generator_type
+    name = "genname"
+    gen_type = "rails"
+    run_generator('component_generator', [name, gen_type], sources)
+
+    assert_generated_file   "#{gen_type}_generators/#{name}/#{name}_generator.rb"
+    assert_generated_file   "#{gen_type}_generators/#{name}/USAGE"
+    assert_generated_file   "test/test_#{name}_generator.rb"
+    assert_generated_file   "test/test_generator_helper.rb"
+    assert_directory_exists "#{gen_type}_generators/#{name}/templates"
+    assert_generated_class  "#{gen_type}_generators/#{name}/#{name}_generator" do |body|
+      # assert_has_method body, "initialize" # as_has_m cannot pickup initialize(...) only initialize
+      assert_has_method body, "manifest"
+      gen_class, superclass = body.match(%r{class ([\w:_]+) < ([\w:_]+)})[1..2]
+      assert_equal("GennameGenerator", gen_class)
+      assert_equal("Rails::Generator::NamedBase", superclass)
+    end
+    assert_generated_class "test/test_#{name}_generator" do |body|
+      assert_has_method body, "setup"
+      assert_has_method body, "teardown"
+      assert_has_method body, "test_generator_without_options"
+      assert_has_method body, "sources"
+      assert_has_method body, "generator_path"
+    end
+  end
+
+  def test_generator_with_merb_generator_type
+    name = "genname"
+    gen_type = "merb"
+    run_generator('component_generator', [name, gen_type], sources)
+
+    assert_generated_file   "#{gen_type}_generators/#{name}/#{name}_generator.rb"
+    assert_generated_file   "#{gen_type}_generators/#{name}/USAGE"
+    assert_generated_file   "test/test_#{name}_generator.rb"
+    assert_generated_file   "test/test_generator_helper.rb"
+    assert_directory_exists "#{gen_type}_generators/#{name}/templates"
+    assert_generated_class  "#{gen_type}_generators/#{name}/#{name}_generator" do |body|
+      # assert_has_method body, "initialize" # as_has_m cannot pickup initialize(...) only initialize
+      assert_has_method body, "manifest"
+      gen_class, superclass = body.match(%r{class ([\w:_]+) < ([\w:_]+)})[1..2]
+      assert_equal("GennameGenerator", gen_class)
+      assert_equal("Merb::GeneratorBase", superclass)
     end
     assert_generated_class "test/test_#{name}_generator" do |body|
       assert_has_method body, "setup"
@@ -60,7 +119,7 @@ class TestGenerateComponentGenerator < Test::Unit::TestCase
     [RubiGen::PathSource.new(:test, File.join(File.dirname(__FILE__),"../#{generator_path}"))
     ]
   end
-  
+
   def generator_path
     "rubygems_generators"
   end

data/website/index.html

@@ -31,7 +31,7 @@
     <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.2.4</a>
+      <a href="http://rubyforge.org/projects/rubigen" class="numbers">1.3.0</a>
     </div>
     <h1>Ruby Generator Framework</h1>
 
@@ -44,6 +44,9 @@
 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>
 
 
@@ -319,6 +322,12 @@ script/generate component_generator
 	<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>
 
 
@@ -328,8 +337,15 @@ script/generate component_generator
 	<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.
-The trunk repository is <code>svn://rubyforge.org/var/svn/rubigen/trunk</code> for anonymous access.</p>
+	<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>
@@ -349,7 +365,7 @@ The trunk repository is <code>svn://rubyforge.org/var/svn/rubigen/trunk</code> f
 
 	<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>, 4th November 2007<br>
+      <a href="drnicwilliams@gmail.com">Dr Nic Williams</a>, 5th March 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -8,6 +8,8 @@ A framework to allow Ruby applications to generate file/folder stubs
 (like the <code>rails</code> command does for Ruby on Rails, and the 'script/generate'
 command within a Rails application during development).
 
+The RubyConf 2007 presentation is now "online":http://rubyconf2007.confreaks.com/d3t1p1_rubigen.html together with the theme from the A-Team.
+
 h2. Background
 
 RubiGen is originally extracted from Ruby on Rails (specifically the rails_generator
@@ -234,6 +236,10 @@ script/generate component_generator
 
 and follow the instructions.
 
+h2. Live at RubyConf 2007
+
+RubiGen had the 9am, Sunday timeslot at RubyConf 2007 and was "recorded for your viewing pleasure":http://rubyconf2007.confreaks.com/d3t1p1_rubigen.html.
+
 h2. Forum
 
 "http://groups.google.com/group/rubigen":http://groups.google.com/group/rubigen
@@ -241,7 +247,12 @@ h2. Forum
 h2. How to submit patches
 
 Read the "8 steps for fixing other people's code":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/ and for section "8b: Submit patch to Google Groups":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups, use the Google Group above.
-The trunk repository is <code>svn://rubyforge.org/var/svn/rubigen/trunk</code> for anonymous access.
+
+The source for this project is available via git. You can "browse and/or fork the source":http://github.com/drnic/rubigen/tree/master, or to clone the project locally:
+  
+<pre>git clone git://github.com/drnic/rubigen.git</pre>
+
+The original Subversion repository is <code>svn://rubyforge.org/var/svn/rubigen/trunk</code> for anonymous access.
 
 h2. Thanks go to...
 

data/website/stylesheets/screen.css

@@ -1,13 +1,13 @@
 body {
-  background-color: #E1D1F1;
+  background-color: #F10B00;
   font-family: "Georgia", sans-serif;
   font-size: 16px;
   line-height: 1.6em;
   padding: 1.6em 0 0 0;
-  color: #333;
+  color: #FFF;
 }
 h1, h2, h3, h4, h5, h6 {
-  color: #444;
+  color: #FFF;
 }
 h1 { 
   font-family: sans-serif;
@@ -101,12 +101,12 @@ pre, code {
   text-align: right;
   font-family: sans-serif;
   font-weight: normal;
-  background-color: #B3ABFF;
-  color: #141331;
+  background-color: #468EFF;
+  color: #EEE;
   padding: 15px 20px 10px 20px;
   margin: 0 auto;
 	margin-top: 15px;
-  border: 3px solid #141331;
+  border: 3px solid #DDD;
 }
 
 #version .numbers {
@@ -119,16 +119,16 @@ pre, code {
 
 #version p {
   text-decoration: none;
-	color: #141331;
-	background-color: #B3ABFF;
+	color: #EEE;
+	background-color: #468EFF;
 	margin: 0;
 	padding: 0;
 }
 
 #version a {
   text-decoration: none;
-	color: #141331;
-	background-color: #B3ABFF;
+	color: #EEE;
+	background-color: #468EFF;
 }
 
 .clickable {

data/website/version-raw.js

@@ -1,3 +1,3 @@
 // Announcement JS file
-var version = "1.2.4";
+var version = "1.3.0";
 MagicAnnouncement.show('compositekeys', version);

data/website/version.js

@@ -1,4 +1,4 @@
 // Version JS file
-var version = "1.2.4";
+var version = "1.3.0";
 
 document.write(" - " + version);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubigen
 version: !ruby/object:Gem::Version 
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-29 00:00:00 +10:00
+date: 2008-04-25 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,6 @@ files:
 - app_generators/ruby_app/ruby_app_generator.rb
 - app_generators/ruby_app/templates/README.txt
 - app_generators/ruby_app/templates/Rakefile
-- app_generators/ruby_app/templates/configs/empty_log
 - app_generators/ruby_app/templates/lib/module.rb
 - app_generators/ruby_app/templates/test/test_helper.rb.erb
 - bin/install_rubigen_scripts
@@ -76,7 +75,6 @@ files:
 - lib/rubigen/simple_logger.rb
 - lib/rubigen/spec.rb
 - lib/rubigen/version.rb
-- log/debug.log
 - rubygems_generators/application_generator/USAGE
 - rubygems_generators/application_generator/application_generator_generator.rb
 - rubygems_generators/application_generator/templates/bin
@@ -147,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubigen
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: "A framework to allow Ruby applications to generate file/folder stubs (like the rails command does for Ruby on Rails, and the \xE2\x80\x98script/generate\xE2\x80\x99 command within a Rails application during development)."