Ensure dirs to flog is an array

Conflicts: lib/metric_fu/metrics/flay/init.rb
metricfu · Aug 4, 2013 · 69e0547 · 69e0547
1 parent 62355a6
commit 69e0547
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/lib/metric_fu/metrics/flay/init.rb b/lib/metric_fu/metrics/flay/init.rb
@@ -6,8 +6,7 @@ def name
     end
 
     def default_run_options
-      { :dirs_to_flay => MetricFu::Io::FileSystem.directory('code_dirs'), # was @code_dirs
-
+      { :dirs_to_flay => MetricFu::Io::FileSystem.directory('code_dirs'),
       # MetricFu has been setting the minimum score as 100 for
       # a long time. This is a really big number, considering
       # the default is 16. Setting it to nil to use the Flay default.

diff --git a/lib/metric_fu/metrics/flog/flog.rb b/lib/metric_fu/metrics/flog/flog.rb
@@ -5,7 +5,7 @@ class Flog < Generator
 
     def emit
       files = []
-      options[:dirs_to_flog].each do |directory|
+      Array(options[:dirs_to_flog]).each do |directory|
         directory = "." if directory=='./'
         dir_files = Dir.glob("#{directory}/**/*.rb")
         dir_files = remove_excluded_files(dir_files)