fight_club 0.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8f2a889515d722593c0bf07deb6a4d972ee78690
+  data.tar.gz: 7bcbbb325571b3c77137f36f8fd5941bb4261e08
+SHA512:
+  metadata.gz: c93ce8b6ade219c9a773a864c1ef9bda730c5ac78267ba939deac1ef1973265a6365fc7990e5fb325359424a63997e1a9d680a1ac401440f111e40dee0991527
+  data.tar.gz: a168e79d03539b657c38e2646d5f41e49eda23357386d44e3255b70e547fb88b6e15f28e7f88b53566777d3e65c25e6a6b5e5ff6c55992995183c4d1b52d776c

data/.gitignore

@@ -0,0 +1,22 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in fight-club.gemspec
+gemspec

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2016 Tim Minkov
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,47 @@
+# FightClub
+![FightClub]
+(http://i.imgur.com/sQJNhBi.gif)
+
+Fight Club will notify users of pull requests of any conflicts against other open pull requests.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'fight-club'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install fight-club
+
+## Configuration
+
+Add the following to an initializer in your codebase (`config/initializers/fight_club.rb` in Rails):
+
+```ruby
+FightClub.configure do |config|
+  config.repo = 'baxterthehacker/public-repo' # the repo with org/user name
+  config.oauth = '12345678901234567890abcdef' # your oauth token
+  config.repo_name = 'public-repo' # the repo name alone
+  config.uri = 'git@github.com:baxterthehacker/public-repo.git' # the URI to use to clone the repo
+  config.master_branch = 'master' # what branch to run fight club against
+end
+```
+
+## Usage
+
+Add this to your code:
+
+```ruby
+FightClub.begin(pull_request)
+```
+
+Where `pull_request` looks like a payload from a [Github webhook](https://developer.github.com/v3/pulls/).
+
+## Why?
+
+Sometimes you want to move fast! It's annoying to have conflicts with a master branch after another branch gets merged.

data/Rakefile

@@ -0,0 +1,2 @@
+require "bundler/gem_tasks"
+

data/fight-club.gemspec

@@ -0,0 +1,23 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'fight_club/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "fight_club"
+  spec.version       = FightClub::VERSION
+  spec.authors       = ["Tim Minkov"]
+  spec.email         = ["timothyminkov@gmail.com"]
+  spec.summary       = %q{Finds conflicts against open pull requests}
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake"
+  spec.add_runtime_dependency "git"
+  spec.add_runtime_dependency "octokit"
+  spec.add_runtime_dependency "httparty"
+end

data/lib/fight_club.rb

@@ -0,0 +1,27 @@
+require_relative "fight_club/version"
+require_relative "fight_club/arena"
+require_relative "fight_club/config"
+
+module FightClub
+  WORKING_DIR = "#{Dir.pwd}/repos"
+
+  class << self
+    attr_writer :config
+  end
+
+  def self.begin(pull_request)
+    Arena.new(pull_request).start
+  end
+
+  def self.config
+    @config ||= Config.new
+  end
+
+  def self.configure
+    yield(config)
+  end
+
+  def self.git_command
+    "git '--git-dir=#{FightClub::WORKING_DIR}/#{FightClub.config.repo_name}/.git' '--work-tree=#{FightClub::WORKING_DIR}/#{FightClub.config.repo_name}'"
+  end
+end

data/lib/fight_club/arena.rb

@@ -0,0 +1,49 @@
+require 'git'
+require 'logger'
+require 'octokit'
+require 'httparty'
+require_relative 'config'
+require_relative 'commenter'
+require_relative 'repository'
+require_relative 'merger'
+require_relative 'rebaser'
+
+module FightClub
+  class Arena
+    def initialize(base_pull, config = FightClub.config)
+      @base_pull = base_pull
+    end
+
+    def start
+      Repository.new.update(FightClub.config.uri, FightClub.config.repo_name)
+
+      git.checkout("origin/#{base_pull["head"]["ref"]}")
+
+      return unless base_pull["base"]["ref"] == FightClub.config.master_branch
+
+      return unless Rebaser.attempt_rebase(base_pull)
+
+      git.reset_hard("origin/#{base_pull["head"]["ref"]}")
+
+      pull_requests = client.pull_requests(FightClub.config.repo, :per_page => 200)
+
+      pull_requests.each do |pr|
+        Merger.new(base_pull, pr, git).execute
+      end
+
+      true
+    end
+
+    private
+
+    attr_reader :base_pull, :client, :git
+
+    def client
+      @client = Octokit::Client.new(access_token: FightClub.config.oauth)
+    end
+
+    def git
+      @git ||= Git.open("#{FightClub::WORKING_DIR}/#{FightClub.config.repo_name}", log: Logger.new(STDOUT))
+    end
+  end
+end

data/lib/fight_club/commenter.rb

@@ -0,0 +1,19 @@
+module FightClub
+  class Commenter
+    def self.comment(pr, message)
+      HTTParty.post(
+        pr["_links"]["comments"]["href"],
+        body: {
+          body: message,
+        }.to_json,
+        headers: {
+          'Content-Type' => 'application/json',
+          'User-Agent' => 'ruby',
+          "Authorization" => "token #{FightClub.config.oauth}"
+        }
+      )
+
+      Logger.new(STDOUT).info "Left a comment on #{pr["number"]} with message: #{message}"
+    end
+  end
+end

data/lib/fight_club/config.rb

@@ -0,0 +1,13 @@
+module FightClub
+  class Config
+    attr_accessor :repo, :oauth, :repo_name, :uri, :master_branch
+
+    def initialize
+      @repo = 'baxterthehacker/public-repo'
+      @oauth = 'Not set'
+      @repo_name = 'public-repo'
+      @uri = 'git@github.com:baxterthehacker/public-repo.git'
+      @master_branch = 'master'
+    end
+  end
+end

data/lib/fight_club/merger.rb

@@ -0,0 +1,36 @@
+module FightClub
+  class Merger
+    def initialize(base_pull, pr, git)
+      @base_pull = base_pull
+      @pr = pr
+      @git = git
+    end
+
+    def execute
+      Logger.new(STDOUT).info "Trying to merge #{pr.head.ref} into #{base_pull["head"]["ref"]}..."
+      return unless pr.base.ref == FightClub.config.master_branch
+      return if pr.head.ref == base_pull["head"]["ref"]
+
+      git.reset_hard("origin/#{base_pull["head"]["ref"]}")
+      git.checkout("origin/#{pr.head.ref}")
+      return unless Rebaser.attempt_rebase(pr)
+
+      git.checkout("origin/#{base_pull["head"]["ref"]}")
+
+      unless attempt_merge(pr)
+        Commenter.comment(pr, "Your branch currently conflicts with another open pull request: #{base_pull["_links"]["html"]["href"]}")
+        Commenter.comment(base_pull, "Your branch currently conflicts with another open pull request: #{pr._links.html.href}")
+      end
+    end
+
+    def attempt_merge(pr)
+      result = `#{FightClub.git_command} merge origin/#{pr.head.ref}`
+
+      !(result.include? 'CONFLICT')
+    end
+
+    private
+
+    attr_reader :base_pull, :pr, :git
+  end
+end

data/lib/fight_club/rebaser.rb

@@ -0,0 +1,16 @@
+module FightClub
+  class Rebaser
+    def self.attempt_rebase(pr)
+      result = `#{FightClub.git_command} rebase origin/#{FightClub.config.master_branch}`
+
+      if result.include? 'CONFLICT'
+        Commenter.comment(pr, 'Your branch is currently conflicting with the target branch. Please resolve all merge conflicts and repush.')
+        `#{FightClub.git_command} rebase --abort`
+
+        return false
+      end
+
+      true
+    end
+  end
+end

data/lib/fight_club/repository.rb

@@ -0,0 +1,19 @@
+module FightClub
+  class Repository
+    WORKING_DIR = "#{Dir.pwd}/repos"
+
+    def update(uri, name)
+      system("mkdir #{WORKING_DIR}/#{name}") unless Dir.exists? "WORKING_DIR/#{name}"
+
+      git = Git.open("#{WORKING_DIR}/#{name}", :log => Logger.new(STDOUT))
+
+      unless File.exists?("#{WORKING_DIR}/#{name}/.gitconfig")
+        Logger.new(STDOUT).info "Cloning #{name}..."
+
+        git.clone(uri, name, :path => WORKING_DIR)
+      end
+
+      git.fetch
+    end
+  end
+end

data/lib/fight_club/version.rb

@@ -0,0 +1,3 @@
+module FightClub
+  VERSION = "0.0.1"
+end

data/repos/.gitignore

@@ -0,0 +1,2 @@
+[^.]*
+

metadata

@@ -0,0 +1,129 @@
+--- !ruby/object:Gem::Specification
+name: fight_club
+version: !ruby/object:Gem::Version
+  version: 0.0.1
+platform: ruby
+authors:
+- Tim Minkov
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2016-01-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: 
+email:
+- timothyminkov@gmail.com
+executables: []
+extensions: []
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- fight-club.gemspec
+- lib/fight_club.rb
+- lib/fight_club/arena.rb
+- lib/fight_club/commenter.rb
+- lib/fight_club/config.rb
+- lib/fight_club/merger.rb
+- lib/fight_club/rebaser.rb
+- lib/fight_club/repository.rb
+- lib/fight_club/version.rb
+- repos/.gitignore
+homepage: 
+licenses:
+- MIT
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
+specification_version: 4
+summary: Finds conflicts against open pull requests
+test_files: []