rufo 0.13.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67f0bac262d71b5c91c9babdc6d975e88d1b7f04e903b8111f7ccf4f56aa2a35
-  data.tar.gz: c437092573d817e16b05bf2ddc6a1b5a084bc8a81a06836b2e84528f65db1dca
+  metadata.gz: 1862ef1cb223254a0b735f6af30b3364045bd1c8673ad2c34ccd381571174377
+  data.tar.gz: 38d6908494f4a93cc527e914281e44c329dbec4b82a3ca4873acbf188856a559
 SHA512:
-  metadata.gz: 4e14f22cc80b1566449f65c5b5eb7ceaa4b3f7ed9e98c9dbce35161830049d155c7cc83dd6fe5c3e965ebc085b7cda787b18d4a705b71daebdc1571060a7b545
-  data.tar.gz: a49e26fe230db7e7c42d6f0a8cb700dec11caac98dfc6bfdc7eda7a0cfe80c3fb7b5da675acf0fd29da6b70253c893183279fd1b042d1f6e450f66b1e6e29813
+  metadata.gz: c8d78360444224de4502c9f727171e7df9e4ff3344e48b28475d0cf9d92f53d6807755542db05c99d3eaa54cde3f6c2cbe5b67c7b1583d3d5e4346b4c93c7afa
+  data.tar.gz: f62ce1f77275410744f235c74a2293d838a5dfe6110768f6434735cc935e7520d6bc0511496e9d5c5912a945a783ac989c990a8bc8b7f61bfffb05c7055f7008

data/.github/workflows/ci.yml

@@ -0,0 +1,60 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+  schedule:
+    - cron: '0 0 * * 0'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby_version: ['3.2', '3.1', '3.0', '2.7']
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby_version }}
+        bundler-cache: true
+
+    - name: Bundle update
+      run: |
+        bundle update
+
+    - name: Run test
+      run: |
+        bundle exec rspec --profile 10 \
+                          --format RspecJunitFormatter \
+                          --out test_results/rspec.xml \
+                          --format progress
+
+    - name: Upload code coverage
+      uses: codecov/codecov-action@v3
+      with:
+        files: ./coverage/coverage.xml
+
+    - name: Run rubocop
+      run: |
+        bundle exec rake rubocop
+
+    - name: Run rufo
+      run: |
+        bundle exec rake rufo:run
+
+    - name: Verify rufo works against sample codebases
+      run: |
+        bin/verify-sample-code
+
+    - name: Save test results
+      uses: actions/upload-artifact@v3
+      if: always()
+      with:
+        name: coverage-ruby-${{ matrix.ruby_version }}
+        path: coverage

data/.gitignore

@@ -8,6 +8,7 @@
 /spec/reports/
 /tmp/
 /*.gem
+/.ruby-version
 
 # rspec failure tracking
 .rspec_status

data/.rubocop.yml

@@ -1,8 +1,9 @@
 AllCops:
+  NewCops: enable
   Exclude:
     - "spec/**/*"
     - "vendor/**/*"
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
 
 Layout:
   Enabled: false

data/CHANGELOG.md

@@ -12,6 +12,34 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
+## [0.15.0] - 2023-02-08
+
+### Fixed
+
+### Changed
+
+### Added
+
+- Support for anonymous block argument forwarding
+- Support for valueless hash literals and keyword arguments
+- Support for anonymous rest and rest keyword arguments forwarding
+
+## [0.14.0] - 2023-01-25
+
+### Fixed
+
+- Correctly interpret erb scriptlets with more than one control-flow/block statement
+
+### Changed
+
+- Dropped support for Ruby 2.6 as it is end of life.
+
+### Added
+
+- Support for partial argument forwarding. (issue [268](https://github.com/ruby-formatter/rufo/issues/268))
+- Support for endless method. (issue [271](https://github.com/ruby-formatter/rufo/issues/271))
+- Add Ruby 3.2.0 to test runs on CI.
+
 ## [0.13.0] - 2021-05-07
 
 ### Fixed

data/README.md

@@ -1,6 +1,6 @@
 # Rufo
 
-[![CircleCI](https://circleci.com/gh/ruby-formatter/rufo.svg?style=svg)](https://circleci.com/gh/ruby-formatter/rufo)
+[![GitHub Actions](https://github.com/ruby-formatter/rufo/workflows/CI/badge.svg)](https://github.com/ruby-formatter/rufo/actions/workflows/ci.yml)
 [![Gem](https://img.shields.io/gem/v/rufo.svg)](https://rubygems.org/gems/rufo)
 
 **Ru**by **fo**rmatter
@@ -12,7 +12,7 @@ Unlike the best known Ruby formatter [RuboCop](https://github.com/bbatsov/ruboco
 
 RuboCop does much more than just format code though, so feel free to run them both!
 
-Rufo supports all Ruby versions >= 2.4.**5**, due to a bug in Ruby's Ripper parser.
+Rufo supports all Ruby versions >= 2.7.0.
 
 ## Installation
 
@@ -35,7 +35,7 @@ Or install it system wide with:
 Once the gem is installed, enable format on save integration in your editor of choice with the following libraries:
 
 - Atom: [rufo-atom](https://github.com/bmulvihill/rufo-atom) :construction:
-- Emacs [emacs-rufo](https://github.com/aleandros/emacs-rufo) :construction: or [rufo.el](https://github.com/danielma/rufo.el)
+- Emacs [emacs-rufo](https://github.com/aleandros/emacs-rufo) :construction: or [rufo.el](https://github.com/danielma/rufo.el) or [run rufo with reformatter](https://gist.github.com/kzkn/5c80c24d39e5e7b7881d55ad04605c5b)
 - Sublime Text: [sublime-rufo](https://github.com/ruby-formatter/sublime-rufo)
 - Vim: [rufo-vim](https://github.com/splattael/rufo-vim)
 - Visual Studio Code: [vscode-rufo](https://marketplace.visualstudio.com/items?itemName=mbessey.vscode-rufo) or [rufo-vscode](https://marketplace.visualstudio.com/items?itemName=siliconsenthil.rufo-vscode)

data/bin/verify-sample-code

@@ -9,6 +9,8 @@ repos = {
       "spec/rspec/core/metadata_spec.rb",
       "spec/rspec/core/formatters/html_formatter_spec.rb",
       "spec/rspec/core/formatters_spec.rb",
+      "spec/rspec/core/formatters/documentation_formatter_spec.rb",
+      "spec/rspec/core/formatters/progress_formatter_spec.rb"
     ].join(","),
   },
 }

data/lib/rufo/erb_formatter.rb

@@ -104,11 +104,48 @@ class Rufo::ErbFormatter
     result.strip
   end
 
+  def format_affix(affix, levels, type)
+    string = ""
+    case type
+    when :prefix
+      count = 0
+      while count < levels
+        count += 1
+        string += (" " * Rufo::Formatter::INDENT_SIZE * (count > 0 ? count - 1 : 0)) + affix
+        string += "\n" if count < levels
+      end
+    when :suffix
+      count = levels
+      while count > 0
+        count -= 1
+        string += "\n"
+        string += (" " * Rufo::Formatter::INDENT_SIZE * (count > 0 ? count - 1 : 0)) + affix
+      end
+    end
+    string
+  end
+
   def determine_code_wrappers(code_str)
-    return nil, "\nend" if Ripper.sexp("#{code_str}\nend")
+    keywords = Ripper.lex("#{code_str}").filter { |lex_token| lex_token[1] == :on_kw }
+    lexical_tokens = keywords.filter { |lex_token| lex_token[2] != "when" }.map { |lex_token| lex_token[3].to_s }
+    state_tally = lexical_tokens.group_by(&:itself).transform_values(&:count)
+    beg_token = state_tally["BEG"] || state_tally["EXPR_BEG"] || 0
+    end_token = state_tally["END"] || state_tally["EXPR_END"] || 0
+    depth = beg_token - end_token
+
+    if depth > 0
+      affix = format_affix("end", depth.abs, :suffix)
+      return nil, affix if Ripper.sexp("#{code_str}#{affix}")
+    end
+
     return nil, "}" if Ripper.sexp("#{code_str} }")
     return "{", nil if Ripper.sexp("{ #{code_str}")
-    return "begin", nil if Ripper.sexp("begin #{code_str}")
+
+    if depth < 0
+      affix = format_affix("begin", depth.abs, :prefix)
+      return affix, nil if Ripper.sexp("#{affix}#{code_str}")
+    end
+
     return "begin\n", "\nend" if Ripper.sexp("begin\n#{code_str}\nend")
     return "if a\n", "\nend" if Ripper.sexp("if a\n#{code_str}\nend")
     return "case a\n", "\nend" if Ripper.sexp("case a\n#{code_str}\nend")

data/lib/rufo/formatter.rb

@@ -227,12 +227,11 @@ class Rufo::Formatter
     when :@CHAR
       # [:@CHAR, "?a", [1, 0]]
       consume_token :on_CHAR
-    when :@gvar
+    when :@gvar, :@backref, :@label, :@op
       # [:@gvar, "$abc", [1, 0]]
-      write node[1]
-      next_token
-    when :@backref
       # [:@backref, "$1", [1, 0]]
+      # [:@label, "foo:", [1, 3]]
+      # [:@op, "*", [1, 1]]
       write node[1]
       next_token
     when :@backtick
@@ -289,11 +288,12 @@ class Rufo::Formatter
       visit_quoted_symbol_literal(node)
     when :@ident
       consume_token :on_ident
-    when :var_ref
+    when :var_ref, :var_field, :const_ref, :vcall, :fcall
       # [:var_ref, exp]
-      visit node[1]
-    when :var_field
       # [:var_field, exp]
+      # [:const_ref, [:@const, "Foo", [1, 8]]]
+      # [:vcall, exp]
+      # [:fcall, [:@ident, "foo", [1, 0]]]
       visit node[1]
     when :@kw
       # [:@kw, "nil", [1, 0]]
@@ -307,9 +307,6 @@ class Rufo::Formatter
     when :@const
       # [:@const, "FOO", [1, 0]]
       consume_token :on_const
-    when :const_ref
-      # [:const_ref, [:@const, "Foo", [1, 8]]]
-      visit node[1]
     when :top_const_ref
       # [:top_const_ref, [:@const, "Foo", [1, 2]]]
       consume_op "::"
@@ -319,9 +316,7 @@ class Rufo::Formatter
       # [:top_const_field, [:@const, "Foo", [1, 2]]]
       consume_op "::"
       visit node[1]
-    when :const_path_ref
-      visit_path(node)
-    when :const_path_field
+    when :const_path_ref, :const_path_field
       visit_path(node)
     when :assign
       visit_assign(node)
@@ -341,12 +336,6 @@ class Rufo::Formatter
       visit_suffix(node, "until")
     when :rescue_mod
       visit_suffix(node, "rescue")
-    when :vcall
-      # [:vcall, exp]
-      visit node[1]
-    when :fcall
-      # [:fcall, [:@ident, "foo", [1, 0]]]
-      visit node[1]
     when :command
       visit_command(node)
     when :command_call
@@ -422,10 +411,6 @@ class Rufo::Formatter
       visit_hash_key_value(node)
     when :assoc_splat
       visit_splat_inside_hash(node)
-    when :@label
-      # [:@label, "foo:", [1, 3]]
-      write node[1]
-      next_token
     when :dot2
       visit_range(node, true)
     when :dot3
@@ -452,10 +437,6 @@ class Rufo::Formatter
       consume_keyword "yield"
     when :yield
       visit_yield(node)
-    when :@op
-      # [:@op, "*", [1, 1]]
-      write node[1]
-      next_token
     when :lambda
       visit_lambda(node)
     when :zsuper
@@ -1456,14 +1437,10 @@ class Rufo::Formatter
     # check for ||
     if empty_params && !local_params
       # Don't write || as it's meaningless
-      if current_token_value == "|"
-        next_token
-        skip_space_or_newline
-        check :on_op
-        next_token
-      else
-        next_token
-      end
+      next_token
+      skip_space_or_newline
+      check :on_op
+      next_token
       return
     end
 
@@ -1520,6 +1497,9 @@ class Rufo::Formatter
       consume_op "&"
       skip_space_or_newline
       visit block_arg
+    elsif current_token_kind == :on_op && current_token_value == "&"
+      consume_op "&"
+      skip_space_or_newline
     end
   end
 
@@ -1548,7 +1528,10 @@ class Rufo::Formatter
     write_indent(base_column) if needs_indent
     consume_op "*"
     skip_space_or_newline
-    visit star
+    # The name of rest arguments might be omitted.
+    if star
+      visit star
+    end
 
     if post_args && !post_args.empty?
       write_params_comma
@@ -1575,7 +1558,12 @@ class Rufo::Formatter
 
     line = @line
 
-    indent_body body
+    endless = body[0].is_a?(Symbol)
+    if endless
+      visit body
+    else
+      indent_body body
+    end
 
     while rescue_body
       # [:rescue, type, name, body, more_rescue]
@@ -1620,7 +1608,7 @@ class Rufo::Formatter
     end
 
     write_indent if @line != line
-    consume_keyword "end"
+    consume_keyword "end" unless endless
   end
 
   def visit_rescue_types(node)
@@ -1996,6 +1984,19 @@ class Rufo::Formatter
     #   [:@ident, "foo", [1, 6]],
     #   [:params, nil, nil, nil, nil, nil, nil, nil],
     #   [:bodystmt, [[:void_stmt]], nil, nil, nil]]
+    #
+    # OR For endless methods (in 3.0)
+    # [:def,
+    #   [:@ident, "foo", [1, 6]],
+    #   nil,
+    #   [:string_literal, [:string_content, [:@tstring_content, "bar", [1, 11]
+    # OR For endless methods (in 3.1)
+    # [:def,
+    #   [:@ident, "foo", [1, 6]],
+    #   nil,
+    #   [:bodystmt,
+    #    [:string_literal, [:string_content, [:@tstring_content, "bar", [1, 11]
+
     _, name, params, body = node
 
     consume_keyword "def"
@@ -2032,6 +2033,7 @@ class Rufo::Formatter
   def visit_def_from_name(name, params, body)
     visit name
 
+    params = [] if params.nil?
     params = params[1] if params[0] == :paren
 
     skip_space
@@ -2072,6 +2074,7 @@ class Rufo::Formatter
         end
         write ")"
         next_token
+        skip_space
       end
     elsif !empty_params?(params)
       if parens_in_def == :yes
@@ -2085,9 +2088,18 @@ class Rufo::Formatter
       skip_space
     end
 
+    format_endless_method if current_token_kind == :on_op
+
     visit body
   end
 
+  def format_endless_method
+    consume_space
+    consume_op "="
+    consume_space
+    skip_space
+  end
+
   def empty_params?(node)
     _, a, b, c, d, e, f, g = node
     !a && !b && !c && !d && !e && !f && !g
@@ -2143,6 +2155,7 @@ class Rufo::Formatter
       when 0, [:excessed_comma]
         write_params_comma
       when [:args_forward]
+        write_params_comma if needs_comma
         consume_op "..."
       else
         # [:rest_param, [:@ident, "x", [1, 15]]]
@@ -2179,22 +2192,31 @@ class Rufo::Formatter
 
     if double_star_param
       write_params_comma if needs_comma
-      consume_op "**"
-      skip_space_or_newline
+      case double_star_param
+      when [:args_forward] # may be [:args_forward] in 3.1.0
+        consume_op "..."
+      else
+        consume_op "**" # here
+        skip_space_or_newline
 
-      # A nameless double star comes as an... Integer? :-S
-      visit double_star_param if double_star_param.is_a?(Array)
-      skip_space_or_newline
-      needs_comma = true
+        # A nameless double star comes as an... Integer? :-S
+        visit double_star_param if double_star_param.is_a?(Array)
+        skip_space_or_newline
+        needs_comma = true
+      end
     end
 
-    if blockarg
+    # In 3.1.0 blockarg may be just a symbol `:&`
+    if blockarg && blockarg.is_a?(Array)
       # [:blockarg, [:@ident, "block", [1, 16]]]
       write_params_comma if needs_comma
       skip_space_or_newline
       consume_op "&"
       skip_space_or_newline
-      visit blockarg[1]
+      # Ruby 3.1 or above, block arg might be anonymous
+      if blockarg[1]
+        visit blockarg[1]
+      end
     end
   end
 
@@ -2371,16 +2393,21 @@ class Rufo::Formatter
     arrow = symbol || !(key[0] == :@label || key[0] == :dyna_symbol)
 
     visit key
-    consume_space
 
     # Don't output `=>` for keys that are `label: value`
     # or `"label": value`
     if arrow
-      consume_op "=>"
       consume_space
+      consume_op "=>"
     end
 
-    visit value
+    if value.nil?
+      # The value for the key is omitted.
+      skip_space
+    else
+      consume_space
+      visit value
+    end
   end
 
   def visit_splat_inside_hash(node)
@@ -2389,7 +2416,11 @@ class Rufo::Formatter
     # [:assoc_splat, exp]
     consume_op "**"
     skip_space_or_newline
-    visit node[1]
+    exp = node[1]
+    # The name of rest kwargs might be omitted.
+    if exp
+      visit exp
+    end
   end
 
   def visit_range(node, inclusive)
@@ -3188,13 +3219,6 @@ class Rufo::Formatter
         last_space = current_token
         next_token
       when :on_nl, :on_ignored_nl
-        # I don't know why but sometimes a on_ignored_nl
-        # can appear with nil as the "text", and that's wrong
-        if current_token[2].nil?
-          next_token
-          next
-        end
-
         if last == :newline
           # If we pass through consecutive newlines, don't print them
           # yet, but remember this fact
@@ -3529,7 +3553,7 @@ class Rufo::Formatter
   end
 
   def write_indent(indent = @indent)
-    @output << " " * indent
+    @output << (" " * indent)
     @column += indent
   end
 
@@ -3874,7 +3898,7 @@ class Rufo::Formatter
     # get line of node, it is only used in visit_hash right now,
     # so handling the following node types is enough.
     case node.first
-    when :hash, :string_literal, :symbol_literal, :symbol, :vcall, :string_content, :assoc_splat, :var_ref
+    when :hash, :string_literal, :symbol_literal, :symbol, :vcall, :string_content, :assoc_splat, :var_ref, :dyna_symbol
       node_line(node[1], beginning: beginning)
     when :assoc_new
       # There's no line number info for empty strings or hashes.
@@ -3887,12 +3911,6 @@ class Rufo::Formatter
       end
     when :assoclist_from_args
       node_line(beginning ? node[1][0] : node[1].last, beginning: beginning)
-    when :dyna_symbol
-      if node[1][0].is_a?(Symbol)
-        node_line(node[1], beginning: beginning)
-      else
-        node_line(node[1][0], beginning: beginning)
-      end
     when :@label, :@int, :@ident, :@tstring_content, :@kw
       node[2][0]
     end

data/lib/rufo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rufo
-  VERSION = "0.13.0"
+  VERSION = "0.15.0"
 end

data/rufo.gemspec

@@ -20,16 +20,17 @@ Gem::Specification.new do |spec|
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.required_ruby_version = ">= 2.7.0"
+  spec.metadata["rubygems_mfa_required"] = "true"
 
   spec.add_development_dependency "bundler", ">= 1.15"
-  spec.add_development_dependency "byebug", "~> 11.0.1"
+  spec.add_development_dependency "byebug", "~> 11.1.3"
   spec.add_development_dependency "guard-rspec", "~> 4.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rexml", "~> 3.2.5"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rspec_junit_formatter", "~> 0.4.1"
-  spec.add_development_dependency "rubocop", "~> 0.79.0"
-  spec.add_development_dependency "simplecov", "~> 0.18.5"
-  spec.add_development_dependency "simplecov-cobertura", "~> 1.3.1"
+  spec.add_development_dependency "rspec_junit_formatter", "~> 0.6.0"
+  spec.add_development_dependency "rubocop", "~> 1.44.1"
+  spec.add_development_dependency "simplecov", "~> 0.22.0"
+  spec.add_development_dependency "simplecov-cobertura", "~> 2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufo
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Ary Borenszweig
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-09 00:00:00.000000000 Z
+date: 2023-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.0.1
+        version: 11.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.0.1
+        version: 11.1.3
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,56 +100,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 1.44.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 1.44.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.5
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.5
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: simplecov-cobertura
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '2.1'
 description: Fast and unobtrusive Ruby code formatter
 email:
 - asterite@gmail.com
@@ -158,8 +158,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -193,7 +193,8 @@ files:
 homepage: https://github.com/ruby-formatter/rufo
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -202,14 +203,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.17
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Ruby code formatter

data/.circleci/config.yml

@@ -1,101 +0,0 @@
-"-": &dockerbuild
-  steps:
-    - checkout
-
-    # Which version of ruby?
-    - run:
-        name: Which ruby?
-        command: ruby --version | tee ruby-version-for-ci.txt
-
-    # Which version of bundler?
-    - run:
-        name: Which bundler?
-        command: bundle -v
-
-    # Restore bundle cache
-    - restore_cache:
-        keys:
-          - bundler-packages-v2-{{ checksum "ruby-version-for-ci.txt" }}-{{ checksum "rufo.gemspec" }}-{{ checksum "bin/verify-sample-code" }}
-
-    - run:
-        name: Bundle Install
-        command: bundle check || bundle install
-
-    - run:
-        name: Run rspec
-        command: |
-          bundle exec rspec --profile 10 \
-                            --format RspecJunitFormatter \
-                            --out test_results/rspec.xml \
-                            --format progress
-    - run:
-          name: Upload code coverage
-          command: bash <(curl -s https://codecov.io/bash) -f 'coverage/coverage.xml'
-    - run:
-        name: Run RuboCop
-        command: |
-          bundle exec rake rubocop
-    - run:
-        name: Run Rufo
-        command: |
-          bundle exec rake rufo:run
-
-    - run:
-        name: Verify rufo works against sample codebases
-        command: |
-          bin/verify-sample-code
-
-    # Store bundle cache
-    - save_cache:
-        key: bundler-packages-v2-{{ checksum "ruby-version-for-ci.txt" }}-{{ checksum "rufo.gemspec" }}-{{ checksum "bin/verify-sample-code" }}
-        paths:
-          - vendor/bundle
-          - Gemfile.lock
-
-    # Save test results for timing analysis
-    - store_test_results:
-        path: test_results
-
-version: 2
-jobs:
-  build-3-0-1:
-    <<: *dockerbuild
-    docker:
-      - image: circleci/ruby:3.0.1
-        environment:
-          BUNDLE_JOBS: "3"
-          BUNDLE_RETRY: "3"
-          BUNDLE_PATH: /home/circleci/project/vendor/bundle
-  build-2-7-3:
-    <<: *dockerbuild
-    docker:
-      - image: circleci/ruby:2.7.3
-        environment:
-          BUNDLE_JOBS: "3"
-          BUNDLE_RETRY: "3"
-          BUNDLE_PATH: /home/circleci/project/vendor/bundle
-  build-2-6-7:
-    <<: *dockerbuild
-    docker:
-      - image: circleci/ruby:2.6.7
-        environment:
-          BUNDLE_JOBS: "3"
-          BUNDLE_RETRY: "3"
-          BUNDLE_PATH: /home/circleci/project/vendor/bundle
-  build-2-6-1:
-    <<: *dockerbuild
-    docker:
-      - image: circleci/ruby:2.6.1
-        environment:
-          BUNDLE_JOBS: "3"
-          BUNDLE_RETRY: "3"
-          BUNDLE_PATH: vendor/bundle
-
-workflows:
-  version: 2
-  test:
-    jobs:
-      - build-3-0-1
-      - build-2-7-3
-      - build-2-6-7
-      - build-2-6-1