fight_club 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d34def593e81184a62f6cf94c897aaf2b0bd4d9f
-  data.tar.gz: e74a9144d1959b1168f31775d3c1ce494b525e78
+  metadata.gz: a269b42519673bd28d5fa19403da0d94f309b0b1
+  data.tar.gz: 87f3cc35e6e17503dc6202acc4c69c46cfb9ad1b
 SHA512:
-  metadata.gz: 149bf227c0f4e283a0589c1b5af1ae54f588d173a93a78b5dc77bbea91de47b482c997a7bc687e48d68f24066b6fc0f1016a08ebe0414c3c771a07850e62bc38
-  data.tar.gz: 318c8ba656c7a6ac41fa0d6105c8e5e401bc9d58df290633f1495f826941dbd53a26bfcab524675d23261908d357966616371d71e787c9db02d1d0cc0cc50f78
+  metadata.gz: 4ae27b472c71cbc3dbc4ecee48faa321acc4bdf3099472580ef1bccfc1b9be2fb4fa790303c34ba806fae7e1c303c1a530b0643b3749fd67affc1a38eec070ee
+  data.tar.gz: 4e23480dc43e04799159ff29a0102c2902f62f5df841af3bf4a999699f8fd7b6b53385e2ad5b63bfec356b2de767aa93f2aaa75a7283eb79d6f188e0edb898e1

data/fight-club.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |spec|
 
   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

@@ -2,6 +2,7 @@ require_relative "fight_club/version"
 require_relative "fight_club/arena"
 require_relative "fight_club/config"
 
+
 module FightClub
   class << self
     attr_writer :config, :log
@@ -22,12 +23,4 @@ module FightClub
   def self.configure
     yield(config)
   end
-
-  def self.working_dir
-    "#{FightClub.config.repos_directory}/repos"
-  end
-
-  def self.git_command
-    "git '--git-dir=#{working_dir}/#{config.repo_name}/.git' '--work-tree=#{working_dir}/#{config.repo_name}'"
-  end
 end

data/lib/fight_club/arena.rb

@@ -1,12 +1,12 @@
-require 'git'
 require 'logger'
 require 'octokit'
 require 'httparty'
+require_relative 'git'
 require_relative 'config'
 require_relative 'commenter'
 require_relative 'repository'
+require_relative 'comparer'
 require_relative 'merger'
-require_relative 'rebaser'
 
 module FightClub
   class Arena
@@ -15,20 +15,25 @@ module FightClub
     end
 
     def start
-      Repository.new.update(FightClub.config.uri, FightClub.config.repo_name)
+      Repository.new.update(
+        FightClub.config.uri,
+        FightClub.config.repo_name,
+        "#{FightClub.config.repos_directory}/repos",
+        git
+      )
 
-      git.checkout("origin/#{base_pull["head"]["ref"]}")
+      git.checkout("#{base_pull["head"]["ref"]}")
 
       return unless base_pull["base"]["ref"] == FightClub.config.master_branch
 
-      return unless Rebaser.attempt_rebase(base_pull)
+      return unless Merger.attempt_merge(base_pull, git)
 
       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
+        Comparer.new(base_pull, pr, git).execute
       end
 
       true
@@ -43,7 +48,10 @@ module FightClub
     end
 
     def git
-      @git ||= Git.open("#{FightClub.working_dir}/#{FightClub.config.repo_name}", log: Logger.new(STDOUT))
+      @git ||= Git.new(
+        "#{FightClub.config.repos_directory}",
+        FightClub.config.repo_name,
+      )
     end
   end
 end

data/lib/fight_club/commenter.rb

@@ -2,17 +2,17 @@ module FightClub
   class Commenter
     def self.comment(pr, message)
       unless FightClub.log[pr["number"]].include? 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}"
-          }
-        )
+        #HTTParty.post(
+          #pr["_links"]["comments"]["href"],
+          #body: {
+            #body: message,
+          #}.to_json,
+          #headers: {
+            #'Content-Type' => 'application/json',
+            #'User-Agent' => 'ruby',
+            #"Authorization" => "token #{FightClub.config.oauth}"
+          #}
+        #)
 
         FightClub.log[pr["number"]] << message
         Logger.new(STDOUT).info "Left a comment on #{pr["number"]} with message: #{message}"

data/lib/fight_club/comparer.rb

@@ -0,0 +1,38 @@
+module FightClub
+  class Comparer
+    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(pr.head.ref)
+      return unless Merger.attempt_merge(pr, git)
+
+      git.checkout(base_pull["head"]["ref"])
+
+      Merger.attempt_merge(base_pull, git)
+
+      unless attempt_to_merge_both_prs(pr.head.ref)
+        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_to_merge_both_prs(branch)
+      result = git.merge("origin/#{branch}")
+
+      !(result.include? 'CONFLICT')
+    end
+
+    private
+
+    attr_reader :base_pull, :pr, :git
+  end
+end

data/lib/fight_club/config.rb

@@ -1,6 +1,7 @@
 module FightClub
   class Config
-    attr_accessor :repo, :oauth, :repo_name, :uri, :master_branch, :repos_directory
+    attr_accessor :repo, :oauth, :repo_name,
+      :uri, :master_branch, :repos_directory
 
     def initialize
       @repo = 'baxterthehacker/public-repo'

data/lib/fight_club/git.rb

@@ -0,0 +1,47 @@
+module FightClub
+  class Git
+    def initialize(directory, repo_name, logger = Logger.new(STDOUT))
+      @logger = logger
+      @directory = directory
+      @repo_name = repo_name
+    end
+
+    def clone(target)
+      run("git clone #{target} #{directory}/#{repo_name}")
+    end
+
+    def checkout(target)
+      run("#{base_command} checkout #{target}")
+    end
+
+    def reset_hard(target)
+      run("#{base_command} reset --hard #{target}")
+    end
+
+    def merge(target)
+      run("#{base_command} merge -m 'merge' #{target}")
+    end
+
+    def merge_abort
+      run("#{base_command} merge --abort")
+    end
+
+    def fetch
+      run("#{base_command} fetch")
+    end
+
+    private
+
+    attr_reader :logger, :directory, :repo_name
+
+    def run(command)
+      logger.info("Git executing: #{command}")
+
+      `#{command}`
+    end
+
+    def base_command
+      "git '--git-dir=#{directory}/#{repo_name}/.git' '--work-tree=#{directory}/#{repo_name}'"
+    end
+  end
+end

data/lib/fight_club/merger.rb

@@ -1,36 +1,18 @@
 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"]
+    def self.attempt_merge(pr, git)
+      git.reset_hard("origin/#{pr["head"]["ref"]}")
+      result = git.merge("origin/#{FightClub.config.master_branch}")
 
-      git.reset_hard("origin/#{base_pull["head"]["ref"]}")
-      git.checkout("origin/#{pr.head.ref}")
-      return unless Rebaser.attempt_rebase(pr)
+      if result.include? 'CONFLICT'
+        Commenter.comment(pr, 'Your branch is currently conflicting with the target branch. Please resolve all merge conflicts and repush.')
 
-      git.checkout("origin/#{base_pull["head"]["ref"]}")
+        git.merge_abort
 
-      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}")
+        return false
       end
-    end
 
-    def attempt_merge(pr)
-      result = `#{FightClub.git_command} merge origin/#{pr.head.ref}`
-
-      !(result.include? 'CONFLICT')
+      true
     end
-
-    private
-
-    attr_reader :base_pull, :pr, :git
   end
 end

data/lib/fight_club/repository.rb

@@ -1,14 +1,11 @@
 module FightClub
   class Repository
-    def update(uri, name)
-      system("mkdir -p #{FightClub.working_dir}/#{name}") unless Dir.exists? "#{FightClub.working_dir}/#{name}"
+    def update(uri, name, working_dir, git)
+      system("mkdir -p #{working_dir}/#{name}") unless Dir.exists? "#{working_dir}/#{name}"
 
-      unless File.exists?("#{FightClub.working_dir}/#{name}/.gitconfig")
-        Logger.new(STDOUT).info "Cloning using URI: #{uri} | Name: #{name} | Path: #{FightClub.working_dir}"
-        git = Git.clone(uri, name, :path => FightClub.working_dir)
+      unless File.exists?("#{working_dir}/#{name}/.gitconfig")
+        git.clone(uri)
         Logger.new(STDOUT).info "Clone complete!"
-      else
-        git = Git.open("#{FightClub.working_dir}/#{name}", :log => Logger.new(STDOUT))
       end
 
       git.fetch

data/lib/fight_club/version.rb

@@ -1,3 +1,3 @@
 module FightClub
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fight_club
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Tim Minkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !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
@@ -96,9 +82,10 @@ files:
 - lib/fight_club.rb
 - lib/fight_club/arena.rb
 - lib/fight_club/commenter.rb
+- lib/fight_club/comparer.rb
 - lib/fight_club/config.rb
+- lib/fight_club/git.rb
 - lib/fight_club/merger.rb
-- lib/fight_club/rebaser.rb
 - lib/fight_club/repository.rb
 - lib/fight_club/version.rb
 - repos/.gitignore

data/lib/fight_club/rebaser.rb

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