gold 0.4.3 → 0.4.4
Sign up to get free protection for your applications and to get access to all the features.
- data/History.txt +6 -1
- data/{README.txt → README.rdoc} +33 -28
- data/lib/gold.rb +3 -3
- metadata +15 -8
data/History.txt
CHANGED
@@ -1,6 +1,11 @@
|
|
1
|
+
== 0.4.4 2010-04-16
|
2
|
+
|
3
|
+
* 1 minor enhancement:
|
4
|
+
* Added 'gold_master' setting for developer.
|
5
|
+
|
1
6
|
== 0.4.3 2009-02-09
|
2
7
|
|
3
|
-
* 2 minor
|
8
|
+
* 2 minor enhancements:
|
4
9
|
* Added a gold_master setting (reviewer only).
|
5
10
|
* Gave other settings a better message (at least I tried).
|
6
11
|
|
data/{README.txt → README.rdoc}
RENAMED
@@ -24,44 +24,49 @@ You need to update the Settings in the 'gold' script to match your own project a
|
|
24
24
|
Developer setup
|
25
25
|
---------------
|
26
26
|
|
27
|
-
1. login on github (John)
|
28
|
-
2. fork sandbox
|
29
|
-
3. on local machine, clone your own fork
|
30
|
-
> git clone git@github.com:john/PROJECT.git
|
31
|
-
> cd PROJECT
|
32
|
-
> gold setup
|
27
|
+
1. login on github (John)
|
28
|
+
2. fork sandbox
|
29
|
+
3. on local machine, clone your own fork
|
30
|
+
> git clone git@github.com:john/PROJECT.git
|
31
|
+
> cd PROJECT
|
32
|
+
> gold setup
|
33
33
|
|
34
34
|
Working on new 'floppy' feature
|
35
35
|
-------------------------------
|
36
36
|
|
37
37
|
[John] (developer, on his own fork)
|
38
|
-
|
39
|
-
> git
|
40
|
-
> git
|
41
|
-
>
|
42
|
-
|
43
|
-
|
38
|
+
|
39
|
+
> git checkout gold
|
40
|
+
> git pull
|
41
|
+
> git checkout -b floppy
|
42
|
+
> commit, commit
|
43
|
+
# propose
|
44
|
+
> gold propose
|
44
45
|
|
45
46
|
[reviewer]
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
47
|
+
|
48
|
+
# only if john is not a remote yet
|
49
|
+
> gold add_dev john
|
50
|
+
# review
|
51
|
+
> gold review john/floppy
|
52
|
+
# fail
|
53
|
+
> gold fail
|
52
54
|
|
53
55
|
[John]
|
54
|
-
|
55
|
-
|
56
|
-
|
56
|
+
|
57
|
+
> reset, commit, squash, etc
|
58
|
+
# propose again
|
59
|
+
> gold propose
|
57
60
|
|
58
61
|
[reviewer]
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
62
|
+
|
63
|
+
# review
|
64
|
+
> gold review john/floppy
|
65
|
+
# ok
|
66
|
+
> gold ok
|
63
67
|
|
64
68
|
[John]
|
65
|
-
|
66
|
-
|
67
|
-
>
|
69
|
+
|
70
|
+
# cleanup
|
71
|
+
> git co floppy
|
72
|
+
> gold cleanup
|
data/lib/gold.rb
CHANGED
@@ -12,7 +12,7 @@ require 'yaml'
|
|
12
12
|
# TODO: move Settings inside each project ?
|
13
13
|
|
14
14
|
class Gold
|
15
|
-
VERSION = '0.4.
|
15
|
+
VERSION = '0.4.4'
|
16
16
|
|
17
17
|
DefaultSettings = {
|
18
18
|
'gold_branch' => 'gold', # name of local branch tracking gold master (in developer's local git)
|
@@ -31,7 +31,7 @@ class Gold
|
|
31
31
|
'4. developer_name' => 'developer\'s account on remote repository',
|
32
32
|
'5. developer_email' => 'developer\'s email',
|
33
33
|
'6. reviewer' => 'reviewer\'s email',
|
34
|
-
'7. gold_master' => '
|
34
|
+
'7. gold_master' => 'name of current "gold" branch (usually "master")'
|
35
35
|
}
|
36
36
|
|
37
37
|
DefaultSettings.keys.each do |k|
|
@@ -70,7 +70,7 @@ class Gold
|
|
70
70
|
return error("Could not create settings file #{settings_path.inspect}.") unless create_settings_file
|
71
71
|
return error("Could create remote #{gold_remote}.") unless system("git remote add #{gold_remote} #{gold_repository}")
|
72
72
|
return error("Could not fetch #{gold_remote}.") unless system("git fetch #{gold_remote}")
|
73
|
-
return error("Could not create #{gold_branch} branch.") unless system("git checkout --track -b #{gold_branch} #{gold_remote}
|
73
|
+
return error("Could not create #{gold_branch} branch.") unless system("git checkout --track -b #{gold_branch} #{gold_remote}/#{gold_master}")
|
74
74
|
end
|
75
75
|
|
76
76
|
def rebase
|
metadata
CHANGED
@@ -1,7 +1,12 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: gold
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
|
4
|
+
prerelease: false
|
5
|
+
segments:
|
6
|
+
- 0
|
7
|
+
- 4
|
8
|
+
- 4
|
9
|
+
version: 0.4.4
|
5
10
|
platform: ruby
|
6
11
|
authors:
|
7
12
|
- Gaspard Bucher
|
@@ -9,7 +14,7 @@ autorequire:
|
|
9
14
|
bindir: bin
|
10
15
|
cert_chain: []
|
11
16
|
|
12
|
-
date: 2010-
|
17
|
+
date: 2010-04-16 00:00:00 +02:00
|
13
18
|
default_executable: gold
|
14
19
|
dependencies: []
|
15
20
|
|
@@ -33,11 +38,11 @@ extensions: []
|
|
33
38
|
|
34
39
|
extra_rdoc_files:
|
35
40
|
- History.txt
|
36
|
-
- README.
|
41
|
+
- README.rdoc
|
37
42
|
- bin/gold
|
38
43
|
files:
|
39
44
|
- History.txt
|
40
|
-
- README.
|
45
|
+
- README.rdoc
|
41
46
|
- bin/gold
|
42
47
|
- lib/gold.rb
|
43
48
|
has_rdoc: true
|
@@ -47,25 +52,27 @@ licenses: []
|
|
47
52
|
post_install_message:
|
48
53
|
rdoc_options:
|
49
54
|
- --main
|
50
|
-
- README.
|
55
|
+
- README.rdoc
|
51
56
|
require_paths:
|
52
57
|
- lib
|
53
58
|
required_ruby_version: !ruby/object:Gem::Requirement
|
54
59
|
requirements:
|
55
60
|
- - ">="
|
56
61
|
- !ruby/object:Gem::Version
|
62
|
+
segments:
|
63
|
+
- 0
|
57
64
|
version: "0"
|
58
|
-
version:
|
59
65
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
60
66
|
requirements:
|
61
67
|
- - ">="
|
62
68
|
- !ruby/object:Gem::Version
|
69
|
+
segments:
|
70
|
+
- 0
|
63
71
|
version: "0"
|
64
|
-
version:
|
65
72
|
requirements: []
|
66
73
|
|
67
74
|
rubyforge_project: gold
|
68
|
-
rubygems_version: 1.3.
|
75
|
+
rubygems_version: 1.3.6
|
69
76
|
signing_key:
|
70
77
|
specification_version: 3
|
71
78
|
summary: Gold is a simple executable that helps git teamwork.
|