Reorderd requires.

lib/pivotal_doc.rb

@@ -2,15 +2,24 @@
 require 'yaml'
 require 'pivotal-tracker'
 require 'haml'
+
 PT= PivotalTracker unless defined?(PT)
 PROJECT_ROOT= File.join(File.dirname(__FILE__), '/../') unless defined?(PROJECT_ROOT)
 
-#Load generators explicitly
-path= File.dirname(__FILE__) + '/pivotal_doc/generators/'
-require File.join(path, 'base.rb')
-require File.join(path,'html.rb')
-require File.join(path,'text.rb')
-require File.join(path,'csv.rb')
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+Dir[File.expand_path(File.join('../ext','**','*.rb'))].each {|f| require f}
+
+#Utilities
+require File.join('pivotal_doc/configuration')
+require File.join('pivotal_doc/exceptions')
+require File.join('pivotal_doc/generator')
+
+#Core classes
+require File.join('pivotal_doc/release')
+
+#Generators
+require File.join('pivotal_doc/generators', 'base.rb')
+require File.join('pivotal_doc/generators', 'html.rb')
+require File.join('pivotal_doc/generators', 'text.rb')
+require File.join('pivotal_doc/generators', 'csv.rb')
 
-Dir[File.expand_path(File.join(File.dirname(__FILE__),'../ext','**','*.rb'))].each {|f| require f}
-Dir[File.expand_path(File.join(File.dirname(__FILE__),'pivotal_doc/', '*.rb'))].each {|f| require f}

lib/pivotal_doc/generators/csv.rb

@@ -4,8 +4,8 @@ module PivotalDoc
   module Generators
     class CSV < Base
       COLUMNS=[
-          'ID', 'Feature', 'Description', 'Requested By', 'Completed By', 
-        ]
+        'ID', 'Feature', 'Description', 'Requested By', 'Completed By', 
+      ]
       def template_name; 'output.csv' end
       def output_ext; '.csv' end
       def render_doc

spec/lib/generators/csv_spec.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
-require 'ruby-debug'
 
 describe PivotalDoc::Generators::CSV do
   before(:each) do