git_pr 0.0.14.beta0 → 0.0.14.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1a52c54177aa30fbf3c66ae58700877bc84c539
-  data.tar.gz: 11e1faab37fcddee44be6e33093832daa48a98d7
+  metadata.gz: fd50ce4e2cfb2bba6e49dea8ec04f6d3467b93bd
+  data.tar.gz: 753a8cfd5bebc83704c0daee2503791a237f953c
 SHA512:
-  metadata.gz: 55b6ea86c912b8d15051f2cd32b01cdeb09c3068a40cdf0d0c8d579615581e35886f408f418e22f6e8f171a0968884fe4ed35048e0fe1c22a5078437b2b37916
-  data.tar.gz: 4028887f5b4262f19657edc05d4f483922505aad091b3a5b917808449f45472b69008c9b814c47cab9553c4721c17cdaed3e224a2f6f3000200d522eac6e1540
+  metadata.gz: b21abd38f9c7131263e51e917b23a85933bc2cc5065778ccf7e15196d5f3a80243fd14a49af0a21c734e4dd7368ce08af2fe8afa1b01de49c9ff3006d22fc95c
+  data.tar.gz: 965c8d39ddbf565248fa80b3af80161cd1335e97d76b31ecba2a38dda02d89341dafa70740ffd36e9671560b4b72f6a840e6628d81a1d975582e63c4c315cc49

data/bin/git-pr

@@ -20,6 +20,8 @@ require 'pp'
 $verbose = false
 $default_remotes = ["origin", "upstream"]
 
+LIST_STATUS_KEY = "pr.liststatus"
+
 options = OpenStruct.new(:help => false,
                          :verbose => false,
                          :project => nil,
@@ -28,13 +30,14 @@ options = OpenStruct.new(:help => false,
                          :difftool => OpenStruct.new(),
                          :list => OpenStruct.new(),
                          :merge => OpenStruct.new(),
-                         :open => OpenStruct.new())
+                         :open => OpenStruct.new(),
+                         :status => OpenStruct.new())
 
 global_options = OptionParser.new do |opts|
   opts.banner = <<eos
 git_pr version #{GitPr::VERSION}
 
-Usage: git pr [options] subcommand [options]
+Usage: git pr [options] command [options]
 eos
 
   opts.separator "\nGlobal options"
@@ -44,7 +47,7 @@ eos
           "The GitHub project to access. Can be a named remote, or a GitHub project in",
           "<user>/<project> form. Defaults to the GitHub project that the \"origin\"",
           "or \"upstream\" remote points to. You can override the default remote",
-          "with git config. Run: 'git config --add pr.defaultremote <remote_name>'"
+          "with git config. Run: 'git config --add #{GitPr::GitHub::DEFAULT_REMOTE_KEY} <remote_name>'"
           ) do |project|
     options.project = project
   end
@@ -61,14 +64,15 @@ eos
 
   opts.separator <<eos
 
-Valid subcommands:
-    diff: Use "git diff" to display a diff for a pull request
+Valid commands:
+    diff:     Use "git diff" to display a diff for a pull request
     difftool: Like "diff", but uses "git difftool" instead
-    list: List open pull requests
-    merge: Merge and close a pull request
-    open: Open a PR page on the web
+    list:     List open pull requests
+    status:   Show the detailed status for a pull request
+    merge:    Merge and close a pull request
+    open:     Open a PR page on the web
 
-Run "git pr <subcommand> -h" for help with subcommands.
+Run "git pr help <command>" for more detailed help.
 
 eos
 end
@@ -86,7 +90,7 @@ eos
   end
 end
 
-subcommands = {
+commands = {
   'diff' => make_diff_argument_parser("diff"),
   'difftool' => make_diff_argument_parser("difftool"),
   'list' => OptionParser.new do |opts|
@@ -98,6 +102,16 @@ subcommands = {
       options.list.user = user
     end
 
+    opts.on("-s", "--[no-]status",
+            "Include PR status in the output. Including status is slower,",
+            "as each PR's status must be queried individually. You can set",
+            "the default behavior with git config:",
+            "\n",
+            "git config --bool --add #{LIST_STATUS_KEY} true"
+           ) do |s|
+      options.list.status = s
+    end
+
     opts.separator ""
   end,
   'merge' => OptionParser.new do |opts|
@@ -122,11 +136,21 @@ argument is passed, open a PR page for the current branch.
 
 eos
 
+  end,
+  'status' => OptionParser.new do |opts|
+    opts.banner = "Usage: git pr status [pr_number|branch]"
+
+    opts.separator <<eos
+
+Report detailed pull request status for the passed in PR number or
+branch.
+
+eos
   end
 }
 
-def alias_to_subcommand(subcommand)
-  case subcommand
+def alias_to_command(command)
+  case command
   when "dt", /^difft/
     "difftool"
   when "d", /^d/
@@ -137,8 +161,10 @@ def alias_to_subcommand(subcommand)
     "list"
   when "ci", /^m/
     "merge"
+  when /^s/
+    "status"
   else
-    subcommand
+    command
   end
 end
 
@@ -151,13 +177,13 @@ rescue OptionParser::InvalidOption => e
   exit
 end
 
-command = alias_to_subcommand(ARGV.shift)
+command = alias_to_command(ARGV.shift)
 
-# Check for the special command help. Support "git pr help" and "git pr help <subcommand>"
+# Check for the special command help. Support "git pr help" and "git pr help <command>"
 if command == "help"
-  command = alias_to_subcommand(ARGV.shift)
-  if subcommands[command]
-    puts subcommands[command]
+  command = alias_to_command(ARGV.shift)
+  if commands[command]
+    puts commands[command]
   else
     puts global_options
   end
@@ -165,17 +191,17 @@ if command == "help"
 end
 
 # Unrecognized command? Print help and exit
-if !subcommands[command]
+if !commands[command]
   puts global_options
   exit
 end
 
-# Parse subcommand options. Print help if any unrecognized
+# Parse command options. Print help if any unrecognized
 begin
-  options[command].additional_arguments = subcommands[command].permute!
+  options[command].additional_arguments = commands[command].permute!
 rescue OptionParser::InvalidOption => e
   puts e
-  puts subcommands[command]
+  puts commands[command]
   exit
 end
 
@@ -198,8 +224,37 @@ elsif File.exists? File.join(git_dir, '.git')
   git = Git.open git_dir, :repository => submodule_git_dir, :index => File.join(submodule_git_dir, 'index')
 end
 
-def pull_summary(pull)
-  return "##{pull[:number]} from #{pull[:user][:login]}: #{pull[:title]}"
+def pull_request_status(pull)
+  Octokit.combined_status(pull.base.repo.full_name, pull.head.sha)
+end
+
+def status_summary(state)
+  case state
+  when "failure"
+    STDOUT.tty? ? "\u2717".red : "-"
+  when "success"
+    STDOUT.tty? ? "\u2713".green : "+"
+  else
+    STDOUT.tty? ? "\u25CF".yellow : "O"
+  end
+end
+
+def pull_summary(pull, include_status)
+  if include_status
+    combined_status = pull_request_status(pull)
+    status_string = "#{status_summary(combined_status.state)} "
+  else
+    status_string = ""
+  end
+  "#{status_string}##{pull[:number]} from #{pull[:user][:login]}: #{pull[:title]}"
+end
+
+def find_pull_request_from_command_line_argument(git, github_project, argument)
+  # Look for an existing pull request that fits. A branch name or PR number can
+  # be passed on the command line, or we default to the current branch.
+  pulls = Octokit.pulls github_project
+  source = argument || git.current_branch
+  pulls.any? ? pulls.find { |p| p.head.ref == source || p.number.to_s == source } : nil
 end
 
 # Figure out what GitHub project we're dealing with.
@@ -221,25 +276,25 @@ when "list"
   if options.list.user
     pulls = pulls.select { |p| p[:user][:login] == options.list.user }
   end
+  include_status = false
+  if options.list.to_h.has_key?(:status)
+    include_status = options.list.status
+  elsif git.config.has_key? LIST_STATUS_KEY
+    include_status = git.config(LIST_STATUS_KEY) == 'true'
+  end
 
   if pulls.any?
-    pulls.each { |p| puts pull_summary(p) }
+    pulls.each { |p| puts pull_summary(p, include_status) }
   else
     puts "No open pull requests found.".yellow
   end
 
 when "open"
-
-  # Look for an existing pull request that fits. A branch name or PR number can
-  # be passed on the command line, or we default to the current branch.
-  pulls = Octokit.pulls github_project
-  source = options[command].additional_arguments.shift || git.current_branch
-  if pulls.any?
-    pull = pulls.find { |p| p.head.ref == source || p.number.to_s == source }
-    if pull
-      `open #{pull.html_url}`
-      exit
-    end
+  argument = options[command].additional_arguments.shift
+  pull = find_pull_request_from_command_line_argument git, github_project, argument
+  if pull
+    `open #{pull.html_url}`
+    exit
   end
 
   # We didn't find a matching pull request, so let's try to open the "create
@@ -281,7 +336,7 @@ when "diff", "difftool"
 
   unless pull_request
     puts "Must specify a pull request to diff.\n".red
-    puts subcommands[command]
+    puts commands[command]
     exit -1
   end
 
@@ -290,7 +345,7 @@ when "diff", "difftool"
     pull = Octokit.pull github_project, pull_request
   rescue Octokit::NotFound
     puts "Pull request #{pull_request} not found in #{github_project}.\n".red
-    puts subcommands[command]
+    puts commands[command]
     exit -1
   end
 
@@ -323,4 +378,30 @@ when "diff", "difftool"
   # Wait for the child
   Process.wait child
 
+when "status"
+  argument = options[command].additional_arguments.shift
+  pull = find_pull_request_from_command_line_argument git, github_project, argument
+  unless pull
+    puts "No matching pull request found"
+    exit 1
+  end
+
+  puts "Pull request #{pull.number}: #{pull.title}"
+  statuses = Octokit.statuses(pull.base.repo.full_name, pull.head.sha)
+  if statuses.empty?
+    puts "No status found."
+    exit
+  end
+
+  statuses_by_context = {}
+  statuses.sort_by { |s| s.updated_at }.each { |s| statuses_by_context[s.context] = s }
+
+  max_context = statuses_by_context.map { |c, s| s.context.length }.max
+  max_description = statuses_by_context.map { |c, s| s.description.length }.max
+
+  puts ""
+  statuses_by_context.each do |context, status|
+    puts "#{status_summary(status.state)}  #{status.context.ljust(max_context)}  #{status.description.ljust(max_description)}  #{status.target_url}"
+  end
+
 end

data/lib/git_pr/merge.rb

@@ -52,13 +52,6 @@ module GitPr
     # If the local target branch differs from the remote target branch, they
     # must be reconciled manually.
     remote_target_branch = "#{target_remote}/#{target_branch}"
-    begin
-      git.diff("remotes/#{remote_target_branch}", target_branch).any?
-    rescue
-      puts "Error cracking diff:"
-      puts git.diff("remotes/#{remote_target_branch}", target_branch).to_s
-      raise
-    end
     if git.diff("remotes/#{remote_target_branch}", target_branch).any?
       puts "Local branch '#{target_branch}' differs from remote branch '#{remote_target_branch}'. Please reconcile before continuing.".red
       exit -1

data/lib/git_pr/version.rb

@@ -1,3 +1,3 @@
 module GitPr
-  VERSION = "0.0.14.beta0"
+  VERSION = "0.0.14.beta1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_pr
 version: !ruby/object:Gem::Version
-  version: 0.0.14.beta0
+  version: 0.0.14.beta1
 platform: ruby
 authors:
 - Brian Sharon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize