git_remote_branch 0.2.2 → 0.2.3

data/README

@@ -1,12 +1,12 @@
 ==== Why git_remote_branch? ====
 
-The basic idea for git_remote_branch is to trivialize the interaction with 
+The basic idea for git_remote_branch is to trivialize the interaction with
 remote branches in simple situations. 
 
-For now git_remote_branch assumes that the local and remote branches have the 
+For now git_remote_branch assumes that the local and remote branches have the
 same name. Multiple origins are supported.
 
-Another goal of git_remote_branch is to help teach the real underlying git 
+Another goal of git_remote_branch is to help teach the real underlying git
 commands. Each operation done on your behalf is displayed at the console.
 
 
@@ -43,24 +43,60 @@ Switch to the new branch.
 $ grb create branch_name [origin_server]
 
 
-== delete (aliases: destroy, kill) ==
+== delete (aliases: destroy, kill, remove) ==
 Delete the remote branch then delete the local branch.
 The local branch is not deleted if there are pending changes.
 
 $ grb delete branch_name [origin_server]
 
 
-== track (aliases: follow grab) ==
+== track (aliases: follow grab fetch) ==
 Track an existing remote branch locally.
 
-
 $ grb track branch_name [origin_server]
 
 
+== rename (aliases: rn, mv, move) ==
+Rename the remote branch by copying and deleting the old name.
+Checkout a new local tracking branch with the new name and delete the branch
+with the old name.
+branch_name is the new name, the old name is always the current branch's
+
+$ grb rename branch_name [origin_server]
+
+
+== explain ==
+
+All commands can be prepended by the word 'explain'.  Instead of executing the
+command, git_remote_branch will simply output the list of commands you need to
+run to accomplish that goal.
+Examples: 
+
+$ grb explain create
+git_remote_branch version 0.2.2
+
+List of operations to do to create a new remote branch and track it locally:
+
+git push origin master:refs/heads/branch_to_create
+git fetch origin
+git branch --track branch_to_create origin/branch_to_create
+git checkout branch_to_create
+
+
+$ grb explain create my_branch github
+git_remote_branch version 0.2.2
+
+List of operations to do to create a new remote branch and track it locally:
+
+git push github master:refs/heads/my_branch
+git fetch github
+git branch --track my_branch github/my_branch
+git checkout my_branch
+
 
 ==== History ====
 
-This script was originally created by Carl Mercier and made public on his blog 
+This script was originally created by Carl Mercier and made public on his blog
 here:
 
 No nonsense GIT, part 1: git-remote-branch
@@ -75,3 +111,4 @@ repositories.
 
 - Mathieu Martin  webmat@gmail.com
 - Carl Mercier    (Carl: want your email here?)
+- Caio Chassot    dev@caiochassot.com

data/Rakefile

@@ -43,7 +43,7 @@ namespace :gem do
 
   desc "Uninstall the .gem"
   task :uninstall do
-    cmd = "#{SUDO} gem uninstall #{NAME}"
+    cmd = "#{SUDO} gem uninstall #{NAME} -x"
     #TODO fix this crap
     puts cmd, '  (Note: execute manually if more than one version is installed)'
     `#{cmd}`

data/bin/grb

@@ -2,7 +2,8 @@
 
 # Check out the README (or try 'grb help') before you screw up your repos ;-)
 
-require "#{File.dirname(__FILE__)}/../lib/git_remote_branch"
+THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+require "#{File.dirname(THIS_FILE)}/../lib/git_remote_branch"
 
 include GitRemoteBranch
 
@@ -20,3 +21,4 @@ if p[:explain]
 else
   execute_action(p[:action], p[:branch], p[:origin], p[:current_branch])
 end
+

data/lib/git_remote_branch.rb

@@ -21,9 +21,22 @@ module GitRemoteBranch
       ]
     },
 
+    :rename     => {
+      :description => 'rename a remote branch and its local tracking branch',
+      :aliases  => %w{ rn mv move },
+      :commands => [
+        '"git push #{origin} #{current_branch}:refs/heads/#{branch_name}"',
+        '"git fetch #{origin}"',
+        '"git branch --track #{branch_name} #{origin}/#{branch_name}"',
+        '"git checkout #{branch_name}"',
+        '"git push #{origin} :refs/heads/#{current_branch}"',
+        '"git branch -d #{current_branch}"',
+      ]
+    },
+
     :delete     => {
       :description => 'delete a local and a remote branch',
-      :aliases  => %w{delete destroy kill remove},
+      :aliases  => %w{delete destroy kill remove rm},
       :commands => [
         '"git push #{origin} :refs/heads/#{branch_name}"',
         '"git checkout master" if current_branch == branch_name',
@@ -54,10 +67,17 @@ module GitRemoteBranch
 
   grb delete branch_name [origin_server]
 
+  grb rename branch_name [origin_server]
+
   grb track branch_name [origin_server]
 
   If origin_server is not specified, the name 'origin' is assumed (git's default)
   
+  The explain meta-command: you can also prepend any command with the keyword 'explain'. Instead of executing the command, git_remote_branch will simply output the list of commands you need to run to accomplish that goal.
+  Example: 
+    grb explain create
+    grb explain create my_branch github
+  
   All commands also have aliases:
   #{ COMMANDS.keys.map{|k| k.to_s}.sort.map {|cmd| 
     "#{cmd}: #{COMMANDS[cmd.to_sym][:aliases].join(', ')}" }.join("\n  ") }

data/lib/param_reader.rb

@@ -29,6 +29,7 @@ module GitRemoteBranch
     return :create if COMMANDS[:create][:aliases].include?(a)
     return :delete if COMMANDS[:delete][:aliases].include?(a)
     return :track  if COMMANDS[:track][:aliases].include?(a)
+    return :rename if COMMANDS[:rename][:aliases].include?(a)
     return nil
   end
 

data/test/test_helper.rb

@@ -3,14 +3,8 @@ require 'test/unit'
 
 test_dir = File.dirname(__FILE__)
 
-begin
-  require 'try_require'
-rescue LoadError
-  require File.join( [test_dir] + %w{ .. vendor try_require try_require } )
-end
-
-try_require 'redgreen'
-try_require 'ruby-debug'
+require 'redgreen'
+require 'ruby-debug'
 
 require File.join(test_dir, 'git_helper')
 require File.join( [test_dir] + %w{ .. lib git_remote_branch} )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: git_remote_branch
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Mathieu Martin