Rearranged files to make intentions clearer.

iain · Feb 23, 2009 · 75fd516 · 75fd516
1 parent 75c7c91
commit 75fd516
Show file tree

Hide file tree

Showing 16 changed files with 10 additions and 13 deletions.
diff --git a/lib/metric_fu/base_template.rb → lib/base/base_template.rb b/lib/metric_fu/base_template.rb → lib/base/base_template.rb
diff --git a/lib/metric_fu/configuration.rb → lib/base/configuration.rb b/lib/metric_fu/configuration.rb → lib/base/configuration.rb
diff --git a/lib/metric_fu/generator.rb → lib/base/generator.rb b/lib/metric_fu/generator.rb → lib/base/generator.rb
diff --git a/lib/metric_fu/md5_tracker.rb → lib/base/md5_tracker.rb b/lib/metric_fu/md5_tracker.rb → lib/base/md5_tracker.rb
diff --git a/lib/metric_fu/report.rb → lib/base/report.rb b/lib/metric_fu/report.rb → lib/base/report.rb
diff --git a/lib/metric_fu/churn.rb → lib/generators/churn.rb b/lib/metric_fu/churn.rb → lib/generators/churn.rb
diff --git a/lib/metric_fu/flay.rb → lib/generators/flay.rb b/lib/metric_fu/flay.rb → lib/generators/flay.rb
diff --git a/lib/metric_fu/flog.rb → lib/generators/flog.rb b/lib/metric_fu/flog.rb → lib/generators/flog.rb
diff --git a/lib/metric_fu/rcov.rb → lib/generators/rcov.rb b/lib/metric_fu/rcov.rb → lib/generators/rcov.rb
diff --git a/lib/metric_fu/reek.rb → lib/generators/reek.rb b/lib/metric_fu/reek.rb → lib/generators/reek.rb
diff --git a/lib/metric_fu/roodi.rb → lib/generators/roodi.rb b/lib/metric_fu/roodi.rb → lib/generators/roodi.rb
diff --git a/lib/metric_fu/saikuro.rb → lib/generators/saikuro.rb b/lib/metric_fu/saikuro.rb → lib/generators/saikuro.rb
@@ -4,8 +4,8 @@ class Saikuro < Generator
 
 
   def emit
-    relative_path = [File.dirname(__FILE__), '..', 
-                     'metric_fu', 'saikuro', 'saikuro.rb']
+    relative_path = [File.dirname(__FILE__), '..', '..', 
+                     'vendor', 'saikuro', 'saikuro.rb']
     saikuro = File.expand_path(File.join(relative_path))
     options_string = MetricFu.saikuro.inject("") do |o, h|
       o + "--#{h.join(' ')} " 

diff --git a/lib/metric_fu/stats.rb → lib/generators/stats.rb b/lib/metric_fu/stats.rb → lib/generators/stats.rb
diff --git a/lib/metric_fu.rb b/lib/metric_fu.rb
@@ -2,14 +2,16 @@
 module MetricFu
   LIB_ROOT = File.dirname(__FILE__)
 end
-metric_fu_dir = File.join(MetricFu::LIB_ROOT, 'metric_fu')
+base_dir = File.join(MetricFu::LIB_ROOT, 'base')
+generator_dir = File.join(MetricFu::LIB_ROOT, 'generators')
 template_dir  = File.join(MetricFu::LIB_ROOT, 'templates')
 
 # We need to require these two things first because our other classes
 # depend on them.
-require File.join(metric_fu_dir, 'report') 
-require File.join(metric_fu_dir, 'generator')
+require File.join(base_dir, 'report') 
+require File.join(base_dir, 'generator')
 
 # Now load everything else that's in the directory
-Dir[File.join(metric_fu_dir, '*.rb')].each{|l| require l }
+Dir[File.join(base_dir, '*.rb')].each{|l| require l }
+Dir[File.join(generator_dir, '*.rb')].each {|l| require l }
 Dir[File.join(template_dir, 'standard/*.rb')].each {|l| require l}
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,13 +1,8 @@
 require 'rubygems'
 require 'spec'
 require 'date'
-require File.join(File.dirname(__FILE__), '/../lib/metric_fu/configuration')
-require File.join(File.dirname(__FILE__), '/../lib/metric_fu/generator')
-require File.join(File.dirname(__FILE__), '/../lib/metric_fu/flay')
-require File.join(File.dirname(__FILE__), '/../lib/metric_fu/flog')
-require File.join(File.dirname(__FILE__), '/../lib/metric_fu/md5_tracker')
-require File.join(File.dirname(__FILE__), '/../lib/metric_fu/churn')
-require File.join(File.dirname(__FILE__), '/../lib/metric_fu/reek')
+
+require File.join(File.dirname(__FILE__), '/../lib/metric_fu.rb')
 include MetricFu
 
 Mystat = <<-EOF

diff --git a/lib/tasks/railroad.rake → tasks/railroad.rake b/lib/tasks/railroad.rake → tasks/railroad.rake