rufo 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c61c7219203fc96ae65a699fe47915af93accda41694e258ab14e370f27b0d7b
-  data.tar.gz: ccbd7e574472ae99b6fc097c57ccc83bfb4c29d6c35255108964bcff7b7d7b38
+  metadata.gz: db1dcca141aa241d1f18e99eb17cab04fe26a2f922fbcd0272c371b43f62459d
+  data.tar.gz: 5319a68334194f410d607a24425584ed114c9fb775908fa9f09eb37101d31da8
 SHA512:
-  metadata.gz: c7662f8ebec1d49f1d1c9fef7731960e28d7e165723acc01b76e0cd8218af50c69ee8fb09b7228962a796744b5fbcbccfbfda5b91dac08b263569e52d45726e8
-  data.tar.gz: 1a180929b2a7b6d3f421208f853346649c6866fb23f0d623f8064dc486cce6c2401eaa38da6304ad1128446d74dc33bd2ace15c26931bf55a2f885d0c1d9a7de
+  metadata.gz: 9ba69ebe856e99f8a0a2d1bd467b0b61e1e12f7d0b3c0dd26d4e0de2b2d4adb5804fdf864904dcf5bccc05afe2e5607f67a4f8be28d9dc5d5004b955ff76d96c
+  data.tar.gz: 276167c342eeddcf7e45608a9219029216081c34a0021aeb35504d4239078ac0a8f31f667d255a76fb384ee7d801857d64954ac7c8abebb0d37bec8120039554

data/.travis.yml

@@ -2,6 +2,7 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
+  - 2.6.0
   - 2.5.1
   - 2.4.4
   - 2.3.7

data/CHANGELOG.md

@@ -10,7 +10,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
-## [0.4.1] - 2018-08-09
+## [0.4.2] - 2019-01-22
+
+### Fixed
+- Fix bug: Rufo indents squiggly HEREDOC incorrectly causing bad formating (issue [136](https://github.com/ruby-formatter/rufo/issues/136))
+
+### Added
+
+- Chore: Added ruby 2.6.0 to CI test runs.
+
+## [0.4.1] - 2018-10-27
 
 ### Fixed
 - Fix bug for double colon operator in method definition (issue [#120](https://github.com/ruby-formatter/rufo/issues/120))

data/README.md

@@ -120,7 +120,11 @@ so they look good.
 ### Format files or directories
 
 ```
-$ rufo file names or dir names
+# All directories (recursive)
+$ rufo .
+
+# Specific file or directory
+$ rufo [file or directory name]
 ```
 
 ### Format STDIN

data/lib/rufo/formatter.rb

@@ -245,25 +245,32 @@ class Rufo::Formatter
       if heredoc && tilde && broken_ripper_version?
         @squiggly_flag = true
       end
-      # For heredocs with tilde we sometimes need to align the contents
-      if heredoc && tilde && @last_was_newline
-        unless (current_token_value == "\n" ||
-                current_token_kind == :on_heredoc_end)
-          write_indent(next_indent)
-        end
-        skip_ignored_space
-        if current_token_kind == :on_tstring_content
-          check :on_tstring_content
-          consume_token_value(current_token_value)
-          next_token
-        end
+      looking_at_newline = current_token_kind == :on_tstring_content && current_token_value == "\n"
+      if heredoc && tilde && !@last_was_newline && looking_at_newline
+        check :on_tstring_content
+        consume_token_value(current_token_value)
+        next_token
       else
-        while (current_token_kind == :on_ignored_sp) ||
-              (current_token_kind == :on_tstring_content) ||
-              (current_token_kind == :on_embexpr_beg)
-          check current_token_kind
-          break if current_token_kind == :on_embexpr_beg
-          consume_token current_token_kind
+        # For heredocs with tilde we sometimes need to align the contents
+        if heredoc && tilde && @last_was_newline
+          unless (current_token_value == "\n" ||
+                  current_token_kind == :on_heredoc_end)
+            write_indent(next_indent)
+          end
+          skip_ignored_space
+          if current_token_kind == :on_tstring_content
+            check :on_tstring_content
+            consume_token_value(current_token_value)
+            next_token
+          end
+        else
+          while (current_token_kind == :on_ignored_sp) ||
+                (current_token_kind == :on_tstring_content) ||
+                (current_token_kind == :on_embexpr_beg)
+            check current_token_kind
+            break if current_token_kind == :on_embexpr_beg
+            consume_token current_token_kind
+          end
         end
       end
     when :string_content
@@ -638,6 +645,8 @@ class Rufo::Formatter
     return if string.include?("\\")
     # don't format strings that contain our quote character
     return if string.include?(quote_char)
+    return if string.include?('#{')
+    return if string.include?('#$')
     true
   end
 

data/lib/rufo/version.rb

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

data/rufo.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>= 2.3.5'
 
-  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "bundler", ">= 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "guard-rspec", "~> 4.0"

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: rufo
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Ary Borenszweig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-27 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
@@ -120,8 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Ruby code formatter