jinzhu-grb 0.2.0 → 0.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/grb.gemspec +2 -2
  2. data/lib/grb.rb +3 -1
  3. data/lib/version.rb +1 -1
  4. metadata +4 -3
data/grb.gemspec CHANGED
@@ -2,11 +2,11 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = %q{grb}
5
- s.version = "0.2.0"
5
+ s.version = "0.2.1"
6
6
 
7
7
  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
8
8
  s.authors = ["Jinzhu Zhang"]
9
- s.date = %q{2009-07-21}
9
+ s.date = %q{2009-07-29}
10
10
  s.default_executable = %q{grb}
11
11
  s.description = %q{grb}
12
12
  s.email = %q{wosmvp@gmail.com}
data/lib/grb.rb CHANGED
@@ -63,7 +63,9 @@ class Grb
63
63
  "#{GIT} config branch.#{branch}.merge refs/heads/#{branch}"
64
64
  else
65
65
  "#{GIT} branch --track #{branch} #{origin}/#{branch}"
66
- end'
66
+ end',
67
+ '"#{GIT} checkout #{branch}" if current_branch != branch',
68
+ '"#{GIT} merge #{origin}/#{branch}"',
67
69
  ]
68
70
  },
69
71
 
data/lib/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Version
2
- VERSION = '0.2.0'
2
+ VERSION = '0.2.1'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jinzhu-grb
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jinzhu Zhang
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-07-21 00:00:00 -07:00
12
+ date: 2009-07-29 00:00:00 -07:00
13
13
  default_executable: grb
14
14
  dependencies: []
15
15
 
@@ -32,6 +32,7 @@ files:
32
32
  - grb.gemspec
33
33
  has_rdoc: false
34
34
  homepage: http://www.zhangjinzhu.com
35
+ licenses:
35
36
  post_install_message:
36
37
  rdoc_options:
37
38
  - --line-numbers
@@ -57,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
57
58
  requirements: []
58
59
 
59
60
  rubyforge_project: grb
60
- rubygems_version: 1.2.0
61
+ rubygems_version: 1.3.5
61
62
  signing_key:
62
63
  specification_version: 3
63
64
  summary: grb