Fixing a few problems with 'require's

kakutani · Nov 5, 2010 · c5f9dbe · c5f9dbe
1 parent 5c9f617
commit c5f9dbe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/lib/base/code_issue.rb b/lib/base/code_issue.rb
@@ -1,10 +1,10 @@
 require 'delegate'
-require 'lib/base/metric_analyzer'
-require 'lib/base/flog_analyzer'
-require 'lib/base/saikuro_analyzer'
-require 'lib/base/churn_analyzer'
-require 'lib/base/reek_analyzer'
-require 'lib/base/flay_analyzer'
+require MetricFu::LIB_ROOT + '/base/metric_analyzer'
+require MetricFu::LIB_ROOT + '/base/flog_analyzer'
+require MetricFu::LIB_ROOT + '/base/saikuro_analyzer'
+require MetricFu::LIB_ROOT + '/base/churn_analyzer'
+require MetricFu::LIB_ROOT + '/base/reek_analyzer'
+require MetricFu::LIB_ROOT + '/base/flay_analyzer'
 
 module CarefulArray
 

diff --git a/lib/metric_fu.rb b/lib/metric_fu.rb
@@ -5,13 +5,12 @@
 rescue LoadError
   require 'active_support'
 end
-require 'lib/base/scoring_strategies'
 
 # Load a few things to make our lives easier elsewhere.
 module MetricFu
   LIB_ROOT = File.dirname(__FILE__)
 end
-base_dir = File.join(MetricFu::LIB_ROOT, 'base')
+base_dir         = File.join(MetricFu::LIB_ROOT, 'base')
 generator_dir    = File.join(MetricFu::LIB_ROOT, 'generators')
 template_dir     = File.join(MetricFu::LIB_ROOT, 'templates')
 graph_dir        = File.join(MetricFu::LIB_ROOT, 'graphs')
@@ -21,6 +20,7 @@ module MetricFu
 require File.join(base_dir, 'report') 
 require File.join(base_dir, 'generator')
 require File.join(base_dir, 'graph')
+require File.join(base_dir, 'scoring_strategies')
 
 # prevent the task from being run multiple times.
 unless Rake::Task.task_defined? "metrics:all"