rfix 1.3.0.pre.199 → 1.4.0.pre.201

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4329b03ddb1e83fbb9a00904e2f12ddd747bef384cea815b3fff933adffdc1c0
-  data.tar.gz: c9dbf63cbaaadefe458c560cf88535d2aef4d57e2dd7c0ff6554dcf560da51be
+  metadata.gz: a9d00d88c31b789becaae582b5c7d6f3954ca694c643b3b8498d94bdf16c7e7d
+  data.tar.gz: af23b2635872fe812d20ba4995777dd03a079f8f2916d5a8c816d79c0a488637
 SHA512:
-  metadata.gz: cc086f736a7bf0341b9bd2c05dc936b2f5a08a3443f235e914a52b05b4ea27ce385802fcba6275c9baae9d0f078493dc280d08a084acee177c4c26c4f5f0de9f
-  data.tar.gz: 9f157905bad41d869dbb3759533b1b7774b06dee8e3033e8f96259a83b8d376ddc23a9013f7014f56b1266ae035f94c9318a65d63099829aba18dde5162891c9
+  metadata.gz: 501a500f81cb2a5d3740aba31426a76ba310c31beb8326f4162ed85be5c719a12e852b166ba63cfd1de913c3712e756f6347bd21bcb4cff2bab7ef75e2be50c1
+  data.tar.gz: fa3a37f18a7c47f47bc33f497581dc649e8ae41e248888a5de4a05959f18d030fe2803ed135c6b3f70796177dd158bb720de0123ffe8949601862ae57ba1ad86

data/.travis.yml

@@ -8,11 +8,8 @@ os:
   - linux
 gemfile:
   - ci/Gemfile.rubocop-0.80
-  - ci/Gemfile.rubocop-0.81
   - ci/Gemfile.rubocop-0.82
-  - ci/Gemfile.rubocop-0.83
   - ci/Gemfile.rubocop-0.84
-  - ci/Gemfile.rubocop-0.85
   - ci/Gemfile.rubocop-0.85.1
 before_install:
   - yes | gem update --system --force

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    rfix (1.3.0)
+    rfix (1.4.0)
       cri (~> 2.15.10)
+      dry-core (~> 0.5.0)
       listen (~> 3.0)
       rainbow (~> 3.0)
       require_all (~> 3.0.0)
@@ -33,7 +34,7 @@ GEM
     colorize (0.8.1)
     concurrent-ruby (1.1.6)
     contracts (0.16.0)
-    cri (2.15.10)
+    cri (2.15.11)
     cucumber (4.0.1)
       builder (~> 3.2, >= 3.2.3)
       cucumber-core (~> 7.0, >= 7.0.0)
@@ -62,6 +63,8 @@ GEM
       cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
       cucumber-messages (~> 12.1, >= 12.1.1)
     diff-lcs (1.3)
+    dry-core (0.5.0)
+      concurrent-ruby (~> 1.0)
     faker (2.13.0)
       i18n (>= 1.6, < 2)
     ffi (1.13.1)
@@ -121,7 +124,7 @@ GEM
     regexp_parser (1.7.1)
     require_all (3.0.0)
     rexml (3.2.4)
-    rouge (3.24.0)
+    rouge (3.26.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -131,6 +134,9 @@ GEM
     rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
+    rspec-its (1.3.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
@@ -175,7 +181,8 @@ DEPENDENCIES
   rake (~> 12.3)
   rfix!
   rspec (~> 3.0)
+  rspec-its (~> 1.3.0)
   rubocop (~> 0.85)
 
 BUNDLED WITH
-   2.1.4
+   2.2.5

data/README.md

@@ -1,4 +1,4 @@
-# :bug: Rfix [![Build Status](https://travis-ci.org/oleander/rfix-rb.svg?branch=master)](https://travis-ci.org/oleander/rfix-rb) [![Gem](https://img.shields.io/gem/dt/rfix)](https://rubygems.org/gems/rfix)
+# :bug: rfix [![Build Status](https://travis-ci.org/oleander/rfix-rb.svg?branch=master)](https://travis-ci.org/oleander/rfix-rb) [![Gem](https://img.shields.io/gem/dt/rfix)](https://rubygems.org/gems/rfix)
 
 RuboCop CLI that only lints and auto-fixes code you committed by utilizing `git-log` and `git-diff`. Rfix CLI makes it possible to lint (`rfix lint`) and auto-fix (`rfix local|origin|branch`) code changes since a certain point in history. You can auto-fix code committed since creating the current branch (`rfix origin`) or since pushing to upstream (`rfix local`).
 
@@ -46,8 +46,8 @@ $ rfix                 # Displays this list of supported commands
   - `$ git clone https://github.com/oleander/rfix-rb`
   - `$ cd rfix-rb`
 2. Downloads fixtures and run time dependencies
-  - `$ make dir fetch`
   - `$ bundle install`
+  - `$ rake rebuild
 
 ### Install from repository
 

data/lib/rfix.rb

@@ -10,6 +10,7 @@ require "rfix/log"
 require "rfix/cmd"
 require "rfix/repository"
 require "rfix/formatter"
+require "rfix/indentation"
 require "rfix/extensions/extensions"
 require "rfix/extensions/offense"
 require "rfix/branch"

data/lib/rfix/formatter.rb

@@ -113,11 +113,13 @@ module Rfix
     def report_line(_file, offense, _location, highlighted_area)
       extra = "  "
       src = highlighted_source_line(offense).lines.map { |line| extra + line }.join("\n")
+      indent = Indentation.new(src, extra_indentation: 2)
+      src = indent.call
       lines = @formatter.format(@lexer.lex(src)).gsub('\\e', CLI::UI::ANSI::ESC).lines.map(&:chomp)
       out("\n\n")
       out(lines.join("\n"), format: false)
-      b_pos = highlighted_area.begin_pos + extra.length
-      e_pos = highlighted_area.end_pos + extra.length
+      b_pos = highlighted_area.begin_pos + extra.length * 2 - indent.min_indentation
+      e_pos = highlighted_area.end_pos + extra.length * 2 - indent.min_indentation
       size =  e_pos - b_pos
       out((" " * b_pos) + Rainbow((" " * size)).underline.bold)
       out("\n\n")

data/lib/rfix/indentation.rb

@@ -0,0 +1,39 @@
+require "dry/core/memoizable"
+
+module Rfix
+  class Indentation
+    include Dry::Core::Memoizable
+    SPACE = " ".freeze
+
+    attr_reader :extra_indentation, :input
+
+    def initialize(input, extra_indentation: 0)
+      @input = input
+      @extra_indentation = extra_indentation
+    end
+
+    def stripped
+      lines.map do |line|
+        line.sub(/^\s{#{min_indentation}}/, "")
+      end.map do |line|
+        [SPACE * extra_indentation, line].join
+      end.join
+    end
+
+    alias call stripped
+
+    private
+
+    def min_indentation
+      lines.map do |line|
+        line.match(/^\s*/)[0].length
+      end.min || 0
+    end
+
+    def lines
+      input.lines
+    end
+
+    memoize :min_indentation, :lines
+  end
+end

data/lib/rfix/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rfix
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/rfix.gemspec

@@ -52,6 +52,7 @@ Gem::Specification.new do |spec|
   spec.requirements << "git, v2.0+"
 
   spec.add_runtime_dependency "cri", "~> 2.15.10"
+  spec.add_runtime_dependency "dry-core", "~> 0.5.0"
   spec.add_runtime_dependency "listen", "~> 3.0"
   spec.add_runtime_dependency "rainbow", "~> 3.0"
   spec.add_runtime_dependency "require_all", "~> 3.0.0"
@@ -60,6 +61,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rugged", "~> 1.0.0"
 
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec-its", "~> 1.3.0"
   spec.add_development_dependency "aruba", "~> 1.0"
   spec.add_development_dependency "colorize", "~> 0.8.1"
   spec.add_development_dependency "git", "~> 1.7.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfix
 version: !ruby/object:Gem::Version
-  version: 1.3.0.pre.199
+  version: 1.4.0.pre.201
 platform: ruby
 authors:
 - Linus Oleander
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2021-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.15.10
+- !ruby/object:Gem::Dependency
+  name: dry-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +142,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -281,6 +309,7 @@ files:
 - lib/rfix/file_cache.rb
 - lib/rfix/formatter.rb
 - lib/rfix/git_helper.rb
+- lib/rfix/indentation.rb
 - lib/rfix/loader/bundler.rb
 - lib/rfix/loader/env.rb
 - lib/rfix/loader/spec.rb