rfix 1.2.6.pre.198 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f49efc581ec20334b8f0e9594959a71185c6a51ae0ca13ab92d5ea3d3db86f6
-  data.tar.gz: 73aef727ae29434806a4c573b77fff684e406f2c3f3c0615963c213c3d6d5931
+  metadata.gz: 94c6a5221d4beb6a82e2ec5993f4e6710f6797d44c5132804cb07963b8e1afd5
+  data.tar.gz: 36466eb65888062cba7c5b58a972ec546670d6c997aae5dac3f7df6aa6403a61
 SHA512:
-  metadata.gz: 06f7708c0d34baf97708409375fc712c8a5cfdce94b44c8acc8a69135ebd2bb9ebe22dd0b7b9587371ddd9eaf718cbfabcf734ac2eb6adbb862cbb6cbe110f01
-  data.tar.gz: 6e3e19062b9e6eeadff64c8215229c95e3ab553065922bf920f0ce622edc2cb83feb4d9a156ee9204070b0f74ff0aed76308c026f3dd53b2507b229d9ebddfc7
+  metadata.gz: f5e6e043ae89ed1cfaac1ff174f772e07d180d1e5e2f0fc178a2f3e7db8f4a5cc991ace2118eb8ecc21ee92f7c7d5947a821f7e75a962d46c36c3623aae67c2b
+  data.tar.gz: c1a48cb3b3372c82645c680123e83f7ec9551307fe723b194f99cd073001fd921eab4abf2a04bbff533f41f524c079bda1dfd5dfcfc21ef224e8c58fe400ab3c

data/.github/workflows/main.yml

@@ -21,4 +21,6 @@ jobs:
       - run: rake libgit2:install
 
       - run: bundle install --path vendor/bundle
-      - run: rake execute:local execute:origin execute:lint execute:branch
+      - run: bundle exec rake travis:setup
+      - run: bundle exec rake travis:spec
+      - run: bundle exec rake travis:verify

data/.travis.yml

@@ -3,16 +3,14 @@ rvm:
   - 2.5.0
   - 2.6.2
   - 2.7.1
+  - 3.0.0
 os:
   - osx
   - 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.2.6)
+    rfix (1.4.1)
       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.21.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`).
 
@@ -42,17 +42,10 @@ $ rfix                 # Displays this list of supported commands
 
 ### Setup
 
-1. Download repository
-  - `$ git clone https://github.com/oleander/rfix-rb`
-  - `$ cd rfix-rb`
-2. Downloads fixtures and run time dependencies
-  - `$ make dir fetch`
-  - `$ bundle install`
-
-### Install from repository
-
 ``` shell
-$ bundle exec rake install
+git clone https://github.com/oleander/rfix-rb
+cd rfix-rb
+bundle install
 ```
 
 ### Run tests

data/Rakefile

@@ -25,3 +25,7 @@ task Bundle::REBUILD => [Bundle::Complex::REBUILD, Bundle::Simple::REBUILD]
 
 # desc "Bump to a new version of rfix"
 task bump: "gem:bump"
+
+task spec: Bundle::BUILD do
+  sh "bundle", "exec", "rspec", "spec"
+end

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,13 +113,15 @@ 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((" " * b_pos) + Rainbow((" " * [size, 0].max)).underline.bold)
       out("\n\n")
     end
   end

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.2.6"
+  VERSION = "1.4.1"
 end

data/rfix.gemspec

@@ -5,22 +5,11 @@ require_relative "lib/rfix/version"
 # require_relative "lib/rfix/gem_helper"
 
 Gem::Specification.new do |spec|
-  # extend GemHelper
-
   spec.name          = "rfix"
-
-  if ENV["TRAVIS"]
-    spec.version = "#{Rfix::VERSION}-#{ENV.fetch('TRAVIS_BUILD_NUMBER')}"
-  elsif ENV["GITHUB_RUN_ID"]
-    spec.version = "#{Rfix::VERSION}-#{ENV.fetch('GITHUB_RUN_ID')}"
-  else
-    # rubocop:disable Gemspec/DuplicatedAssignment
-    spec.version = Rfix::VERSION
-    # rubocop:enable Gemspec/DuplicatedAssignment
-  end
-
+  spec.version = Rfix::VERSION
   spec.authors       = ["Linus Oleander"]
   spec.email         = ["linus@oleander.nu"]
+  # rubocop:disable Layout/LineLength
   spec.summary       = "RuboCop CLI that only lints and auto-fixes code you committed by utilizing `git-log` and `git-diff`"
   # rubocop:enable Layout/LineLength
 
@@ -52,6 +41,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 +50,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.2.6.pre.198
+  version: 1.4.1
 platform: ruby
 authors:
 - Linus Oleander
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-18 00:00:00.000000000 Z
+date: 2021-03-11 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
@@ -346,9 +375,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - git, v2.0+
 rubygems_version: 3.0.3