rufo 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db1dcca141aa241d1f18e99eb17cab04fe26a2f922fbcd0272c371b43f62459d
-  data.tar.gz: 5319a68334194f410d607a24425584ed114c9fb775908fa9f09eb37101d31da8
+  metadata.gz: dc9f1ff616a0e805085d05d0f2fcb92bd8c1b0887e5aedaff75a94a33ee3b0a7
+  data.tar.gz: 9525bb1291e062e4822105b95cce321b89ef06013a05bc5c444be04ddf1ae24e
 SHA512:
-  metadata.gz: 9ba69ebe856e99f8a0a2d1bd467b0b61e1e12f7d0b3c0dd26d4e0de2b2d4adb5804fdf864904dcf5bccc05afe2e5607f67a4f8be28d9dc5d5004b955ff76d96c
-  data.tar.gz: 276167c342eeddcf7e45608a9219029216081c34a0021aeb35504d4239078ac0a8f31f667d255a76fb384ee7d801857d64954ac7c8abebb0d37bec8120039554
+  metadata.gz: 5de0e49f1d959f51383602712f54c3c9e1dc947583f99c074c0524989ec8b2971158187b08d5c0bd85fdd982f0db327d2246ed4bfab0f37f9b76b2581dd0d5d2
+  data.tar.gz: 7ea03c65b2744b23fadc20ebd5021ec964997755d6d299ab92cdb5f31a1eaa07df00f53a72bcdbda38370a3918d7f2f3d9d0f489c51007ae0a920fe1b8b8c460

data/.circleci/config.yml

@@ -0,0 +1,92 @@
+"-": &dockerbuild
+  steps:
+    - checkout
+
+    # Which version of ruby?
+    - run:
+        name: Which ruby?
+        command: ruby --version | tee ruby-version-for-ci.txt
+
+    # Which version of bundler?
+    - run:
+        name: Which bundler?
+        command: bundle -v
+
+    # Restore bundle cache
+    - restore_cache:
+        keys:
+          - bundler-packages-{{ checksum "ruby-version-for-ci.txt" }}-{{ checksum "rufo.gemspec" }}
+
+    - run:
+        name: Bundle Install
+        command: bundle check || bundle install
+
+    # Store bundle cache
+    - save_cache:
+        key: bundler-packages-{{ checksum "ruby-version-for-ci.txt" }}-{{ checksum "rufo.gemspec" }}
+        paths:
+          - vendor/bundle
+          - Gemfile.lock
+    - run:
+        name: Run rspec
+        command: |
+          bundle exec rspec --profile 10 \
+                            --format RspecJunitFormatter \
+                            --out test_results/rspec.xml \
+                            --format progress
+    - run:
+        name: Run RuboCop
+        command: |
+          bundle exec rake rubocop
+    - run:
+        name: Run Rufo
+        command: |
+          bundle exec rake rufo:run['lib spec exe/rufo rakelib Rakefile rufo.gemspec']
+
+    # Save test results for timing analysis
+    - store_test_results:
+        path: test_results
+
+
+version: 2
+jobs:
+  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-1:
+    <<: *dockerbuild
+    docker:
+      - image: circleci/ruby:2.5.1
+        environment:
+          BUNDLE_JOBS: "3"
+          BUNDLE_RETRY: "3"
+          BUNDLE_PATH: vendor/bundle
+  build-2-4-4:
+    <<: *dockerbuild
+    docker:
+      - image: circleci/ruby:2.4.4
+        environment:
+          BUNDLE_JOBS: "3"
+          BUNDLE_RETRY: "3"
+          BUNDLE_PATH: vendor/bundle
+  build-2-3-7:
+    <<: *dockerbuild
+    docker:
+      - image: circleci/ruby:2.3.7
+        environment:
+          BUNDLE_JOBS: "3"
+          BUNDLE_RETRY: "3"
+          BUNDLE_PATH: vendor/bundle
+workflows:
+  version: 2
+  test:
+    jobs:
+      - build-2-6-1
+      - build-2-5-1
+      - build-2-4-4
+      - build-2-3-7

data/.rubocop.yml

@@ -0,0 +1,15 @@
+AllCops:
+  Exclude:
+    - "spec/**/*"
+    - "vendor/**/*"
+  TargetRubyVersion: 2.3
+
+Layout:
+  Enabled: false
+
+Metrics:
+  Enabled: false
+
+Style:
+  Enabled: false
+

data/CHANGELOG.md

@@ -10,6 +10,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
+## [0.5.0] - 2019-02-09
+
+### Added
+
+- Add space inside hash literal braces when contents are on the same line. `{a: 1} => { a: 1 }`. This brings Rufo inline with:
+  - [RuboCop](https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Layout/SpaceInsideHashLiteralBraces)
+  - [Prettier](https://prettier.io/docs/en/options.html#bracket-spacing)
+  - [RSpec core](https://github.com/rspec/rspec-core/blob/7b6b9c3f2e2878213f97d6fc9e9eb23c323cfe1c/lib/rspec/core/bisect/shell_command.rb#L49)
+  - [Rails activemodel](https://github.com/rails/rails/blob/master/activemodel/lib/active_model/validations/acceptance.rb#L7)
+  - [Devise](https://github.com/plataformatec/devise/blob/master/app/controllers/devise/sessions_controller.rb#L44)
+- Format gem and Rake related files.
+
 ## [0.4.2] - 2019-01-22
 
 ### Fixed

data/Rakefile

@@ -1,6 +1,8 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "rubocop/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new
 
 task :default => :spec

data/lib/rufo.rb

@@ -10,9 +10,9 @@ module Rufo
   end
 end
 
-require_relative "rufo/backport"
 require_relative "rufo/command"
 require_relative "rufo/dot_file"
 require_relative "rufo/settings"
 require_relative "rufo/formatter"
 require_relative "rufo/version"
+require_relative "rufo/file_finder"

data/lib/rufo/command.rb

@@ -61,30 +61,28 @@ class Rufo::Command
   end
 
   def format_args(args)
-    files = []
-
-    args.each do |arg|
-      if Dir.exist?(arg)
-        files.concat Dir[File.join(arg, "**", "*.rb")].select(&File.method(:file?))
-      elsif File.exist?(arg)
-        files << arg
-      else
-        STDERR.puts "Error: file or directory not found: #{arg}"
-      end
-    end
-
-    return CODE_ERROR if files.empty?
+    file_finder = Rufo::FileFinder.new(args)
+    files = file_finder.to_a
 
     changed = false
     syntax_error = false
+    files_exist = false
 
-    files.each do |file|
+    files.each do |(exists, file)|
+      if exists
+        files_exist = true
+      else
+        STDERR.puts "Error: file or directory not found: #{file}"
+        next
+      end
       result = format_file(file)
 
       changed |= result == CODE_CHANGE
       syntax_error |= result == CODE_ERROR
     end
 
+    return CODE_ERROR unless files_exist
+
     STDERR.puts squiggly_heredoc_warning unless @squiggly_warning_files.empty?
 
     case
@@ -95,16 +93,16 @@ class Rufo::Command
   end
 
   def squiggly_heredoc_warning
-    <<-EOF
+    <<-WARNING
 Rufo Warning!
   File#{squiggly_pluralize} #{squiggly_warning_files} #{squiggly_pluralize(:has)} not been formatted due to a problem with Ruby version #{RUBY_VERSION}
   Please update to Ruby #{backported_version} to fix your formatting!
   See https://github.com/ruby-formatter/rufo/wiki/Squiggly-Heredocs for information.
-    EOF
+    WARNING
   end
 
-  def squiggly_pluralize(x = :s)
-    idx = x == :s ? 0 : 1
+  def squiggly_pluralize(word = :s)
+    idx = word == :s ? 0 : 1
     (@squiggly_warning_files.length > 1 ? ["s", "have"] : ["", "has"])[idx]
   end
 

data/lib/rufo/file_finder.rb

@@ -0,0 +1,36 @@
+class Rufo::FileFinder
+  include Enumerable
+
+  # Taken from https://github.com/ruby/rake/blob/f0a897e3fb557f64f5da59785b1a4464826f77b2/lib/rake/application.rb#L41
+  RAKEFILES = [
+    "rakefile",
+    "Rakefile",
+    "rakefile.rb",
+    "Rakefile.rb",
+  ].join(",")
+
+  def initialize(files_or_dirs)
+    @files_or_dirs = files_or_dirs
+  end
+
+  def each
+    files_or_dirs.each do |file_or_dir|
+      if Dir.exist?(file_or_dir)
+        all_rb_files(file_or_dir).each { |file| yield [true, file] }
+      else
+        yield [File.exist?(file_or_dir), file_or_dir]
+      end
+    end
+  end
+
+  private
+
+  attr_reader :files_or_dirs
+
+  def all_rb_files(file_or_dir)
+    Dir.glob(
+      File.join(file_or_dir, "**", "{*.rb,Gemfile,*.gemspec,#{RAKEFILES},*.rake}"),
+      File::FNM_EXTGLOB
+    ).select(&File.method(:file?))
+  end
+end

data/lib/rufo/formatter.rb

@@ -29,7 +29,7 @@ class Rufo::Formatter
     @line = 0
     @column = 0
     @last_was_newline = true
-    @output = "".dup
+    @output = +""
 
     # The column of a `obj.method` call, so we can align
     # calls to that dot
@@ -343,7 +343,6 @@ class Rufo::Formatter
       visit_suffix(node, "rescue")
     when :vcall
       # [:vcall, exp]
-      token_column = current_token_column
       visit node[1]
     when :fcall
       # [:fcall, [:@ident, "foo", [1, 0]]]
@@ -485,9 +484,9 @@ class Rufo::Formatter
     when :for
       visit_for(node)
     when :BEGIN
-      visit_BEGIN(node)
+      visit_begin_node(node)
     when :END
-      visit_END(node)
+      visit_end_node(node)
     else
       bug "Unhandled node: #{node.first}"
     end
@@ -677,7 +676,7 @@ class Rufo::Formatter
   #
   # This can happen with heredocs, but also with string literals spanning
   # multiple lines.
-  def with_unmodifiable_string_lines(&block)
+  def with_unmodifiable_string_lines
     line = @line
     yield
     (line + 1..@line).each do |i|
@@ -724,7 +723,7 @@ class Rufo::Formatter
 
     visit string1
 
-    has_backslash, first_space = skip_space_backslash
+    has_backslash, _ = skip_space_backslash
     if has_backslash
       write " \\"
       write_line
@@ -885,9 +884,7 @@ class Rufo::Formatter
   end
 
   def visit_assign_value(value)
-    base_column = @column
-
-    has_slash_newline, first_space = skip_space_backslash
+    has_slash_newline, _first_space = skip_space_backslash
 
     sticky = indentable_value?(value)
 
@@ -901,8 +898,7 @@ class Rufo::Formatter
       end
     else
       indent_after_space value, sticky: sticky,
-                                want_space: true,
-                                first_space: first_space
+                                want_space: true
     end
   end
 
@@ -919,7 +915,7 @@ class Rufo::Formatter
       body = value[1]
       return false unless body[0] == :bodystmt
 
-      _, body, rescue_body, else_body, ensure_body = body
+      _, _, rescue_body, else_body, ensure_body = body
       rescue_body || else_body || ensure_body
     else
       false
@@ -1000,7 +996,7 @@ class Rufo::Formatter
 
   def visit_call_with_receiver(node)
     # [:call, obj, :".", name]
-    _, obj, text, name = node
+    _, obj, _, name = node
 
     @dot_column = nil
     visit obj
@@ -1224,13 +1220,12 @@ class Rufo::Formatter
     #   :".",
     #   name
     #   [:args_add_block, [[:@int, "1", [1, 8]]], block]]
-    _, receiver, dot, name, args = node
+    _, receiver, _, name, args = node
 
     base_column = current_token_column
 
     visit receiver
 
-    line = @line
     skip_space_or_newline
 
     # Remember dot column
@@ -1371,7 +1366,7 @@ class Rufo::Formatter
       return
     end
 
-    closing_brace_token, index = find_closing_brace_token
+    closing_brace_token, _ = find_closing_brace_token
 
     # If the whole block fits into a single line, use braces
     if current_token_line == closing_brace_token[0][0]
@@ -1394,7 +1389,7 @@ class Rufo::Formatter
     consume_token :on_lbrace
     consume_block_args args
 
-    if call_info = @line_to_call_info[@line]
+    if (call_info = @line_to_call_info[@line])
       call_info << true
     end
 
@@ -1469,7 +1464,6 @@ class Rufo::Formatter
       # Nothing
     elsif empty_params && local_params
       consume_token :on_semicolon
-      found_semicolon = true
     end
 
     skip_space_or_newline
@@ -1559,8 +1553,6 @@ class Rufo::Formatter
     # [: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
-    current_type = @current_type
     @inside_type_body = false
 
     line = @line
@@ -1726,15 +1718,15 @@ class Rufo::Formatter
     consume_keyword "end"
   end
 
-  def visit_BEGIN(node)
-    visit_BEGIN_or_END node, "BEGIN"
+  def visit_begin_node(node)
+    visit_begin_or_end node, "BEGIN"
   end
 
-  def visit_END(node)
-    visit_BEGIN_or_END node, "END"
+  def visit_end_node(node)
+    visit_begin_or_end node, "END"
   end
 
-  def visit_BEGIN_or_END(node, keyword)
+  def visit_begin_or_end(node, keyword)
     # [:BEGIN, body]
     _, body = node
 
@@ -1800,7 +1792,7 @@ class Rufo::Formatter
       # then a star shouldn't be here... but if it is... handle it
       # somehow...
       if current_token_kind == :on_op && current_token_value == "*"
-        before, star, after = nil, before, after
+        star = before
       else
         visit_comma_separated_list to_ary(before)
         write_params_comma
@@ -1848,9 +1840,7 @@ class Rufo::Formatter
     # [:unary, :-@, [:vcall, [:@ident, "x", [1, 2]]]]
     _, op, exp = node
 
-    consume_op_or_keyword op
-
-    setting = op == :not ? :one : :no
+    consume_op_or_keyword
 
     first_space = space?
     skip_space_or_newline
@@ -1881,7 +1871,7 @@ class Rufo::Formatter
 
   def visit_binary(node)
     # [:binary, left, op, right]
-    _, left, op, right = node
+    _, left, _, right = node
 
     # If this binary is not at the beginning of a line, if there's
     # a newline following the op we want to align it with the left
@@ -1903,7 +1893,7 @@ class Rufo::Formatter
     visit left
     needs_space = space?
 
-    has_backslash, first_space = skip_space_backslash
+    has_backslash, _ = skip_space_backslash
     if has_backslash
       needs_space = true
       write " \\"
@@ -1913,9 +1903,9 @@ class Rufo::Formatter
       write_space
     end
 
-    consume_op_or_keyword op
+    consume_op_or_keyword
 
-    first_space = skip_space
+    skip_space
 
     if newline? || comment?
       indent_after_space right,
@@ -1929,7 +1919,7 @@ class Rufo::Formatter
     end
   end
 
-  def consume_op_or_keyword(op)
+  def consume_op_or_keyword
     case current_token_kind
     when :on_op, :on_kw
       write current_token_value
@@ -2005,7 +1995,7 @@ class Rufo::Formatter
     # [:@ident, "bar", [1, 9]],
     # [:params, nil, nil, nil, nil, nil, nil, nil],
     # [:bodystmt, [[:void_stmt]], nil, nil, nil]]
-    _, receiver, period, name, params, body = node
+    _, receiver, _, name, params, body = node
 
     consume_keyword "def"
     consume_space
@@ -2026,7 +2016,7 @@ class Rufo::Formatter
 
     params = params[1] if params[0] == :paren
 
-    first_space = skip_space
+    skip_space
 
     if current_token_kind == :on_lparen
       next_token
@@ -2309,11 +2299,14 @@ class Rufo::Formatter
   def visit_hash(node)
     # [:hash, elements]
     _, elements = node
-
     token_column = current_token_column
 
+    closing_brace_token, _ = find_closing_brace_token
+    need_space = need_space_for_hash?(node, closing_brace_token)
+
     check :on_lbrace
     write "{"
+    write " " if need_space
     next_token
 
     if elements
@@ -2326,6 +2319,7 @@ class Rufo::Formatter
     end
 
     check :on_rbrace
+    write " " if need_space
     write "}"
     next_token
   end
@@ -2477,7 +2471,7 @@ class Rufo::Formatter
     # (followed by `=`, though not included in this node)
     #
     # [:field, receiver, :".", name]
-    _, receiver, dot, name = node
+    _, receiver, _, name = node
 
     @dot_column = nil
     @original_dot_column = nil
@@ -2573,7 +2567,7 @@ class Rufo::Formatter
     brace = current_token_value == "{"
 
     if brace
-      closing_brace_token, index = find_closing_brace_token
+      closing_brace_token, _ = find_closing_brace_token
 
       # Check if the whole block fits into a single line
       if current_token_line == closing_brace_token[0][0]
@@ -2722,7 +2716,7 @@ 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, needs_trailing_comma, wrote_comma)
+      wrote_comma = check_heredocs_in_literal_elements(is_last, wrote_comma)
 
       next unless comma?
 
@@ -2736,7 +2730,7 @@ class Rufo::Formatter
       next_token_no_heredoc_check
 
       first_space = skip_space_no_heredoc_check
-      wrote_comma = check_heredocs_in_literal_elements(is_last, needs_trailing_comma, wrote_comma)
+      wrote_comma = check_heredocs_in_literal_elements(is_last, wrote_comma)
 
       if newline? || comment?
         if is_last
@@ -2784,7 +2778,7 @@ class Rufo::Formatter
     end
   end
 
-  def check_heredocs_in_literal_elements(is_last, needs_trailing_comma, wrote_comma)
+  def check_heredocs_in_literal_elements(is_last, wrote_comma)
     if (newline? || comment?) && !@heredocs.empty?
       if is_last && trailing_commas
         write "," unless wrote_comma
@@ -2820,7 +2814,7 @@ class Rufo::Formatter
     skip_space
 
     indent_body node[2]
-    if else_body = node[3]
+    if (else_body = node[3])
       # [:else, else_contents]
       # [:elsif, cond, then, else]
       write_indent
@@ -2895,8 +2889,6 @@ class Rufo::Formatter
     consume_keyword "when"
     consume_space
 
-    space_after_when = nil
-
     indent(@column) do
       visit_comma_separated_list conds
       skip_space
@@ -3001,7 +2993,7 @@ class Rufo::Formatter
   end
 
   def consume_space_or_newline
-    first_space = skip_space
+    skip_space
     if newline? || comment?
       consume_end_of_line
       write_indent(next_indent)
@@ -3187,9 +3179,7 @@ class Rufo::Formatter
         if !found_newline && want_semicolon && last != :semicolon
           skip_space
           kind = current_token_kind
-          case kind
-          when :on_ignored_nl, :on_eof
-          else
+          unless [:on_ignored_nl, :on_eof].include?(kind)
             return if (kind == :on_kw) &&
                       (%w[class module def].include?(current_token_value))
             write "; "
@@ -3343,8 +3333,8 @@ class Rufo::Formatter
     consume_token :on___end__
 
     lines = @code.lines[line..-1]
-    lines.each do |line|
-      write line.chomp
+    lines.each do |current_line|
+      write current_line.chomp
       write_line
     end
   end
@@ -3451,7 +3441,7 @@ class Rufo::Formatter
 
   def capture_output
     old_output = @output
-    @output = "".dup
+    @output = +""
     yield
     result = @output
     @output = old_output
@@ -3502,8 +3492,7 @@ class Rufo::Formatter
     @column += indent
   end
 
-  def indent_after_space(node, sticky: false, want_space: true, first_space: nil, needed_indent: next_indent, token_column: nil, base_column: nil)
-    first_space = current_token if space?
+  def indent_after_space(node, sticky: false, want_space: true, needed_indent: next_indent, token_column: nil, base_column: nil)
     skip_space
 
     case current_token_kind
@@ -3575,8 +3564,8 @@ class Rufo::Formatter
     current_token[0][1]
   end
 
-  def keyword?(kw)
-    current_token_kind == :on_kw && current_token_value == kw
+  def keyword?(keyword)
+    current_token_kind == :on_kw && current_token_value == keyword
   end
 
   def newline?
@@ -3608,7 +3597,7 @@ class Rufo::Formatter
     i = @tokens.size - 1
     while i >= 0
       token = @tokens[i]
-      (line, column), kind = token
+      _, kind = token
       case kind
       when :on_lbrace, :on_tlambeg
         count += 1
@@ -3621,23 +3610,6 @@ class Rufo::Formatter
     nil
   end
 
-  def newline_follows_token(index)
-    index -= 1
-    while index >= 0
-      token = @tokens[index]
-      case current_token_kind
-      when :on_sp
-        # OK
-      when :on_nl, :on_ignored_nl
-        return true
-      else
-        return false
-      end
-      index -= 1
-    end
-    true
-  end
-
   def next_token
     prev_token = self.current_token
 
@@ -3665,8 +3637,8 @@ class Rufo::Formatter
     @tokens.pop
   end
 
-  def last?(i, array)
-    i == array.size - 1
+  def last?(index, array)
+    index == array.size - 1
   end
 
   def push_call(node)
@@ -3711,7 +3683,7 @@ class Rufo::Formatter
 
     lines = @output.lines
 
-    while line_to_call_info = @line_to_call_info.shift
+    while (line_to_call_info = @line_to_call_info.shift)
       first_line, call_info = line_to_call_info
       next unless call_info.size == 5
 
@@ -3767,18 +3739,18 @@ class Rufo::Formatter
     do_align @case_when_positions, :case
   end
 
-  def do_align(elements, scope)
+  def do_align(components, scope)
     lines = @output.lines
 
-    # Chunk elements that are in consecutive lines
-    chunks = chunk_while(elements) do |(l1, c1, i1, id1), (l2, c2, i2, id2)|
+    # Chunk components that are in consecutive lines
+    chunks = components.chunk_while do |(l1, _c1, i1, id1), (l2, _c2, i2, id2)|
       l1 + 1 == l2 && i1 == i2 && id1 == id2
     end
 
     chunks.each do |elements|
       next if elements.size == 1
 
-      max_column = elements.map { |l, c| c }.max
+      max_column = elements.map { |_l, c| c }.max
 
       elements.each do |(line, column, _, _, offset)|
         next if column == max_column
@@ -3828,14 +3800,6 @@ class Rufo::Formatter
     end
   end
 
-  def chunk_while(array, &block)
-    if array.respond_to?(:chunk_while)
-      array.chunk_while(&block)
-    else
-      Rufo::Backport.chunk_while(array, &block)
-    end
-  end
-
   def broken_ripper_version?
     version, teeny = RUBY_VERSION[0..2], RUBY_VERSION[4..4].to_i
     (version == "2.3" && teeny < 5) ||
@@ -3859,4 +3823,44 @@ class Rufo::Formatter
   def result
     @output
   end
+
+  # Check to see if need to add space inside hash literal braces.
+  def need_space_for_hash?(node, closing_brace_token)
+    return false unless node[1]
+
+    left_need_space = current_token_line == node_line(node, beginning: true)
+    right_need_space = closing_brace_token[0][0] == node_line(node, beginning: false)
+
+    left_need_space && right_need_space
+  end
+
+  def node_line(node, beginning: true)
+    # get line of node, it is only used in visit_hash right now,
+    # so handling the following node types is enough.
+    case node.first
+    when :hash, :string_literal, :symbol_literal, :symbol, :vcall, :string_content, :assoc_splat, :var_ref
+      node_line(node[1], beginning: beginning)
+    when :assoc_new
+      if beginning
+        node_line(node[1], beginning: beginning)
+      else
+        if node.last == [:string_literal, [:string_content]]
+          # there's no line number for [:string_literal, [:string_content]]
+          node_line(node[1], beginning: beginning)
+        else
+          node_line(node.last, beginning: beginning)
+        end
+      end
+    when :assoclist_from_args
+      node_line(beginning ? node[1][0] : node[1].last, beginning: beginning)
+    when :dyna_symbol
+      if node[1][0].is_a?(Symbol)
+        node_line(node[1], beginning: beginning)
+      else
+        node_line(node[1][0], beginning: beginning)
+      end
+    when :@label, :@int, :@ident, :@tstring_content, :@kw
+      node[2][0]
+    end
+  end
 end

data/lib/rufo/settings.rb

@@ -7,7 +7,7 @@ module Rufo::Settings
     quote_style: [:double, :single],
   }
 
-  attr_accessor *OPTIONS.keys
+  attr_accessor(*OPTIONS.keys)
 
   def init_settings(options)
     OPTIONS.each do |name, valid_options|

data/lib/rufo/version.rb

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

data/rakelib/rufo.rake

@@ -11,12 +11,12 @@ namespace :rufo do
   end
 
   desc "Format Ruby code in current directory"
-  task :run, [:files_or_dirs] do |task, rake_args|
+  task :run, [:files_or_dirs] do |_task, rake_args|
     rufo_command(rake_args)
   end
 
   desc "Check that no formatting changes are produced"
-  task :check, [:files_or_dirs] do |task, rake_args|
+  task :check, [:files_or_dirs] do |_task, rake_args|
     rufo_command("--check", rake_args)
   end
 end

data/rufo.gemspec

@@ -4,26 +4,29 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "rufo/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "rufo"
-  spec.version       = Rufo::VERSION
-  spec.authors       = ["Ary Borenszweig"]
-  spec.email         = ["asterite@gmail.com"]
+  spec.name = "rufo"
+  spec.version = Rufo::VERSION
+  spec.authors = ["Ary Borenszweig"]
+  spec.email = ["asterite@gmail.com"]
 
-  spec.summary       = %q{Ruby code formatter}
-  spec.description   = %q{Fast and unobtrusive Ruby code formatter}
-  spec.homepage      = "https://github.com/ruby-formatter/rufo"
-  spec.license       = "MIT"
+  spec.summary = %q{Ruby code formatter}
+  spec.description = %q{Fast and unobtrusive Ruby code formatter}
+  spec.homepage = "https://github.com/ruby-formatter/rufo"
+  spec.license = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  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.required_ruby_version = ">= 2.3.5"
 
   spec.add_development_dependency "bundler", ">= 1.15"
+  spec.add_development_dependency "byebug", "~> 10.0.2"
+  spec.add_development_dependency "guard-rspec", "~> 4.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "guard-rspec", "~> 4.0"
+  spec.add_development_dependency "rspec_junit_formatter", "~> 0.4.1"
+  spec.add_development_dependency "rubocop", "~> 0.63.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufo
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Ary Borenszweig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.15'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.0.2
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -53,19 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 0.4.1
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.63.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.63.1
 description: Fast and unobtrusive Ruby code formatter
 email:
 - asterite@gmail.com
@@ -74,11 +116,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".rufo"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -92,13 +135,12 @@ files:
 - docs/settings.md
 - exe/rufo
 - lib/rufo.rb
-- lib/rufo/backport.rb
 - lib/rufo/command.rb
 - lib/rufo/dot_file.rb
+- lib/rufo/file_finder.rb
 - lib/rufo/formatter.rb
 - lib/rufo/settings.rb
 - lib/rufo/version.rb
-- rakelib/ci.rake
 - rakelib/rufo.rake
 - rufo.gemspec
 homepage: https://github.com/ruby-formatter/rufo

data/.travis.yml

@@ -1,15 +0,0 @@
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.0
-  - 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.2
-script:
-  - bundle exec rake ci

data/lib/rufo/backport.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module Rufo::Backport
-  # Implement Enumerable#chunk_while
-  # if it's not available in the current Ruby version
-  def self.chunk_while(array)
-    results = []
-    current = []
-    first = true
-    last = nil
-
-    array.each do |elem|
-      if first
-        current << elem
-        first = false
-      else
-        if yield(last, elem)
-          current << elem
-        else
-          results << current
-          current = [elem]
-        end
-      end
-      last = elem
-    end
-
-    results << current unless current.empty?
-
-    results
-  end
-end

data/rakelib/ci.rake

@@ -1,4 +0,0 @@
-desc "Run tasks on CI"
-task :ci => :spec do
-  Rake::Task["rufo:check"].invoke("lib spec")
-end