grb 0.3.1 → 0.4.0

data/README.rdoc

@@ -1,14 +1,18 @@
 = GRB
-  re-implement git_remote_branch [http://github.com/webmat/git_remote_branch] for cleaner,simpler,stronger!
+  A tool to simplify working with remote branches.
 
 == Install:
-  $ sudo gem install jinzhu-grb
+  $ sudo gem install grb
 
 == USAGE:
   * rename `branch1` to `branch2`
     $ grb mv   [branch1] [branch2] [--explain]
   * rename current branch to `branch`
     $ grb mv branch [--explain]
+  * add a remote repo
+    $ grb remote_add `name` `repo path` [--explain]
+  * remove a remote repo
+    $ grb remote_rm `name` [--explain]
   * delete branch `branch`,default current_branch
     $ grb rm [branch] [--explain]
   * pull branch `branch`,default current_branch
@@ -18,7 +22,7 @@
   * create new branch `branch`
     $ grb new [branch] [--explain]
 
-Copyright (c) 2009-present GPL3
+Copyright (c) 2009-present MIT
 
 Author : Jinzhu Zhang
 Email  : wosmvp@gmail.com

data/TODO

@@ -11,4 +11,3 @@ grb
   pull fetch
 
   push publish
-

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/bin/grb

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2009-present. GPL3.
+# Copyright (c) 2009-present. MIT.
 # Author: Zhang Jinzhu
 
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
-require "grb"
+require File.expand_path(File.dirname(__FILE__) + "/../lib/grb")
 
 # easy debugger
 if ARGV.delete('--debug')
@@ -13,7 +12,6 @@ else
   def debugger;end
 end
 
-
 abort('Version: ' + File.read(File.expand_path("../../VERSION",__FILE__))) if ARGV.delete('--version') || ARGV.delete('-v')
 
 EXPLAIN = ARGV.delete('--explain') || ARGV.delete('-e')

data/lib/grb.rb

@@ -0,0 +1,125 @@
+class Grb
+  GIT    = ENV['GRB_GIT']    || 'git'
+  ORIGIN = ENV['GRB_ORIGIN'] || 'origin'
+
+  COMMANDS = {
+    :new     => {
+      :desc  => "=> create new branch `branch`\ngrb new [branch] [--explain]",
+      :commands => [
+        '"#{GIT} push #{origin} #{current_branch}:refs/heads/#{branch}"',
+        '"#{GIT} fetch #{origin}"',
+        '"#{GIT} branch --track #{branch} #{origin}/#{branch}"',
+        '"#{GIT} checkout #{branch}"'
+      ]
+    },
+
+    :push     => {
+      :desc  => "=> push branch `branch`, default current_branch\ngrb push [branch] [--explain]",
+      :commands => [
+        '"#{GIT} push #{origin} #{branch}:refs/heads/#{branch}"',
+        '"#{GIT} fetch #{origin}"',
+        '"#{GIT} config branch.#{branch}.remote #{origin}"',
+        '"#{GIT} config branch.#{branch}.merge refs/heads/#{branch}"',
+        '"#{GIT} checkout #{branch}"'
+      ]
+    },
+
+    :mv     => {
+      :desc  => "=> rename `branch1` to `branch2`\ngrb mv   [branch1] [branch2] [--explain]\n=> rename current branch to `branch`\ngrb mv branch [--explain]",
+      :commands => [
+        ' if(branch != branch_)
+           "#{GIT} push #{origin} #{branch}:refs/heads/#{branch_}
+            #{GIT} fetch #{origin}
+            #{GIT} branch --track #{branch_} #{origin}/#{branch_}
+            #{GIT} checkout #{branch_}
+            #{GIT} branch -d #{branch}
+            #{GIT} push #{origin} :refs/heads/#{branch}"
+          else
+           "#{GIT} push #{origin} #{current_branch}:refs/heads/#{branch}
+            #{GIT} fetch #{origin}
+            #{GIT} branch --track #{branch} #{origin}/#{branch}
+            #{GIT} checkout #{branch}
+            #{GIT} push #{origin} :refs/heads/#{current_branch}
+            #{GIT} branch -d #{current_branch}"
+          end'
+      ]
+    },
+
+    :rm     => {
+      :desc  => "=> delete branch `branch`,default current_branch\ngrb rm [branch] [--explain]",
+      :commands => [
+        '"#{GIT} push #{origin} :refs/heads/#{branch}"',
+        '"#{GIT} checkout master" if current_branch == branch',
+        '"#{GIT} branch -d #{branch}"'
+      ]
+    },
+
+    :pull      => {
+      :desc  => "=> pull branch `branch`,default current_branch\ngrb pull [branch] [--explain]",
+      :commands => [
+        '"#{GIT} fetch #{origin}"',
+        'if local_branches.include?(branch) 
+          "#{GIT} config branch.#{branch}.remote #{origin}\n" +
+          "#{GIT} config branch.#{branch}.merge refs/heads/#{branch}"
+        else
+          "#{GIT} branch --track #{branch} #{origin}/#{branch}"
+        end',
+        '"#{GIT} checkout #{branch}" if current_branch != branch',
+        '"#{GIT} rebase #{origin}/#{branch}"',
+      ]
+    },
+
+    :track      => {
+      :desc  => "=> track branch\ngrb track `branch` [--explain]",
+      :commands => [
+        '"#{GIT} fetch #{origin}"',
+        '"#{GIT} branch --track #{branch} origin/#{branch}"',
+        '"#{GIT} checkout #{branch}"'
+        ]
+     },
+
+    :remote_add => {
+      :desc  => "=> add a remote repo\ngrb remote_add `name` `repo path` [--explain]",
+      :commands => [
+        '"#{GIT} remote add #{branch} #{branch_}"',
+        '"#{GIT} fetch #{branch}"'
+        ]
+     },
+
+    :remote_rm => {
+      :desc  => "=> remove a remote repo\ngrb remote_rm `name` [--explain]",
+      :commands => [
+        '"#{GIT} remote rm #{branch}"',
+        ]
+     }
+   }
+
+  def self.parse(opt)
+    if COMMANDS.keys.include?(opt[:command].to_sym)
+      current_branch,branch,branch_,origin = get_current_branch,opt[:branch],opt[:branch_],ORIGIN
+
+      COMMANDS[opt[:command].to_sym][:commands].map {|x| exec_cmd(eval(x))}
+    else
+     help 
+    end
+  end
+
+  def self.exec_cmd(str)
+    return true unless str
+    puts("\e[031m" + str.gsub(/^\s*/,'') + "\e[0m")
+    system("#{str}") unless EXPLAIN
+  end
+
+  def self.get_current_branch
+    (`#{GIT} branch 2> /dev/null | grep '^\*'`).gsub(/[\*\s]/,'')
+  end
+
+  def self.local_branches
+   (`#{GIT} branch -l`).split(/\n/).map{|x| x.gsub(/[\*\s]/,'')}
+  end
+
+  def self.help(*args)
+    puts "USAGE:"
+    COMMANDS.values.map {|x| puts x[:desc].gsub(/^(\W.*)$/,"\e[31m" + '\1' + "\e[0m").gsub(/^(\w.*)$/,'  $ \1')}
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grb
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jinzhu Zhang
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-19 00:00:00 +08:00
+date: 2010-07-20 00:00:00 +08:00
 default_executable: grb
 dependencies: []
 
@@ -30,6 +30,7 @@ extra_rdoc_files:
 - TODO
 files: 
 - VERSION
+- lib/grb.rb
 - README.rdoc
 - TODO
 - bin/grb