rufo 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea171b0f22404cea26bb2f1263b5787721a968bc4be3dccb96d258ca7ab1586a
-  data.tar.gz: bdbafe76de95494aadff70e0183805dbe5a1734373b45d8fa5f6c4c8addb4e48
+  metadata.gz: 19befa300eb72a2de7c9f70a5df89a9d81520ae565ec28260eb78ccb8c6259a4
+  data.tar.gz: efa9c54a96d77df14c1ecdd9fd301942c73be0ec80ad1312b7a419007b7ad282
 SHA512:
-  metadata.gz: 79279d81687a7137424100278d5fbc3727052317ad264bbf9b9379ec8f1902bf4e2a8239d6ba43b219149912372f9db78bc82288ff645889bd1333741c072b9d
-  data.tar.gz: 604473d7682a92356a4e3fd9aa865f3a0cb5ee248e7bac2b237c8f917d5feffa7fc66597dfbd5a91101154cfdbd5f9adb4d402fad2e0fcf034b4a3be79452867
+  metadata.gz: c1c699f17a408b12d9e134869d9e9857c048a3d64c35daf06f3ab4ccd4880371c6940ca382aa90f92e91c86dc534e466cbc4ca7652e15f720c2d8ad13dcd985a
+  data.tar.gz: b07894fcad0897b000cf84aa6e664a276fb2bcd7bf1e228ed7b3f1d3c43a3352cd9c12f03926236e15b932fe099f82c32af20aa04f0246c066d44ad9e8b67224

data/.gitignore

@@ -11,4 +11,8 @@
 
 # rspec failure tracking
 .rspec_status
+spec/examples.txt
+
 sample_code
+
+.byebug_history

data/.rspec

@@ -1,2 +1,2 @@
+--require spec_helper
 --format documentation
---color

data/CHANGELOG.md

@@ -12,6 +12,41 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
+## [0.10.0] - 2020-01-16
+
+### Fixed
+- Squiggly heredoc closing tag indentation.
+- Formatting .erb files from stdin.
+
+### Changed
+- Method parameters are now no longer aligned with the method parenthesis. For example:
+  - ```ruby
+    def foo(
+            param
+           )
+    end
+
+    # Becomes:
+
+    def foo(
+      param
+    )
+    end
+    ```
+- Multiline assignments are no longer aligned with variable indentation.
+  - ```ruby
+    a = if true
+          b
+        end
+
+    # Becomes:
+
+    a = if true
+        b
+      end
+    ```
+### Added
+
 ## [0.9.0] - 2020-01-11
 
 ### Added

data/lib/rufo/command.rb

@@ -35,17 +35,18 @@ class Rufo::Command
 
   def run(argv)
     status_code = if argv.empty?
-                    format_stdin
-                  else
-                    format_args argv
-                  end
+        format_stdin
+      else
+        format_args argv
+      end
     exit exit_code(status_code)
   end
 
   def format_stdin
     code = STDIN.read
 
-    result = format(code, @filename_for_dot_rufo || Dir.getwd)
+    erb = @filename_for_dot_rufo && @filename_for_dot_rufo.end_with?(".erb")
+    result = format(code, @filename_for_dot_rufo || Dir.getwd, erb: erb)
 
     print(result) if !@want_check
 
@@ -53,10 +54,10 @@ class Rufo::Command
   rescue Rufo::SyntaxError => e
     logger.error("STDIN is invalid code. Error on line:#{e.lineno} #{e.message}")
     CODE_ERROR
-  rescue => ex
+  rescue => e
     logger.error("You've found a bug!")
     logger.error("Please report it to https://github.com/ruby-formatter/rufo/issues with code that triggers it\n")
-    raise ex
+    raise e
   end
 
   def format_args(args)
@@ -121,11 +122,11 @@ class Rufo::Command
   rescue Rufo::SyntaxError => e
     logger.error("#{filename}:#{e.lineno} #{e.message}")
     CODE_ERROR
-  rescue => ex
+  rescue => e
     logger.error("You've found a bug!")
     logger.error("It happened while trying to format the file #{filename}")
     logger.error("Please report it to https://github.com/ruby-formatter/rufo/issues with code that triggers it\n")
-    raise ex
+    raise e
   end
 
   def format(code, dir, erb: false)

data/lib/rufo/formatter.rb

@@ -887,19 +887,24 @@ class Rufo::Formatter
   def visit_assign_value(value)
     has_slash_newline, _first_space = skip_space_backslash
 
-    sticky = indentable_value?(value)
-
     # Remove backslash after equal + newline (it's useless)
     if has_slash_newline
       skip_space_or_newline
-      write_line
+      write_space
       indent(next_indent) do
-        write_indent
         visit(value)
       end
     else
-      indent_after_space value, sticky: sticky,
-                                want_space: true
+      if [:begin, :case, :if, :unless].include?(value.first)
+        skip_space_or_newline
+        write_space
+        indent(next_indent) do
+          visit value
+        end
+      else
+        indent_after_space value, sticky: false,
+                                  want_space: true
+      end
     end
   end
 
@@ -1195,9 +1200,6 @@ class Rufo::Formatter
       write current_token_value.rstrip
       next_token
       write_line
-      if @heredocs.last[1]
-        write_indent(next_indent)
-      end
     end
 
     printed = false
@@ -2031,6 +2033,7 @@ class Rufo::Formatter
       next_token
       skip_space
       skip_semicolons
+      broken_across_line = false
 
       if empty_params?(params)
         skip_space_or_newline
@@ -2041,8 +2044,8 @@ class Rufo::Formatter
         write "("
 
         if newline? || comment?
-          column = @column
-          indent(column) do
+          broken_across_line = true
+          indent(next_indent) do
             consume_end_of_line
             write_indent
             visit params
@@ -2056,6 +2059,10 @@ class Rufo::Formatter
         skip_space_or_newline
         consume_keyword("nil") if current_token[1] == :on_kw
         check :on_rparen
+        if broken_across_line
+          write_line
+          write_indent
+        end
         write ")"
         next_token
       end
@@ -2737,8 +2744,9 @@ class Rufo::Formatter
       # We have to be careful not to aumatically write a heredoc on next_token,
       # because we miss the chance to write a comma to separate elements
       first_space = skip_space_no_heredoc_check
-      wrote_comma = check_heredocs_in_literal_elements(is_last, wrote_comma)
-
+      indent(needed_indent) do
+        wrote_comma = check_heredocs_in_literal_elements(is_last, wrote_comma)
+      end
       next unless comma?
 
       unless is_last
@@ -2751,7 +2759,9 @@ class Rufo::Formatter
       next_token_no_heredoc_check
 
       first_space = skip_space_no_heredoc_check
-      wrote_comma = check_heredocs_in_literal_elements(is_last, wrote_comma)
+      indent(needed_indent) do
+        wrote_comma = check_heredocs_in_literal_elements(is_last, wrote_comma)
+      end
 
       if newline? || comment?
         if is_last

data/lib/rufo/version.rb

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

data/rufo.gemspec

@@ -23,10 +23,10 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.4.5"
 
   spec.add_development_dependency "bundler", ">= 1.15"
-  spec.add_development_dependency "byebug", "~> 10.0.2"
+  spec.add_development_dependency "byebug", "~> 11.0.1"
   spec.add_development_dependency "guard-rspec", "~> 4.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec_junit_formatter", "~> 0.4.1"
-  spec.add_development_dependency "rubocop", "~> 0.63.1"
+  spec.add_development_dependency "rubocop", "~> 0.79.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufo
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Ary Borenszweig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-11 00:00:00.000000000 Z
+date: 2020-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.2
+        version: 11.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.2
+        version: 11.0.1
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.63.1
+        version: 0.79.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.63.1
+        version: 0.79.0
 description: Fast and unobtrusive Ruby code formatter
 email:
 - asterite@gmail.com