git_pr 0.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c87ac91486e6a5273bc76ffdd29e36669010d56f
+  data.tar.gz: 7503626a0aa947362e5f12c15c40818e3320244f
+SHA512:
+  metadata.gz: 2f2710728e24a9ce6c7d5aaedfbc39cd2d948a21ed1e58f37adfc9c9b37b3024ef11d2341dc8404ea848f1f02524fe84f8ff091e675283f873cf3d26b431d6ad
+  data.tar.gz: c5026497f74f7a8979dccf51e54375c1d00b817f7521466ad5d49b63f4f1a535aa42adbcacbad7b27f0b7c75e8e67db95c141a9aa6ede2b1e3b0e22a9562c3c9

data/.gitignore

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

data/Gemfile

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

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2014 Brian Sharon
+
+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,29 @@
+# GitPr
+
+TODO: Write a gem description
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'git_pr'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install git_pr
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+1. Fork it ( https://github.com/[my-github-username]/git_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 a new Pull Request

data/Rakefile

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

data/bin/git-pr

@@ -0,0 +1,380 @@
+#!/usr/bin/ruby
+
+# Future improvements:
+# 1) Use more git shell integration
+#    https://www.kernel.org/pub/software/scm/git/docs/git-sh-setup.html
+#    https://coderwall.com/p/bt93ia
+# 2) Take a branch name instead of a PR number and Do The Right Thing
+
+
+require 'colorize'
+require 'git'
+require 'highline/import'
+require 'io/console'
+require 'netrc'
+require 'octokit'
+require 'optparse'
+require 'pp'
+require 'git_pr'
+require 'ostruct'
+
+options = OpenStruct.new(:help => false,
+                         :verbose => false,
+                         :auth => OpenStruct.new(),
+                         :list => OpenStruct.new(),
+                         :merge => OpenStruct.new(:remote => "origin"),
+                         :open => OpenStruct.new())
+
+global_options = OptionParser.new do |opts|
+  opts.banner = "Usage: git pr [options] subcommand [options]"
+
+  opts.separator "\nGlobal options"
+
+  opts.on("-h", "--help", "Show help") do
+    options.help = true
+  end
+  opts.on("-v", "--verbose", "Verbose output") do
+    options.verbose = true
+  end
+  opts.on("-V", "--version", "Print version") do
+    puts GitPr::VERSION
+    exit
+  end
+
+    # auth: Check GitHub auth credentials, and prompt to update them if necessary
+    # list: List open pull requests
+    # open: Open the webpage for a pull request
+  opts.separator <<eos
+
+Valid subcommands:
+    merge: Merge and close a pull request
+
+eos
+end
+
+subcommands = {
+  # 'auth' => OptionParser.new do |opts|
+  #   opts.banner = "Usage: git pr auth [options]"
+
+  #   opts.separator "\nAuth command options"
+
+  #   opts.on("-r", "--readonly", "Check without prompting") do |v|
+  #     options.auth.readonly = true
+  #   end
+
+  #   opts.separator ""
+  # end,
+  # 'list' => OptionParser.new do |opts|
+  #   opts.banner = "Usage: git pr list [options]"
+
+  #   opts.separator "\nList command options"
+
+  #   opts.on("-r", "--readonly", "Check without prompting") do |v|
+  #     options.list.readonly = true
+  #   end
+
+  #   opts.separator ""
+  # end,
+  'merge' => OptionParser.new do |opts|
+    opts.banner = "Usage: git pr merge [options] [PR number]"
+
+    opts.separator "\nMerge command options"
+
+    opts.on("-r", "--remote REMOTE", "Remote that PR will be merged into. Default: origin") do |remote|
+      puts remote
+      options.merge.remote = remote
+    end
+
+    opts.separator ""
+  end,
+  # 'open' => OptionParser.new do |opts|
+  #   opts.banner = "Usage: git pr open [options]"
+
+  #   opts.separator "\nOpen command options"
+
+  #   opts.on("-r", "--readonly", "Check without prompting") do |v|
+  #     options.open.readonly = true
+  #   end
+
+  #   opts.separator ""
+  # end
+}
+
+begin
+  global_options.order!
+rescue OptionParser::InvalidOption => e
+  puts e
+  puts global_options
+  exit
+end
+
+command = ARGV.shift
+if !subcommands[command]
+  puts global_options
+  exit
+end
+
+begin
+  options[command].additional_arguments = subcommands[command].permute!
+rescue OptionParser::InvalidOption => e
+  puts e
+  puts subcommands[command]
+  exit
+end
+
+# TODO: clean up subcommand parsing
+if command == "merge" and !options.merge.additional_arguments.empty?
+  options.merge.pr = options.merge.additional_arguments.shift.to_i
+end
+
+AUTH_KEY_NAME = "git-merge-pull"
+NETRC_KEY = "#{AUTH_KEY_NAME}.api.github.com"
+
+def run(cmd, args = { :failure => lambda {} })
+  puts cmd.green
+  puts `#{cmd}`
+  puts ''
+  if $?.exitstatus != 0
+    args[:failure].call()
+    exit -1
+  end
+end
+
+def run_test_output_empty(cmd)
+  "" == `#{cmd}`
+end
+
+def test_github_credentials
+  n = Netrc.read
+  user, oauth_token = n[NETRC_KEY]
+  client = Octokit::Client.new :access_token => oauth_token
+  begin
+    client.user
+  rescue
+    n.delete NETRC_KEY
+    n.save
+    return false
+  end
+  return true
+end
+
+def prompt_for_github_credentials(args = {})
+  user = args[:user]
+  pass = args[:pass]
+  needs_otp = args[:needs_otp]
+  headers = {}
+
+  unless user
+    print "Enter your github username: "
+    user = STDIN.gets.chomp!
+    print "Password: "
+    pass = STDIN.noecho(&:gets).chomp!
+    puts "\n"
+  end
+
+  if needs_otp
+    print "Enter an OTP code: "
+    otp = STDIN.gets.chomp!
+    headers = { "X-GitHub-OTP" => "#{otp}" }
+  end
+
+  client = Octokit::Client.new :login => user, :password => pass
+  begin
+    authorizations = client.authorizations :headers => headers
+    auth = authorizations.find { |x| x[:app][:name].match "^#{AUTH_KEY_NAME}" }
+    unless auth
+      auth = client.create_authorization(:scopes => ["user", "repo"], :note => AUTH_KEY_NAME, :headers => headers)
+    end
+  rescue Octokit::Unauthorized
+    puts "Invalid username or password."
+    return false
+  rescue Octokit::OneTimePasswordRequired
+    # Come back through this method, prompting for an OTP
+    return prompt_for_github_credentials :user => user, :pass => pass, :needs_otp => true
+  end
+
+  n = Netrc.read
+  n[NETRC_KEY] = user, auth[:token]
+  n.save
+
+  return true
+end
+
+def pull_summary(pull)
+  return "##{pull[:number]} from #{pull[:user][:login]}: \"#{pull[:title]}\""
+end
+
+def query_for_pull_to_merge(pulls)
+  puts
+  pull_to_merge = nil
+  choose do |menu|
+    menu.prompt = "Select PR to merge: "
+    pulls.each do |pull|
+      menu.choice(pull_summary(pull)) { pull_to_merge = pull }
+    end
+    menu.choice(:Quit, "Exit program.") { exit }
+  end
+  return pull_to_merge
+end
+
+if not test_github_credentials and not prompt_for_github_credentials
+  exit -1
+end
+
+# Get local Git object pointed at our repo root
+git = Git.open `git rev-parse --show-toplevel`.chomp!
+
+# Find the target repository that we'll merge the pull request into
+# TODO: could read off command line instead
+target_remote = git.remotes.find { |x| x.name == options.merge.remote }
+url_match = target_remote.url.match "^git@github.com:(.*)/(.*).git"
+organization = url_match[1]
+repository = url_match[2]
+
+n = Netrc.read
+user, oauth_token = n[NETRC_KEY]
+Octokit.configure do |c|
+  c.access_token = oauth_token
+end
+
+github_repo = Octokit.repo "#{organization}/#{repository}"
+# pp github_repo
+
+pulls = Octokit.pulls "#{organization}/#{repository}/pulls"
+if options.merge.pr
+  pull = pulls.find { |p| p[:number] == options.merge.pr }
+  unless pull
+    puts "Pull request #{options.merge.pr} not found!".red
+    exit
+  end
+else
+  pull = query_for_pull_to_merge pulls
+end
+
+pull_number = pull[:number]
+source_branch = pull[:head][:ref]
+source_repo_ssh_url = pull[:head][:repo][:git_url]
+source_repo_clone_url = pull[:head][:repo][:clone_url]
+
+target_branch = pull[:base][:ref]
+target_repo_ssh_url = pull[:base][:repo][:git_url]
+target_repo_clone_url = pull[:base][:repo][:clone_url]
+
+puts
+puts "Merging #{pull_summary(pull)}".cyan
+puts "#{target_repo_ssh_url}/#{target_branch} <= #{source_repo_ssh_url}/#{source_branch}".cyan
+
+# find or add a remote for the PR
+# pp git.remotes.last
+source_remote = git.remotes.find { |x| [pull[:head][:repo][:git_url],
+                                        pull[:head][:repo][:ssh_url]].include? x.url }
+unless source_remote
+  puts "Adding remote: #{pull[:user][:login]} from #{pull[:head][:repo][:ssh_url]}"
+  source_remote = git.add_remote pull[:user][:login], pull[:head][:repo][:ssh_url]
+end
+
+# Fetch latest changes from source & target remotes. Useful in case one of source or target
+# branches doesn't exist locally yet, or if we've never pulled from one of the remotes.
+puts "Fetching latest changes from #{source_remote}"
+source_remote.fetch
+puts "Fetching latest changes from #{target_remote}"
+target_remote.fetch
+
+# Get the target branch up to date
+run "git checkout #{target_branch}"
+run "git pull --no-rebase --ff-only", :failure => lambda {
+  "Unable to update local target branch (#{target_branch}). Please repair manually before continuing.".red
+}
+
+# If the local target branch differs from the remote target branch, they
+# must be reconciled manually.
+remote_target_branch = "#{target_remote}/#{target_branch}"
+if (not run_test_output_empty "git diff #{target_branch} #{remote_target_branch}")
+  puts "Local branch (#{target_branch}) differs from remote branch (#{remote_target_branch}). Please reconcile before continuing.".red
+  exit -1
+end
+
+# If a local branch exists with the name source_branch, check that it has the
+# same contents as the remote source branch. If not, it must be reconciled
+# manually.
+remote_source_branch = "#{source_remote}/#{source_branch}"
+if (not run_test_output_empty "git branch --list #{source_branch}" and not run_test_output_empty "git diff #{remote_source_branch} #{source_branch}")
+  puts "Local branch (#{source_branch}) differs from remote branch (#{remote_source_branch}). Please reconcile before continuing.".red
+  exit -1
+end
+
+# Check out the remote source branch using a temporary branch name,
+# failing if the temporary name already exists.
+rebase_branch = "#{source_branch}-rebase"
+if not run_test_output_empty "git branch --list #{rebase_branch}"
+  puts "Local rebase branch (#{rebase_branch}) already exists. Please remove before continuing.".red
+  exit -1
+end
+run "git checkout -b #{rebase_branch} #{remote_source_branch}"
+
+# Rebase the rebase branch on top of the target branch
+run "git rebase #{target_branch}", :failure => lambda {
+  puts "Conflict detected in rebase. Please rebase manually, update PR, and re-run.".red
+  run "git rebase --abort"
+  run "git checkout #{target_branch}"
+  run "git branch -D #{rebase_branch}"
+}
+
+# Force push the rebased branch to the source remote.
+run "git push -f #{source_remote.name} HEAD:#{source_branch}"
+
+# Merge the source branch into the target. Use --no-ff so that an explicit
+# merge commit is created.
+run "git checkout #{target_branch}"
+run "git merge --no-ff #{rebase_branch} -m 'Merge #{pull_summary(pull)}'"
+
+# Now that the rebase branch is merged, we can safely delete it.
+run "git branch -D #{rebase_branch}"
+
+# Print a log of the merge with branch structure visible. Jump through hoops to
+# get the right branch to start the log revision range with. If origin/develop
+# is a merge commit, we need the right parent of the merge.
+#
+# The goal is to get output like this:
+#
+# *   5be2a77 (HEAD, develop) PR #1269. Merge branch floatplane/feature/categories into develop.
+# |\
+# | * 2242141 (floatplane/feature/categories, feature/categories) Process CR feedback. Remove StaticCreatorListDataSource, will just rework Streamed* version to meet needs instead.
+# | * d7cf231 Implement StaticCreatorListDataSource for categories, rename CreatorListDataSource => StreamedCreatorListDataSource
+# | * ef034d0 Don't animate profile pic transitions when we're re-using a cell and needing to replace someone else's picture. Only animate from the blank thumbnail to an actual picture.
+# | * 25cda8b Refactor CreatorListViewController.
+# | * 682b7ba Adjust search dialog size and default position. Remove temp close button. Stub categories into search dialog.
+# | * e8ba0b1 Rename CollaboratorsListViewController => CreatorListViewController. Add CollaboratorListViewController as a subclass of CreatorListViewController, will refactor behavior into it in future commits.
+# | * e901256 Make dismissWithBackgroundTouch work for all CustomModalDialogs, even those that don't set useCustomPopover. Fix latent bug in ApplicationInfoNavigationController's implementation of the same.
+# |/
+# * 8d5ecbc (origin/develop, origin/HEAD) Merge branch 'feature/schemaUpgradeUtils' into develop
+#
+# where the log stops at origin/develop, no matter whether it's a merge commit or not.
+#
+origin_parent = `git rev-list --abbrev-commit --parents -n 1 origin/#{target_branch}`.split().last
+run "git log --graph --decorate --pretty=oneline --abbrev-commit --color #{target_branch} #{origin_parent}..#{target_branch}"
+
+def get_char
+  state = `stty -g`
+  `stty raw -echo -icanon isig`
+
+  STDIN.getc.chr
+ensure
+  `stty #{state}`
+  puts ""
+end
+
+print "Do you want to proceed with the merge (y/n)? ".cyan
+if get_char.downcase == 'y'
+  puts "Pushing changes to #{target_remote}"
+  run "git push #{target_remote} #{target_branch}"
+  print "Do you want to delete the feature branch (y/n)? ".cyan
+  if get_char.downcase == 'y'
+    run "git push #{source_remote} :#{source_branch}"
+    run "git branch -d #{source_branch}"
+  end
+  puts "Merge complete!".cyan
+else
+  puts "Undoing local merge"
+  run "git reset --hard #{target_remote}/#{target_branch}"
+end

data/git_pr.gemspec

@@ -0,0 +1,27 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'git_pr/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "git_pr"
+  spec.version       = GitPr::VERSION
+  spec.authors       = ["Brian Sharon"]
+  spec.email         = ["brian@floatplane.us"]
+  spec.summary       = %q{A tool for listing and merging GitHub pull requests.}
+  spec.description   = %q{}
+  spec.homepage      = ""
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  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"]
+
+  [ "colorize", "tty", "git", "netrc", "octokit", "highline" ].each do |dep|
+    spec.add_runtime_dependency dep
+  end
+
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake"
+end

data/lib/git_pr/version.rb

@@ -0,0 +1,3 @@
+module GitPr
+  VERSION = "0.0.1"
+end

data/lib/git_pr.rb

@@ -0,0 +1,5 @@
+require "git_pr/version"
+
+module GitPr
+  # Your code goes here...
+end

metadata

@@ -0,0 +1,166 @@
+--- !ruby/object:Gem::Specification
+name: git_pr
+version: !ruby/object:Gem::Version
+  version: 0.0.1
+platform: ruby
+authors:
+- Brian Sharon
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2014-09-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: colorize
+  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: tty
+  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: 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: netrc
+  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
+    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: highline
+  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: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !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:
+- brian@floatplane.us
+executables:
+- git-pr
+extensions: []
+extra_rdoc_files: []
+files:
+- .gitignore
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- bin/git-pr
+- git_pr.gemspec
+- lib/git_pr.rb
+- lib/git_pr/version.rb
+homepage: ''
+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.0.14
+signing_key: 
+specification_version: 4
+summary: A tool for listing and merging GitHub pull requests.
+test_files: []