Merge pull request #512 from pivotal-legacy/rubo-bump

Bumps rubocop version to current latest (0.59.1)
pivotal · Oct 5, 2018 · ffe5754 · ffe5754
2 parents bfa749b + 9d59a7c
commit ffe5754
Show file tree

Hide file tree

Showing 212 changed files with 495 additions and 37 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,3 +1,13 @@
+AllCops:
+  TargetRubyVersion: 2.3.3 
+  Exclude:
+    - 'lib/license_finder/reports/**/*'
+    - 'features/fixtures/**/*'
+    - 'releases/**/*'
+    - 'ci/**/*'
+    - 'tmp/**/*'
+    - 'Gemfile'
+
 #Layout Cops
 IndentHeredoc:
   Enabled: false
@@ -32,6 +42,14 @@ YAMLLoad:
   Enabled: false
 
 #Style Cops
+Style/MethodMissingSuper:
+  Enabled: false
+Style/MissingRespondToMissing:
+  Enabled: false
+Style/FormatStringToken:
+  EnforcedStyle: unannotated
+Layout/MultilineMethodCallIndentation:
+    Enabled: false
 DoubleNegation:
   Enabled: false
 Documentation:
@@ -41,18 +59,6 @@ FileName:
     - '**/Rakefile'
     - '**/Gemfile'
     - '**/Podfile'
-MethodMissing:
-  Enabled: false
 ModuleFunction:
   Enabled: false
   EnforcedStyle: extend_self
-AllCops:
-  Include:
-    - 'bin/license_finder'
-  Exclude:
-    - 'lib/license_finder/reports/**/*'
-    - 'features/fixtures/**/*'
-    - 'releases/**/*'
-    - 'ci/**/*'
-    - 'tmp/**/*'
-    - 'Gemfile'
diff --git a/Rakefile b/Rakefile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 

diff --git a/bin/license_finder b/bin/license_finder
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'license_finder'
 

diff --git a/ci/scripts/run-rubocop.sh b/ci/scripts/run-rubocop.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 cd LicenseFinder
-gem install rubocop --version 0.51
+gem install rubocop --version 0.59.2
 
 
 echo "Running Rubocop ..."

diff --git a/features/features/cli/cli_spec.rb b/features/features/cli/cli_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 describe 'License Finder command line executable' do
   # As a developer

diff --git a/features/features/configure/add_dependencies_spec.rb b/features/features/configure/add_dependencies_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Manually Added Dependencies' do

diff --git a/features/features/configure/approve_dependencies_spec.rb b/features/features/configure/approve_dependencies_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Manually Approved Dependencies' do

diff --git a/features/features/configure/assign_licenses_spec.rb b/features/features/configure/assign_licenses_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Manually Assigned Licenses' do

diff --git a/features/features/configure/blacklist_licenses_spec.rb b/features/features/configure/blacklist_licenses_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Blacklisted licenses' do

diff --git a/features/features/configure/ignore_dependencies_spec.rb b/features/features/configure/ignore_dependencies_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Ignored Dependencies' do

diff --git a/features/features/configure/ignore_groups_spec.rb b/features/features/configure/ignore_groups_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 require 'bundler'
 

diff --git a/features/features/configure/name_project_spec.rb b/features/features/configure/name_project_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Project name' do

diff --git a/features/features/configure/prepare_spec.rb b/features/features/configure/prepare_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Prepare Step' do

diff --git a/features/features/configure/set_project_path_spec.rb b/features/features/configure/set_project_path_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Project path' do

diff --git a/features/features/configure/whitelist_licenses_spec.rb b/features/features/configure/whitelist_licenses_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Whitelisted licenses' do

diff --git a/features/features/package_managers/bower_spec.rb b/features/features/package_managers/bower_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Bower Dependencies' do

diff --git a/features/features/package_managers/carthage_spec.rb b/features/features/package_managers/carthage_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Carthage Dependencies', ios: true do

diff --git a/features/features/package_managers/cocoapods_spec.rb b/features/features/package_managers/cocoapods_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'CocoaPods Dependencies', ios: true do

diff --git a/features/features/package_managers/conan_spec.rb b/features/features/package_managers/conan_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Conan Dependencies' do

diff --git a/features/features/package_managers/dep_spec.rb b/features/features/package_managers/dep_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Dep Dependencies' do

diff --git a/features/features/package_managers/glide_spec.rb b/features/features/package_managers/glide_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Glide Dependencies' do

diff --git a/features/features/package_managers/go_modules_spec.rb b/features/features/package_managers/go_modules_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Go Modules Dependencies' do

diff --git a/features/features/package_managers/godep_spec.rb b/features/features/package_managers/godep_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Godep Dependencies' do

diff --git a/features/features/package_managers/govendor_spec.rb b/features/features/package_managers/govendor_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Govendor Dependencies' do

diff --git a/features/features/package_managers/gradle_spec.rb b/features/features/package_managers/gradle_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Gradle Dependencies' do

diff --git a/features/features/package_managers/gvt_spec.rb b/features/features/package_managers/gvt_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Gvt Dependencies' do

diff --git a/features/features/package_managers/maven_spec.rb b/features/features/package_managers/maven_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Maven Dependencies' do

diff --git a/features/features/package_managers/mix_spec.rb b/features/features/package_managers/mix_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Mix Dependencies' do

diff --git a/features/features/package_managers/npm_spec.rb b/features/features/package_managers/npm_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'NPM Dependencies' do

diff --git a/features/features/package_managers/nuget_spec.rb b/features/features/package_managers/nuget_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Nuget Dependencies' do

diff --git a/features/features/package_managers/pip_spec.rb b/features/features/package_managers/pip_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Pip Dependencies' do

diff --git a/features/features/package_managers/rebar_spec.rb b/features/features/package_managers/rebar_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Rebar Dependencies' do

diff --git a/features/features/package_managers/sbt_spec.rb b/features/features/package_managers/sbt_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'SBT Dependencies' do

diff --git a/features/features/package_managers/yarn_spec.rb b/features/features/package_managers/yarn_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Yarn Dependencies' do

diff --git a/features/features/report/composite_spec.rb b/features/features/report/composite_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 describe 'Composite project' do
   # As a non-technical product owner

diff --git a/features/features/report/csv_spec.rb b/features/features/report/csv_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'CSV report' do

diff --git a/features/features/report/diff_spec.rb b/features/features/report/diff_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Diff report' do

diff --git a/features/features/report/html_spec.rb b/features/features/report/html_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'HTML report' do

diff --git a/features/features/report/java_groups_spec.rb b/features/features/report/java_groups_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Composite project' do

diff --git a/features/features/report/subproject_spec.rb b/features/features/report/subproject_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../support/feature_helper'
 
 describe 'Aggregate Paths Projects report' do

diff --git a/features/support/feature_helper.rb b/features/support/feature_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # These are integration tests, so reaching directly into LicenseFinder is forbidden
 # DO NOT:
 # require 'rubygems'

diff --git a/features/support/testing_dsl.rb b/features/support/testing_dsl.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'delegate'
 require 'English'
 
@@ -587,7 +589,7 @@ def reset_projects!
     end
 
     module Shell
-      ERROR_MESSAGE_FORMAT = <<ERRORFORMAT.freeze
+      ERROR_MESSAGE_FORMAT = <<ERRORFORMAT
 Command failed: `%s`
 output: %s
 exit: %d

diff --git a/lib/license_finder.rb b/lib/license_finder.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'yaml'
 

diff --git a/lib/license_finder/cli.rb b/lib/license_finder/cli.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
   end

diff --git a/lib/license_finder/cli/approvals.rb b/lib/license_finder/cli/approvals.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
     class Approvals < Base

diff --git a/lib/license_finder/cli/base.rb b/lib/license_finder/cli/base.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 
 module LicenseFinder

diff --git a/lib/license_finder/cli/blacklist.rb b/lib/license_finder/cli/blacklist.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
     class Blacklist < Base

diff --git a/lib/license_finder/cli/dependencies.rb b/lib/license_finder/cli/dependencies.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
     class Dependencies < Base

diff --git a/lib/license_finder/cli/ignored_dependencies.rb b/lib/license_finder/cli/ignored_dependencies.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
     class IgnoredDependencies < Base

diff --git a/lib/license_finder/cli/ignored_groups.rb b/lib/license_finder/cli/ignored_groups.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
     class IgnoredGroups < Base

diff --git a/lib/license_finder/cli/licenses.rb b/lib/license_finder/cli/licenses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
     class Licenses < Base

diff --git a/lib/license_finder/cli/main.rb b/lib/license_finder/cli/main.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'license_finder/report'
 require 'license_finder/version'
 require 'license_finder/diff'
@@ -172,6 +174,7 @@ def aggregate_paths
         aggregate_paths = ProjectFinder.new(project_path, config.strict_matching).find_projects if config.recursive
         say(aggregate_paths || project_path) if config.strict_matching
         return aggregate_paths unless aggregate_paths.nil? || aggregate_paths.empty?
+
         [config.project_path] unless config.project_path.nil?
       end
 

diff --git a/lib/license_finder/cli/makes_decisions.rb b/lib/license_finder/cli/makes_decisions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
     module MakesDecisions

diff --git a/lib/license_finder/cli/patched_thor.rb b/lib/license_finder/cli/patched_thor.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
     module Rootcommand

diff --git a/lib/license_finder/cli/project_name.rb b/lib/license_finder/cli/project_name.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
     class ProjectName < Base

diff --git a/lib/license_finder/cli/whitelist.rb b/lib/license_finder/cli/whitelist.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LicenseFinder
   module CLI
     class Whitelist < Base