barsoom_utils 0.2.0.64 → 0.2.0.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cccdc6fc4265ea2cd6ae9f045fef87d7ef796ca5b330c35abff20006872c59d
-  data.tar.gz: b4fdf5c17d092dad93656925955f87cbbd0590307269ae7acea6a30b49127474
+  metadata.gz: f85cdf8a1dce5c728cf624248b7a98af640dd2c1fb331bb3a3bb99b5e9b80a2c
+  data.tar.gz: 91204dcd93f3458155f0e5b4e6d93875656601f965eb21f8602641ba87874d99
 SHA512:
-  metadata.gz: 7cc2fec26acb707bcff01af5f29ea62db07b41c90f157687d9591a452fe3281a8a3a7111063418daeb4da0560621995b58412db59c94691e33c7d0949a519e6c
-  data.tar.gz: d44aebbadb9488b219d881a61f35da778168894e2b4cf23468f34b82ed02741dd02c112c85fae1850b11e8875b24ba4db16dfc778c1267d397bf65eea989d3dc
+  metadata.gz: fd327952fc415218f8346b1a098a0cdb6406cd828876a7f62d993ed7121046f6fb05471ebf0c077052c5d30faac2357c1488ccfc7585115a088decf512c59860
+  data.tar.gz: 749e5a3e143553728f50934a73559cfbcb1fa03390d9e168e71ded9ba100e1f39740af8c95b361805e4d9a82a3e8786f41cb2f6f21e8946991d0f151d9247a7b

data/Gemfile

@@ -15,5 +15,4 @@ group :development, :test do
   gem "redis"
   gem "rspec"
   gem "rubocop"
-  gem "rubocop-rspec"  # For `expect_offense` test helpers.
 end

data/VERSION

@@ -1 +1 @@
-0.2.0.64
+0.2.0.65

data/shared_rubocop.yml

@@ -1,8 +1,5 @@
 # Configuration for the Rubocop code linting tool. See README.
 
-require:
-  - barsoom_utils/rubocop
-
 AllCops:
   ActiveSupportExtensionsEnabled: true
   DisabledByDefault: true
@@ -231,10 +228,10 @@ Style/RedundantBegin:
 Style/MethodCallWithoutArgsParentheses:
   Enabled: true
 
-# Replaces Style/TrailingCommaInArguments, which doesn't support our preferred style:
-# require trailing comma only when `)` is on its own line.
-Barsoom/TrailingCommaInArguments:
+# https://docs.rubocop.org/rubocop/cops_style.html#enforcedstyleformultiline-comma
+Style/TrailingCommaInArguments:
   Enabled: true
+  EnforcedStyleForMultiline: diff_comma
 
 # https://docs.rubocop.org/rubocop/cops_style.html#stylereturnnilinpredicatemethoddefinition
 Style/ReturnNilInPredicateMethodDefinition:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barsoom_utils
 version: !ruby/object:Gem::Version
-  version: 0.2.0.64
+  version: 0.2.0.65
 platform: ruby
 authors:
 - Tomas Skogberg
@@ -29,8 +29,6 @@ files:
 - lib/barsoom_utils.rb
 - lib/barsoom_utils/exception_notifier.rb
 - lib/barsoom_utils/feature_toggle.rb
-- lib/barsoom_utils/rubocop.rb
-- lib/barsoom_utils/rubocop/cop/barsoom/trailing_comma_in_arguments.rb
 - lib/barsoom_utils/spec/debug_helpers.rb
 - lib/barsoom_utils/version.rb
 - script/test
@@ -38,7 +36,6 @@ files:
 - shared_rubocop_rails.yml
 - spec/exception_notifier_spec.rb
 - spec/feature_toggle_spec.rb
-- spec/rubocop/cop/barsoom/trailing_comma_in_arguments_spec.rb
 - spec/spec/debug_helpers_spec.rb
 - spec/spec_helper.rb
 homepage: https://dev.auctionet.com/

data/lib/barsoom_utils/rubocop/cop/barsoom/trailing_comma_in_arguments.rb

@@ -1,105 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Cop
-    module Barsoom
-      # Require a trailing comma in multiline method arguments when the
-      # closing `)` is on its own line. Disallow it when `)` is on the
-      # same line as the last argument.
-      #
-      # This differs from the built-in `Style/TrailingCommaInArguments`:
-      # - `comma` disallows trailing commas when args share a line.
-      # - `consistent_comma` requires them even when `)` is on the same line.
-      #
-      # @example
-      #   # good
-      #   foo(
-      #     a,
-      #     b,
-      #   )
-      #
-      #   # good – args sharing a line is fine as long as there's a trailing comma
-      #   foo(
-      #     a, b,
-      #   )
-      #
-      #   # good – single-line
-      #   foo(a, b)
-      #
-      #   # good – closing paren on same line as last arg
-      #   foo(
-      #     a, b)
-      #
-      #   # bad – missing trailing comma
-      #   foo(
-      #     a,
-      #     b
-      #   )
-      #
-      #   # bad – trailing comma but closing paren on same line
-      #   foo(
-      #     a, b,)
-      class TrailingCommaInArguments < Base
-        extend AutoCorrector
-
-        MSG_MISSING = "Put a trailing comma after the last argument when `)` is on the next line."
-        MSG_UNWANTED = "Remove the trailing comma when `)` is on the same line as the last argument."
-
-        def on_send(node)
-          check(node)
-        end
-        alias on_csend on_send
-
-        private
-
-        def check(node)
-          return unless node.arguments? && node.parenthesized?
-
-          close_paren_line = node.source_range.end.line
-          last_arg = node.last_argument
-          last_arg_line = last_arg.source_range.end.line
-
-          return if close_paren_line == last_arg_line && close_paren_line == node.first_argument.first_line
-
-          # A trailing comma after `&` is a syntax error.
-          return if last_arg.block_pass_type?
-
-          trailing_comma = trailing_comma_token(node)
-          paren_on_own_line = close_paren_line > last_arg_line
-
-          if paren_on_own_line && !trailing_comma
-            add_offense_missing(last_arg)
-          elsif !paren_on_own_line && trailing_comma
-            add_offense_unwanted(trailing_comma)
-          end
-        end
-
-        def add_offense_missing(last_arg)
-          add_offense(last_arg, message: MSG_MISSING) do |corrector|
-            corrector.insert_after(last_arg, ",")
-          end
-        end
-
-        def add_offense_unwanted(comma_token)
-          range = comma_token.pos
-          add_offense(range, message: MSG_UNWANTED) do |corrector|
-            corrector.remove(range)
-          end
-        end
-
-        def trailing_comma_token(node)
-          close_paren_idx = node.loc.end
-          tokens = processed_source.tokens
-
-          # Find the non-whitespace token just before the closing paren.
-          tokens.reverse_each do |token|
-            next if token.pos.end_pos > close_paren_idx.begin_pos
-            next if token.comment? || token.type == :tNL
-            return token if token.comma?
-            return nil
-          end
-        end
-      end
-    end
-  end
-end

data/lib/barsoom_utils/rubocop.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "rubocop/cop/barsoom/trailing_comma_in_arguments"

data/spec/rubocop/cop/barsoom/trailing_comma_in_arguments_spec.rb

@@ -1,179 +0,0 @@
-# frozen_string_literal: true
-
-require "rubocop"
-require "rubocop/rspec/support"
-require "barsoom_utils/rubocop"
-
-RSpec.describe RuboCop::Cop::Barsoom::TrailingCommaInArguments, :config do
-  include RuboCop::RSpec::ExpectOffense
-
-  context "when closing paren is on its own line" do
-    it "registers an offense when trailing comma is missing" do
-      expect_offense(<<~RUBY)
-        foo(
-          a,
-          b
-          ^ Put a trailing comma after the last argument when `)` is on the next line.
-        )
-      RUBY
-
-      expect_correction(<<~RUBY)
-        foo(
-          a,
-          b,
-        )
-      RUBY
-    end
-
-    it "accepts trailing comma" do
-      expect_no_offenses(<<~RUBY)
-        foo(
-          a,
-          b,
-        )
-      RUBY
-    end
-
-    it "accepts trailing comma when args share a line" do
-      expect_no_offenses(<<~RUBY)
-        foo(
-          a, b,
-        )
-      RUBY
-    end
-
-    it "registers an offense for missing comma when args share a line" do
-      expect_offense(<<~RUBY)
-        foo(
-          a, b
-             ^ Put a trailing comma after the last argument when `)` is on the next line.
-        )
-      RUBY
-
-      expect_correction(<<~RUBY)
-        foo(
-          a, b,
-        )
-      RUBY
-    end
-  end
-
-  context "when closing paren is on the same line as last arg" do
-    it "registers an offense when trailing comma is present" do
-      expect_offense(<<~RUBY)
-        foo(
-          a,
-          b,)
-           ^ Remove the trailing comma when `)` is on the same line as the last argument.
-      RUBY
-
-      expect_correction(<<~RUBY)
-        foo(
-          a,
-          b)
-      RUBY
-    end
-
-    it "accepts no trailing comma" do
-      expect_no_offenses(<<~RUBY)
-        foo(
-          a,
-          b)
-      RUBY
-    end
-  end
-
-  context "single-line calls" do
-    it "accepts no trailing comma" do
-      expect_no_offenses(<<~RUBY)
-        foo(a, b)
-      RUBY
-    end
-
-    it "accepts a single argument" do
-      expect_no_offenses(<<~RUBY)
-        foo(a)
-      RUBY
-    end
-  end
-
-  context "safe navigation calls" do
-    it "registers an offense when trailing comma is missing" do
-      expect_offense(<<~RUBY)
-        foo&.bar(
-          a,
-          b
-          ^ Put a trailing comma after the last argument when `)` is on the next line.
-        )
-      RUBY
-
-      expect_correction(<<~RUBY)
-        foo&.bar(
-          a,
-          b,
-        )
-      RUBY
-    end
-  end
-
-  context "with keyword arguments" do
-    it "registers an offense when trailing comma is missing" do
-      expect_offense(<<~RUBY)
-        foo(
-          key: "value"
-          ^^^^^^^^^^^^ Put a trailing comma after the last argument when `)` is on the next line.
-        )
-      RUBY
-
-      expect_correction(<<~RUBY)
-        foo(
-          key: "value",
-        )
-      RUBY
-    end
-
-    it "accepts trailing comma" do
-      expect_no_offenses(<<~RUBY)
-        foo(
-          key: "value",
-        )
-      RUBY
-    end
-
-    it "accepts trailing comma followed by a comment" do
-      expect_no_offenses(<<~RUBY)
-        foo(
-          key: "value", # some comment
-        )
-      RUBY
-    end
-  end
-
-  context "with block pass argument" do
-    it "ignores block pass on its own line" do
-      expect_no_offenses(<<~RUBY)
-        bar(
-          a,
-          &block
-        )
-      RUBY
-    end
-  end
-
-  context "without parentheses" do
-    it "ignores calls without parentheses" do
-      expect_no_offenses(<<~RUBY)
-        foo a,
-          b
-      RUBY
-    end
-  end
-
-  context "without arguments" do
-    it "ignores calls without arguments" do
-      expect_no_offenses(<<~RUBY)
-        foo()
-      RUBY
-    end
-  end
-end