rfix 1.4.1 → 2.0.0

data/ci/Gemfile.rubocop-0.85.lock

@@ -1,173 +0,0 @@
-PATH
-  remote: .
-  specs:
-    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/
-  specs:
-    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.2)
-      childprocess (>= 2.0, < 5.0)
-      contracts (~> 0.16.0)
-      cucumber (>= 2.4, < 5.0)
-      ffi (~> 1.9)
-      rspec-expectations (~> 3.4)
-      thor (~> 1.0)
-    ast (2.4.1)
-    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)
-      cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
-      cucumber-gherkin (~> 13.0, >= 13.0.0)
-      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)
-      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-gherkin (13.0.0)
-      cucumber-messages (~> 12.0, >= 12.0.0)
-    cucumber-html-formatter (6.0.3)
-      cucumber-messages (~> 12.1, >= 12.1.1)
-    cucumber-messages (12.1.1)
-      protobuf-cucumber (~> 3.10, >= 3.10.8)
-    cucumber-tag-expressions (2.0.4)
-    cucumber-wire (3.0.0)
-      cucumber-core (~> 7.0, >= 7.0.0)
-      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)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    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.6)
-    method_source (1.0.0)
-    middleware (0.1.0)
-    minitest (5.14.1)
-    multi_test (0.1.2)
-    nenv (0.3.0)
-    notiffany (0.1.3)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    parallel (1.19.2)
-    parser (2.7.1.4)
-      ast (~> 2.4.1)
-    protobuf-cucumber (3.10.8)
-      activesupport (>= 3.2)
-      middleware
-      thor
-      thread_safe
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    rainbow (3.0.0)
-    rake (12.3.3)
-    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)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.85.0)
-      parallel (~> 1.10)
-      parser (>= 2.7.0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
-      rexml
-      rubocop-ast (>= 0.0.3)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    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)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aruba (~> 1.0)
-  colorize
-  faker
-  gem-release
-  git (~> 1.7.0)
-  guard
-  guard-rspec
-  pry
-  rake (~> 12.3)
-  rfix!
-  rspec (~> 3.0)
-  rubocop (= 0.85.0)
-
-BUNDLED WITH
-   2.1.4

data/lib/rfix/box.rb

@@ -1,112 +0,0 @@
-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

data/lib/rfix/branches/base.rb

@@ -1,15 +0,0 @@
-class Rfix::Branch::Base
-  def resolve(with:)
-    raise Rfix::NotYetImplementedError, "#resolved"
-  end
-
-  def to_s
-    raise Rfix::NotYetImplementedError, "#to_s"
-  end
-
-  def revparse(using:, ref:)
-    using.rev_parse(ref)
-  rescue Rugged::InvalidError
-    raise Rfix::Branch::UnknownBranchError, "Could not find reference {{error:#{ref}}}"
-  end
-end

data/lib/rfix/branches/head.rb

@@ -1,13 +0,0 @@
-require_relative "base"
-
-module Rfix
-  class Branch::Head < Branch::Base
-    def resolve(with:)
-      with.lookup(with.head.target_id)
-    end
-
-    def to_s
-      "HEAD"
-    end
-  end
-end

data/lib/rfix/branches/main.rb

@@ -1,28 +0,0 @@
-require "rugged"
-require_relative "base"
-
-module Rfix
-  class Branch::Main < Branch::Base
-    KEY = "rfix.main.branch".freeze
-
-    def resolve(with:)
-      unless name = with.config[KEY]
-        raise Error, "Please run {{command:rfix setup}} first"
-      end
-
-      Branch::Name.new(name).resolve(with: with)
-    end
-
-    def self.set(branch, at: Dir.pwd)
-      Branch.repo(at: at).config[KEY] = branch
-    end
-
-    def self.get(at: Dir.pwd)
-      Branch.repo(at: at).config[KEY]
-    end
-
-    def to_s
-      "configured main branch"
-    end
-  end
-end

data/lib/rfix/branches/name.rb

@@ -1,23 +0,0 @@
-require_relative "base"
-
-module Rfix
-  class Branch::Name < Branch::Base
-    attr_reader :name
-
-    def initialize(name)
-      @name = name
-    end
-
-    def resolve(with:)
-      unless branch = with.branches[name]
-        raise Branch::UnknownBranchError, "Could not find branch {{error:#{name}}}"
-      end
-
-      with.lookup(with.merge_base(branch.target_id, with.head.target_id))
-    rescue Rugged::ReferenceError
-      raise Branch::UnknownBranchError, "Could not find branch {{error:#{name}}}"
-    end
-
-    alias to_s name
-  end
-end

data/lib/rfix/branches/reference.rb

@@ -1,21 +0,0 @@
-require_relative "base"
-
-module Rfix
-  class Branch::Reference < Branch::Base
-    attr_reader :reference
-
-    def initialize(reference)
-      @reference = reference
-    end
-
-    def resolve(with:)
-      Branch::Name.new(reference).resolve(with: with)
-    rescue Branch::UnknownBranchError
-      revparse(using: with, ref: reference)
-    rescue Rugged::InvalidError
-      raise Branch::UnknownBranchError, "Branch with reference {{error:#{reference}}} not found"
-    end
-
-    alias to_s reference
-  end
-end

data/lib/rfix/branches/upstream.rb

@@ -1,13 +0,0 @@
-require_relative "base"
-
-module Rfix
-  class Branch::Upstream < Branch::Base
-    def resolve(with:)
-      with.rev_parse("@{upstream}")
-    end
-
-    def to_s
-      "upstream"
-    end
-  end
-end

data/lib/rfix/cmd.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require "open3"
-require "rfix"
-require "rfix/log"
-
-module Rfix::Cmd
-  include Rfix::Log
-
-  def cmd(*args, quiet: false)
-    out, err, status = Open3.capture3(*args)
-    box = Rfix::Box.new(out, err, status, args, quiet)
-    return box.stdout if box.success?
-    return yield if block_given?
-    return if quiet
-
-    box.render(color: :red)
-    exit box.exit_status
-  ensure
-    # box.render(debug: false)
-  end
-
-  def cmd_succeeded?(*cmd)
-    Open3.capture2e(*cmd).last.success?
-  end
-
-  def params
-    [
-      "--word-diff-regex=[^[:space:]]",
-      "--no-renames",
-      "--no-merges",
-      "--first-parent",
-      "--diff-filter=AM",
-      "-U0",
-      "--no-color",
-      "-p"
-    ]
-  end
-end