standard 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad16fa94acb2de73ebed6090c37d6e73791f7db9588ce441606963930381d36a
-  data.tar.gz: 2a649119dd14d36e72f0eb159373cba7b173e43b92566a27d92c8d4582564a89
+  metadata.gz: 16ec4288b1ec5d16ae48f2b6ccd9bee9dd3a644ea1461f0745b629bca3367599
+  data.tar.gz: d2eb8efc1ca7e9561806ed7820e3ad17fc30c44d02c7ffc0d69f0ad56dac2ce3
 SHA512:
-  metadata.gz: 6190b3e6ffd7bc1f7254c42d085fa42e4e7e5d16032c46841be6c7149a7ee3d3b01ea07487380237bc7745d2d52112b9c1f8434fac55ce11935212ed6f081b08
-  data.tar.gz: d3c470c9d92695eaa9acb8532b2959176e2c6caa42115cb5781eb6efff81ebab9f711ead27598b7acc3c643a193a9848c7b81dc26637f1d239d38cb8131f2009
+  metadata.gz: 5e9b1e0954d2e9df13ce44cf0a5bbf18bb5c76093828c6205467ac67065061c0eee839b7caf3da2cc48563770c6355ad4b5d256b6ad9f50a938266b8dabe08df
+  data.tar.gz: 49effa8819996f2eec32ad46b1a333bf9edd1e99a048d2f9443868494c2dcc939e0f248904426d953dd7e63450b2388ba0fa222ce62e89a0ffefc9af702cff78

data/.github/workflows/test.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        ruby-version: [2.4, 2.7, 3.0]
+        ruby-version: [2.5, 2.7, 3.0]
 
     runs-on: ${{ matrix.os }}
 

data/CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## 1.1.0
+
+* Update rubocop from 1.12.1 to [1.13.0](https://github.com/rubocop-hq/rubocop/releases/tag/v1.13.0)
+* Update rubocop-performance from 1.9.2 to [1.11.1](https://github.com/rubocop-hq/rubocop-performance/releases/tag/v1.11.1)
+* Enabled the following rules:
+  * [`Performance/RedundantSplitRegexpArgument`](https://github.com/rubocop/rubocop-performance/pull/190)
+  * [`Style/IfWithBooleanLiteralBranches`](https://github.com/rubocop-hq/rubocop/pull/9396)
+  * [`Lint/TripleQuotes`](https://github.com/rubocop-hq/rubocop/pull/9402)
+  * [`Lint/SymbolConversion`](https://github.com/rubocop/rubocop/pull/9362)
+  * [`Lint/OrAssignmentToConstant`](https://github.com/rubocop-hq/rubocop/pull/9363)
+  * [`Lint/NumberedParameterAssignment`](https://github.com/rubocop-hq/rubocop/pull/9326)
+  * [`Style/HashConversion`](https://github.com/rubocop-hq/rubocop/pull/9478)
+  * [`Gemspec/DateAssignment`](https://github.com/rubocop-hq/rubocop/pull/9496)
+  * [`Style/StringChars`](https://github.com/rubocop/rubocop/pull/9615)
+
+## 1.0.5
+
+* Update rubocop from 1.11.0 to [1.12.1](https://github.com/rubocop-hq/rubocop/releases/tag/v1.12.1)
+
+## 1.0.4
+
+* Workaround RuboCop's CLI from erroring when it detects a cop named
+  BlockDelimiters by renaming it to BlockSingleLineBraces
+  ([#271](https://github.com/testdouble/standard/issues/271)0
+
+## 1.0.3
+
+* Fix an exit code bug introduced in 1.0.2
+  ([#272](https://github.com/testdouble/standard/pull/272)
+
+## 1.0.2
+
+* Preserve RuboCop's CLI exit codes
+  ([#270](https://github.com/testdouble/standard/pull/270)) by
+  [@nicksieger](https://github.com/nicksieger)
+
 ## 1.0.1
 
 * Update rubocop from 1.10.0 to [1.11.0](https://github.com/rubocop-hq/rubocop/releases/tag/v1.11.0)

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    standard (1.0.1)
-      rubocop (= 1.11.0)
-      rubocop-performance (= 1.10.1)
+    standard (1.1.0)
+      rubocop (= 1.13.0)
+      rubocop-performance (= 1.11.1)
 
 GEM
   remote: https://rubygems.org/
@@ -15,16 +15,16 @@ GEM
     method_source (1.0.0)
     minitest (5.14.4)
     parallel (1.20.1)
-    parser (3.0.0.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
-    pry (0.14.0)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rainbow (3.0.0)
     rake (13.0.3)
     regexp_parser (2.1.1)
-    rexml (3.2.4)
-    rubocop (1.11.0)
+    rexml (3.2.5)
+    rubocop (1.13.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -33,10 +33,10 @@ GEM
       rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.10.1)
-      rubocop (>= 0.90.0, < 2.0)
+    rubocop-ast (1.5.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.11.1)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
     simplecov (0.21.2)
@@ -44,7 +44,7 @@ GEM
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
+    simplecov_json_formatter (0.1.3)
     unicode-display_width (2.0.0)
 
 PLATFORMS

data/LICENSE.txt

@@ -2,7 +2,7 @@ Copyright (c) 2019 Test Double, LLC
 
 Portions of these files Copyright (c) 2012-18 Bozhidar Batsov:
   - config/base.yml
-  - lib/standard/cop/block_delimiters.rb
+  - lib/standard/cop/block_single_line_braces.rb
   - test/cop_invoker.rb
 
 Permission is hereby granted, free of charge, to any person obtaining

data/README.md

@@ -211,6 +211,7 @@ if you've used StandardJS.)
 * [myRent](https://www.myrent.co.nz)
 * [Renuo](https://www.renuo.ch/)
 * [JetThoughts](https://www.jetthoughts.com/)
+* [Oyster](https://www.oysterhr.com/)
 * And that's about it so far!
 
 If your team starts using Standard, [send a pull
@@ -231,11 +232,6 @@ style.
 
 ## I disagree with rule X, can you change it?
 
-**[NOTE: until StandardRB hits 1.0.0, the answer is yes! It just requires
-[opening an issue](https://github.com/testdouble/standard/issues/new) and
-convincing [@searls](https://twitter.com/searls) (the BDFNow) to make the
-change.]**
-
 No. The whole point of Standard is to save you time by avoiding
 [bikeshedding](https://www.freebsd.org/doc/en/books/faq/misc.html#bikeshed-painting)
 about code style. There are lots of debates online about tabs vs. spaces, etc.
@@ -295,7 +291,7 @@ rules to ignore for a particular glob:
 ```yaml
 ignore:
   - 'test/**/*':
-    - Style/BlockDelimiters
+    - Layout/EndAlignment
 ```
 
 ## How do I disable a warning within my source code?

data/config/base.yml

@@ -21,6 +21,9 @@ Bundler/InsecureProtocolSource:
     - '**/Gemfile'
     - '**/gems.rb'
 
+Gemspec/DateAssignment:
+  Enabled: true
+
 Gemspec/DuplicatedAssignment:
   Enabled: true
   Include:
@@ -478,6 +481,12 @@ Lint/NonDeterministicRequireOrder:
 Lint/NonLocalExitFromIterator:
   Enabled: true
 
+Lint/NumberedParameterAssignment:
+  Enabled: true
+
+Lint/OrAssignmentToConstant:
+  Enabled: true
+
 Lint/OrderedMagicComments:
   Enabled: true
 
@@ -557,6 +566,9 @@ Lint/ShadowedArgument:
 Lint/ShadowedException:
   Enabled: true
 
+Lint/SymbolConversion:
+  Enabled: true
+
 Lint/Syntax:
   Enabled: true
 
@@ -566,6 +578,9 @@ Lint/TopLevelReturnWithArgument:
 Lint/TrailingCommaInAttributeDeclaration:
   Enabled: true
 
+Lint/TripleQuotes:
+  Enabled: true
+
 Lint/UnderscorePrefixedVariableName:
   Enabled: true
 
@@ -689,6 +704,9 @@ Performance/RedundantMerge:
 Performance/RedundantSortBlock:
   Enabled: true
 
+Performance/RedundantSplitRegexpArgument:
+  Enabled: true
+
 Performance/RedundantStringChars:
   Enabled: true
 
@@ -738,7 +756,7 @@ Security/YAMLLoad:
   Enabled: true
   SafeAutoCorrect: false
 
-Standard/BlockDelimiters:
+Standard/BlockSingleLineBraces:
   Enabled: true
 
 Style/Alias:
@@ -747,7 +765,6 @@ Style/Alias:
 
 Style/AndOr:
   Enabled: true
-  EnforcedStyle: always
 
 Style/ArgumentsForwarding:
   Enabled: true
@@ -855,6 +872,9 @@ Style/GlobalVars:
   Enabled: true
   AllowedVariables: []
 
+Style/HashConversion:
+  Enabled: true
+
 Style/HashExcept:
   Enabled: true
 
@@ -871,6 +891,9 @@ Style/IfInsideElse:
 Style/IfUnlessModifierOfIfUnless:
   Enabled: true
 
+Style/IfWithBooleanLiteralBranches:
+  Enabled: true
+
 Style/IfWithSemicolon:
   Enabled: true
 
@@ -1090,6 +1113,9 @@ Style/StabbyLambdaParentheses:
 Style/StderrPuts:
   Enabled: true
 
+Style/StringChars:
+  Enabled: true
+
 Style/StringLiterals:
   Enabled: true
   EnforcedStyle: double_quotes

data/config/ruby-1.9.yml

@@ -2,3 +2,6 @@ inherit_from: ./ruby-2.2.yml
 
 Style/Encoding:
   Enabled: false
+
+Style/HashConversion:
+  Enabled: false

data/config/ruby-2.3.yml

@@ -1,4 +1 @@
-inherit_from: ./ruby-2.5.yml
-
-AllCops:
-  TargetRubyVersion: 2.4 # The oldest supported
+inherit_from: ./ruby-2.4.yml

data/config/ruby-2.4.yml

@@ -0,0 +1,4 @@
+inherit_from: ./ruby-2.5.yml
+
+AllCops:
+  TargetRubyVersion: 2.5 # The oldest supported

data/lib/standard.rb

@@ -7,7 +7,7 @@ require "standard/cli"
 require "standard/railtie" if defined?(Rails) && defined?(Rails::Railtie)
 
 require "standard/formatter"
-require "standard/cop/block_delimiters"
+require "standard/cop/block_single_line_braces"
 
 module Standard
 end

data/lib/standard/cli.rb

@@ -3,9 +3,6 @@ require_relative "loads_runner"
 
 module Standard
   class Cli
-    SUCCESS_STATUS_CODE = 0
-    FAILURE_STATUS_CODE = 1
-
     def initialize(argv)
       @argv = argv
       @builds_config = BuildsConfig.new
@@ -14,10 +11,7 @@ module Standard
 
     def run
       config = @builds_config.call(@argv)
-
-      success = @loads_runner.call(config.runner).call(config)
-
-      success ? SUCCESS_STATUS_CODE : FAILURE_STATUS_CODE
+      @loads_runner.call(config.runner).call(config).to_i
     end
   end
 end

data/lib/standard/cop/{block_delimiters.rb → block_single_line_braces.rb}

@@ -10,7 +10,7 @@ module RuboCop::Cop
     #   # good - single line block
     #   items.each { |item| item / 5 }
     #
-    class BlockDelimiters < RuboCop::Cop::Base
+    class BlockSingleLineBraces < RuboCop::Cop::Base
       extend RuboCop::Cop::AutoCorrector
 
       def on_send(node)

data/lib/standard/creates_config_store/assigns_rubocop_yaml.rb

@@ -18,6 +18,8 @@ class Standard::CreatesConfigStore
         "ruby-2.2.yml"
       elsif desired_version < Gem::Version.new("2.4")
         "ruby-2.3.yml"
+      elsif desired_version < Gem::Version.new("2.5")
+        "ruby-2.4.yml"
       elsif desired_version < Gem::Version.new("2.6")
         "ruby-2.5.yml"
       elsif desired_version < Gem::Version.new("3.0")

data/lib/standard/creates_config_store/sets_target_ruby_version.rb

@@ -9,7 +9,7 @@ class Standard::CreatesConfigStore
     private
 
     def max_rubocop_supported_version(desired_version)
-      rubocop_supported_version = Gem::Version.new("2.4")
+      rubocop_supported_version = Gem::Version.new("2.5")
       if desired_version < rubocop_supported_version
         rubocop_supported_version
       else

data/lib/standard/rubocop/ext.rb

@@ -6,9 +6,9 @@ module RuboCop
     end
   end
 
-  class CommentConfig
-    remove_const :COMMENT_DIRECTIVE_REGEXP
-    COMMENT_DIRECTIVE_REGEXP = Regexp.new(
+  class DirectiveComment
+    remove_const :DIRECTIVE_COMMENT_REGEXP
+    DIRECTIVE_COMMENT_REGEXP = Regexp.new(
       ('# (?:standard|rubocop) : ((?:disable|enable|todo))\b ' + COPS_PATTERN)
         .gsub(" ", '\s*')
     )

data/lib/standard/runners/genignore.rb

@@ -13,7 +13,7 @@ module Standard
           config.rubocop_options[:formatters] = [["files", temp_file.path]]
           config.rubocop_options[:format] = "files"
           config.rubocop_options[:out] = temp_file.path
-          Runners::Rubocop.new.call(config)
+          exit_code = Runners::Rubocop.new.call(config)
 
           # Read in the files with errors.  It will have the absolute paths
           # of the files but we only want the relative path.
@@ -37,6 +37,7 @@ module Standard
             file.puts "# Remove from this list as you refactor files."
             file.write(yaml_format_errors.to_yaml)
           end
+          exit_code
         ensure
           # Clean up temp file.
           temp_file.close

data/lib/standard/runners/rubocop.rb

@@ -4,36 +4,15 @@ module Standard
   module Runners
     class Rubocop
       def call(config)
-        rubocop_runner = RuboCop::Runner.new(
-          config.rubocop_options,
-          config.rubocop_config_store
+        rubocop_runner = RuboCop::CLI::Command::ExecuteRunner.new(
+          RuboCop::CLI::Environment.new(
+            config.rubocop_options,
+            config.rubocop_config_store,
+            config.paths
+          )
         )
 
-        rubocop_runner.run(config.paths).tap do |success|
-          print_errors_and_warnings(success, rubocop_runner)
-          print_corrected_code_if_fixing_stdin(config.rubocop_options)
-        end
-      end
-
-      private
-
-      def print_errors_and_warnings(success, rubocop_runner)
-        return unless success
-
-        (rubocop_runner.warnings + rubocop_runner.errors).each do |message|
-          warn message
-        end
-      end
-
-      def print_corrected_code_if_fixing_stdin(rubocop_options)
-        return unless rubocop_options[:stdin] && rubocop_options[:auto_correct]
-
-        if rubocop_options[:stderr]
-          warn "=" * 20
-        else
-          puts "=" * 20
-        end
-        print rubocop_options[:stdin]
+        rubocop_runner.run
       end
     end
   end

data/lib/standard/version.rb

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

data/standard.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.version = Standard::VERSION
   spec.authors = ["Justin Searls"]
   spec.email = ["searls@gmail.com"]
-  spec.required_ruby_version = ">= 2.4.0"
+  spec.required_ruby_version = ">= 2.5.0"
 
   spec.summary = "Ruby Style Guide, with linter & automatic code fixer"
   spec.homepage = "https://github.com/testdouble/standard"
@@ -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.11.0"
-  spec.add_dependency "rubocop-performance", "1.10.1"
+  spec.add_dependency "rubocop", "1.13.0"
+  spec.add_dependency "rubocop-performance", "1.11.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standard
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Justin Searls
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.1
 description:
 email:
 - searls@gmail.com
@@ -62,6 +62,7 @@ files:
 - config/ruby-1.9.yml
 - config/ruby-2.2.yml
 - config/ruby-2.3.yml
+- config/ruby-2.4.yml
 - config/ruby-2.5.yml
 - config/ruby-2.7.yml
 - docs/RELEASE.md
@@ -69,7 +70,7 @@ files:
 - lib/standard.rb
 - lib/standard/builds_config.rb
 - lib/standard/cli.rb
-- lib/standard/cop/block_delimiters.rb
+- lib/standard/cop/block_single_line_braces.rb
 - lib/standard/creates_config_store.rb
 - lib/standard/creates_config_store/assigns_rubocop_yaml.rb
 - lib/standard/creates_config_store/configures_ignored_paths.rb
@@ -101,14 +102,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Ruby Style Guide, with linter & automatic code fixer