Skip to content

Commit 5973595

Browse files
committed
Remove unused Flay param 'filetypes'. Not a valid Flay option, either.
Closes #151
1 parent 9d459a1 commit 5973595

File tree

4 files changed

+19
-5
lines changed

4 files changed

+19
-5
lines changed

lib/metric_fu/metrics/flay/flay.rb

+16-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ def self.metric
77
end
88

99
def emit
10-
minimum_score_parameter = options[:minimum_score] ? "--mass #{options[:minimum_score]} " : ""
11-
args = "#{minimum_score_parameter} #{options[:dirs_to_flay].join(" ")}"
10+
args = "#{minimum_duplication_mass} #{dirs_to_flay}"
1211
@output = run!(args)
1312
end
1413

@@ -29,5 +28,20 @@ def to_h
2928
end
3029
{:flay => {:total_score => total_score, :matches => target.flatten}}
3130
end
31+
32+
private
33+
34+
def minimum_duplication_mass
35+
flay_mass = options[:minimum_score]
36+
return "" unless flay_mass
37+
38+
39+
"--mass #{flay_mass} "
40+
end
41+
42+
def dirs_to_flay
43+
options[:dirs_to_flay].join(" ")
44+
end
45+
3246
end
3347
end

lib/metric_fu/metrics/flay/init.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def default_run_options
1111
# a long time. This is a really big number, considering
1212
# the default is 16. Setting it to nil to use the Flay default.
1313
:minimum_score => nil,
14-
:filetypes => ['rb'] }
14+
}
1515
end
1616

1717
def has_graph?

spec/metric_fu/metrics/flay/configuration_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
it 'should set @flay to {:dirs_to_flay => @code_dirs}' do
88
load_metric 'flay'
99
expect(MetricFu::Metric.get_metric(:flay).run_options).to eq(
10-
{:dirs_to_flay => ['lib'], :filetypes=>["rb"], :minimum_score=>nil}
10+
{:dirs_to_flay => ['lib'], :minimum_score=>nil}
1111
)
1212
end
1313

spec/metric_fu/metrics/flay/flay_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
describe MetricFu::FlayGenerator do
55
describe "emit method" do
66
it "should look at the dirs" do
7-
options = { :dirs_to_flay => ['app', 'lib'], :filetypes => ['rb'] }
7+
options = { :dirs_to_flay => ['app', 'lib'] }
88
allow(File).to receive(:directory?).and_return(true)
99
@flay = MetricFu::FlayGenerator.new(options)
1010

0 commit comments

Comments
 (0)