octo-merge 0.7.0.rc1

data/lib/octo_merge/strategy.rb

@@ -0,0 +1,11 @@
+require "octo_merge/strategy/base"
+
+require "octo_merge/strategy/merge_with_rebase"
+require "octo_merge/strategy/merge_with_rebase_and_message"
+require "octo_merge/strategy/merge_without_rebase"
+require "octo_merge/strategy/rebase"
+
+module OctoMerge
+  module Strategy
+  end
+end

data/lib/octo_merge/strategy/base.rb

@@ -0,0 +1,53 @@
+# == Links
+#
+# * https://www.atlassian.com/git/tutorials/merging-vs-rebasing/workflow-walkthrough
+# * https://www.atlassian.com/git/articles/git-team-workflows-merge-or-rebase/
+module OctoMerge
+  module Strategy
+    class Base
+      attr_reader :working_directory, :pull_requests
+
+      def initialize(working_directory:, pull_requests:)
+        @working_directory = working_directory
+        @pull_requests = pull_requests
+      end
+
+      def self.run(*args)
+        new(*args).tap { |strategy| strategy.run }
+      end
+
+      def run
+        fail NotImplementedError
+      end
+
+      private
+
+      def git
+        @git ||= Git.new(working_directory)
+      end
+
+      # Fetch the read-only branch for the corresponding pull request and
+      # create a local branch to rebase the current master on.
+      #
+      # Read more: [Checking out pull requests locally](https://help.github.com/articles/checking-out-pull-requests-locally/)
+      def fetch(pull_request)
+        git.fetch "#{upstream} #{pull_request.number_branch}/head:#{pull_request.number_branch} --force"
+      end
+
+      def fetch_master
+        git.checkout(master)
+        git.fetch(upstream)
+        git.reset_hard("#{upstream}/#{master}")
+      end
+
+
+      def upstream
+        :upstream
+      end
+
+      def master
+        :master
+      end
+    end
+  end
+end

data/lib/octo_merge/strategy/merge_with_rebase.rb

@@ -0,0 +1,29 @@
+module OctoMerge
+  module Strategy
+    class MergeWithRebase < Base
+      def run
+        fetch_master
+
+        pull_requests.each do |pull_request|
+          fetch(pull_request)
+
+          git.checkout(pull_request.number_branch)
+          git.rebase(master)
+
+          git.checkout(master)
+          merge(pull_request)
+
+          git.delete_branch(pull_request.number_branch)
+        end
+      end
+
+      private
+
+      def merge(pull_request)
+        message = "Merge branch '#{pull_request.remote_branch}'"
+
+        git.merge_no_ff("-m \"#{message}\" #{pull_request.number_branch}")
+      end
+    end
+  end
+end

data/lib/octo_merge/strategy/merge_with_rebase_and_message.rb

@@ -0,0 +1,90 @@
+require 'tempfile'
+
+module OctoMerge
+  module Strategy
+    class MergeWithRebaseAndMessage < Base
+      def run
+        fetch_master
+
+        pull_requests.each do |pull_request|
+          fetch(pull_request)
+
+          git.checkout(pull_request.number_branch)
+          git.rebase(master)
+
+          git.checkout(master)
+          git.merge_no_ff(pull_request.number_branch)
+
+          add_merge_message(pull_request)
+
+          git.delete_branch(pull_request.number_branch)
+        end
+      end
+
+      private
+
+      # TODO: Can we add a custom message to a merge commit in an easier way?
+      #
+      # Note: It's hard to add a multiline message with `merge --message`.
+      #
+      # The `--file` options does not work for `git --merge` so we abuse
+      # `git commit --amend` to apply this message to the merge commit.
+      def add_merge_message(pull_request)
+        MergeMessageFile.path_for(pull_request) do |path|
+          git.commit("--amend --file=#{path}")
+        end
+      end
+
+      class MergeMessageFile
+        def initialize(pull_request)
+          @pull_request = pull_request
+          file.write(body)
+          file.close
+        end
+
+        def self.path_for(pull_request)
+          new(pull_request).tap do |file|
+            yield(file.path)
+            file.delete
+          end
+        end
+
+        def path
+          file.path
+        end
+
+        def delete
+          file.unlink
+        end
+
+        private
+
+        attr_reader :pull_request
+
+        def file
+          @file ||= Tempfile.new('merge_commit_message')
+        end
+
+        def body
+          sanitize <<-BODY
+Merge branch '#{pull_request.remote_branch}'
+
+Resolves and closes: #{pull_request.url}
+
+= #{pull_request.title}
+
+#{pull_request.body}
+BODY
+
+        end
+
+        def sanitize(body)
+          # Replace leading "#" and replace with "="
+          body.gsub(/^#+/) { |s| "=" * s.length }
+        end
+      end
+
+      private_constant :MergeMessageFile
+    end
+  end
+end

data/lib/octo_merge/strategy/merge_without_rebase.rb

@@ -0,0 +1,24 @@
+module OctoMerge
+  module Strategy
+    class MergeWithoutRebase < Base
+      def run
+        fetch_master
+
+        pull_requests.each do |pull_request|
+          fetch(pull_request)
+          merge(pull_request)
+
+          git.delete_branch(pull_request.number_branch)
+        end
+      end
+
+      private
+
+      def merge(pull_request)
+        message = "Merge remote branch '#{pull_request.remote}/#{pull_request.remote_branch}'"
+
+        git.merge_no_ff("-m \"#{message}\" #{pull_request.number_branch}")
+      end
+    end
+  end
+end

data/lib/octo_merge/strategy/rebase.rb

@@ -0,0 +1,21 @@
+module OctoMerge
+  module Strategy
+    class Rebase < Base
+      def run
+        fetch_master
+
+        pull_requests.each do |pull_request|
+          fetch(pull_request)
+
+          git.checkout(pull_request.number_branch)
+          git.rebase(master)
+
+          git.checkout(master)
+          git.rebase("#{pull_request.number_branch}")
+
+          git.delete_branch(pull_request.number_branch)
+        end
+      end
+    end
+  end
+end

data/lib/octo_merge/version.rb

@@ -0,0 +1,3 @@
+module OctoMerge
+  VERSION = "0.7.0.rc1"
+end

data/octo_merge.gemspec

@@ -0,0 +1,34 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'octo_merge/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "octo-merge"
+  spec.version       = OctoMerge::VERSION
+  spec.authors       = ["Patrick Helm"]
+  spec.email         = ["me@patrick-helm.de"]
+
+  spec.summary       = %q{Merge GitHub pull requests.}
+  spec.description   = %q{
+  octo_merge is a simple command line tool to merge GitHub pull requests using different strategies
+  }
+  spec.homepage      = "https://github.com/Deradon/octo-merge"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "octokit", "~> 4.0"
+  spec.add_dependency "inquirer", "~> 0.2.1"
+
+  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec-its"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "webmock"
+end

metadata

@@ -0,0 +1,205 @@
+--- !ruby/object:Gem::Specification
+name: octo-merge
+version: !ruby/object:Gem::Version
+  version: 0.7.0.rc1
+platform: ruby
+authors:
+- Patrick Helm
+autorequire: 
+bindir: exe
+cert_chain: []
+date: 2016-10-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: inquirer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  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: simplecov
+  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: webmock
+  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'
+description: "\n  octo_merge is a simple command line tool to merge GitHub pull requests
+  using different strategies\n  "
+email:
+- me@patrick-helm.de
+executables:
+- octo-merge
+extensions: []
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- CODE_OF_CONDUCT.md
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- TODO.md
+- bin/console
+- bin/octo-merge
+- bin/setup
+- exe/octo-merge
+- lib/git.rb
+- lib/octo_merge.rb
+- lib/octo_merge/cli.rb
+- lib/octo_merge/cli/parser.rb
+- lib/octo_merge/configuration.rb
+- lib/octo_merge/context.rb
+- lib/octo_merge/execute.rb
+- lib/octo_merge/interactive_pull_requests.rb
+- lib/octo_merge/list_pull_requests.rb
+- lib/octo_merge/options.rb
+- lib/octo_merge/pull_request.rb
+- lib/octo_merge/setup.rb
+- lib/octo_merge/strategy.rb
+- lib/octo_merge/strategy/base.rb
+- lib/octo_merge/strategy/merge_with_rebase.rb
+- lib/octo_merge/strategy/merge_with_rebase_and_message.rb
+- lib/octo_merge/strategy/merge_without_rebase.rb
+- lib/octo_merge/strategy/rebase.rb
+- lib/octo_merge/version.rb
+- octo_merge.gemspec
+homepage: https://github.com/Deradon/octo-merge
+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: 1.3.1
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
+specification_version: 4
+summary: Merge GitHub pull requests.
+test_files: []