rfix 1.0.5 → 1.0.7.pre.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 868bfaa86ad3d23783d477797cfcf3e3f385aa07e99d58eef7ffc6b7627cee70
-  data.tar.gz: ad027badc525a3dc9c132a769f887cf6b6dfaae2f67b5fa54860b141701913d1
+  metadata.gz: 3ba09b69185ab60b9f686736e5c9e7fb31f304076e34da632c680d086cc2b2ad
+  data.tar.gz: 0cec0d7801f62c92660cfada322c883aded3ea5a5a2912fafcc8b25d106847ce
 SHA512:
-  metadata.gz: 03bd3ad38f44c7d255d3b7833dd971c1871a694f3817f00f4e09182012e9f4d37462e7006cc71eb7cdc5d45b4bdf04525a23ef1032d1eef7b7263c6d36c8cf98
-  data.tar.gz: 768876291035c8296f24307f2290b0c08d1a26ad3c1d9299c3f3ad3c67192988c3b841e8e2acb72d2f361a4dddee552cc899bd6483145706faafdf07cdb9a497
+  metadata.gz: 774c1bef50501190800a11c878d887071c3a531b32605d05eb1d92e6f7d3b5ba7a757801dfb2d6cf90e11c223766f24a80ec6d1ce4a33a6785e5064893a8096a
+  data.tar.gz: 46872dec584d09199205210c3a13f3f278164702407acfe7833f58280307b2f27888a8d705d31901be73cb280689ee7c8c87f74a0f213ec5c2c30c53b0b5bca1

data/.travis.yml

@@ -1,4 +1,11 @@
 language: ruby
+cache:
+  bundler: true
+  directories:
+    - $HOME/.rvm
+    - $HOME/Library/Caches/Homebrew
+before_cache:
+  - brew cleanup
 rvm:
   - 2.5.0
   - 2.6.2
@@ -17,8 +24,7 @@ gemfile:
   - ci/Gemfile.rubocop-0.85.1
 before_install:
   - yes | gem update --system --force
-  - gem uninstall bundler
-  - gem install bundler -v 2.1.4
+  - gem install bundler
   - bundle config git.allow_insecure true
 install:
   - bundle install
@@ -27,4 +33,15 @@ install:
 script:
   - bundle exec rake spec
   - bundle exec rake install
-  - rfix --help
+  - rfix info
+jobs:
+  include:
+    deploy:
+      provider: rubygems
+      api_key:
+        secure: SJ5rZtQxDnY7aeWIb+gZ1OEV2rDHz8jvMBStHtzPDVtpQeUoo6DJB4FN4Vt5i7VaVk1otkAdOgyANzOQDSB0/1mMBUcy902zKrrUISALeIXp2FpsvjijRdKD0hLJaeX00n/MEJpw671NbzCNboEdiMnCrxSgd775qeQibcv72iRGIY07xv/BLUCtLTmqtjQFQAvcYEFpMQsRE6XEnkRSEOigSsYvNKZrygG4AgUaNY4rcOPqP+Yl26BFHw833GBQeuGgD5a310k3xYwpPc+9I+pTVHcpc4qh2m9kPcNuyDE3OjAMqE3XVn9WXeciZnQR6AQ94n6+5CJyTD3NEv5n58i4kyCLB71YfmPJjO+04+EiCUSZjeECkwACNguzOisdV8Z/vDzfNhI5tvNL7lv3jU05F/lw8LXKR30GBte5BquPY4DjjjXKgKoKl0tbo1bBT0u8LItEaFYoGqRmUiXiHFQNaH02pjBFkjUsyyEgnscWTDtoPxEjyP4aLnW+ESxnJxpwMHHiHPmplrPmK+3hYrTYz9saZyIajLIfcxcGcSSWEHXt2gV5i80pHJFQCc1qV/9d3g8s8sy3N9eKzV6SMYspFTtdKe2Pf7m/nwFt235/ibx0Z4Gyb1TZKze7phv9yAzvAaIb28I3Ye6S2S/ALemlKiu1A/XWtNtOxo8xMNE=
+      gem: rfix
+      on:
+        repo: oleander/rfix-rb
+        tags: false
+      cleanup: 'false'

data/Gemfile.lock

@@ -21,7 +21,7 @@ GIT
 PATH
   remote: .
   specs:
-    rfix (1.0.5)
+    rfix (1.0.7)
       rainbow (~> 3.0)
       rouge (~> 3.20)
       rubocop (~> 0.80)
@@ -110,7 +110,7 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.19.1)
+    parallel (1.19.2)
     parser (2.7.1.3)
       ast (~> 2.4.0)
     progressbar (0.21.0)

data/README.md

@@ -1,4 +1,4 @@
-# Rfix [![Build Status](https://travis-ci.org/oleander/rfix-rb.svg?branch=master)](https://travis-ci.org/oleander/rfix-rb)
+# 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 complains about your latest changes
 
@@ -18,6 +18,17 @@ $ rfix  [--dry] [--help]
 - `bundle exec rake local`
 - `bundle exec rake spec`
 
+## Overcommit
+
+``` yaml
+PreCommit:
+  RFix:
+    enabled: true
+    command: ["rfix", "local", "--untracked", "--dry"]
+    description: "Lint changes since last push using RuboCop"
+    parallelize: true
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/oleander/rfix.

data/lib/rfix.rb

@@ -5,9 +5,22 @@
 
 require "rfix/version"
 require "rfix/log"
-require "rfix/extensions"
+require "rfix/extensions/extensions"
+require "rfix/extensions/offense"
 require "rfix/rfix"
 
 module Rfix
+  module Ext; end
   extend self
 end
+
+RuboCop::Options.prepend(Rfix::Ext::Options)
+RuboCop::Runner.prepend(Rfix::Ext::Runner)
+RuboCop::CommentConfig.prepend(Rfix::Ext::CommentConfig)
+RuboCop::Cop::Offense.prepend(Rfix::Ext::Offense)
+
+# TODO: Handle cases where color can't be resolved by CLI::UI
+RuboCop::Formatter::SimpleTextFormatter::COLOR_FOR_SEVERITY.each do |severity, color|
+  id = RuboCop::Cop::Severity::CODE_TABLE.invert.fetch(severity)
+  CLI::UI::Glyph.new(id.to_s, 0x25cf, CLI::UI.resolve_color(color))
+end

data/lib/rfix/cmd.rb

@@ -16,7 +16,7 @@ module Rfix::Cmd
       say_error "[Cmd] {{italic:#{args.join(" ")}}}"
       say_error "[Pwd] {{italic:#{Dir.pwd}}}"
       say_error "[Err] {{error:#{err.strip}}}"
-      
+
       exit status.exitstatus
     end
 

data/lib/rfix/extensions/extensions.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "rubocop"
+require "rainbow"
+
+module Rfix::Ext
+  module CommentConfig
+    # Called by RuboCop on every line to see
+    # if its suppose to run against it or not
+    def cop_enabled_at_line?(_cop, line)
+      Rfix.enabled?(processed_source.file_path, line) && super
+    end
+  end
+
+  module Runner
+    # Called _after_ @source has been 'auto fixed' by Rubocop
+    def check_for_infinite_loop(source, offences)
+      # rubocop:disable Style/Semicolon
+      Rfix.refresh!(source); super
+      # rubocop:enable Style/Semicolon
+    end
+  end
+
+  module Options
+    # Appends custom --args to RuboCop CLI
+    def define_options
+      super.tap do |options|
+        @ons.each do |args, block|
+          option(options, *args, &block)
+        end
+      end
+    end
+
+    # Helper method used by rfix to append cli --args to Rubocop
+    def on(*args, &block)
+      @ons ||= []
+      @ons += [[args, block]]
+    end
+  end
+end

data/lib/rfix/extensions/offense.rb

@@ -0,0 +1,77 @@
+module Rfix::Ext
+  module Offense
+    def where
+      line.to_s + ":" + real_column.to_s
+    end
+
+    def info
+      message.split(": ", 2).last.delete("\n")
+    end
+
+    def msg
+      CLI::UI.resolve_text("{{italic:#{info}}}", truncate_to: CLI::UI::Terminal.width - 10)
+    end
+
+    def code
+      message.split(": ", 2).first
+    end
+
+    def star
+      Rainbow("⭑")
+    end
+
+    def cross
+      Rainbow("✗").red
+    end
+
+    def check
+      Rainbow("✓").green
+    end
+
+    def circle
+      Rainbow("⍟")
+    end
+
+    def relative_path
+      Rfix.to_relative(path: location.source_buffer.name)
+    end
+
+    def clickable_path
+      "{{italic:#{relative_path}:#{where}}}"
+    end
+
+    def clickable_plain_severity
+      to_url("https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/#{code}", code)
+    end
+
+    def clickable_severity
+      "{{#{severity.code}}} {{italic:#{clickable_plain_severity}}}"
+    end
+
+    def icon
+      return check.green if corrected?
+      return star.yellow if correctable?
+
+      cross.red
+    end
+
+    def to_clickable(url, title)
+      esc = CLI::UI::ANSI::ESC
+      cmd = esc + "]8;;"
+      slash = "\x07"
+      cmd + "#{escape(url)}#{slash}#{escape(title)}" + cmd + slash
+    end
+
+    def to_path(path, title)
+      to_clickable("file://#{path}", title)
+    end
+
+    def to_url(url, title)
+      to_clickable(url, title)
+    end
+
+    def escape(str)
+      Shellwords.escape(str)
+    end
+  end
+end

data/lib/rfix/formatter.rb

@@ -30,37 +30,14 @@ module Rfix
       report_summary(files.size, offenses.count, corrected.count)
     end
 
-    def to_clickable(url, title)
-      esc = CLI::UI::ANSI::ESC
-      cmd = esc + "]8;;"
-      slash = "\x07"
-      cmd + "#{escape(url)}#{slash}#{escape(title)}" + cmd + slash
-    end
-
-    def to_path(path, title)
-      to_clickable("file://#{path}", title)
-    end
-
-    def to_url(url, title)
-      to_clickable(url, title)
-    end
-
-    def escape(str)
-      Shellwords.escape(str)
-    end
-
     def render_file(file, offenses)
       return if offenses.empty?
 
-      path = Rfix.to_relative(path: file)
-      url = to_url(file, path)
       offenses.each do |offense|
         out("\n\n")
-        clickable_path = "{{italic:#{path}:#{offense.where}}}"
-        clickable_code = to_url("https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/#{offense.code}", offense.code)
         CLI::UI::Frame.open("#{offense.icon} #{offense.msg}", color: :reset)
         report_line(file, offense, offense.location, offense.highlighted_area)
-        CLI::UI::Frame.close("#{clickable_path} » {{italic:#{clickable_code}}}", color: :reset)
+        CLI::UI::Frame.close("#{offense.clickable_severity} » #{offense.clickable_path}", color: :reset)
       end
     end
 

data/lib/rfix/git_helper.rb

@@ -9,8 +9,8 @@ module Rfix::GitHelper
   include Rfix::Log
   include Rfix::Cmd
 
-  def git(*args)
-    cmd("git", *args)
+  def git(*args, &block)
+    cmd("git", *args, &block)
   end
 
   def params
@@ -19,7 +19,9 @@ module Rfix::GitHelper
       "--no-renames",
       "--no-merges",
       "--first-parent",
-      "--diff-filter=AM",
+      "--find-renames",
+      "--find-copies",
+      "--diff-filter=AMCR",
       "-U0",
       "--no-color",
       "-p"

data/lib/rfix/rfix.rb

@@ -88,7 +88,9 @@ module Rfix
 
   # Ref since last push
   def ref_since_push
-    git("rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}").first
+    git("rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}") do
+      [ref_since_origin]
+    end.first
   end
 
   # Original branch, usually master

data/lib/rfix/version.rb

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

data/rfix.gemspec

@@ -5,12 +5,31 @@ require_relative "lib/rfix/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "rfix"
-  spec.version       = Rfix::VERSION
+
+  if ENV["TRAVIS"]
+    spec.version = "#{Rfix::VERSION}-#{ENV.fetch('TRAVIS_BUILD_NUMBER')}"
+  else
+    # rubocop:disable Gemspec/DuplicatedAssignment
+    spec.version = Rfix::VERSION
+    # rubocop:enable Gemspec/DuplicatedAssignment
+  end
+
   spec.authors       = ["Linus Oleander"]
   spec.email         = ["linus@oleander.nu"]
 
   spec.summary       = "RuboCop CLI that only complains about your latest changes"
-  spec.description   = "$ rfix local|branch|origin|info|all [--dry] [--help]"
+  spec.description   = <<~TEXT
+    #{spec.summary}
+    Uses 'git diff' to determine what changes were made then runs RuboCop against them
+
+  	$ rfix branch <branch> -- Fix changes made between HEAD and <branch>
+  	$ rfix origin          -- Fix changes made between HEAD and origin branch
+  	$ rfix local           -- Fix changes not yet pushed to upstream branch
+  	$ rfix info            -- Display runtime dependencies and their versions
+  	$ rfix all             -- Fix all files in this repository (not recommended)
+
+    Optional args: --dry --help --list-files --limit-files --config --untracked
+  TEXT
   spec.homepage      = "https://github.com/oleander/rfix-rb"
   spec.license       = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
@@ -29,6 +48,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib", "vendor/cli-ui/lib"]
 
+  spec.requirements << "git, v2.0+"
+
   spec.add_runtime_dependency "rainbow", "~> 3.0"
   spec.add_runtime_dependency "rouge", "~> 3.20"
   spec.add_runtime_dependency "rubocop", "~> 0.80"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfix
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7.pre.66
 platform: ruby
 authors:
 - Linus Oleander
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2020-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -52,7 +52,14 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.80'
-description: "$ rfix local|branch|origin|info|all [--dry] [--help]"
+description: "RuboCop CLI that only complains about your latest changes\nUses 'git
+  diff' to determine what changes were made then runs RuboCop against them\n\n\t$
+  rfix branch <branch> -- Fix changes made between HEAD and <branch>\n\t$ rfix origin
+  \         -- Fix changes made between HEAD and origin branch\n\t$ rfix local           --
+  Fix changes not yet pushed to upstream branch\n\t$ rfix info            -- Display
+  runtime dependencies and their versions\n\t$ rfix all             -- Fix all files
+  in this repository (not recommended)\n\nOptional args: --dry --help --list-files
+  --limit-files --config --untracked\n"
 email:
 - linus@oleander.nu
 executables:
@@ -89,7 +96,8 @@ files:
 - exe/rfix
 - lib/rfix.rb
 - lib/rfix/cmd.rb
-- lib/rfix/extensions.rb
+- lib/rfix/extensions/extensions.rb
+- lib/rfix/extensions/offense.rb
 - lib/rfix/formatter.rb
 - lib/rfix/git_file.rb
 - lib/rfix/git_helper.rb
@@ -129,7 +137,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/oleander/rfix-rb
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -141,12 +149,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
-requirements: []
-rubygems_version: 3.1.4
-signing_key:
+      version: 1.3.1
+requirements:
+- git, v2.0+
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: RuboCop CLI that only complains about your latest changes
 test_files: []

data/lib/rfix/extensions.rb

@@ -1,92 +0,0 @@
-# frozen_string_literal: true
-
-require "rubocop"
-require "rainbow"
-
-module Rfix::Ext
-  module CommentConfig
-    # Called by RuboCop on every line to see
-    # if its suppose to run against it or not
-    def cop_enabled_at_line?(_cop, line)
-      Rfix.enabled?(processed_source.file_path, line) && super
-    end
-  end
-
-  module Runner
-    # Called _after_ @source has been 'auto fixed' by Rubocop
-    def check_for_infinite_loop(source, offences)
-      Rfix.refresh!(source); super # TODO: Before or after?
-    end
-  end
-
-  module Options
-    # Appends custom --args to RuboCop CLI
-    def define_options
-      super.tap do |options|
-        @ons.each do |args, block|
-          option(options, *args, &block)
-        end
-      end
-    end
-
-    # Helper method used by rfix to append cli --args to Rubocop
-    def on(*args, &block)
-      @ons ||= []
-      @ons += [[args, block]]
-    end
-  end
-
-  module Offense
-    def where
-      line.to_s + ":" + real_column.to_s
-    end
-
-    def info
-      message.split(": ", 2).last.delete("\n")
-    end
-
-    def msg
-      CLI::UI.resolve_text("{{italic:#{info}}}", truncate_to: CLI::UI::Terminal.width - 10)
-    end
-
-    def code
-      message.split(": ", 2).first
-    end
-
-    def star
-      Rainbow("⭑")
-    end
-
-    def cross
-      Rainbow("✗")
-    end
-
-    def check
-      Rainbow("✓")
-    end
-
-    def level
-      colors = {
-        refactor: star.lightcyan,
-        convention: star.lightblue,
-        warning: star.lightyellow,
-        error: cross.indianred,
-        fatal: cross.lightsalmon
-      }
-
-      colors[severity.name]
-    end
-
-    def icon
-      return check.green if corrected?
-      return check.lightgreen if correctable?
-
-      cross.indianred
-    end
-  end
-end
-
-RuboCop::Options.prepend(Rfix::Ext::Options)
-RuboCop::Runner.prepend(Rfix::Ext::Runner)
-RuboCop::CommentConfig.prepend(Rfix::Ext::CommentConfig)
-RuboCop::Cop::Offense.prepend(Rfix::Ext::Offense)