octo_merge 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 44a2d601243a0c6f3ea9c877a0bea6f83e11ad44
+  data.tar.gz: b785b8f17116d72bd30cc529ca62cd0a8eb7ddde
+SHA512:
+  metadata.gz: e1d9eff205e35c939623695748bf1228b9b44f18d8df4c3eb94176cda0707ef8259384d6a9fc9b75c339ad91cf3435e1105ab038d70ace5102e9609ee26b36ee
+  data.tar.gz: d747b34ff3c0f8220d8e08c04ef51931f9687943678fdce781925e9549f3c6c56c2fb9d0eff923179b00f0461d6af5dbd172e2ac73d37c281f6dcdfa293650e1

data/.gitignore

@@ -0,0 +1,9 @@
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.3.0
+before_install: gem install bundler -v 1.11.2

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,49 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic
+  addresses, without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to
+fairly and consistently applying these principles to every aspect of managing
+this project. Project maintainers who do not follow or enforce the Code of
+Conduct may be permanently removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting a project maintainer at me@patrick-helm.de. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. Maintainers are
+obligated to maintain confidentiality with regard to the reporter of an
+incident.
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 1.3.0, available at
+[http://contributor-covenant.org/version/1/3/0/][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/3/0/

data/Gemfile

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

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Patrick Helm
+
+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,89 @@
+**WARNING**
+
+This is still **WIP**. Using this tool will change your local master branch
+and under certain circumstances some of your feature branches too!
+
+Use at your own risk!
+
+# OctoMerge
+
+`octo_merge` is a simple command line tool to merge GitHub pull requests using different strategies.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'octo_merge'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install octo_merge
+
+## Examples
+
+```
+octo-merge \
+  --repo=rails/rails \
+  --dir=~/Dev/Rails/rails \
+  --pull_requests=23,42 \
+  --login=Deradon \
+  --password=<your-github-API-token> \
+  --strategy=MergeWithRebase
+```
+
+* You can find you API token [here](https://github.com/settings/tokens)
+
+## Avilable strategies
+
+### MergeWithoutRebase
+
+```ruby
+git.checkout(master)
+git.fetch(upstream)
+git.reset_hard("#{upstream}/#{master}")
+
+pull_requests.each do |pull_request|
+  git.remote_add("#{pull_request.remote} #{pull_request.remote_url}")
+  git.fetch(pull_request.remote)
+  git.merge_no_ff("#{pull_request.remote}/#{pull_request.branch}")
+end
+```
+
+### MergeWithRebase
+
+```ruby
+git.checkout(master)
+git.fetch(upstream)
+git.reset_hard("#{upstream}/#{master}")
+
+pull_requests.each do |pull_request|
+  git.remote_add("#{pull_request.remote} #{pull_request.remote_url}")
+  git.fetch(pull_request.remote)
+  git.checkout(pull_request.branch)
+  git.rebase(master)
+  git.checkout(master)
+  git.merge_no_ff(pull_request.branch)
+end
+```
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/octo_merge. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+

data/Rakefile

@@ -0,0 +1,6 @@
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "octo_merge"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/bin/octo-merge

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "octo_merge"
+
+require 'optparse'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: octo-merge [options]"
+
+  opts.on("--repo=REPO", "Repository (e.g.: 'rails/rails')") do |repo|
+    options[:repo] = repo
+  end
+
+  opts.on("--dir=DIR", "Working directory (e.g.: '~/Dev/Rails/rails')") do |dir|
+    options[:working_directory] = File.expand_path(dir)
+  end
+
+  opts.on("--pull_requests=PULL_REQUESTS", "Pull requests (e.g.: '23,42,66')") do |pull_requests|
+    options[:pull_requests] = pull_requests.split(",")
+  end
+
+  opts.on("--login=login", "Login (Your GitHub username)") do |login|
+    options[:login] = login
+  end
+
+  opts.on("--password=password", "Password (Your GitHub API-Token)") do |password|
+    options[:password] = password
+  end
+
+  opts.on("--strategy=STRATEGY", "Merge strategy (e.g.: 'MergeWithoutRebase')") do |strategy|
+    options[:strategy] = Object.const_get("OctoMerge::#{strategy}")
+  end
+
+  opts.on('-h', '--help', 'Display this screen') do
+    puts opts
+    exit
+  end
+end.parse!
+
+OctoMerge.configure do |config|
+  config.login = options[:login]
+  config.password = options[:password]
+end
+
+OctoMerge.run(
+  repo: options[:repo],
+  pull_request_numbers: options[:pull_requests],
+  working_directory: options[:working_directory],
+  strategy: options[:strategy]
+)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/octo_merge/abstract_merge.rb

@@ -0,0 +1,32 @@
+module OctoMerge
+  class AbstractMerge
+    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 { |merge| merge.run }
+    end
+
+    def run
+      fail "NotImplementedYet"
+    end
+
+    private
+
+    def git
+      @git ||= Git.new(working_directory)
+    end
+
+    def upstream
+      :upstream
+    end
+
+    def master
+      :master
+    end
+  end
+end

data/lib/octo_merge/configuration.rb

@@ -0,0 +1,5 @@
+module OctoMerge
+  class Configuration
+    attr_accessor :login, :password
+  end
+end

data/lib/octo_merge/context.rb

@@ -0,0 +1,21 @@
+module OctoMerge
+  class Context
+    attr_reader :working_directory, :repo
+
+    def initialize(working_directory:, repo:, pull_request_numbers:)
+      @working_directory = working_directory
+      @repo = repo
+      @pull_request_numbers = pull_request_numbers
+    end
+
+    def pull_requests
+      @pull_requests ||= pull_request_numbers.map do |number|
+        PullRequest.new(repo: repo, number: number.to_s)
+      end
+    end
+
+    private
+
+    attr_reader :pull_request_numbers
+  end
+end

data/lib/octo_merge/execute.rb

@@ -0,0 +1,21 @@
+module OctoMerge
+  class Execute
+    attr_reader :context, :strategy
+
+    def initialize(context:, strategy:)
+      @context = context
+      @strategy = strategy
+    end
+
+    def run
+      env.run
+    end
+
+    def env
+      @env ||= strategy.new(
+        working_directory: context.working_directory,
+        pull_requests: context.pull_requests
+      )
+    end
+  end
+end

data/lib/octo_merge/git.rb

@@ -0,0 +1,41 @@
+# TODO: Move to another repository (e.g.: `SimpleGit`)
+class Git
+  def self.git(method_name, cmd = nil)
+    define_method(method_name) do |args|
+      if cmd
+        git("#{cmd} #{args}")
+      else
+        git("#{method_name} #{args}")
+      end
+    end
+  end
+
+  attr_reader :working_directory
+
+  def initialize(working_directory)
+    @working_directory ||= File.absolute_path(working_directory)
+  end
+
+  git :checkout
+  git :fetch
+  git :merge_no_ff, "merge --no-ff"
+  git :rebase
+  git :remote_add, "remote add"
+  git :reset_hard, "reset --hard"
+
+
+  private
+
+  def git(cmd)
+    run "git #{cmd}"
+  end
+
+  def run(cmd)
+    cmd = <<-CMD
+      cd #{working_directory} &&
+      #{cmd}
+    CMD
+
+    `#{cmd}`
+  end
+end

data/lib/octo_merge/merge_with_rebase.rb

@@ -0,0 +1,22 @@
+# == 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
+  class MergeWithRebase < AbstractMerge
+    def run
+      git.checkout(master)
+      git.fetch(upstream)
+      git.reset_hard("#{upstream}/#{master}")
+
+      pull_requests.each do |pull_request|
+        git.remote_add("#{pull_request.remote} #{pull_request.remote_url}")
+        git.fetch(pull_request.remote)
+        git.checkout(pull_request.branch)
+        git.rebase(master)
+        git.checkout(master)
+        git.merge_no_ff(pull_request.branch)
+      end
+    end
+  end
+end

data/lib/octo_merge/merge_without_rebase.rb

@@ -0,0 +1,15 @@
+module OctoMerge
+  class MergeWithoutRebase < AbstractMerge
+    def run
+      git.checkout(master)
+      git.fetch(upstream)
+      git.reset_hard("#{upstream}/#{master}")
+
+      pull_requests.each do |pull_request|
+        git.remote_add("#{pull_request.remote} #{pull_request.remote_url}")
+        git.fetch(pull_request.remote)
+        git.merge_no_ff("#{pull_request.remote}/#{pull_request.branch}")
+      end
+    end
+  end
+end

data/lib/octo_merge/pull_request.rb

@@ -0,0 +1,45 @@
+require "octokit"
+
+module OctoMerge
+  class PullRequest
+    attr_reader :repo, :number
+
+    def initialize(repo:, number:)
+      @repo = repo
+      @number = number.to_s
+    end
+
+    def remote
+      github_api_result.user.login
+    end
+
+    def remote_url
+      github_api_result.head.repo.ssh_url
+    end
+
+    def branch
+      github_api_result.head.ref
+    end
+
+    def ==(other_pull_request)
+      repo == other_pull_request.repo && number == other_pull_request.number
+    end
+
+    private
+
+    def github_api_result
+      @github_api_result ||= github_client.pull_request(repo, number)
+    end
+
+    def github_client
+      @github_client ||= Octokit::Client.new(
+        login: config.login,
+        password: config.password
+      )
+    end
+
+    def config
+      OctoMerge.configuration
+    end
+  end
+end

data/lib/octo_merge/version.rb

@@ -0,0 +1,3 @@
+module OctoMerge
+  VERSION = "0.1.0"
+end

data/lib/octo_merge.rb

@@ -0,0 +1,33 @@
+require "octo_merge/version"
+
+require "octo_merge/configuration"
+require "octo_merge/context"
+require "octo_merge/execute"
+require "octo_merge/git"
+require "octo_merge/pull_request"
+
+require "octo_merge/abstract_merge"
+require "octo_merge/merge_with_rebase"
+require "octo_merge/merge_without_rebase"
+
+module OctoMerge
+  class << self
+    def run(repo:, pull_request_numbers:, working_directory:, strategy:)
+      context = Context.new(
+        working_directory: working_directory,
+        repo: repo,
+        pull_request_numbers: pull_request_numbers
+      )
+
+      Execute.new(context: context, strategy: strategy).run
+    end
+
+    def configure
+      yield(configuration)
+    end
+
+    def configuration
+      @configuration ||= Configuration.new
+    end
+  end
+end

data/octo_merge.gemspec

@@ -0,0 +1,40 @@
+# 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"
+
+  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
+  # delete this section to allow pushing this gem to any host.
+  # if spec.respond_to?(:metadata)
+  #   spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
+  # else
+  #   raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+  # end
+
+  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_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 "webmock"
+end

metadata

@@ -0,0 +1,165 @@
+--- !ruby/object:Gem::Specification
+name: octo_merge
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+platform: ruby
+authors:
+- Patrick Helm
+autorequire: 
+bindir: exe
+cert_chain: []
+date: 2016-02-29 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: 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: 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: []
+extensions: []
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- CODE_OF_CONDUCT.md
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- bin/console
+- bin/octo-merge
+- bin/setup
+- lib/octo_merge.rb
+- lib/octo_merge/abstract_merge.rb
+- lib/octo_merge/configuration.rb
+- lib/octo_merge/context.rb
+- lib/octo_merge/execute.rb
+- lib/octo_merge/git.rb
+- lib/octo_merge/merge_with_rebase.rb
+- lib/octo_merge/merge_without_rebase.rb
+- lib/octo_merge/pull_request.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: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
+specification_version: 4
+summary: Merge GitHub pull requests.
+test_files: []