rfix 1.0.7.pre.66 → 1.0.8.pre.109

data/lib/rfix/gem_helper.rb

@@ -0,0 +1,12 @@
+require "bundler"
+
+module GemHelper
+  def source_for(name:, &block)
+    bundle_root = Bundler.bundle_path.join('bundler/gems')
+    path = Dir.glob(bundle_root.join("#{name}-*").to_s).first
+    path or raise "Could not find source for #{name}, run bundle install first"
+    block(path)
+  rescue StandardError => e
+    puts "[Bundler] #{e}"
+  end
+end

data/lib/rfix/git_helper.rb

@@ -9,8 +9,20 @@ module Rfix::GitHelper
   include Rfix::Log
   include Rfix::Cmd
 
-  def git(*args, &block)
-    cmd("git", *args, &block)
+  def git(*args, root: Dir.pwd, quiet: false, &block)
+    args.unshift *["--git-dir", File.join(root, ".git")]
+    args.unshift *["--work-tree", root]
+    cmd("git", *args, quiet: quiet, &block)
+  end
+
+  def has_branch?(branch)
+    cmd_succeeded?("git", "cat-file", "-t", branch)
+  end
+
+  def dirty?(path)
+    Dir.chdir(path) do
+      !cmd_succeeded?("git diff --quiet")
+    end
   end
 
   def params
@@ -28,3 +40,8 @@ module Rfix::GitHelper
     ]
   end
 end
+
+# TODO: Rename above to just ::Git
+module Rfix::Git
+  extend Rfix::GitHelper
+end

data/lib/rfix/log.rb

@@ -13,11 +13,13 @@ module Rfix::Log
   end
 
   def say_error_sub(message)
-    CLI::UI.puts("#{message}")
+    CLI::UI.puts(message.to_s)
   end
 
   def say_debug(message)
-    CLI::UI.puts("{{*}} #{message}")
+    unless Rfix.debug?
+      CLI::UI.puts("{{*}} [{{info:Debug}}] #{message}")
+    end
   end
 
   def say_abort(message)

data/lib/rfix/rake_helper.rb

@@ -0,0 +1,56 @@
+require "tmpdir"
+
+module RakeHelper
+  include Rfix::Log
+  include Rfix::Cmd
+  include Rfix::GitHelper
+
+  def dirty?
+    !cmd_succeeded?("git diff --quiet")
+  end
+
+  def clone(github:, ref:)
+    Dir.mktmpdir(github.split("/")) do |src|
+      say "Clone {{info:#{github}}}, hold on ..."
+      git("clone", "https://github.com/#{github}", src)
+      Dir.chdir(src) do
+        say "Check out {{info:#{ref}}}"
+        git("reset", "--hard", ref)
+        git("clean", "-f", "-d")
+      end
+
+      dest = File.join("vendor", github)
+      say "Copy files to {{info:#{dest}}}"
+      FileUtils.mkdir_p(dest)
+      FileUtils.copy_entry(src, dest, true, true, true)
+    end
+  end
+
+  def gemfiles
+    Dir.glob("ci/Gemfile*").unshift("Gemfile").reject do |path|
+      [".lock", ".base"].include?(File.extname(path))
+    end
+  end
+
+  def gemlocks
+    Dir.glob("ci/Gemfile*.lock").unshift("Gemfile.lock")
+  end
+
+  def source_for(name:)
+    bundle_root = Bundler.bundle_path.join('bundler/gems')
+    path = Dir.glob(bundle_root.join("#{name}-*").to_s).first
+    path or raise "Could not find source for #{name}, run bundle install first"
+  end
+
+  def dest_for(name:)
+    File.join(__dir__, 'vendor', name)
+  end
+
+  def osx?
+    ENV.fetch("TRAVIS_OS_NAME") == "osx"
+  end
+
+  def brew_url(ref:)
+    "https://raw.githubusercontent.com/Homebrew/homebrew-core/#{ref}/Formula/git.rb"
+  end
+end

data/lib/rfix/rfix.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# rubocop:disable Layout/LineLength
+
 require "rubocop"
 require "optparse"
 require "rbconfig"
@@ -13,6 +15,82 @@ module Rfix
   include GitHelper
   include Log
 
+  def thanks
+    tx = []
+    tx << "\n{{v}} Thank you for installing {{green:rfix v#{Rfix::VERSION}}}!\n"
+    tx << "{{i}} Run {{command:rfix}} for avalible commands or any of the following to get started:"
+    tx << ""
+    # tx << "Here are a few examples that might be useful:"
+    indent = " " * 3
+    tx << "#{indent}{{command:rfix local}}   {{italic:# Auto-fixes commits not yet pushed to upstream}}"
+    tx << "#{indent}{{command:rfix origin}}  {{italic:# Auto-fixes commits between HEAD and origin branch}}"
+    tx << "#{indent}{{command:rfix lint}}    {{italic:# Lints commits and untracked files not yet pushed to upstream}}"
+    tx << ""
+    tx << "{{*}} {{bold:ProTip:}} Append {{command:--dry}} to run {{command:rfix}} in read-only mode"
+    tx << ""
+    tx << "{{i}} {{bold:Issues}} {{italic:https://github.com/oleander/rfix-rb/issues}}"
+    tx << "{{i}} {{bold:Readme}} {{italic:https://github.com/oleander/rfix-rb/blob/master/README.md}}"
+    tx << "{{i}} {{bold:Travis}} {{italic:https://travis-ci.org/github/oleander/rfix-rb}}"
+    tx << ""
+    tx << "{{italic:~ Linus}}\n\n"
+    CLI::UI.fmt(tx.join("\n"), enable_color: true)
+  end
+
+  def help
+    cmds = []
+    cmds << "\t{{bold:rfix [cmd] [options]}} -- {{italic:--dry --help --list-files --limit-files --config --untracked}}"
+    cmds << "\t{{bold:rfix branch <branch>}} -- {{italic:Fix changes made between HEAD and <branch>}}"
+    cmds << "\t{{bold:rfix origin}}          -- {{italic:Fix changes made between HEAD and origin branch}}"
+    cmds << "\t{{bold:rfix local}}           -- {{italic:Fix changes not yet pushed to upstream branch}}"
+    cmds << "\t{{bold:rfix info}}            -- {{italic:Display runtime dependencies and their versions}}"
+    cmds << "\t{{bold:rfix all}}             -- {{italic:Fix all files in this repository}} {{warning:(not recommended)}}"
+    cmds << "\t{{bold:rfix lint}}            -- {{italic:Shortcut for 'local --dry --untracked'}}"
+    CLI::UI.fmt(cmds.join("\n"), enable_color: true)
+  end
+
+  def current_branch
+    git("rev-parse", "--abbrev-ref", "HEAD").first
+  end
+
+  def debug?
+    @debug
+  end
+
+  def debug!
+    @debug = true
+  end
+
+  def number_of_commits_since
+    cmd("git rev-list master..HEAD | wc -l").first
+  end
+
+  def config
+    @config
+  end
+
+  def no_auto_correct!
+    @config[:auto_correct] = false
+  end
+
+  def auto_correct!
+    @config[:auto_correct] = true
+  end
+
+  def load_config
+    yield @store
+  rescue RuboCop::Error => e
+    say_abort "[Config:RuboCop] #{e}"
+  rescue TypeError => e
+    say_abort "[Config:Type] #{e}"
+  rescue Psych::SyntaxError => e
+    say_abort "[Config:Syntax] #{e}"
+  end
+
+  def lint_mode!
+    no_auto_correct!
+    load_untracked!
+  end
+
   def git_version
     cmd("git --version").last.split(/\s+/, 3).last
   end
@@ -33,9 +111,25 @@ module Rfix
     @global_enable
   end
 
+  def store
+    @store
+  end
+
+  def clear_cache!
+    RuboCop::ResultCache.cleanup(@store, true)
+  end
+
   def init!
     @files ||= {}
     @global_enable = false
+    @config = {
+      force_exclusion: true,
+      formatters: ["Rfix::Formatter"]
+    }
+
+    @store = RuboCop::ConfigStore.new
+    @debug = false
+    auto_correct!
   end
 
   def files
@@ -83,7 +177,7 @@ module Rfix
   end
 
   def has_branch?(name)
-    Open3.capture2e("git", "cat-file", "-t", name).last.success?
+    cmd_succeeded?("git", "cat-file", "-t", name)
   end
 
   # Ref since last push
@@ -100,6 +194,12 @@ module Rfix
 
   private
 
+  def old?
+    # For version 0.80.x .. 0.83.x:
+    # Otherwise it will exit with status code = 1
+    (0.80..0.83).include?(RuboCop::Version::STRING.to_f)
+  end
+
   def get_file(path, &block)
     if file = @files[path]
       block.call(file)
@@ -107,9 +207,7 @@ module Rfix
   end
 
   def list_untrack_files
-    git("status", "-u", "--porcelain", "--no-column").map do |line|
-      line.split(" ", 2).map(&:strip)
-    end.select { |el| el.first == "??" }.map(&:last)
+    git("ls-files", "--exclude-standard", "--others")
   end
 
   def cached(files)
@@ -119,3 +217,5 @@ module Rfix
     end
   end
 end
+
+# rubocop:enable Layout/LineLength

data/lib/rfix/version.rb

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

data/rfix.gemspec

@@ -2,8 +2,11 @@
 
 require "pathname"
 require_relative "lib/rfix/version"
+# require_relative "lib/rfix/gem_helper"
 
 Gem::Specification.new do |spec|
+  # extend GemHelper
+
   spec.name          = "rfix"
 
   if ENV["TRAVIS"]
@@ -17,18 +20,16 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Linus Oleander"]
   spec.email         = ["linus@oleander.nu"]
 
-  spec.summary       = "RuboCop CLI that only complains about your latest changes"
+  # 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
+
   spec.description   = <<~TEXT
-    #{spec.summary}
-    Uses 'git diff' to determine what changes were made then runs RuboCop against them
+    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`).
 
-  	$ 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)
+    Includes a RuboCop formatter with syntax highlighting and build in hyperlinks for offense documentation.
 
-    Optional args: --dry --help --list-files --limit-files --config --untracked
+    Holds the same CLI arguments as RuboCop. Run `rfix --help` for a complete list or `rfix` for supported commands.
   TEXT
   spec.homepage      = "https://github.com/oleander/rfix-rb"
   spec.license       = "MIT"
@@ -42,15 +43,19 @@ Gem::Specification.new do |spec|
     `git ls-files -z`.split("\x0").reject(&validate_file)
   end
 
-  spec.files += Dir.glob("vendor/cli-ui/lib/**/*").reject(&validate_file)
+  spec.files += Dir.glob("vendor/shopify/cli-ui/lib/**/*").reject(&validate_file)
 
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib", "vendor/cli-ui/lib"]
+  spec.require_paths = ["lib", "vendor/shopify/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"
+  spec.add_runtime_dependency "rubocop", ">= 0.80"
+
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "aruba", "~> 1.0"
+  spec.add_development_dependency "rake", "~> 12.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rfix
 version: !ruby/object:Gem::Version
-  version: 1.0.7.pre.66
+  version: 1.0.8.pre.109
 platform: ruby
 authors:
 - Linus Oleander
@@ -42,24 +42,64 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.80'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.80'
-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"
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
+description: |
+  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`).
+
+  Includes a RuboCop formatter with syntax highlighting and build in hyperlinks for offense documentation.
+
+  Holds the same CLI arguments as RuboCop. Run `rfix --help` for a complete list or `rfix` for supported commands.
 email:
 - linus@oleander.nu
 executables:
@@ -72,12 +112,19 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
+- Gemfile.base
 - Gemfile.lock
 - Guardfile
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
+- bin/bundle
 - bin/console
+- bin/guard
+- bin/rake
+- bin/rfix
+- bin/rspec
 - bin/setup
 - ci/Gemfile.rubocop-0.80
 - ci/Gemfile.rubocop-0.80.lock
@@ -94,44 +141,48 @@ files:
 - ci/Gemfile.rubocop-0.85.1.lock
 - ci/Gemfile.rubocop-0.85.lock
 - exe/rfix
+- file.rb
 - lib/rfix.rb
 - lib/rfix/cmd.rb
 - lib/rfix/extensions/extensions.rb
 - lib/rfix/extensions/offense.rb
 - lib/rfix/formatter.rb
+- lib/rfix/gem_helper.rb
 - lib/rfix/git_file.rb
 - lib/rfix/git_helper.rb
 - lib/rfix/log.rb
+- lib/rfix/rake_helper.rb
 - lib/rfix/rfix.rb
 - lib/rfix/tracked_file.rb
 - lib/rfix/untracked_file.rb
 - lib/rfix/version.rb
+- resources/ps.png
 - rfix.gemspec
-- vendor/cli-ui/lib/cli/ui.rb
-- vendor/cli-ui/lib/cli/ui/ansi.rb
-- vendor/cli-ui/lib/cli/ui/color.rb
-- vendor/cli-ui/lib/cli/ui/formatter.rb
-- vendor/cli-ui/lib/cli/ui/frame.rb
-- vendor/cli-ui/lib/cli/ui/frame/frame_stack.rb
-- vendor/cli-ui/lib/cli/ui/frame/frame_style.rb
-- vendor/cli-ui/lib/cli/ui/frame/frame_style/box.rb
-- vendor/cli-ui/lib/cli/ui/frame/frame_style/bracket.rb
-- vendor/cli-ui/lib/cli/ui/glyph.rb
-- vendor/cli-ui/lib/cli/ui/printer.rb
-- vendor/cli-ui/lib/cli/ui/progress.rb
-- vendor/cli-ui/lib/cli/ui/prompt.rb
-- vendor/cli-ui/lib/cli/ui/prompt/interactive_options.rb
-- vendor/cli-ui/lib/cli/ui/prompt/options_handler.rb
-- vendor/cli-ui/lib/cli/ui/spinner.rb
-- vendor/cli-ui/lib/cli/ui/spinner/async.rb
-- vendor/cli-ui/lib/cli/ui/spinner/spin_group.rb
-- vendor/cli-ui/lib/cli/ui/stdout_router.rb
-- vendor/cli-ui/lib/cli/ui/terminal.rb
-- vendor/cli-ui/lib/cli/ui/truncater.rb
-- vendor/cli-ui/lib/cli/ui/version.rb
-- vendor/cli-ui/lib/cli/ui/widgets.rb
-- vendor/cli-ui/lib/cli/ui/widgets/base.rb
-- vendor/cli-ui/lib/cli/ui/widgets/status.rb
+- vendor/shopify/cli-ui/lib/cli/ui.rb
+- vendor/shopify/cli-ui/lib/cli/ui/ansi.rb
+- vendor/shopify/cli-ui/lib/cli/ui/color.rb
+- vendor/shopify/cli-ui/lib/cli/ui/formatter.rb
+- vendor/shopify/cli-ui/lib/cli/ui/frame.rb
+- vendor/shopify/cli-ui/lib/cli/ui/frame/frame_stack.rb
+- vendor/shopify/cli-ui/lib/cli/ui/frame/frame_style.rb
+- vendor/shopify/cli-ui/lib/cli/ui/frame/frame_style/box.rb
+- vendor/shopify/cli-ui/lib/cli/ui/frame/frame_style/bracket.rb
+- vendor/shopify/cli-ui/lib/cli/ui/glyph.rb
+- vendor/shopify/cli-ui/lib/cli/ui/printer.rb
+- vendor/shopify/cli-ui/lib/cli/ui/progress.rb
+- vendor/shopify/cli-ui/lib/cli/ui/prompt.rb
+- vendor/shopify/cli-ui/lib/cli/ui/prompt/interactive_options.rb
+- vendor/shopify/cli-ui/lib/cli/ui/prompt/options_handler.rb
+- vendor/shopify/cli-ui/lib/cli/ui/spinner.rb
+- vendor/shopify/cli-ui/lib/cli/ui/spinner/async.rb
+- vendor/shopify/cli-ui/lib/cli/ui/spinner/spin_group.rb
+- vendor/shopify/cli-ui/lib/cli/ui/stdout_router.rb
+- vendor/shopify/cli-ui/lib/cli/ui/terminal.rb
+- vendor/shopify/cli-ui/lib/cli/ui/truncater.rb
+- vendor/shopify/cli-ui/lib/cli/ui/version.rb
+- vendor/shopify/cli-ui/lib/cli/ui/widgets.rb
+- vendor/shopify/cli-ui/lib/cli/ui/widgets/base.rb
+- vendor/shopify/cli-ui/lib/cli/ui/widgets/status.rb
 homepage: https://github.com/oleander/rfix-rb
 licenses:
 - MIT
@@ -141,7 +192,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
-- vendor/cli-ui/lib
+- vendor/shopify/cli-ui/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -157,5 +208,6 @@ requirements:
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: RuboCop CLI that only complains about your latest changes
+summary: RuboCop CLI that only lints and auto-fixes code you committed by utilizing
+  `git-log` and `git-diff`
 test_files: []