rufo 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2da6aac7c9ee2daf498d8131afd7e77717a9ebb7
-  data.tar.gz: 1fbb0734dec03fc709b615fae32f6c52bfcb1df1
+  metadata.gz: 7cd6d76280a492dbed740bbd7f3d339f11569ffa
+  data.tar.gz: 33f7f1ea2649f177af1933597154ea2e34c78315
 SHA512:
-  metadata.gz: d21c78d0b4287cc04e5121c91631dacebcbf7f860c0398335e39f885da82de0a08676048b44c0964e8480253d86ebc78f699e23499931398318ba2a54e7dfc27
-  data.tar.gz: 23800db7fbb6224f5be334fab2141ef022d87906bc27926d6744debfd2d1751538ad9d189f956cf0a8e7c382c8cf0c801a5d6672dba49652117b041a615161ef
+  metadata.gz: cf1009830d35c4009d4f7175f68675cc36e77d43e0891c5154f6f8b0fb31dc60efc5652891da51d3dd0677fe7def47f1af0d0d6951fec083ce78aa7122d9101a
+  data.tar.gz: 68b71bdf20a8e023d44076a5fb0e0075fc1f7f1e0921fefb4f6ee5096e86a9b144f54f9111d90e86090be80ce674630e889b40dfcdce90b5b2157337ff5be08c

data/README.md

@@ -63,12 +63,11 @@ according to **rufo**, and will exit with exit code 1.
 - Sublime Text: [sublime-rufo](https://github.com/asterite/sublime-rufo)
 - Vim: [rufo-vim](https://github.com/splattael/rufo-vim) :construction:
 - Atom: [rufo-atom](https://github.com/bmulvihill/rufo-atom) :construction:
+- Emacs [emacs-rufo](https://github.com/aleandros/emacs-rufo) :construction:
 
 Did you write a plugin for your favorite editor? That's great! Let me know about it and
 I will list it here.
 
-Right now it would be great to have an [Emacs](https://www.gnu.org/software/emacs/) plugin :-)
-
 ## Configuration
 
 Rufo follows most of the conventions found in this [Ruby style guide](https://github.com/bbatsov/ruby-style-guide). It does a bit more than that, and it can also be configured a bit.

data/lib/rufo/command.rb

@@ -32,7 +32,7 @@ class Rufo::Command
   rescue Rufo::SyntaxError
     STDERR.puts "Error: the given text is not a valid ruby program (it has syntax errors)"
     exit 1
-  rescue Rufo::Bug => ex
+  rescue => ex
     STDERR.puts "You've found a bug!"
     STDERR.puts "Please report it to https://github.com/asterite/rufo/issues with code that triggers it"
     STDERR.puts
@@ -88,7 +88,7 @@ class Rufo::Command
   rescue Rufo::SyntaxError
     STDERR.puts "Error: the given text in #{filename} is not a valid ruby program (it has syntax errors)"
     exit 1
-  rescue Rufo::Bug => ex
+  rescue => ex
     STDERR.puts "You've found a bug!"
     STDERR.puts "It happened while trying to format the file #{filename}"
     STDERR.puts "Please report it to https://github.com/asterite/rufo/issues with code that triggers it"

data/lib/rufo/formatter.rb

@@ -587,7 +587,7 @@ class Rufo::Formatter
 
     case current_token_kind
     when :on_heredoc_end
-      (line+1..@line).each do |i|
+      (line + 1..@line).each do |i|
         @heredoc_lines[i] = true
       end
 
@@ -922,7 +922,12 @@ class Rufo::Formatter
 
   def consume_call_dot
     if current_token_kind == :on_op
-      consume_token :on_op
+      if current_token_value == "&."
+        write "&."
+      else
+        write "."
+      end
+      next_token
     else
       consume_token :on_period
     end
@@ -2203,9 +2208,7 @@ class Rufo::Formatter
 
     # Remember dot column
     dot_column = @column
-    check :on_period
-    write "."
-    next_token
+    consume_call_dot
     skip_space
 
     if newline? || comment?
@@ -3236,16 +3239,20 @@ class Rufo::Formatter
       next unless first_paren_end_line == last_line
 
       diff = first_param_indent - indent
-      (first_line+1..last_line).each do |line|
+      (first_line + 1..last_line).each do |line|
         @line_to_call_info.delete(line)
 
         next if @heredoc_lines[line]
 
         current_line = lines[line]
         current_line = current_line[diff..-1]
-        lines[line] = current_line
 
-        adjust_other_alignments nil, line, 0, -diff
+        # It can happen that this line didn't need an indent because
+        # it simply had a newline
+        if current_line
+          lines[line] = current_line
+          adjust_other_alignments nil, line, 0, -diff
+        end
       end
     end
 

data/lib/rufo/version.rb

@@ -1,3 +1,3 @@
 module Rufo
-  VERSION = "0.0.26"
+  VERSION = "0.0.27"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufo
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Ary Borenszweig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler