rufo 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6403e7160a1d00c65b0562de144fe3aebf112a7e
-  data.tar.gz: d175a0ae7c46af1e5ebdfa7b4db59e324af1fdf3
+SHA256:
+  metadata.gz: 882bdf48ef5e72a77d7971ee7569d8f9b8e70269c6c61a87bb73791a17634b8e
+  data.tar.gz: df6f5f5b21ad982b68bb21cb092d06eae0b9f1bdaebcbbd22711b490b9d41eb6
 SHA512:
-  metadata.gz: 8664f038f6bb0f10e60a7e84278bcfd91ae6205d71b7e73b50dfdaf39145664c8300e2b10cfe0eddb2551eb2fd81e81e6a50ae9a6e5de3f6c1500f51ea155c18
-  data.tar.gz: 4d6390b9b88aeb21d97090326b9ae2eb923fdb299b658209efaf30f21b0830bc37778ced67811d550eaedc3c9f9125618b6f88e4ac2287db3e5c67e6caf66c86
+  metadata.gz: c4fdfc5b81de84282a471532d222fdf5b233a88d04c1ac5f8fa542e15b480264be269c5dcbf03d2bdea192739b5ca7b6c01fb96a95695b341211bff81f36ac90
+  data.tar.gz: 6bb2aa7c349e41503634d7a891047a401f9ebb8fe8f574c9f894bdcc5fd5c6cbf45aa16cc327b69227630c143e8e5b82e7edd141749dda5b423c4d2572791a9c

data/.travis.yml

@@ -2,14 +2,13 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.5.0
-  - 2.4.2
-  - 2.3.5
-  - 2.2.8
+  - 2.5.1
+  - 2.4.4
+  - 2.3.7
   - ruby-head
 matrix:
   allow_failures:
     - rvm: ruby-head
-before_install: gem install bundler -v 1.16.1
+before_install: gem install bundler -v 1.16.2
 script:
   - bundle exec rake ci

data/CHANGELOG.md

@@ -6,6 +6,24 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
+
+### Added
+
+## [0.4.0] - 2018-08-09
+
+### Fixed
+- Fix Bug: Rufo breaks HEREDOC syntax. (issue [#88](https://github.com/ruby-formatter/rufo/issues/88)). This fixes heredoc within parens formatting causing bad formatting and subsequent syntax error.
+- Fix Bug: formatter.rb:3700:in `block in adjust_other_alignments': undefined method `[]' for nil:NilClass (NoMethodError) (issue [#87](https://github.com/ruby-formatter/rufo/issues/87)). Check alignment target exists.
+- Fix Bug: Rufo keeps switching formatting on same file every time it runs (issue [#86](https://github.com/ruby-formatter/rufo/issues/86)). Avoids re-indenting nested literal indents.
+
+### Added
+- Allow for simpler else_body node to suit new Ripper style in 2.6.0
+- Allow new Ripper node :excessed_comma in block parsing
+- Allow :bodystmt in lambda nodes to suit Ripper format in 2.6.0
+- Drop support for ruby 2.2
+- Set minimum required ruby version. As rufo is not tested on unsupported versions it may (and is known to) break code.
+
 ## [0.3.1] - 2018-04-12
 
 ### Fixed

data/README.md

@@ -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.2.4, but works most reliably with >= 2.3.**5** / >= 2.4.**2**, due to a bug in Ruby's Ripper parser.
+Rufo supports all Ruby versions >= 2.3.**5** / >= 2.4.**2**, due to a bug in Ruby's Ripper parser.
 
 ## Installation
 

data/lib/rufo/command.rb

@@ -113,8 +113,8 @@ Rufo Warning!
   end
 
   def backported_version
-    return "2.3.5" if RUBY_VERSION[0..2] == "2.3"
-    "2.4.2"
+    return "2.3.7" if RUBY_VERSION[0..2] == "2.3"
+    "2.4.4"
   end
 
   def format_file(filename)

data/lib/rufo/formatter.rb

@@ -1547,6 +1547,7 @@ class Rufo::Formatter
 
   def visit_bodystmt(node)
     # [:bodystmt, body, rescue_body, else_body, ensure_body]
+    # [:bodystmt, [[:@int, "1", [2, 1]]], nil, [[:@int, "2", [4, 1]]], nil] (2.6.0)
     _, body, rescue_body, else_body, ensure_body = node
 
     inside_type_body = @inside_type_body
@@ -1585,9 +1586,11 @@ class Rufo::Formatter
 
     if else_body
       # [:else, body]
+      # [[:@int, "2", [4, 1]]] (2.6.0)
       write_indent
       consume_keyword "else"
-      indent_body else_body[1]
+      else_body = else_body[1] if else_body[0] == :else
+      indent_body else_body
     end
 
     if ensure_body
@@ -2077,11 +2080,13 @@ class Rufo::Formatter
     consume_token :on_lparen
     skip_space_or_newline
 
+    heredoc = current_token_kind == :on_heredoc_beg
     if exps
       visit_exps to_ary(exps), with_lines: false
     end
 
     skip_space_or_newline
+    write "\n" if heredoc
     consume_token :on_rparen
   end
 
@@ -2111,8 +2116,9 @@ class Rufo::Formatter
     end
 
     if rest_param
-      # check for trailing , |x, |
-      if rest_param == 0
+      # check for trailing , |x, | (may be [:excessed_comma] in 2.6.0)
+      case rest_param
+      when 0, [:excessed_comma]
         write_params_comma
       else
         # [:rest_param, [:@ident, "x", [1, 15]]]
@@ -2524,8 +2530,11 @@ class Rufo::Formatter
 
   def visit_lambda(node)
     # [:lambda, [:params, nil, nil, nil, nil, nil, nil, nil], [[:void_stmt]]]
+    # [:lambda, [:params, nil, nil, nil, nil, nil, nil, nil], [[:@int, "1", [2, 2]], [:@int, "2", [3, 2]]]]
+    # [:lambda, [:params, nil, nil, nil, nil, nil, nil, nil], [:bodystmt, [[:@int, "1", [2, 2]], [:@int, "2", [3, 2]]], nil, nil, nil]] (on 2.6.0)
     _, params, body = node
 
+    body = body[1] if body[0] == :bodystmt
     check :on_tlambda
     write "->"
     next_token
@@ -3728,14 +3737,18 @@ class Rufo::Formatter
 
     lines = @output.lines
 
+    modified_lines = []
     @literal_indents.each do |first_line, last_line, indent|
       (first_line + 1..last_line).each do |line|
         next if @unmodifiable_string_lines[line]
 
         current_line = lines[line]
         current_line = "#{" " * indent}#{current_line}"
-        lines[line] = current_line
-        adjust_other_alignments nil, line, 0, indent
+        unless modified_lines[line]
+          modified_lines[line] = current_line
+          lines[line] = current_line
+          adjust_other_alignments nil, line, 0, indent
+        end
       end
     end
 
@@ -3803,7 +3816,7 @@ class Rufo::Formatter
       next if adjustment_column <= column
       next if scope == key
 
-      target[index][1] += offset
+      target[index][1] += offset if target[index]
     end
   end
 

data/lib/rufo/version.rb

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

data/rufo.gemspec

@@ -20,6 +20,7 @@ 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.3.5'
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufo
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Ary Borenszweig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Ruby code formatter