git-publish 0.0.1 → 0.0.2

data/lib/git-publish.rb

@@ -3,12 +3,8 @@ require 'git-publish/helpers'
 class GitPublish
   include Helpers
   def run
-    init
-    origin(ARGV[0])
-    remote_branch_name(ARGV[1])
-    %x|git push #{origin} #{@local_branch_name}:refs/heads/#{remote_branch_name}|
-    %x|git fetch #{origin}|
-    %x|git branch --track #{@local_branch_name} #{origin}/#{remote_branch_name}|
-    %x|git checkout #{@local_branch_name}|
+    init(ARGV[0], ARGV[1])
+    %x|git push #{@origin} #{@local_branch_name}:refs/heads/#{@remote_branch_name}|
+    %x|git branch --set-upstream #{@local_branch_name} #{@origin}/#{@remote_branch_name}|
   end
 end

data/lib/git-publish/helpers.rb

@@ -1,18 +1,12 @@
 require 'grit'
 
 module Helpers
-  def init
+  def init(origin=nil, remote_branch_name=nil)
     git_dir = `git rev-parse --git-dir`
     repo = Grit::Repo.new(File.dirname(git_dir))
     @local_branch_name = repo.head.name
-  end
-
-  def origin(origin=nil)
-    @origin ||= "origin"
-  end
-
-  def remote_branch_name(remote_branch_name=nil)
     @remote_branch_name ||= @local_branch_name
+    @origin ||= "origin"
   end
 end
 

data/lib/git-publish/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Publish
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/git-unpublish.rb

@@ -3,10 +3,8 @@ require 'git-publish/helpers'
 class GitUnpublish
   include Helpers
   def run
-    init
-    origin(ARGV[0])
-    remote_branch_name(ARGV[1])
-    %x|git push #{origin} :#{remote_branch_name}|
+    init(ARGV[0], ARGV[1])
+    %x|git push #{@origin} :#{@remote_branch_name}|
     puts %Q|\n  Run \`git branch -d #{@local_branch_name}\` to delete the branch locally\n |
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: git-publish
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Adam
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-18 00:00:00 +01:00
+date: 2011-06-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency