rubigen 1.3.0 → 1.3.1

data/History.txt

@@ -1,3 +1,10 @@
+== 1.3.1 2008-04-25
+
+* Fixed the require statements in generated tests for rails/merb generators
+* Rails::Generator::Base is a valid generator superclass
+* Rails generators have alternate template (based on standard NamedBase)
+* test helpers define RAILS_ROOT for rails generators
+
 == 1.3.0 2008-04-25
 
 * component_generator: specific subclasses for rails + merb generators,

data/Manifest.txt

@@ -44,6 +44,7 @@ rubygems_generators/application_generator/templates/usage
 rubygems_generators/component_generator/USAGE
 rubygems_generators/component_generator/component_generator_generator.rb
 rubygems_generators/component_generator/templates/generator.rb
+rubygems_generators/component_generator/templates/rails_generator.rb
 rubygems_generators/component_generator/templates/readme
 rubygems_generators/component_generator/templates/test.rb
 rubygems_generators/component_generator/templates/test_generator_helper.rb

data/lib/rubigen/spec.rb

@@ -27,11 +27,11 @@ module RubiGen
     def class_name
       "#{name.camelize}Generator"
     end
-    
+
     def usage_file
       "#{path}/USAGE"
     end
-    
+
     def visible?
       File.exists? usage_file
     end
@@ -41,10 +41,30 @@ module RubiGen
       # whose name matches the requested class name.
       def lookup_class
         ObjectSpace.each_object(Class) do |obj|
-          return obj if obj.ancestors.include?(RubiGen::Base) and
+          return obj if valid_superclass?(obj) and
                         obj.name.split('::').last == class_name
         end
         raise NameError, "Missing #{class_name} class in #{class_file}"
       end
+
+      def valid_superclass?(obj)
+        valid_generator_superclasses.each do |klass|
+          return true if obj.ancestors.include?(klass)
+        end
+        false
+      end
+
+      def valid_generator_superclasses
+        @valid_generator_superclasses ||= [
+          "RubiGen::Base",
+          "Rails::Generator::Base"
+        ].inject([]) do |list, class_name|
+          klass = class_name.split("::").inject(Object) do |klass, name|
+            klass.const_get(name) rescue nil
+          end
+          list << klass if klass
+          list
+        end
+      end
   end
 end

data/lib/rubigen/version.rb

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

data/rubygems_generators/application_generator/templates/test_generator_helper.rb

@@ -14,6 +14,11 @@ if defined?(APP_ROOT)
 else
   APP_ROOT = app_root
 end
+if defined?(RAILS_ROOT)
+  RAILS_ROOT.replace(app_root)
+else
+  RAILS_ROOT = app_root
+end
 
 begin
   require 'rubigen'

data/rubygems_generators/component_generator/component_generator_generator.rb

@@ -23,7 +23,7 @@ class ComponentGeneratorGenerator < RubiGen::Base
       m.directory "test"
 
       # Generator stub
-      m.template "generator.rb",              "#{path}/#{name}_generator.rb"
+      m.template generator,              "#{path}/#{name}_generator.rb"
       m.template "test.rb",                   "test/test_#{name}_generator.rb"
       m.file     "test_generator_helper.rb",  "test/test_generator_helper.rb"
       m.file     "usage",                     "#{path}/USAGE"
@@ -31,6 +31,15 @@ class ComponentGeneratorGenerator < RubiGen::Base
     end
   end
 
+  def generator
+    case (generator_type.to_sym rescue nil)
+    when :rails
+      "rails_generator.rb"
+    else
+      "generator.rb"
+    end
+  end
+
   def superclass_name
     case (generator_type.to_sym rescue nil)
     when :rails
@@ -42,6 +51,17 @@ class ComponentGeneratorGenerator < RubiGen::Base
     end
   end
 
+  def superclass_requirement
+    case (generator_type.to_sym rescue nil)
+    when :rails
+      ["rails_generator"]
+    when :merb
+      ["merb-core", "merb-gen"]
+    else
+      []
+    end
+  end
+
   protected
     def banner
       <<-EOS

data/rubygems_generators/component_generator/templates/rails_generator.rb

@@ -0,0 +1,21 @@
+class <%= class_name %> < <%= superclass_name %>
+  def manifest
+    record do |m|
+      # Ensure appropriate folder(s) exists
+      m.directory 'some_folder'
+
+      # Create stubs
+      # m.template "template.rb",  "some_file_after_erb.rb"
+      # m.file     "file",         "some_file_copied"
+    end
+  end
+
+  protected
+    def banner
+      <<-EOS
+Creates a ...
+
+USAGE: #{$0} #{spec.name} name
+EOS
+    end
+end

data/rubygems_generators/component_generator/templates/test.rb

@@ -1,13 +1,7 @@
 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
+<% for requirement in superclass_requirement -%>
+require '<%= requirement %>'
 <% end -%>
 
 class Test<%= class_name %> < Test::Unit::TestCase

data/rubygems_generators/component_generator/templates/test_generator_helper.rb

@@ -14,6 +14,11 @@ if defined?(APP_ROOT)
 else
   APP_ROOT = app_root
 end
+if defined?(RAILS_ROOT)
+  RAILS_ROOT.replace(app_root)
+else
+  RAILS_ROOT = app_root
+end
 
 begin
   require 'rubigen'

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.3.0</a>
+      <a href="http://rubyforge.org/projects/rubigen" class="numbers">1.3.1</a>
     </div>
     <h1>Ruby Generator Framework</h1>
 

data/website/version-raw.js

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

data/website/version.js

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubigen
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -86,6 +86,7 @@ files:
 - rubygems_generators/component_generator/USAGE
 - rubygems_generators/component_generator/component_generator_generator.rb
 - rubygems_generators/component_generator/templates/generator.rb
+- rubygems_generators/component_generator/templates/rails_generator.rb
 - rubygems_generators/component_generator/templates/readme
 - rubygems_generators/component_generator/templates/test.rb
 - rubygems_generators/component_generator/templates/test_generator_helper.rb