Fix all rubocop issues

Signed-off-by: Shane Lattanzio <[email protected]>

lib/license_finder/cli/main.rb

@@ -49,25 +49,17 @@ def self.shared_options
  required: false
 
  method_option :recursive, aliases: '-r', type: :boolean, default: false,
- desc: 'Recursively runs License Finder on all sub-projects'
+  desc: 'Recursively runs License Finder on all sub-projects'
 
  method_option :aggregate_paths, aliases: '-a', type: :array,
- desc: "Generate a single report for multiple projects. Ex: --aggregate_paths='path/to/project1' 'path/to/project2'"
+  desc: "Generate a single report for multiple projects. Ex: --aggregate_paths='path/to/project1' 'path/to/project2'"
 
  method_option :quiet, aliases: '-q', type: :boolean, desc: 'Silences progress report', required: false
  end
 
  desc 'action_items', 'List unapproved dependencies (the default action for `license_finder`)'
-
  shared_options
  def action_items
- aggregate_paths = options[:aggregate_paths]
- aggregate_paths = ProjectFinder.new(license_finder.config.project_path).find_projects if options[:recursive]
-
- if (aggregate_paths.nil? || aggregate_paths.empty?) && !license_finder_config[:project_path].nil?
- aggregate_paths = [license_finder_config[:project_path]]
- end
-
  finder = LicenseAggregator.new(license_finder_config, aggregate_paths)
  any_packages = finder.any_packages?
  unapproved = finder.unapproved
@@ -143,6 +135,13 @@ def diff(file1, file2)
 
  private
 
+ def aggregate_paths
+ aggregate_paths = options[:aggregate_paths]
+ aggregate_paths = ProjectFinder.new(license_finder.config.project_path).find_projects if options[:recursive]
+ return aggregate_paths unless aggregate_paths.nil? || aggregate_paths.empty?
+ [license_finder_config[:project_path]] unless license_finder_config[:project_path].nil?
+ end
+
  def save_report(content, file_name)
  File.open(file_name, 'w') do |f|
  f.write(content)

lib/license_finder/license_aggregator.rb

@@ -10,7 +10,7 @@ def dependencies
  end
 
  def any_packages?
- finders.map { |finder| finder.any_packages? }.reduce(:|)
+ finders.map(&:any_packages?).reduce(:|)
  end
 
  def unapproved
@@ -25,13 +25,13 @@ def blacklisted
 
  def finders
  return @finders unless @finders.nil?
- if @aggregate_paths.nil?
- @finders = [LicenseFinder::Core.new(@license_finder_config)]
- else
- @finders = @aggregate_paths.map do |path|
- LicenseFinder::Core.new(@license_finder_config.merge(project_path: path))
- end
- end
+ @finders = if @aggregate_paths.nil?
+   [LicenseFinder::Core.new(@license_finder_config)]
+  else
+   @aggregate_paths.map do |path|
+  LicenseFinder::Core.new(@license_finder_config.merge(project_path: path))
+  end
+  end
  end
 
  def aggregate_packages
@@ -41,7 +41,7 @@ def aggregate_packages
  finder.acknowledged.map { |dep| MergedPackage.new(dep, [finder.project_path]) }
  end
  @packages = all_packages.group_by { |package| [package.name, package.version] }
- .map do |_, packages|
+  .map do |_, packages|
  MergedPackage.new(packages[0].dependency, packages.flat_map(&:aggregate_paths))
  end
  end

spec/lib/license_finder/license_aggregator_spec.rb

@@ -3,7 +3,6 @@
 module LicenseFinder
  describe LicenseAggregator do
  context 'when there are no packages' do
-
  describe '#any_packages' do
  let(:project_1_path) { 'path/to/subproject-1' }
  let(:license_finder_1) { double(:license_finder, acknowledged: [], project_path: project_1_path, any_packages?: false) }
@@ -49,7 +48,6 @@ module LicenseFinder
  expect(aggregator.blacklisted).to eq([merged_1_expected])
  end
  end
-
  end
 
  context 'when duplicates' do
@@ -88,7 +86,6 @@ module LicenseFinder
  expect(aggregator.blacklisted).to eq([merged_1_expected])
  end
  end
-
  end
 
  context 'when duplicates with different versions' do
@@ -127,7 +124,6 @@ module LicenseFinder
  expect(aggregator.blacklisted).to eq([merged_1_expected])
  end
  end
-
  end
 
  describe '#dependencies' do