Skip to content

Commit 77e07fc

Browse files
committed
Cleanup instance variables
1 parent 03f863d commit 77e07fc

File tree

3 files changed

+18
-11
lines changed

3 files changed

+18
-11
lines changed

bin/bundler-audit

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ else
1111
end
1212

1313
CC::Engine::BundlerAudit::Analyzer.new(
14-
directory: "/code", engine_config: engine_config, io: STDOUT
14+
directory: "/code",
15+
engine_config: engine_config
1516
).run

lib/cc/engine/bundler_audit/analyzer.rb

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ module BundlerAudit
44
class Analyzer
55
GemfileLockNotFound = Class.new(StandardError)
66

7-
def initialize(directory: , io: , engine_config: )
7+
def initialize(directory:, io: STDOUT, engine_config: {})
88
@directory = directory
9-
@engine_config = engine_config
109
@io = io
10+
@engine_config = engine_config
1111
end
1212

1313
def run
1414
if gemfile_lock_exists?
15-
Dir.chdir(@directory) do
15+
Dir.chdir(directory) do
1616
Bundler::Audit::Scanner.new.scan do |vulnerability|
1717
result = Result.new(vulnerability, File.open(gemfile_lock_path))
1818
issue = result.to_issue
1919

20-
@io.print("#{issue.to_json}\0")
20+
io.print("#{issue.to_json}\0")
2121
end
2222
end
2323
else
@@ -27,12 +27,14 @@ def run
2727

2828
private
2929

30+
attr_reader :directory, :io
31+
3032
def gemfile_lock_exists?
3133
File.exist?(gemfile_lock_path)
3234
end
3335

3436
def gemfile_lock_path
35-
File.join(@directory, "Gemfile.lock")
37+
File.join(directory, "Gemfile.lock")
3638
end
3739
end
3840
end

spec/cc/engine/bundler_audit/analyzer_spec.rb

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ module CC::Engine::BundlerAudit
44
describe Analyzer do
55
describe "#run" do
66
it "raises an error when no Gemfile.lock exists" do
7-
directory = File.join(Dir.pwd, "spec", "fixtures", "no_gemfile_lock")
7+
directory = fixture_directory("no_gemfile_lock")
88
io = StringIO.new
99

10-
expect { Analyzer.new(directory: directory, io: io, engine_config: {}).run }
10+
expect { Analyzer.new(directory: directory, io: io).run }
1111
.to raise_error(Analyzer::GemfileLockNotFound)
1212
end
1313

1414
it "emits issues for Gemfile.lock problems" do
1515
io = StringIO.new
16-
directory = File.join(Dir.pwd, "spec", "fixtures", "unpatched_versions")
16+
directory = fixture_directory("unpatched_versions")
1717

18-
audit = Analyzer.new(directory: directory, io: io, engine_config: {})
18+
audit = Analyzer.new(directory: directory, io: io)
1919
audit.run
2020

2121
issues = io.string.split("\0").map { |issue| JSON.load(issue) }
@@ -24,10 +24,14 @@ module CC::Engine::BundlerAudit
2424
end
2525

2626
def expected_issues(fixture)
27-
path = File.join(Dir.pwd, "spec", "fixtures", fixture, "issues.json")
27+
path = File.join(fixture_directory(fixture), "issues.json")
2828
body = File.read(path)
2929
JSON.load(body)
3030
end
31+
32+
def fixture_directory(fixture)
33+
File.join(Dir.pwd, "spec", "fixtures", fixture)
34+
end
3135
end
3236
end
3337
end

0 commit comments

Comments
 (0)