git_pr 0.0.14.beta3 → 0.0.14.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7b026f77b603e491fcb40a97fba29f9eb12c5a8
-  data.tar.gz: b950b8dee8e1b081ed4c2bb95033b9efdd192458
+  metadata.gz: 7e547458a924539d3d3f6e960d4d7d00bd14bd65
+  data.tar.gz: de36ad310f6c68800bc87f2c25c952e406cac2e8
 SHA512:
-  metadata.gz: 53b72813791e5837ad5d3b50671eb2ceb0d9ef06e7ce92237c729acf5eaa47ee04b054f13866b21e6f81611ef2f935cc84ef2644542075b66625ac8ef56e16f9
-  data.tar.gz: 4fb865efda40700eb11588bf83cfa5dd945d22181e7e2865273b5b0fdb6b531af048b07c282164a9401fa2445a006dd888d4b2235dfa3830be3b1ab7caabd0cc
+  metadata.gz: bf8767ff0b704faf1309cc2c2a29d0e8612575432ea3b36c2100daad3296ac61aaaf7b49177e4c2f0c39749ee6710b852668fa62a86452ee82b26825764e763f
+  data.tar.gz: a45cd138fa12884339cbbc16dde94092a6b74265d1f31d56bee424cab04ab22a1d16e0db408e73fc063ea26a2c85f90cd77d7febfe6a2bf8887f2adc087fab53

data/bin/git-pr

@@ -29,7 +29,7 @@ options = OpenStruct.new(:help => false,
                          :diff => OpenStruct.new(),
                          :difftool => OpenStruct.new(),
                          :list => OpenStruct.new(),
-                         :merge => OpenStruct.new(),
+                         :merge => OpenStruct.new(:yolo => false),
                          :open => OpenStruct.new(),
                          :status => OpenStruct.new())
 
@@ -121,7 +121,13 @@ Usage: git pr merge [PR number]
 If a PR number isn't passed, a menu of open PRs will be displayed.
 eos
 
-    # opts.separator "\nMerge command options"
+    opts.separator "\nMerge command options"
+
+    opts.on("-y", "--yolo",
+            "Don't check PR status before merging"
+           ) do |y|
+      options.merge.yolo = y
+    end
 
     opts.separator ""
   end,
@@ -224,37 +230,13 @@ 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_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
+  pull = pulls.any? ? pulls.find { |p| p.head.ref == source || p.number.to_s == source } : nil
+  pull ? GitPr::PullRequest.new(pull) : nil
 end
 
 # Figure out what GitHub project we're dealing with.
@@ -269,10 +251,10 @@ when "merge"
   end
   # Load a pull request
   pull = GitPr::GitHub.find_or_prompt_for_pull_request github_project, pull_request
-  GitPr::merge_pull_cleanly git, pull
+  GitPr::merge_pull_cleanly git, pull, options.merge
 
 when "list"
-  pulls = Octokit.pulls "#{github_project}"
+  pulls = Octokit.pulls("#{github_project}").map { |p| GitPr::PullRequest.new(p) }
   if options.list.user
     pulls = pulls.select { |p| p[:user][:login] == options.list.user }
   end
@@ -284,7 +266,7 @@ when "list"
   end
 
   if pulls.any?
-    pulls.each { |p| puts pull_summary(p, include_status) }
+    pulls.each { |p| puts p.summary(include_status) }
   else
     puts "No open pull requests found.".yellow
   end
@@ -386,28 +368,23 @@ when "status"
     exit 1
   end
 
-  puts "##{pull.number} from #{pull[:user][:login]}: #{pull.title}\n\n"
-  statuses = Octokit.statuses(pull.base.repo.full_name, pull.head.sha)
-  if statuses.empty?
+  puts "#{pull.summary}\n\n"
+  if pull.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_context = pull.statuses.map { |s| s.context.length }.max
 
   puts <<EOS
 Status (cmd-double-click to open links):
 
 EOS
-  statuses_by_context.each do |context, status|
-    puts "#{status_summary(status.state)}  #{status.context.ljust(max_context)}  #{status.target_url}"
+  pull.statuses.each do |status|
+    puts "#{GitPr::PullRequest.summary_icon(status.state)}  #{status.context.ljust(max_context)}  #{status.target_url}"
   end
   puts "\n"
 
-  success = statuses_by_context.all? { |c, s| s.state == 'success' }
-  exit (success ? 0 : 1)
+  exit (pull.status.state == 'success' ? 0 : 1)
 
 end

data/lib/git_pr/github.rb

@@ -1,3 +1,4 @@
+require 'git_pr/pull_request'
 require 'io/console'
 require 'octokit'
 require 'netrc'
@@ -132,7 +133,7 @@ module GitPr
       choose do |menu|
         menu.prompt = "Select PR to merge: "
         pulls.each do |pull|
-          menu.choice(pull_summary(pull)) { pull_to_merge = pull }
+          menu.choice(pull_summary(pull)) { pull_to_merge = GitPr::PullRequest.new(pull) }
         end
         menu.choice(:Quit, "Exit program.") { exit }
       end
@@ -155,7 +156,7 @@ module GitPr
       else
         pull = self.query_for_pull_to_merge pulls
       end
-      pull
+      GitPr::PullRequest.new(pull)
     end
 
   end

data/lib/git_pr/merge.rb

@@ -4,30 +4,73 @@ module GitPr
 
   def self.ensure_remotes_for_pull_request git, pull
     source_remote = GitPr.ensure_remote_for_project(git,
-                                                    pull[:head][:user][:login],
-                                                    pull[:head][:repo][:ssh_url],
-                                                    pull[:head][:repo][:git_url])
+                                                    pull.head.user.login,
+                                                    pull.head.repo.ssh_url,
+                                                    pull.head.repo.git_url)
 
     target_remote = GitPr.ensure_remote_for_project(git,
-                                                    pull[:base][:user][:login],
-                                                    pull[:base][:repo][:ssh_url],
-                                                    pull[:base][:repo][:git_url])
+                                                    pull.base.user.login,
+                                                    pull.base.repo.ssh_url,
+                                                    pull.base.repo.git_url)
 
     [source_remote, target_remote]
   end
 
-  def self.merge_pull_cleanly git, pull
+  def self.merge_pull_cleanly git, pull, command_options
+    unless command_options.yolo
+      case pull.state
+      when 'failure'
+        failed_statuses = pull.statuses.select { |s| s.state == 'failure' }
+        max_context = failed_statuses.map { |s| s.context.length }.max
+        puts <<EOS
+#{"ERROR".red}: One or more status checks have failed on this pull request!
 
-    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]
+#{" " * (max_context + 5)}(cmd-double-click to open links)
+EOS
+        failed_statuses.each do |status|
+          puts "#{GitPr::PullRequest.summary_icon(status.state)}  #{status.context.ljust(max_context)}  #{status.target_url}"
+        end
+
+        puts <<EOS
+
+If you're still sure you want to merge, call again with --yolo: 'git pr merge --yolo #{pull.number}'
+EOS
+        exit 1
+      when 'success'
+        nil
+      else
+        unless pull.statuses.empty?
+          pending_statuses = pull.statuses.select { |s| s.state == 'pending' }
+          max_context = pending_statuses.map { |s| s.context.length }.max
+          puts <<EOS
+#{"WARNING".yellow}: One or more status checks is in progress on this pull request.
+You should let them finish.
+
+#{" " * (max_context + 5)}(cmd-double-click to open links)
+EOS
+          pending_statuses.each do |status|
+            puts "#{GitPr::PullRequest.summary_icon(status.state)}  #{status.context.ljust(max_context)}  #{status.target_url}"
+          end
+
+          puts <<EOS
+
+If you're still sure you want to merge, call again with --yolo: 'git pr merge --yolo #{pull.number}'
+EOS
+          exit 1
+        end
+      end
+    end
 
-    target_branch = pull[:base][:ref]
-    target_repo_ssh_url = pull[:base][:repo][:git_url]
-    target_repo_clone_url = pull[:base][:repo][:clone_url]
+    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
 
-    puts "Merging #{pull_summary(pull)}".cyan
+    target_branch = pull.base.ref
+    target_repo_ssh_url = pull.base.repo.git_url
+    target_repo_clone_url = pull.base.repo.clone_url
+
+    puts "Merging #{pull.summary}".cyan
     puts "#{target_repo_ssh_url}/#{target_branch} <= #{source_repo_ssh_url}/#{source_branch}\n".cyan
 
     # find or add a remote for the PR
@@ -106,9 +149,9 @@ module GitPr
     puts "Merging changes from '#{rebase_branch}' to '#{target_branch}'"
     GitPr.run_command "git checkout -q #{target_branch}"
     commit_message = <<EOS
-Merge #{pull_summary(pull)}
+Merge #{pull.summary}
 
-#{pull[:body]}
+#{pull.body}
 EOS
     GitPr.run_command "git merge --no-ff #{rebase_branch} -m #{Shellwords.escape commit_message}"
 
@@ -139,15 +182,16 @@ EOS
     if GitPr.prompt "\nDo you want to proceed with the merge (y/n)? ".cyan
       puts "Pushing changes to '#{target_remote}'"
       GitPr.run_command "git push #{target_remote} #{target_branch} 2>&1"
-      if GitPr.prompt "\nDo you want to delete the feature branch (y/n)? ".cyan
-        source_branch_sha = git.branches["#{source_remote}/#{source_branch}"].gcommit.sha[0..6]
-        GitPr.run_command "git push #{source_remote} :#{source_branch} 2>&1"
-        if git.is_local_branch? source_branch
-          source_branch_sha = git.branches[source_branch].gcommit.sha[0..6]
-          GitPr.run_command "git branch -D #{source_branch}"
-        end
-        puts "Feature branch '#{source_branch}' deleted. To restore it, run: " + "git branch #{source_branch} #{source_branch_sha}".green
+
+      # Delete the remote and local feature branches
+      source_branch_sha = git.branches["#{source_remote}/#{source_branch}"].gcommit.sha[0..6]
+      GitPr.run_command "git push #{source_remote} :#{source_branch} 2>&1"
+      if git.is_local_branch? source_branch
+        source_branch_sha = git.branches[source_branch].gcommit.sha[0..6]
+        GitPr.run_command "git branch -D #{source_branch}"
       end
+      puts "Feature branch '#{source_branch}' deleted. To restore it, run: " + "git branch #{source_branch} #{source_branch_sha}".green
+
       puts "\nMerge complete!".cyan
     else
       puts "\nUndoing local merge"

data/lib/git_pr/pull_request.rb

@@ -4,6 +4,46 @@ module GitPr
     def initialize(pull)
       @pull = pull
     end
+
+    def status
+      unless @_status
+        @_status = Octokit.status(@pull.base.repo.full_name, @pull.head.sha, :accept => Octokit::Client::Statuses::COMBINED_STATUS_MEDIA_TYPE)
+      end
+      @_status
+    end
+
+    def state
+      self.status.state
+    end
+
+    def statuses
+      self.status.statuses
+    end
+
+    def self.summary_icon(state)
+      case state
+      when "failure"
+        STDOUT.tty? ? "\u2717".red : "-"
+      when "success"
+        STDOUT.tty? ? "\u2713".green : "+"
+      else
+        STDOUT.tty? ? "\u25CF".yellow : "O"
+      end
+    end
+
+    def summary(include_status = false)
+      if include_status
+        status_string = "#{PullRequest.summary_icon(self.state)} "
+      else
+        status_string = ""
+      end
+      "#{status_string}##{@pull.number} from #{@pull.user.login}: #{@pull.title}"
+    end
+
+    def method_missing(method_name, *args, &block)
+      @pull.send method_name, *args, &block
+    end
+
   end
 
 end

data/lib/git_pr/version.rb

@@ -1,3 +1,3 @@
 module GitPr
-  VERSION = "0.0.14.beta3"
+  VERSION = "0.0.14.beta4"
 end

data/lib/git_pr.rb

@@ -27,10 +27,11 @@ module GitPr
     state = `stty -g`
     `stty raw -echo -icanon isig`
 
-    STDIN.getc.chr
+    c = STDIN.getc.chr
+    c
   ensure
     `stty #{state}`
-    puts ""
+    puts "#{c}"
   end
 
   def self.prompt prompt

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_pr
 version: !ruby/object:Gem::Version
-  version: 0.0.14.beta3
+  version: 0.0.14.beta4
 platform: ruby
 authors:
 - Brian Sharon