open_git 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e133f59c02d53f04615fad070f58005c11cd3c74b91a8909d6fca5845945f97
-  data.tar.gz: 8ca25f79b8146c592a6eeb6c76680d25c2a60f8192f1d567c0a99500fc85dff6
+  metadata.gz: b65d60f92b9722efe5a45c713edb979b66ea93792559599c04ea47a81230e87a
+  data.tar.gz: 3ea0f1cc15675b04cea3f9160d7c037840d0c0758cb5b919a0cda8cf48c3f4ba
 SHA512:
-  metadata.gz: bc602439f4a7e737e12141c179e1bb735b277cd5ea5940427feb815a50407458cd6f7c0eed32508d2348fca95c88f7537f129df33f214d583c41716d228a4e93
-  data.tar.gz: bb05c05cd538b8cd879dbdbddaa9960324688b944894dd5a6e2e2c2da4436a3347c106b628c62a6edebb96dcbb06a1791903583e2ade0ad5c9918a66bdb28b32
+  metadata.gz: dc15127c4a6aa9a2ba0e036848c645b5cbecfa331e337ae429aa35a66fd2f4f780a64c9f65cbbf2710cdaabe4ec90373e5a3d2611f2e7578840ff45192885161
+  data.tar.gz: e664adfabe313928b1e424e2cd4a1cd01fe558134bd8eb855a03d6e1e0b723c1705352efcb6b97709e4ced89f0eb42dd7e6a3f22ce1288745dc81acf5dc3e141

data/bin/opr

@@ -3,17 +3,31 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'rubygems'
 require 'open_git'
+require 'English'
 
 if ARGV.size > 1
   puts "usage: opr [<branch>]"
 else
   begin
-    system "open #{OpenGit::Open.github_pull_request ARGV[0]}"
+    if OpenGit::Git.upstream == ""
+      output = `git push --set-upstream #{OpenGit::Git.remote} #{OpenGit::Git.branch}`
+      if $CHILD_STATUS != 0
+        puts "opr: Error trying to push new branch to remote."
+        puts output
+        exit
+      end
+      system "open #{OpenGit::Open.github_new_pull_request ARGV[0]}"
+    else
+      # upstream has been set and a pull request may already exist
+      system "open #{OpenGit::Open.github_pull_request ARGV[0]}"
+    end
   rescue OpenGit::Git::NoGitRepoError
     puts "opr: No git repo found. Please use opr in a git repo."
   rescue OpenGit::Git::NoRemoteError
     puts "opr: No git remote found. Setup a git remote before using opr."
   rescue OpenGit::Git::InvalidRemoteError
     puts "opr: could not find specified remote."
+  rescue StandardError => e
+    puts "opr: unexpected internal error."
   end
 end

data/lib/open_git/git.rb

@@ -34,7 +34,14 @@ module OpenGit
     end
 
     def self.branch
-      return `git rev-parse --abbrev-ref HEAD`.strip
+      `git rev-parse --abbrev-ref HEAD`.strip
+    end
+    
+    def self.upstream
+      up = `git rev-parse --abbrev-ref --symbolic-full-name @{u}`.strip
+      # ignore output if error code 128, no upstream error
+      up = '' if $CHILD_STATUS == 128
+      up
     end
   end
 end

data/lib/open_git/open.rb

@@ -12,5 +12,8 @@ module OpenGit
       "#{self.github(remote)}/pull/#{OpenGit::Git.branch}"
     end
 
+    def self.github_new_pull_request(remote = nil)
+      "#{self.github(remote)}/pull/new/#{OpenGit::Git.branch}"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open_git
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Kevin Peng