grb 0.3.0 → 0.3.1

data/README.rdoc

@@ -0,0 +1,24 @@
+= GRB
+  re-implement git_remote_branch [http://github.com/webmat/git_remote_branch] for cleaner,simpler,stronger!
+
+== Install:
+  $ sudo gem install jinzhu-grb
+
+== USAGE:
+  * rename `branch1` to `branch2`
+    $ grb mv   [branch1] [branch2] [--explain]
+  * rename current branch to `branch`
+    $ grb mv branch [--explain]
+  * delete branch `branch`,default current_branch
+    $ grb rm [branch] [--explain]
+  * pull branch `branch`,default current_branch
+    $ grb pull [branch] [--explain]
+  * push branch `branch`, default current_branch
+    $ grb push [branch] [--explain]
+  * create new branch `branch`
+    $ grb new [branch] [--explain]
+
+Copyright (c) 2009-present GPL3
+
+Author : Jinzhu Zhang
+Email  : wosmvp@gmail.com

data/TODO

@@ -0,0 +1,14 @@
+grb 
+
+  new
+  
+  list
+
+  rm
+
+  mv
+
+  pull fetch
+
+  push publish
+

data/VERSION

@@ -0,0 +1 @@
+0.3.1

data/bin/grb

@@ -1,27 +1,26 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2009. GPL3.
+# Copyright (c) 2009-present. GPL3.
 # Author: Zhang Jinzhu
 
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+require "grb"
 
-# easy debug
+# easy debugger
 if ARGV.delete('--debug')
   ['rubygems','ruby-debug'].each {|x| require x}
 else
   def debugger;end
 end
 
-require "version"
-require "grb"
 
-abort('Version: ' + Version::VERSION) if ARGV.delete('--version') || ARGV.delete('-v')
+abort('Version: ' + File.read(File.expand_path("../../VERSION",__FILE__))) if ARGV.delete('--version') || ARGV.delete('-v')
 
 EXPLAIN = ARGV.delete('--explain') || ARGV.delete('-e')
 
 opt = {
  :command => ARGV[0] || 'push',
- :branch => branch   =  (ARGV[1] || Grb.get_current_branch),
+ :branch  => branch  =  (ARGV[1] || Grb.get_current_branch),
  :branch_ => ARGV[2] || branch,
 }
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grb
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Jinzhu Zhang
@@ -14,62 +15,57 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-28 00:00:00 +08:00
-default_executable: 
+date: 2010-07-19 00:00:00 +08:00
+default_executable: grb
 dependencies: []
 
-description: grb
+description: A tool to simplify working with remote branches
 email: wosmvp@gmail.com
 executables: 
 - grb
 extensions: []
 
 extra_rdoc_files: 
-- bin/grb
-- lib/version.rb
-- lib/grb.rb
+- README.rdoc
+- TODO
 files: 
+- VERSION
+- README.rdoc
+- TODO
 - bin/grb
-- Rakefile
-- lib/version.rb
-- lib/grb.rb
-- Manifest
-- grb.gemspec
 has_rdoc: true
-homepage: http://www.zhangjinzhu.com
+homepage: http://github.com/jinzhu/grb
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Grb
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
-      - 1
-      - 2
-      version: "1.2"
+      - 0
+      version: "0"
 requirements: []
 
-rubyforge_project: grb
-rubygems_version: 1.3.6
+rubyforge_project: 
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: grb
+summary: A tool to simplify working with remote branches
 test_files: []
 

data/Manifest

@@ -1,5 +0,0 @@
-bin/grb
-Rakefile
-lib/version.rb
-lib/grb.rb
-Manifest

data/Rakefile

@@ -1,14 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'echoe'
-require File.dirname(__FILE__) + '/lib/version'
-
-Echoe.new('grb', Version::VERSION) do |p|
-  p.description     = "grb"
-  p.url             = "http://www.zhangjinzhu.com"
-  p.author          = "Jinzhu Zhang"
-  p.email           = "wosmvp@gmail.com"
-  p.ignore_pattern  = ["TODO"]
-  p.rubyforge_name  = "grb"
-end
-

data/grb.gemspec

@@ -1,32 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{grb}
-  s.version = "0.3.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jinzhu Zhang"]
-  s.date = %q{2010-02-28}
-  s.default_executable = %q{grb}
-  s.description = %q{grb}
-  s.email = %q{wosmvp@gmail.com}
-  s.executables = ["grb"]
-  s.extra_rdoc_files = ["bin/grb", "lib/version.rb", "lib/grb.rb"]
-  s.files = ["bin/grb", "Rakefile", "lib/version.rb", "lib/grb.rb", "Manifest", "grb.gemspec"]
-  s.homepage = %q{http://www.zhangjinzhu.com}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Grb", "--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{grb}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{grb}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end

data/lib/grb.rb

@@ -1,125 +0,0 @@
-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} merge #{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(/\W/,'')
-  end
-
-  def self.local_branches
-   (`#{GIT} branch -l`).split(/\n/).map{|x| x.gsub(/\W/,'')}
-  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

data/lib/version.rb

@@ -1,3 +0,0 @@
-module Version
-  VERSION = '0.3.0'
-end