git_pr 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b845e6d7a05d53f4bc31e91986cd886b56c88cd1
-  data.tar.gz: 157e6084f4c39dee37322508e0464cf371f07bc7
+  metadata.gz: e231910d981e67ad3eede6e7ceb0b64edb8e838c
+  data.tar.gz: b0f203c2bd2c920840aa0440fe80f29b8b4185b2
 SHA512:
-  metadata.gz: 103b7d80a8719dde69faba086dd9b959d76c08458f083059c8c52ff7ccac99623eb540c9228c8d511f8ddce51f0a9613e38c3780b414882ec847024319343a65
-  data.tar.gz: f992d1c24326943f34d7568ede54c0fd094337c70ac11a88ccda9263bd230c8e6f1b5b90ed41562f9900a0e544e93190c032b6f9e2a118c8af868c184ea650cc
+  metadata.gz: fdeb0d89f3c48faa1b9acbf9735745824b71b3dc2b74a700bad7a747a5cc02edf9c7a1d122afd2d7a4982695d0ac17967afd707f4d634a5fc8e458f26d2b4e68
+  data.tar.gz: e59e243ffcc9b8bf6d27c1a87b5486182f6971e0ed541698c89d0b4bcbb85e81ba8228f3c06b1ec2370de0f34935a62a578cfea234e4cca3eb7ae6d68f529e3d

data/bin/git-pr

@@ -64,8 +64,9 @@ eos
 Valid subcommands:
     diff: Use "git diff" to display a diff for a pull request
     difftool: Like "diff", but uses "git difftool" instead
-    merge: Merge and close a pull request
     list: List open pull requests
+    merge: Merge and close a pull request
+    open: Open a PR page on the web
 
 Run "git pr <subcommand> -h" for help with subcommands.
 
@@ -110,17 +111,18 @@ eos
 
     opts.separator ""
   end,
-  # 'open' => OptionParser.new do |opts|
-  #   opts.banner = "Usage: git pr open [options]"
+  'open' => OptionParser.new do |opts|
+    opts.banner = "Usage: git pr open [pr_number|branch]"
 
-  #   opts.separator "\nOpen command options"
+    opts.separator <<eos
 
-  #   opts.on("-r", "--readonly", "Check without prompting") do |v|
-  #     options.open.readonly = true
-  #   end
+Open a pull request page, if one exists, for the passed in PR number or
+branch. Otherwise, open a diff page where a pull request can be created. If no
+argument is passed, open a PR page for the current branch.
 
-  #   opts.separator ""
-  # end
+eos
+
+  end
 }
 
 begin
@@ -183,6 +185,49 @@ when "list"
     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
+  end
+
+  # We didn't find a matching pull request, so let's try to open the "create
+  # pull request" page.
+  source = source
+  if not git.is_local_branch? source
+    puts "Unknown branch '#{source}'.".red
+    exit -1
+  end
+  target_repo = Octokit.repo(github_project)
+  target = target_repo.default_branch
+  if source == target
+    puts "Current branch '#{target}' is the default branch for the project '#{github_project}'."
+    puts "Can't open pull request page.".yellow
+    exit -1
+  end
+
+  # Need to open a diff page. Diff URL looks like:
+  # https://github.com/FiftyThree/Studio/compare/FiftyThree:master...floatplane:blobstore
+  # So I need to: get the upstream for the named branch. Extract the github project owner.
+  github_target_owner, github_target_project = github_project.split "/"
+  remote_source_branch = git.branches.remote.find { |b| b.name == source }
+  remote_url = remote_source_branch ? remote_source_branch.remote.url : nil
+  unless remote_url and remote_url.match /github\.com/
+    puts "Branch '#{source}' has never been pushed to GitHub."
+    exit -1
+  end
+  github_source_owner = remote_url.match(/git@github.com:(.*)\//)[1]
+  url = "https://github.com/#{github_source_owner}/#{github_target_project}/compare/#{github_target_owner}:#{target}...#{github_source_owner}:#{source}?expand=1"
+  `open #{url}`
+  exit
 
 when "diff", "difftool"
   pull_request = nil

data/lib/git_pr/merge.rb

@@ -59,7 +59,7 @@ module GitPr
     # same contents as the remote source branch. If not, it must be reconciled
     # manually.
     remote_source_branch = "#{source_remote}/#{source_branch}"
-    if git.is_branch? source_branch and
+    if git.is_local_branch? source_branch and
         git.diff("remotes/#{remote_source_branch}", source_branch).any?
       puts "Local branch '#{source_branch}' differs from remote branch '#{remote_source_branch}'. Please reconcile before continuing.".red
       exit -1
@@ -69,7 +69,7 @@ module GitPr
     # failing if the temporary name already exists.
     rebase_branch = "#{source_branch}-rebase"
     puts "Create temporary branch '#{rebase_branch}'"
-    if git.is_branch? rebase_branch
+    if git.is_local_branch? rebase_branch
       puts "Local rebase branch '#{rebase_branch}' already exists. Please remove before continuing.".red
       exit -1
     end
@@ -77,7 +77,7 @@ module GitPr
 
     # Add an at_exit handler to blow away the temp branch when we exit
     at_exit do
-      if git.is_branch? rebase_branch
+      if git.is_local_branch? rebase_branch
         puts "Removing temporary branch #{rebase_branch}" if $verbose
         GitPr.run_command "git checkout -q #{target_branch}"
         GitPr.run_command "git branch -D #{rebase_branch}"
@@ -135,7 +135,7 @@ module GitPr
       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_branch? source_branch
+        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

data/lib/git_pr/version.rb

@@ -1,3 +1,3 @@
 module GitPr
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_pr
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Brian Sharon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize