rfix 1.0.7.pre.67 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18adac7bf6bfb125c3cac54933353fb5c52a6a60854f0001afa0c5bdc69ece87
-  data.tar.gz: 1f1656bec3253bb8d609fa35fd157d60c45510e2fc787cf44139ae39dda756f7
+  metadata.gz: f66d49622b2d3173a8f76e81202218924859cfd4ca216887b9ff505bedf7d012
+  data.tar.gz: 33f02bc18c137a7d6bd943de07d7947bb5c275cb99635743072daf30de66f1e8
 SHA512:
-  metadata.gz: 6dac6c467ca60c677bceb2926e3f78ee86164ecda79b50a010595d40a8a5e924fa2182fbe7d90f64b5158abd36aa5b7860b107b2c2495748abfed15154da50d6
-  data.tar.gz: 29c0aca1abaa4ba8b3d13169128f052324061709ca7c03b01296b395d6f00b8dae8e76f231bd59942a350811ed6cb9d5b8a425b37bfd32a8bd01e7b368ed16a1
+  metadata.gz: ed91cea00b13371dd5faf6fbbd671409fda7886e21ba3e56fdabe9e923bcdbcebcbe2e4231d9be09f2508c701baf93c33e2597faa9afbfd7d9ee7cda78488597
+  data.tar.gz: 0b723a5d0011bf4d0f3df50723baea13a562e1c1088a0092fb90ac962fc139b7cfd97749e402b6dcd977ca53bb4fe683b6046024f1a0af415aa99bf8a8246bcc

data/.gitignore

@@ -16,3 +16,23 @@ vendor/*
 tmp/*
 .rspec_status
 pkg/*.gem
+bin/_guard-core
+bin/aruba
+bin/coderay
+bin/cucumber
+bin/cucumber-html-formatter
+bin/gherkin
+bin/gherkin-ruby
+bin/git-fame
+bin/htmldiff
+bin/ldiff
+bin/listen
+bin/protoc-gen-ruby
+bin/pry
+bin/rougify
+bin/rpc_server
+bin/rubocop
+bin/ruby-parse
+bin/ruby-rewrite
+bin/thor
+ci/vendor/

data/.rubocop.yml

@@ -66,3 +66,7 @@ Style/AsciiComments:
   Enabled: false
 Style/ConditionalAssignment:
   EnforcedStyle: assign_inside_condition
+Lint/AmbiguousBlockAssociation:
+  Enabled: false
+Style/Semicolon:
+  Enabled: false

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
-cache:
-  bundler: true
-  directories:
-    - $HOME/.rvm
-    - $HOME/Library/Caches/Homebrew
+# cache:
+#   bundler: true
+#   directories:
+#     - $HOME/.rvm
+#     - $HOME/Library/Caches/Homebrew
 before_cache:
   - brew cleanup
 rvm:
@@ -14,7 +14,6 @@ os:
   - osx
   - linux
 gemfile:
-  - Gemfile
   - ci/Gemfile.rubocop-0.80
   - ci/Gemfile.rubocop-0.81
   - ci/Gemfile.rubocop-0.82
@@ -24,13 +23,11 @@ gemfile:
   - ci/Gemfile.rubocop-0.85.1
 before_install:
   - yes | gem update --system --force
-  - gem install bundler
-  - bundle config git.allow_insecure true
+  - make dir fetch
 install:
   - bundle install
-  - bundle exec rake setup
-  - bundle exec rake git:config
 script:
+  - bundle exec rake git:config
   - bundle exec rake spec
   - bundle exec rake install
   - rfix info

data/Gemfile

@@ -1,16 +1,2 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-ruby '>= 2.5.0'
-
-gemspec
-
-gem 'aruba'
-gem 'pry'
-gem 'rake', '~> 12.0'
-gem 'rspec', '~> 3.0'
-gem 'guard', require: false
-gem 'guard-rspec', require: false
-
-gem 'cli-ui', github: 'Shopify/cli-ui', ref: 'ef976df676f4', require: false
-gem 'git_fame', github: 'oleander/git-fame-rb', ref: 'a9b9c25bbab1', require: false
+eval_gemfile(File.join(__dir__, "Gemfile.base"))
+gem "rubocop", "~> 0.85"

data/Gemfile.base

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "guard", require: false
+gem "guard-rspec", require: false
+gem "gem-release", require: false
+
+gemspec path: __dir__

data/Gemfile.lock

@@ -1,42 +1,22 @@
-GIT
-  remote: https://github.com/Shopify/cli-ui.git
-  revision: ef976df676f43a80b47249ac2390d5f12b2293d1
-  ref: ef976df676f4
-  specs:
-    cli-ui (1.3.0)
-
-GIT
-  remote: https://github.com/oleander/git-fame-rb.git
-  revision: a9b9c25bbab197feaee00f9a5c970998e76f636c
-  ref: a9b9c25bbab1
-  specs:
-    git_fame (2.5.3)
-      hirb (~> 0.7.3)
-      memoist (~> 0.14.0)
-      method_profiler (~> 2.0.1)
-      progressbar (~> 0.21.0)
-      scrub_rb (~> 1.0.1)
-      trollop (~> 2.1.2)
-
 PATH
   remote: .
   specs:
-    rfix (1.0.7)
+    rfix (1.0.15)
       rainbow (~> 3.0)
       rouge (~> 3.20)
-      rubocop (~> 0.80)
+      rubocop (>= 0.80)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    aruba (1.0.1)
-      childprocess (~> 3.0)
+    aruba (1.0.2)
+      childprocess (>= 2.0, < 5.0)
       contracts (~> 0.16.0)
       cucumber (>= 2.4, < 5.0)
       ffi (~> 1.9)
@@ -44,7 +24,7 @@ GEM
       thor (~> 1.0)
     ast (2.4.1)
     builder (3.2.4)
-    childprocess (3.0.0)
+    childprocess (4.0.0)
     coderay (1.1.3)
     concurrent-ruby (1.1.6)
     contracts (0.16.0)
@@ -78,6 +58,7 @@ GEM
     diff-lcs (1.3)
     ffi (1.13.1)
     formatador (0.2.5)
+    gem-release (2.1.1)
     guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -92,16 +73,12 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    hirb (0.7.3)
     i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.5)
-    memoist (0.14.0)
-    method_profiler (2.0.1)
-      hirb (>= 0.6.0)
+    lumberjack (1.2.6)
     method_source (1.0.0)
     middleware (0.1.0)
     minitest (5.14.1)
@@ -111,9 +88,8 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.19.2)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
-    progressbar (0.21.0)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     protobuf-cucumber (3.10.8)
       activesupport (>= 3.2)
       middleware
@@ -155,13 +131,11 @@ GEM
     rubocop-ast (0.0.3)
       parser (>= 2.7.0.1)
     ruby-progressbar (1.10.1)
-    scrub_rb (1.0.1)
     shellany (0.0.1)
     sys-uname (1.2.1)
       ffi (>= 1.0.0)
     thor (1.0.1)
     thread_safe (0.3.6)
-    trollop (2.1.3)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
@@ -171,18 +145,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba
-  cli-ui!
-  git_fame!
+  aruba (~> 1.0)
+  gem-release
   guard
   guard-rspec
-  pry
-  rake (~> 12.0)
+  rake (~> 12.3)
   rfix!
   rspec (~> 3.0)
-
-RUBY VERSION
-   ruby 2.5.0p0
+  rubocop (~> 0.85)
 
 BUNDLED WITH
    2.1.4

data/Makefile

@@ -0,0 +1,13 @@
+FAME=vendor/oleander/git-fame-rb
+CLI=vendor/shopify/cli-ui
+dir:
+	mkdir -p vendor
+	rm -rf vendor/shopify
+	rm -rf vendor/oleander
+	mkdir -p vendor/shopify
+	mkdir -p vendor/oleander
+fetch:
+	git clone https://github.com/shopify/cli-ui $(CLI)
+	git --git-dir $(CLI)/.git --work-tree $(CLI) reset --hard ef976df676f4
+	git clone https://github.com/oleander/git-fame-rb $(FAME)
+	git --git-dir $(FAME)/.git --work-tree $(FAME) reset --hard a9b9c25bbab1

data/README.md

@@ -1,39 +1,92 @@
-# 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 complains about your latest changes
+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. Here are a few examples to get you started:
+
+- `rfix local` Auto-fixes commits not yet pushed to upstream
+- `rfix origin` Auto-fixes commits between `HEAD` and origin branch
+- `rfix lint` Lints commits and untracked files not yet pushed to upstream
+
+![Printscreen](resources/ps.png)
 
 ## Installation
 
 ``` shell
-$ gem install rfix
-$ rfix <local|branch|origin|info|all> [--dry] [--help]
+$ gem install rfix [--pre]
+```
+
+## Help
+
+``` shell
+$ 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)
+$ rfix lint            # Shortcut for 'rfix local --dry --untracked'
+$ rfix                 # Displays this list of supported commands
 ```
 
+### Arguments
+
+- `--dry` Turns off RuboCops autofix feature (read-only mode)
+- `--help` Displays RubyCops and Rfix supported arguments
+- `--list-files` List all files being passed to RubyCop
+- `--untracked` Include files not tracked by git
+- `--config` Configuration file, defaults to `.rubocop.yml`
+
 ## Development
 
-- `git clone https://github.com/oleander/rfix-rb`
-- `cd rfix-rb`
-- `bundle install`
-- `bundle exec rake setup`
-- `bundle exec rake local`
-- `bundle exec rake spec`
+### 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
+```
+
+### Run tests
+
+``` shell
+$ bundle exec rake spec
+```
 
 ## Overcommit
 
+Add the following to your `.overcommit.yml`, then run `overcommit --install` and `overcommit --sign pre-commit`. Lints commits not yet pushed to your upstream branch whenever `git commit` is ran.
+
 ``` yaml
 PreCommit:
   RFix:
     enabled: true
-    command: ["rfix", "local", "--untracked", "--dry"]
-    description: "Lint changes since last push using RuboCop"
+    command: ["rfix", "lint"]
+    description: "Lint unchanged commits using RuboCop"
     parallelize: true
 ```
 
+### From scratch
+
+1. `gem install overcommit rfix`
+2. `curl https://raw.githubusercontent.com/oleander/rfix-rb/master/resouces/overcommit.yml > .overcommit.yml`
+3. `overcommit --install`
+4. `overcommit --sign pre-commit`
+
+Run `overcommit --run` to test the new hook.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/oleander/rfix.
 
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/Rakefile

@@ -3,58 +3,39 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'fileutils'
-require 'rfix'
-
-include Rfix::Log
-include Rfix::Cmd
+require "rfix"
+require_relative "lib/rfix/rake_helper"
 
 RSpec::Core::RakeTask.new(:spec)
-
-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 setup(gem:)
-  say "Setup gem {{yellow:#{gem}}}"
-  Bundler.setup(gem)
-
-  source = source_for(name: gem)
-  say "Load source {{yellow:#{source}}}"
-
-  dest = dest_for(name: gem)
-  say "Load dest {{yellow:#{dest}}}"
-
-  FileUtils.mkdir_p(dest)
-  say "Copy files"
-  FileUtils.copy_entry source, dest, true, true, true
-end
+extend RakeHelper
 
 task default: :spec
 
-task :bundle_install do
-  say "Running bundle install"
-  cmd "bundle install"
-end
+desc "Install gems not in the gemspec or gemfile"
+namespace :vendor do
+  task :download do
+    say "Download external gems, hold on ..."
+    clone(github: "shopify/cli-ui", ref: "ef976df676f4")
+    clone(github: "oleander/git-fame-rb", ref: "a9b9c25bbab1")
+  end
 
-task setup: [:bundle_install] do
-  setup(gem: "cli-ui")
-  setup(gem: "git-fame-rb")
+  task :clear do
+    say "Remove and create vendor folder"
+    FileUtils.remove_dir("vendor/shopify")
+    FileUtils.remove_dir("vendor/oleander")
+  end
 end
 
-def osx?
-  ENV.fetch("TRAVIS_OS_NAME") == "osx"
+desc "Install dependencies in the correct order"
+namespace :bundle do
+  task :install do
+    say "Running {{command:bundle install}} with gemspec"
+    cmd "bundle install"
+  end
 end
 
-def brew_url(ref:)
-  "https://raw.githubusercontent.com/Homebrew/homebrew-core/#{ref}/Formula/git.rb"
-end
 
+desc "Set user.* for global git user"
 namespace :git do
   task :config do
     cmd("git config --global user.email hello@world.com")
@@ -79,15 +60,47 @@ namespace :git do
   end
 end
 
-namespace :update do
-  task :gemfiles do
-    Dir.glob("ci/Gemfile*").unshift("Gemfile").reject do |path|
-      File.extname(path) == ".lock"
-    end.each do |gemfile|
+namespace :gemfile do
+  task :update do
+    gemfiles.each do |gemfile|
       say "Update #{gemfile}"
       cmd("bundle", "update", "--gemfile", gemfile)
     end
   end
+
+  namespace :locks do
+    task :clear do
+      gemlocks.each do |lock|
+        say "Remove #{lock}"
+        FileUtils.remove_file(lock, true)
+      end
+    end
+  end
+
+  task :install do
+    gemfiles.each do |gemfile|
+      say "Bundle install #{gemfile}"
+      cmd("bundle", "install", "--gemfile", gemfile)
+    end
+  end
+
+  task commit: :update do
+    cmd("git", "commit", "-a", "-m", "Ran bundle install")
+  end
+end
+
+task :rehash do
+  cmd("rbenv", "rehash")
+end
+
+task :bump do
+  cmd("gem", "bump", "-c", "-m", "Bump version to %{version}")
+  cmd("bundle", "install")
+  cmd("git add Gemfile.lock")
+  cmd("git commit --amend --no-edit")
 end
 
+task clear: ["vendor:clear", "gemfile:locks:clear"]
+task setup: ["vendor:download", "gemfile:install", "gemfile:update"]
 task local: [:setup, :install]
+task reset: [:clear, :setup]