rfix 1.0.15 → 1.1.0.pre.147

data/ci/Gemfile.rubocop-0.85.1.lock

@@ -1,10 +1,13 @@
 PATH
   remote: .
   specs:
-    rfix (1.0.8)
+    rfix (1.0.20)
+      cri (~> 2.15.10)
+      listen (~> 3.0)
       rainbow (~> 3.0)
       rouge (~> 3.20)
       rubocop (>= 0.80)
+      rugged (~> 1.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -26,9 +29,11 @@ GEM
     builder (3.2.4)
     childprocess (4.0.0)
     coderay (1.1.3)
+    colorize (0.8.1)
     concurrent-ruby (1.1.6)
     contracts (0.16.0)
-    cucumber (4.0.0)
+    cri (2.15.10)
+    cucumber (4.0.1)
       builder (~> 3.2, >= 3.2.3)
       cucumber-core (~> 7.0, >= 7.0.0)
       cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
@@ -36,14 +41,14 @@ GEM
       cucumber-html-formatter (~> 6.0, >= 6.0.1)
       cucumber-messages (~> 12.1, >= 12.1.1)
       cucumber-wire (~> 3.0, >= 3.0.0)
-      diff-lcs (~> 1.3, >= 1.3)
+      diff-lcs (~> 1.3, >= 1.3, < 1.4)
       multi_test (~> 0.1, >= 0.1.2)
       sys-uname (~> 1.0, >= 1.0.2)
     cucumber-core (7.0.0)
       cucumber-gherkin (~> 13.0, >= 13.0.0)
       cucumber-messages (~> 12.1, >= 12.1.1)
       cucumber-tag-expressions (~> 2.0, >= 2.0.4)
-    cucumber-cucumber-expressions (10.2.0)
+    cucumber-cucumber-expressions (10.2.1)
     cucumber-gherkin (13.0.0)
       cucumber-messages (~> 12.0, >= 12.0.0)
     cucumber-html-formatter (6.0.3)
@@ -56,9 +61,13 @@ GEM
       cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
       cucumber-messages (~> 12.1, >= 12.1.1)
     diff-lcs (1.3)
+    faker (2.13.0)
+      i18n (>= 1.6, < 2)
     ffi (1.13.1)
     formatador (0.2.5)
     gem-release (2.1.1)
+    git (1.7.0)
+      rchardet (~> 1.8)
     guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -103,6 +112,7 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    rchardet (1.8.0)
     regexp_parser (1.7.1)
     rexml (3.2.4)
     rouge (3.20.0)
@@ -131,6 +141,7 @@ GEM
     rubocop-ast (0.0.3)
       parser (>= 2.7.0.1)
     ruby-progressbar (1.10.1)
+    rugged (1.0.1)
     shellany (0.0.1)
     sys-uname (1.2.1)
       ffi (>= 1.0.0)
@@ -146,9 +157,13 @@ PLATFORMS
 
 DEPENDENCIES
   aruba (~> 1.0)
+  colorize
+  faker
   gem-release
+  git (~> 1.7.0)
   guard
   guard-rspec
+  pry
   rake (~> 12.3)
   rfix!
   rspec (~> 3.0)

data/ci/Gemfile.rubocop-0.85.lock

@@ -1,10 +1,13 @@
 PATH
   remote: .
   specs:
-    rfix (1.0.8)
+    rfix (1.0.20)
+      cri (~> 2.15.10)
+      listen (~> 3.0)
       rainbow (~> 3.0)
       rouge (~> 3.20)
       rubocop (>= 0.80)
+      rugged (~> 1.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -26,8 +29,10 @@ GEM
     builder (3.2.4)
     childprocess (4.0.0)
     coderay (1.1.3)
+    colorize (0.8.1)
     concurrent-ruby (1.1.6)
     contracts (0.16.0)
+    cri (2.15.10)
     cucumber (4.0.0)
       builder (~> 3.2, >= 3.2.3)
       cucumber-core (~> 7.0, >= 7.0.0)
@@ -56,9 +61,13 @@ GEM
       cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
       cucumber-messages (~> 12.1, >= 12.1.1)
     diff-lcs (1.3)
+    faker (2.13.0)
+      i18n (>= 1.6, < 2)
     ffi (1.13.1)
     formatador (0.2.5)
     gem-release (2.1.1)
+    git (1.7.0)
+      rchardet (~> 1.8)
     guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -103,6 +112,7 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    rchardet (1.8.0)
     regexp_parser (1.7.1)
     rexml (3.2.4)
     rouge (3.20.0)
@@ -131,6 +141,7 @@ GEM
     rubocop-ast (0.0.3)
       parser (>= 2.7.0.1)
     ruby-progressbar (1.10.1)
+    rugged (1.0.1)
     shellany (0.0.1)
     sys-uname (1.2.1)
       ffi (>= 1.0.0)
@@ -146,9 +157,13 @@ PLATFORMS
 
 DEPENDENCIES
   aruba (~> 1.0)
+  colorize
+  faker
   gem-release
+  git (~> 1.7.0)
   guard
   guard-rspec
+  pry
   rake (~> 12.3)
   rfix!
   rspec (~> 3.0)

data/exe/rfix

@@ -1,156 +1,30 @@
 #!/usr/bin/env ruby
 
-# frozen_string_literal: true
-
+require "cri"
 require "rfix"
+require "rfix/log"
 require "rubocop"
-require "rfix/formatter"
-require "cli/ui"
-
-should_list_files = false
-limit_files       = false
-options           = RuboCop::Options.new
-
-display_help      = ARGV.include?("--help")
-is_dry            = ARGV.include?("--dry")
-config_path       = false
-clear_cache       = false
-
-extend Rfix::Log
-Rfix.init!
-CLI::UI::StdoutRouter.enable
-
-if ARGV.include?("--debug")
-  Rfix.debug!
-end
-
-options.on("--untracked", "Include untracked files") do
-  Rfix.load_untracked!
-end
-
-options.on("--dry", "No auto correct") do
-  say "Will run rfix in {{red:read-only}} mode"
-  Rfix.no_auto_correct!
-end
-
-options.on("--list-files", "List files found by git") do
-  should_list_files = true
-end
-
-options.on("--clear-cache", "Clear RuboCop cache") do
-  clear_cache = true
-end
+require "rfix/extensions/string"
+require "rfix/commands/extensions/options"
+require "rfix/commands/helper/loader"
+require "rfix/branch"
 
-options.on("--limit-files NUM", Integer, "Limit number of files") do |limit|
-  limit_files = limit
-end
-
-options.on("--config PATH", "A configuration file") do |path|
-  config_path = path
-end
+include Rfix::Loader
+include Rfix::Log
 
-case cmd = ARGV.shift
-when "info"
-  say "Using RuboCop {{yellow:#{RuboCop::Version.version}}}"
-  say_debug "Current directory {{italic:#{Dir.pwd}}}"
-  say_debug "[Ruby] {{italic:#{RbConfig.ruby}}}"
-  say "Using Rfix {{yellow:#{Rfix::VERSION}}}"
-  say "Using OS {{yellow:#{Rfix.current_os}}}"
-  say "Using Git {{yellow:#{Rfix.git_version}}}"
-  say "Using Ruby {{yellow:#{Rfix.ruby_version}}}"
-  say_debug "Current Git branch {{yellow:#{Rfix.current_branch}}}"
-  say_debug "Number of commits {{yellow:#{Rfix.number_of_commits_since}}}"
-  exit 0
-when "lint"
-  Rfix.lint_mode!
-  reference = Rfix.ref_since_push
-when "local"
-  reference = Rfix.ref_since_push
-when "origin"
-  reference = Rfix.ref_since_origin
-when "welcome"
-  abort Rfix.thanks
-when "all"
-  reference = false
-  Rfix.global_enable!
-when "branch"
-  abort_message = "No branch passed as second argument"
-  unless reference = ARGV.shift
-    say_abort abort_message
-  end
-
-  # Catches:
-  # NOT OK: branch --help
-  # OK branch master --help
-  say_abort abort_message if reference.start_with?("--")
-
-  # Check if branch exists
-  say_abort "Branch {{yellow:#{reference}}} does not exist" unless Rfix.has_branch?(reference)
-else
-  unless display_help
-    say_error "Valid rfix commands are:"
-    say_error_sub Rfix.help
-    exit 1
-  end
+root = Cri::Command.new
 
-  ARGV.unshift(cmd)
+Dir.glob(File.join(__dir__, "../lib/rfix/commands/*.rb")).each do |command|
+  root.add_command(Cri::Command.load_file(command, infer_name: true))
 end
 
 begin
-  options, paths = options.parse(ARGV)
-rescue OptionParser::MissingArgument => e
-  say_abort "[Parser] #{e}"
-end
-
-if path = config_path
-  Rfix.load_config do |config|
-    say_debug "[Config:Option] Load from #{path}"
-    config.options_config = path
-  end
-else
-  Rfix.load_config do |config|
-    say_debug "[Config:PWD] Load from #{Dir.pwd}"
-    config.for(Dir.pwd)
-  end
-end
-
-if clear_cache
-  say "Clearing cache"
-  Rfix.clear_cache!
-end
-
-if ref = reference
-  say "Compare against {{yellow:#{ref}}}"
-
-  Rfix.load_tracked!(ref)
-
-  paths = Rfix.paths if paths.empty?
-
-  say_exit "No files to run against" if paths.empty?
-end
-
-if limit = limit_files
-  say "Limit number of files to {{yellow:#{limit}}}"
-  paths = paths.take(limit)
-end
-
-if should_list_files
-  say "Loaded {{yellow:#{paths.count}}} paths"
-  paths.each do |path|
-    say "\t" + Rfix.to_relative(path: path)
+  if root.run(ARGV, {}, hard_exit: false)
+    exit 0
+  else
+    prt root.help
+    exit 1
   end
-end
-
-say_debug "[Config:Dump] #{Rfix.store}"
-
-env = RuboCop::CLI::Environment.new(
-  Rfix.config.merge(options),
-  Rfix.store,
-  paths
-)
-
-begin
-  exit RuboCop::CLI::Command::ExecuteRunner.new(env).run
-rescue RuboCop::Error => e
-  say_abort e.message
+rescue RuntimeError => e
+  say_abort e.to_s
 end

data/lib/rfix.rb

@@ -3,22 +3,29 @@
 
 # https://gist.github.com/skanev/9d4bec97d5a6825eaaf6
 
-require "rfix/version"
 require "cli/ui"
+require "rfix/version"
+require "rfix/log"
+require "rfix/cmd"
+require "rfix/repository"
+require "rfix/formatter"
 require "rfix/extensions/extensions"
 require "rfix/extensions/offense"
+require "rfix/branch"
 require "rfix/rfix"
+require "rfix/box"
+require "rfix/error"
 
 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)
 
+CLI::UI::StdoutRouter.enable
+
 # 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)

data/lib/rfix/box.rb

@@ -0,0 +1,112 @@
+class Rfix::Box < Struct.new(:out, :err, :status, :args, :quiet)
+  include Rfix::Log
+
+  def render(color: :reset, debug: false)
+    return if Rfix.debug? && !debug
+
+    @render ||= box(title, color: color) do
+      margin do
+        prt cmd_lines
+      end
+
+      div("{{info:STDOUT}}") do
+        prt lines_or_none(stdout)
+      end
+
+      div("{{error:STDERR}}") do
+        prt lines_or_none(stderr)
+      end
+    end
+  end
+
+  def lines_or_none(lines)
+    if lines.join.chomp.empty?
+      return "{{italic:<none>}}"
+    end
+
+    lines.map(&method(:strip)).join("\n")
+  end
+
+  def title
+    "#{quiet_icon}#{icon} #{bin} (#{exit_status}) @ {{italic:#{pwd}}}"
+  end
+
+  def quiet_icon
+    return "" unless quiet
+
+    "{{warning:[silent]}} "
+  end
+
+  def stdout
+    @stdout ||= dumpable(out.lines.map(&:chomp))
+  end
+
+  def stderr
+    @stderr ||= dumpable(err.lines.map(&:chomp))
+  end
+
+  def dumpable(lines)
+    box = self
+    lines.tap do
+      lines.define_singleton_method(:dump!) do
+        tap do
+          box.render
+        end
+      end
+    end
+  end
+
+  def icon
+    success? ? "{{v}}" : "{{x}}"
+  end
+
+  def success?
+    status.success?
+  end
+
+  def bin
+    clean_args.first
+  end
+
+  def tail
+    clean_args[1..-1]
+  end
+
+  def exit_status
+    status.exitstatus
+  end
+
+  def pwd
+    if Dir.getwd == Dir.pwd
+      return "{{italic:#{Dir.getwd}}}"
+    end
+
+    Dir.getwd.sub(Dir.pwd, "")
+  end
+
+  private
+
+  def longest_arg
+    @longest_arg ||= clean_args.reduce(0) do |acc, arg|
+      acc < arg.length ? arg.length : acc
+    end
+  end
+
+  def clean_args
+    @clean_args ||= args.map(&method(:strip))
+  end
+
+  def rest
+    tail.each_slice(2).map do |args|
+      args.map do |arg|
+        arg.ljust(longest_arg + 5)
+      end.join(" ")
+    end.map do |tail|
+      "  {{italic:#{tail}}}"
+    end.join("\n")
+  end
+
+  def cmd_lines
+    "{{command:$ #{bin} \n#{rest}}}"
+  end
+end