rabal 0.2.0 → 0.2.1

data/CHANGES

@@ -1,9 +1,13 @@
 =  Changelog
 
+=== Version 0.2.1
+
+* fix bug wherein some templates get lost for subdirectories when multiple modules are in use.
+
 === Version 0.2.0
 
 * create conditional tasks based upon the availability of libraries (webby, heel, rubyforge)
-* added in site plugin add associated tasks
+* added in site plugin and associated tasks
 * moved all rake tasks to .rake files
 * added tasks to show website and rdoc if heel is installed
 

data/lib/rabal/application.rb

@@ -233,10 +233,10 @@ module Rabal
         # if the params for the logfile were given then open them up and
         # 
         def logfile_and_level_if_necessary
-            if main.params["logfile"].given? then
+            if @main.params[:logfile].given? then
                 Log.logger = main.params["logfile"].value
             end
-            Log.logger.level = ::Logger::SEV_LABEL.index(main.params["verbosity"].value)
+            Log.logger.level = ::Logger::SEV_LABEL.index(main.params[:verbosity].value)
             Log.debug "Logger initialized"
         end
     end

data/lib/rabal/tree.rb

@@ -15,7 +15,7 @@ module Rabal
         # root.
         attr_accessor :parent
 
-        # The children of this node.  If this Array is empty, then this
+        # The children of this node.  If this Hash is empty, then this
         # Tree is a leaf.
         attr_accessor :children
 
@@ -128,9 +128,10 @@ module Rabal
             # Don't overwrite any existing children with the same name,
             # just put the new subtree's children into the children of
             # the already existing subtree.
+
             if children.has_key?(subtree.name) then
-                subtree.children.each do |n,tree|
-                    children[n] = tree
+                subtree.children.each_pair do |subtree_child_name,subtree_child_tree|
+                    children[subtree.name] << subtree_child_tree
                 end
             else
                 children[subtree.name] = subtree

data/lib/rabal/version.rb

@@ -4,7 +4,7 @@ module Rabal
     class Version
         MAJOR   = 0
         MINOR   = 2 
-        BUILD   = 0
+        BUILD   = 1
 
         class << self
             def to_a

data/spec/application_spec.rb

@@ -20,28 +20,37 @@ describe Rabal::Application do
     end
 
     it "should exit 0 on --help" do
-        begin
-            @application.run(%w[--help])
-        rescue SystemExit => se
-            se.status.should == 0
-        end
-    end
-
-    it "should output to stderr on bad parameters" do
-        begin
-            @application.run(%w[--blah])
-        rescue SystemExit => se
-            se.status.should == 1
-            @stderr.string.should =~ /unrecognized option `--blah'/m
-        end
-    end
-
-    it "should have allow for plugin options" do
-        begin
-            @application.run(%w[--use-all --help])
-        rescue SystemExit => se
-            se.status.should == 0
-        end
-    end 
+         begin
+             @application.run(%w[--help])
+         rescue SystemExit => se
+             se.status.should == 0
+         end
+     end
+    
+     it "should output to stderr on bad parameters" do
+         begin
+             @application.run(%w[--blah])
+         rescue SystemExit => se
+             se.status.should == 1
+             @stderr.string.should =~ /unrecognized option `--blah'/m
+         end
+     end
+    
+     it "should have allow for plugin options" do
+         begin
+             @application.run(%w[--use-all --help])
+         rescue SystemExit => se
+             se.status.should == 0
+         end
+     end 
+    
+    # it "should have a good default tree " do
+    #     begin
+    #         Rabal::Application.new(@stdin,@stdout,@stderr).run(%w[--core-author=Testing --core-email=testing@example.com --license-flavor=mit new-rabal-proj])
+    #     rescue SystemExit => se
+    #         se.status.should == 0
+    #         find_in("new-rabal-proj").sort.should == @base_tree.sort
+    #     end
+    # end
 end
 

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ rescue LoadError
     $: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
     require 'rabal'
 end
+require 'set'
 require 'rubygems'
 require 'tmpdir'
 require 'mktemp'

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
+rubygems_version: 0.9.2
 specification_version: 1
 name: rabal
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-09-09 00:00:00 -06:00
+  version: 0.2.1
+date: 2007-09-11 00:00:00 -06:00
 summary: A tool for bootstrapping project development
 require_paths: 
 - lib