standard 1.3.0 → 1.4.0

data/config/ruby-2.5.yml

@@ -1,4 +1,4 @@
-inherit_from: ./ruby-2.7.yml
+inherit_from: ./ruby-2.6.yml
 
 AllCops:
   TargetRubyVersion: 2.5

data/config/ruby-2.6.yml

@@ -0,0 +1,10 @@
+inherit_from: ./ruby-2.7.yml
+
+AllCops:
+  TargetRubyVersion: 2.6
+
+Style/NumberedParameters:
+  Enabled: false
+
+Style/NumberedParametersLimit:
+  Enabled: false

data/lib/standard/creates_config_store/assigns_rubocop_yaml.rb

@@ -10,7 +10,11 @@ class Standard::CreatesConfigStore
     private
 
     def rubocop_yaml_path(desired_version)
-      file_name = if desired_version < Gem::Version.new("1.9")
+      default = "base.yml"
+
+      file_name = if !Gem::Version.correct?(desired_version)
+        default
+      elsif desired_version < Gem::Version.new("1.9")
         "ruby-1.8.yml"
       elsif desired_version < Gem::Version.new("2.0")
         "ruby-1.9.yml"
@@ -25,7 +29,7 @@ class Standard::CreatesConfigStore
       elsif desired_version < Gem::Version.new("3.0")
         "ruby-2.7.yml"
       else
-        "base.yml"
+        default
       end
 
       Pathname.new(__dir__).join("../../../config/#{file_name}")

data/lib/standard/creates_config_store/sets_target_ruby_version.rb

@@ -1,7 +1,7 @@
 class Standard::CreatesConfigStore
   class SetsTargetRubyVersion
     def call(options_config, standard_config)
-      options_config["AllCops"]["TargetRubyVersion"] = floatify_version(
+      options_config["AllCops"]["TargetRubyVersion"] = normalize_version(
         max_rubocop_supported_version(standard_config[:ruby_version])
       )
     end
@@ -9,6 +9,8 @@ class Standard::CreatesConfigStore
     private
 
     def max_rubocop_supported_version(desired_version)
+      return desired_version unless Gem::Version.correct?(desired_version)
+
       rubocop_supported_version = Gem::Version.new("2.5")
       if desired_version < rubocop_supported_version
         rubocop_supported_version
@@ -17,7 +19,9 @@ class Standard::CreatesConfigStore
       end
     end
 
-    def floatify_version(version)
+    def normalize_version(version)
+      return version unless Gem::Version.correct?(version)
+
       major, minor = version.segments
       "#{major}.#{minor}".to_f # lol
     end

data/lib/standard/formatter.rb

@@ -19,6 +19,7 @@ module Standard
       @detects_fixability = DetectsFixability.new
       @header_printed_already = false
       @fix_suggestion_printed_already = false
+      @offenses_encountered = false
     end
 
     def started(_target_files)
@@ -26,7 +27,11 @@ module Standard
     end
 
     def file_finished(file, offenses)
-      return unless (uncorrected_offenses = offenses.reject(&:corrected?)).any?
+      uncorrected_offenses = offenses.reject(&:corrected?)
+
+      return unless uncorrected_offenses.any?
+
+      @offenses_encountered = true
 
       print_header_once
       print_fix_suggestion_once(uncorrected_offenses)
@@ -36,6 +41,10 @@ module Standard
       end
     end
 
+    def finished(inspected_files)
+      print_todo_congratulations
+    end
+
     private
 
     def print_header_once
@@ -64,7 +73,7 @@ module Standard
       return unless todo_file
 
       todo_ignore_files = options[:todo_ignore_files]
-      return unless todo_ignore_files
+      return unless todo_ignore_files&.any?
 
       output.print <<-HEADER.gsub(/^ {8}/, "")
         WARNING: this project is being migrated to standard gradually via `#{todo_file}` and is ignoring these files:
@@ -75,6 +84,20 @@ module Standard
       end
     end
 
+    def print_todo_congratulations
+      return if @offenses_encountered
+
+      todo_file = options[:todo_file]
+      return unless todo_file
+
+      todo_ignore_files = options[:todo_ignore_files]
+      return if todo_ignore_files&.any?
+
+      output.print <<-HEADER.gsub(/^ {8}/, "")
+        Congratulations, you've successfully migrated this project to Standard! Delete `#{todo_file}` in celebration.
+      HEADER
+    end
+
     def path_to(file)
       Pathname.new(file).relative_path_from(Pathname.new(Dir.pwd))
     end

data/lib/standard/loads_yaml_config.rb

@@ -24,7 +24,7 @@ module Standard
 
     def construct_config(yaml_path, standard_yaml, todo_path, todo_yaml)
       {
-        ruby_version: Gem::Version.new((standard_yaml["ruby_version"] || RUBY_VERSION)),
+        ruby_version: normalized_ruby_version(standard_yaml["ruby_version"]),
         fix: !!standard_yaml["fix"],
         format: standard_yaml["format"],
         parallel: !!standard_yaml["parallel"],
@@ -36,6 +36,12 @@ module Standard
       }
     end
 
+    def normalized_ruby_version(version)
+      return version if version && !Gem::Version.correct?(version)
+
+      Gem::Version.new(version || RUBY_VERSION)
+    end
+
     def expand_ignore_config(ignore_config)
       arrayify(ignore_config).map { |rule|
         if rule.is_a?(String)

data/lib/standard/version.rb

@@ -1,3 +1,3 @@
 module Standard
-  VERSION = Gem::Version.new("1.3.0")
+  VERSION = Gem::Version.new("1.4.0")
 end

data/standard.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rubocop", "1.20.0"
+  spec.add_dependency "rubocop", "1.22.3"
   spec.add_dependency "rubocop-performance", "1.11.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standard
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Justin Searls
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-27 00:00:00.000000000 Z
+date: 2021-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 1.22.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 1.22.3
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -64,6 +64,7 @@ files:
 - config/ruby-2.3.yml
 - config/ruby-2.4.yml
 - config/ruby-2.5.yml
+- config/ruby-2.6.yml
 - config/ruby-2.7.yml
 - docs/RELEASE.md
 - exe/standardrb