git-merge-pr 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e3619e70e8a8bf820b63d7cd705712c8582b5d67
+  data.tar.gz: 7a287e9ebc8efa41283b03b4c9bda5b3fc4aa933
+SHA512:
+  metadata.gz: ff81e737286b3c05ed48369352e721d6dff438446352e41852e779dfc1b1b08e244443fa4355a7d7d47a94ca0a4b4d7d8496f51f3b16ac7942a9252e72275ddc
+  data.tar.gz: 79df8a71ff40a7becaec903970552adccbb02b59115e68f7ae9c71db927a36d97c3b25a8fcd4fa68d87671eaae646f954b2c20ed042d9b5770dc67dfcbab608e

data/.gitignore

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

data/Gemfile

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

data/History.markdown

@@ -0,0 +1,18 @@
+## HEAD
+
+## 0.3.0 / 2014-03-17
+
+* DON'T DELETE THE MASTER BRANCH, LIKE EVER (#4)
+
+## 0.2.0 / 2014-02-24
+
+* Delete the merged branch if it's on the repo (#2)
+* Kill newline after 'Continue Anyway' prompt (#3)
+
+## 0.1.0 / 2014-02-10
+
+* Fixed netrc support (#1)
+
+## 0.0.1 / 2014-01-21
+
+* Birthday!

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2014 Parker Moore
+
+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,30 @@
+# git-merge-pr
+
+Merge a pull request for the current directory's project on GitHub.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'git-merge-pr'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install git-merge-pr
+
+## Usage
+
+1. Navigate to your local clone of the project
+2. Run `git merge-pr PR_NUM`. Do not include the `#`.
+
+## Contributing
+
+1. Fork it ( http://github.com/<my-github-username>/git_merge_pr/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

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

data/bin/git-merge-pr

@@ -0,0 +1,50 @@
+#! /usr/bin/env ruby
+#
+# git-merge-pr(1)
+#
+# Summary:
+#   Merge a pull request on github.com
+#
+# Usage:
+#   git-merge-pr 1776
+#
+# Author:
+#   Parker Moore (@parkr)
+#
+
+require 'octokit'
+require 'netrc'
+require 'rugged'
+
+abort "Provide a PR number (no '#' tho)" if ARGV.empty?
+
+pr_num = ARGV.first
+remote = Rugged::Repository.new(Rugged::Repository.discover(Dir.pwd)).remotes.first.url
+remote.sub!("git@github.com:", "https://github.com/")
+remote.sub!(/\.git$/, "")
+
+client = Octokit::Client.new(netrc: true)
+repo   = Octokit::Repository.from_url(remote)
+
+unless client.pull_merged?(repo, pr_num)
+  begin
+    client.merge_pull_request(repo, pr_num)
+  rescue Octokit::NotFound => e
+    abort "Got a 404 -- looks like #{repo}##{pr_num} doesn't exist."
+  end
+
+  # delete branch if it's on the repo
+  merged_branch = client.pull_request(repo, pr_num).head.ref
+  begin
+    if client.ref(repo, "heads/#{merged_branch}")
+      unless %w[master gh-pages].include?(merged_branch)
+        client.delete_branch(repo, merged_branch)
+      end
+    end
+  rescue Octokit::NotFound
+  end
+else
+  puts "Pull request #{repo}##{pr_num} has already been merged."
+  print "Continue anyway? (y/n) "
+  abort unless STDIN.gets.chomp == "y"
+end

data/git-merge-pr.gemspec

@@ -0,0 +1,26 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'git-merge-pr/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "git-merge-pr"
+  spec.version       = GitMergePr::VERSION
+  spec.authors       = ["Parker Moore"]
+  spec.email         = ["parkrmoore@gmail.com"]
+  spec.summary       = %q{Merge a pull request on GitHub.com from the command-line.}
+  spec.homepage      = "https://github.com/parkr/git-merge-pr"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_runtime_dependency "octokit", "~> 2.7"
+  spec.add_runtime_dependency "rugged", "~> 0.19.0"
+  spec.add_runtime_dependency "netrc", "~> 0.7.7"
+
+  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "rake"
+end

data/lib/git-merge-pr.rb

@@ -0,0 +1,5 @@
+require "git_merge_pr/version"
+
+module GitMergePr
+  # There is no code here, yet. Look in bin/.
+end

data/lib/git-merge-pr/version.rb

@@ -0,0 +1,3 @@
+module GitMergePr
+  VERSION = "0.3.0"
+end

metadata

@@ -0,0 +1,125 @@
+--- !ruby/object:Gem::Specification
+name: git-merge-pr
+version: !ruby/object:Gem::Version
+  version: 0.3.0
+platform: ruby
+authors:
+- Parker Moore
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2014-03-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: rugged
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.0
+- !ruby/object:Gem::Dependency
+  name: netrc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.7
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !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'
+description: 
+email:
+- parkrmoore@gmail.com
+executables:
+- git-merge-pr
+extensions: []
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- Gemfile
+- History.markdown
+- LICENSE.txt
+- README.md
+- Rakefile
+- bin/git-merge-pr
+- git-merge-pr.gemspec
+- lib/git-merge-pr.rb
+- lib/git-merge-pr/version.rb
+homepage: https://github.com/parkr/git-merge-pr
+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: Merge a pull request on GitHub.com from the command-line.
+test_files: []