octo-merge 0.7.0.rc1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 878087419505c2889d26336412ef9d8baa52b294
+  data.tar.gz: 1d398a00add5efd12d194f84a4d740e6ba5fefe4
+SHA512:
+  metadata.gz: 88da4079d3c790e0395afd2f2fd95e6cdf3faf98c22be3df15f6728e71d8a80e9144787d0b89da3efeebe8f8ea64054b142e05ab81339f24b82985d96de8e10b
+  data.tar.gz: 482e8e48ccd3a599a7c8848f243c6b0952428d6981b7934f9c02f5bf26467aa3759be2aee76a2f67522b4570bbbc2bd9ca5771428ee875f76967d4fc2376ab9f

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,8 @@
+language: ruby
+rvm:
+  - 2.3.0
+before_install: gem install bundler -v 1.11.2
+
+before_script:
+  - git config --global user.email "anon@example.com"
+  - git config --global user.name "Anon"

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,129 @@
+[![Build Status](https://travis-ci.org/Deradon/octo-merge.svg?branch=master)](https://travis-ci.org/Deradon/octo-merge)
+
+**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
+
+## Setup / Configure
+
+If you do not want to provide your GitHub login credentials every time you
+call `octo-merge` you can easily set these in your `~/.octo-merge.yml`.
+
+Feel free to use the included setup task:
+
+```
+octo-merge --setup
+```
+
+## Examples
+
+```
+# Within your shell
+
+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 your API token [here](https://github.com/settings/tokens)
+
+## Available Strategies
+
+* NOTE: All strategies are using read-only branches for a specific pull requests.
+        This way we avoid adding lot of remotes.
+* Read more: [Checking out pull requests locally](https://help.github.com/articles/checking-out-pull-requests-locally/)
+
+### MergeWithoutRebase
+
+```
+# Reset master
+git checkout master
+git fetch upstream
+git reset --hard upstream/master
+
+# For each pull request
+  git fetch upstream pull/23/head:pull/23 --force"
+  git merge --no-ff pull/23
+  git branch -D pull/23
+```
+
+### MergeWithRebase
+
+```
+# Reset master
+git checkout master
+git fetch upstream
+git reset --hard upstream/master
+
+# For each pull request
+  git fetch upstream pull/23/head:pull/23 --force"
+  git checkout pull/23
+  git rebase master
+
+  git checkout master
+  git merge --no-ff pull/23
+
+  git branch -D pull/23
+```
+
+### Rebase
+
+```
+# Reset master
+git checkout master
+git fetch upstream
+git reset --hard upstream/master
+
+# For each pull request
+  git fetch upstream pull/23/head:pull/23 --force"
+  git checkout pull/23
+  git rebase master
+
+  git checkout master
+  git rebase pull/23
+
+  git branch -D pull/23
+```
+
+## 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/Deradon/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/TODO.md

@@ -0,0 +1,11 @@
+# TODO
+
+Before we release `v1.0.0` the following tasks needs to be done:
+
+* [x] Move logic from `exe/octo-merge` into a testable class
+* [x] Add specs for `InteractivePullRequests`
+* [x] Create a setup task
+* [ ] Complete docs (`README.md`)
+* [ ] Try to get rid of external dependencies (`octokit`, `inquirer`)
+* [x] Decide on gem name (`octo_merge` VS `octo-merge`)
+* [x] Use GitHubs `secret` pull requests branches instead of adding new remotes

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,9 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "octo_merge"
+
+verbose = !(ENV["VERBOSE"] == "0")
+Git.verbose!(verbose)
+
+OctoMerge::CLI.run(ARGV)

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/exe/octo-merge

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+require "octo_merge"
+
+verbose = !(ENV["VERBOSE"] == "0")
+Git.verbose!(verbose)
+
+OctoMerge::CLI.run(ARGV)

data/lib/git.rb

@@ -0,0 +1,61 @@
+require 'open3'
+
+# 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
+
+  def self.verbose!(is_verbose = true)
+    @verbose = is_verbose
+  end
+
+  def self.verbose?
+    !!@verbose
+  end
+
+  attr_reader :working_directory
+
+  def initialize(working_directory)
+    @working_directory ||= File.absolute_path(working_directory)
+  end
+
+  git :checkout
+  git :commit
+  git :delete_branch, "branch -D"
+  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 verbose?
+    self.class.verbose?
+  end
+
+  def run(cmd)
+    puts "$: #{cmd}" if verbose?
+
+    cmd = <<-CMD
+      cd #{working_directory} &&
+      #{cmd}
+    CMD
+
+    # NOTE: Logging and debugging is writte to stderr
+    _stdin, stdout, stderr = Open3.popen3(cmd)
+    print stderr.read if verbose?
+    stdout.read
+  end
+end

data/lib/octo_merge.rb

@@ -0,0 +1,44 @@
+require "octo_merge/version"
+
+require "git"
+
+require "octo_merge/cli"
+require "octo_merge/configuration"
+require "octo_merge/context"
+require "octo_merge/execute"
+require "octo_merge/interactive_pull_requests"
+require "octo_merge/list_pull_requests"
+require "octo_merge/options"
+require "octo_merge/pull_request"
+require "octo_merge/setup"
+require "octo_merge/strategy"
+
+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
+      @github_client = nil
+      yield(configuration)
+    end
+
+    def configuration
+      @configuration ||= Configuration.new
+    end
+
+    def github_client
+      @github_client ||= Octokit::Client.new(
+        login: configuration.login,
+        password: configuration.password
+      )
+    end
+  end
+end

data/lib/octo_merge/cli.rb

@@ -0,0 +1,53 @@
+require "octo_merge/cli/parser"
+
+module OctoMerge
+  class CLI
+    attr_reader :args
+
+    def self.run(*args)
+      new(*args).run
+    end
+
+    def initialize(args)
+      @args = args
+    end
+
+    def run
+      configure
+
+      if options.setup
+        setup
+      else
+        execute
+      end
+    end
+
+    private
+
+    def configure
+      OctoMerge.configure do |config|
+        config.login = options.login
+        config.password = options.password
+      end
+    end
+
+    def setup
+      Setup.run(options)
+    end
+
+    def execute
+      OctoMerge.run(
+        pull_request_numbers: options.pull_requests,
+        repo: options.repo,
+        strategy: options.strategy,
+        working_directory: options.dir
+      )
+    end
+
+    def options
+      @options ||= Options.new.tap do |options|
+        options.cli_options = Parser.parse(args)
+      end
+    end
+  end
+end