git_lib 1.2.0

data/Rakefile

@@ -0,0 +1,17 @@
+#!/usr/bin/env rake
+# frozen_string_literal: true
+
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
+require 'coveralls/rake/task'
+require "bundler/gem_tasks"
+require 'bundler/audit/task'
+
+RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new
+Coveralls::RakeTask.new
+Bundler::Audit::Task.new
+
+task test: :spec
+task rspec: :spec
+task default: :spec

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/rails_4.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.2"
+gem "appraisal"
+gem "bundler", "~> 1.17"
+gem "bundler-audit", require: false
+gem "climate_control", "~> 0.2"
+gem "coveralls", require: false
+gem "fakefs", "~> 0.9", require: "fakefs/safe"
+gem "json", "~> 1.8"
+gem "pry"
+gem "pry-byebug"
+gem "rake"
+gem "rspec", "~> 3.5"
+gem "rspec_junit_formatter"
+gem "rubocop", require: false
+gem "rubocop-rspec", require: false
+
+gemspec path: "../"

data/gemfiles/rails_5.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 5.2"
+gem "appraisal"
+gem "bundler", "~> 1.17"
+gem "bundler-audit", require: false
+gem "climate_control", "~> 0.2"
+gem "coveralls", require: false
+gem "fakefs", "~> 0.9", require: "fakefs/safe"
+gem "json", "~> 1.8"
+gem "pry"
+gem "pry-byebug"
+gem "rake"
+gem "rspec", "~> 3.5"
+gem "rspec_junit_formatter"
+gem "rubocop", require: false
+gem "rubocop-rspec", require: false
+
+gemspec path: "../"

data/gemfiles/rails_6.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 6.0"
+gem "appraisal"
+gem "bundler", "~> 1.17"
+gem "bundler-audit", require: false
+gem "climate_control", "~> 0.2"
+gem "coveralls", require: false
+gem "fakefs", "~> 0.9", require: "fakefs/safe"
+gem "json", "~> 1.8"
+gem "pry"
+gem "pry-byebug"
+gem "rake"
+gem "rspec", "~> 3.5"
+gem "rspec_junit_formatter"
+gem "rubocop", require: false
+gem "rubocop-rspec", require: false
+
+gemspec path: "../"

data/git_lib.gemspec

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'git/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "git_lib"
+  spec.version       = Git::VERSION
+  spec.authors       = ["Invoca Development"]
+  spec.email         = ["development@invoca.com"]
+  spec.summary       = "Git wrapper library."
+  spec.homepage      = "https://github.com/Invoca/git_lib"
+
+  spec.metadata = {
+    'allowed_push_host' => "https://rubygems.org"
+  }
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency 'activesupport', '>= 4.2', '< 7'
+end

data/lib/git/git.rb

@@ -0,0 +1,186 @@
+# frozen_string_literal: true
+
+require 'open3'
+require 'shellwords'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/time/calculations'
+require_relative './git_branch.rb'
+require_relative './git_commit.rb'
+require_relative './git_conflict.rb'
+require_relative './git_error.rb'
+
+module Git
+  class Git
+    GIT_PATH = '/usr/bin/git'.freeze
+
+    attr_reader :repository_name, :repository_url, :repository_path
+
+    def initialize(repository_name, git_cache_path: '/tmp/git')
+      @repository_name = repository_name
+      @repository_url = "git@github.com:#{repository_name}.git"
+      @repository_path = File.join(git_cache_path, repository_name).to_s
+    end
+
+    def execute(command, run_in_repository_path = true)
+      options = if run_in_repository_path
+                  { chdir: @repository_path }
+                else
+                  {}
+                end
+      stdout_andstderr_str, status = Open3.capture2e(GIT_PATH, *command.split(/ /), options)
+      unless status.success?
+        raise GitError.new("#{GIT_PATH} #{command}", status, stdout_andstderr_str)
+      end
+
+      stdout_andstderr_str
+    end
+
+    def branch_list
+      raw_output = execute(
+        'for-each-ref refs/remotes/ --format=\'%(refname:short)~%(authordate:iso8601)~%(authorname)~%(authoremail)\''
+      )
+
+      raw_output.split("\n").collect! do |raw_branch_data|
+        branch_data = raw_branch_data.split('~')
+        GitBranch.new(
+          @repository_name,
+          branch_data[0].sub!('origin/', ''),
+          DateTime.parse(branch_data[1]),
+          branch_data[2],
+          branch_data[3].gsub!(/[<>]/, '')
+        )
+      end
+    end
+
+    def merge_branches(target_branch_name,
+                       source_branch_name,
+                       source_tag_name: nil,
+                       keep_changes: true,
+                       commit_message: nil)
+      if current_branch_name != target_branch_name
+        checkout_branch(target_branch_name)
+      end
+
+      commit_message_argument = "-m \"#{commit_message.gsub('"', '\\"')}\"" if commit_message
+      source = if source_tag_name.present?
+                 Shellwords.escape(source_tag_name)
+               else
+                 "origin/#{Shellwords.escape(source_branch_name)}"
+               end
+
+      raw_output = execute("merge --no-edit #{commit_message_argument} #{source}")
+
+      if raw_output =~ /.*Already up-to-date.\n/
+        [false, nil]
+      else
+        [true, nil]
+      end
+    rescue GitError => ex
+      conflicting_files = Git.get_conflict_list_from_failed_merge_output(ex.error_message)
+      if conflicting_files.empty?
+        raise
+      else
+        [
+          false,
+          GitConflict.new(
+            @repository_name,
+            target_branch_name,
+            source_branch_name,
+            conflicting_files
+          )
+        ]
+      end
+    ensure
+      # cleanup our "mess"
+      keep_changes || reset
+    end
+
+    def clone_repository(default_branch_name)
+      if Dir.exist?(@repository_path)
+        # cleanup any changes that might have been left over if we crashed while running
+        reset
+        execute('clean -f -d')
+
+        # move to the master branch
+        checkout_branch(default_branch_name)
+
+        # remove branches that no longer exist on origin and update all branches that do
+        execute('fetch --prune --all')
+
+        # pull all of the branches
+        execute('pull --all')
+      else
+        execute("clone #{@repository_url} #{@repository_path}", false)
+      end
+    end
+
+    def push(dry_run: false)
+      dry_run_argument = ''
+      if dry_run
+        dry_run_argument = '--dry-run'
+      end
+      raw_output = execute("push #{dry_run_argument} origin")
+      raw_output != "Everything up-to-date\n"
+    end
+
+    def checkout_branch(branch_name)
+      reset
+      execute("checkout #{Shellwords.escape(branch_name)}")
+      reset
+    end
+
+    def reset
+      execute("reset --hard origin/#{Shellwords.escape(current_branch_name)}")
+    end
+
+    def lookup_tag(tag)
+      execute("describe --abbrev=0 --match #{tag}").strip
+    end
+
+    def fetch_all
+      execute('fetch --all')
+    end
+
+    def file_diff_branch_with_ancestor(branch_name, ancestor_branch_name)
+      # gets the merge base of the branch and its ancestor, then gets a list of files changed since the merge base
+      raw_output = execute(
+        "diff --name-only $(git merge-base origin/#{Shellwords.escape(ancestor_branch_name)} " \
+        "origin/#{Shellwords.escape(branch_name)})..origin/#{Shellwords.escape(branch_name)}"
+      )
+      raw_output.split("\n")
+    end
+
+    def commit_diff_refs(ref, ancestor_ref, fetch: false)
+      if fetch
+        fetch_all
+      end
+      ref_prefix = 'origin/' unless self.class.is_git_sha?(ref)
+      ancestor_ref_prefix = 'origin/' unless self.class.is_git_sha?(ancestor_ref)
+
+      raw_output = execute(
+        "log --format=%H\t%an\t%ae\t%aI\t%s " \
+        "--no-color #{ancestor_ref_prefix}#{Shellwords.escape(ancestor_ref)}..#{ref_prefix}#{Shellwords.escape(ref)}"
+      )
+      raw_output.split("\n").map do |row|
+        commit_data = row.split("\t")
+        GitCommit.new(commit_data[0], commit_data[4], DateTime.iso8601(commit_data[3]), commit_data[1], commit_data[2])
+      end
+    end
+
+    def current_branch_name
+      execute('rev-parse --abbrev-ref HEAD').strip
+    end
+
+    class << self
+      def is_git_sha?(str) # rubocop:disable Style/PredicateName
+        (str =~ /[0-9a-f]{40}/) == 0
+      end
+
+      def get_conflict_list_from_failed_merge_output(failed_merged_output)
+        failed_merged_output.split("\n").grep(/CONFLICT/).collect! do |conflict|
+          conflict.sub(/CONFLICT \(.*\): /, '').sub(/Merge conflict in /, '').sub(/ deleted in .*/, '')
+        end
+      end
+    end
+  end
+end

data/lib/git/git_branch.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Git
+  class GitBranch
+    attr_reader :repository_name, :name, :last_modified_date, :author_name, :author_email
+
+    def initialize(repository_name, name, last_modified_date, author_name, author_email)
+      @repository_name = repository_name
+      @name = name
+      @last_modified_date = last_modified_date
+      @author_email = author_email
+      @author_name = author_name
+    end
+
+    def to_s
+      name
+    end
+
+    def =~(other)
+      name =~ other
+    end
+
+    def ==(other)
+      repository_name == other.repository_name \
+        && name == other.name && \
+        last_modified_date == other.last_modified_date \
+        && author_email == other.author_email \
+        && author_name == other.author_name
+    end
+
+    def self.name_from_ref(ref)
+      ref.gsub(/^refs\/heads\//, '')
+    end
+  end
+end

data/lib/git/git_commit.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Git
+  class GitCommit
+    attr_reader :sha, :message, :commit_date, :author_name, :author_email
+
+    def initialize(sha, message, commit_date, author_name, author_email)
+      @sha = sha
+      @message = message
+      @commit_date = commit_date
+      @author_email = author_email
+      @author_name = author_name
+    end
+
+    def to_s
+      sha
+    end
+
+    def ==(other)
+      sha == other.sha
+    end
+  end
+end

data/lib/git/git_conflict.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Git
+  class GitConflict
+    attr_reader :repository_name, :branch_a, :branch_b, :conflicting_files
+
+    def initialize(repository_name, branch_a, branch_b, conflicting_files)
+      unless conflicting_files.present?
+        raise ArgumentError, 'Must specify conflicting file list'
+      end
+
+      @repository_name = repository_name
+      @branch_a = branch_a
+      @branch_b = branch_b
+      @conflicting_files = conflicting_files
+    end
+
+    def ==(other)
+      repository_name == other.repository_name \
+        && branch_a == other.branch_a \
+        && branch_b == other.branch_b \
+        && conflicting_files == other.conflicting_files
+    end
+
+    def contains_branch(branch_name)
+      branch_a == branch_name || branch_b == branch_name
+    end
+  end
+end

data/lib/git/git_error.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Git
+  class GitError < StandardError
+    attr_reader :command, :exit_code, :error_message
+
+    def initialize(command, exit_code, error_message)
+      @command = command
+      @exit_code = exit_code
+      @error_message = error_message
+      super("Git command #{@command} failed with exit code #{@exit_code}. Message:\n#{@error_message}")
+    end
+  end
+end

data/lib/git/git_test_helpers.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'digest/sha1'
+require 'securerandom'
+require_relative './git_branch.rb'
+require_relative './git_conflict.rb'
+require_relative './git_commit.rb'
+
+module Git
+  module TestHelpers
+    def self.create_branch(repository_name: 'repository_name',
+                           name: 'path/branch',
+                           last_modified_date: Time.current,
+                           author_name: 'Author Name',
+                           author_email: 'author@email.com')
+      GitBranch.new(repository_name, name, last_modified_date, author_name, author_email)
+    end
+
+    def self.create_conflict(repository_name: 'repository_name',
+                             branch_a_name: 'branch_a',
+                             branch_b_name: 'branch_b',
+                             file_list: ['file1', 'file2'])
+      GitConflict.new(repository_name, branch_a_name, branch_b_name, file_list)
+    end
+
+    def self.create_commit(sha: '1234567890123456789012345678901234567890',
+                           message: 'Commit message',
+                           author_name: 'Author Name',
+                           author_email: 'author@email.com',
+                           commit_date: Time.current)
+      GitCommit.new(sha, message, commit_date, author_name, author_email)
+    end
+
+    def self.create_sha
+      Digest::SHA1.hexdigest(SecureRandom.hex)
+    end
+  end
+end