rufo 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87b9e11a2d83bf366134074b750fca515da61d65c626ad4a85cb029b3246f314
-  data.tar.gz: 5f2caf3f22b5b7e8411e7a35f9e73c27bfd7a92f7f8246f3099ed98ecacef359
+  metadata.gz: 67f0bac262d71b5c91c9babdc6d975e88d1b7f04e903b8111f7ccf4f56aa2a35
+  data.tar.gz: c437092573d817e16b05bf2ddc6a1b5a084bc8a81a06836b2e84528f65db1dca
 SHA512:
-  metadata.gz: 00742ceee28433e130ccceffd31ee41a8a827135d3f986f552d42821e62acc6b5a7c795771c5bdea5ec46069374a1ca014f964ca21fcd425240ffeedc101b72f
-  data.tar.gz: ade0daa5611c2cbe51f9bf59de4df7750aaac6ecec829eaad97b9f478cba2d5f5a4671ac054c9d2850f5b1758b07881b51474e94a1cbe754f02a6348ccaa1607
+  metadata.gz: 4e14f22cc80b1566449f65c5b5eb7ceaa4b3f7ed9e98c9dbce35161830049d155c7cc83dd6fe5c3e965ebc085b7cda787b18d4a705b71daebdc1571060a7b545
+  data.tar.gz: a49e26fe230db7e7c42d6f0a8cb700dec11caac98dfc6bfdc7eda7a0cfe80c3fb7b5da675acf0fd29da6b70253c893183279fd1b042d1f6e450f66b1e6e29813

data/.circleci/config.yml

@@ -58,42 +58,34 @@
 
 version: 2
 jobs:
-  build-2-7-0:
+  build-3-0-1:
     <<: *dockerbuild
     docker:
-      - image: circleci/ruby:2.7.0
+      - image: circleci/ruby:3.0.1
         environment:
           BUNDLE_JOBS: "3"
           BUNDLE_RETRY: "3"
           BUNDLE_PATH: /home/circleci/project/vendor/bundle
-  build-2-6-3:
+  build-2-7-3:
     <<: *dockerbuild
     docker:
-      - image: circleci/ruby:2.6.3
+      - image: circleci/ruby:2.7.3
         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
-  build-2-5-3:
+  build-2-6-7:
     <<: *dockerbuild
     docker:
-      - image: circleci/ruby:2.5.3
+      - image: circleci/ruby:2.6.7
         environment:
           BUNDLE_JOBS: "3"
           BUNDLE_RETRY: "3"
-          BUNDLE_PATH: vendor/bundle
-  build-2-4-5:
+          BUNDLE_PATH: /home/circleci/project/vendor/bundle
+  build-2-6-1:
     <<: *dockerbuild
     docker:
-      - image: circleci/ruby:2.4.5
+      - image: circleci/ruby:2.6.1
         environment:
           BUNDLE_JOBS: "3"
           BUNDLE_RETRY: "3"
@@ -103,8 +95,7 @@ workflows:
   version: 2
   test:
     jobs:
-      - build-2-7-0
-      - build-2-6-3
+      - build-3-0-1
+      - build-2-7-3
+      - build-2-6-7
       - build-2-6-1
-      - build-2-5-3
-      - build-2-4-5

data/.rubocop.yml

@@ -2,7 +2,7 @@ AllCops:
   Exclude:
     - "spec/**/*"
     - "vendor/**/*"
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6
 
 Layout:
   Enabled: false

data/CHANGELOG.md

@@ -12,9 +12,25 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
+## [0.13.0] - 2021-05-07
+
+### Fixed
+
+- Properly format comma when a heredoc is passed as a call argument
+- Correctly interpret case statements with multiple when clauses in ERB files
+
+### Changed
+
+- Dropped support for Ruby 2.4 and 2.5 as they are end of life.
+
+### Added
+
+- Add Ruby 3.0.1 to test runs on CI.
+
 ## [0.12.0] - 2020-03-08
 
 ### Fixed
+
 - File.read default encode UTF-8
 - Handle case where the code is invalid but ripper does not raise an error.
 - Removed implicit dependency on `rake`.

data/bin/verify-sample-code

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

data/docs/settings.md

@@ -23,7 +23,7 @@ See https://github.com/ruby-formatter/rufo/issues/2 for more context!
 - [parens_in_def](#parens_in_def)
 - [trailing_commas](#trailing_commas)
 - [quote_style](#quote_style)
-- [includes and excludes](#includes%20and%20excludes)
+- [includes and excludes](#includes-and-excludes)
 
 ### align_case_when
 
@@ -284,5 +284,5 @@ Files can be excluded or included in formatting with rufo by specifying glob pat
 For example:
 ```
 includes [*.txt,*.text]
-excludes [*.rb]
+excludes [**/*.erb]
 ```

data/lib/rufo/erb_formatter.rb

@@ -111,6 +111,7 @@ class Rufo::ErbFormatter
     return "begin", nil if Ripper.sexp("begin #{code_str}")
     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")
     raise_syntax_error!(code_str)
   end
 

data/lib/rufo/formatter.rb

@@ -212,7 +212,7 @@ class Rufo::Formatter
     when :@float
       # Float literal
       #
-      # [:@int, "123.45", [1, 0]]
+      # [:@float, "123.45", [1, 0]]
       consume_token :on_float
     when :@rational
       # Rational literal
@@ -1126,11 +1126,14 @@ class Rufo::Formatter
 
       found_comma = comma?
 
+      heredoc_needs_newline = true
+
       if found_comma
         if needs_trailing_newline
           write "," if trailing_commas && !block_arg
 
           next_token
+          heredoc_needs_newline = !newline?
           indent(next_indent) do
             consume_end_of_line
           end
@@ -1142,7 +1145,7 @@ class Rufo::Formatter
       end
 
       if newline? || comment?
-        if needs_trailing_newline
+        if needs_trailing_newline && !@last_was_heredoc
           write "," if trailing_commas && want_trailing_comma
 
           indent(next_indent) do
@@ -1154,7 +1157,7 @@ class Rufo::Formatter
         end
       else
         if needs_trailing_newline && !found_comma
-          write "," if trailing_commas && want_trailing_comma
+          write "," if trailing_commas && want_trailing_comma && !@last_was_heredoc
           consume_end_of_line
           write_indent
         end
@@ -1169,8 +1172,9 @@ class Rufo::Formatter
       call_info << @line
     end
 
-    if @last_was_heredoc
+    if @last_was_heredoc && heredoc_needs_newline
       write_line
+      write_indent
     end
     consume_token :on_rparen
   end

data/lib/rufo/version.rb

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

data/rufo.gemspec

@@ -20,12 +20,13 @@ 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.4.5"
+  spec.required_ruby_version = ">= 2.6.0"
 
   spec.add_development_dependency "bundler", ">= 1.15"
   spec.add_development_dependency "byebug", "~> 11.0.1"
   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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufo
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Ary Borenszweig
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-08 00:00:00.000000000 Z
+date: 2021-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +194,7 @@ homepage: https://github.com/ruby-formatter/rufo
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -188,15 +202,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.5
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.17
+signing_key:
 specification_version: 4
 summary: Ruby code formatter
 test_files: []