gold 0.4.3 → 0.4.4

data/History.txt

@@ -1,6 +1,11 @@
+== 0.4.4 2010-04-16
+
+* 1 minor enhancement:
+  * Added 'gold_master' setting for developer.
+
 == 0.4.3 2009-02-09
 
-* 2 minor enhancement:
+* 2 minor enhancements:
   * Added a gold_master setting (reviewer only).
   * Gave other settings a better message (at least I tried).
 

data/{README.txt → README.rdoc}

@@ -24,44 +24,49 @@ You need to update the Settings in the 'gold' script to match your own project a
 Developer setup
 ---------------
 
-1. login on github (John)
-2. fork sandbox
-3. on local machine, clone your own fork
-> git clone git@github.com:john/PROJECT.git
-> cd PROJECT
-> gold setup
+ 1. login on github (John)
+ 2. fork sandbox
+ 3. on local machine, clone your own fork
+ > git clone git@github.com:john/PROJECT.git
+ > cd PROJECT
+ > gold setup
 
 Working on new 'floppy' feature
 -------------------------------
 
 [John] (developer, on his own fork)
-> git checkout gold
-> git pull
-> git checkout -b floppy
-> commit, commit
-# propose
-> gold propose
+
+ > git checkout gold
+ > git pull
+ > git checkout -b floppy
+ > commit, commit
+ # propose
+ > gold propose
 
 [reviewer]
-# only if john is not a remote yet
-> gold add_dev john
-# review
-> gold review john/floppy
-# fail
-> gold fail
+
+ # only if john is not a remote yet
+ > gold add_dev john
+ # review
+ > gold review john/floppy
+ # fail
+ > gold fail
 
 [John]
-> reset, commit, squash, etc
-# propose again
-> gold propose
+
+ > reset, commit, squash, etc
+ # propose again
+ > gold propose
 
 [reviewer]
-# review
-> gold review john/floppy
-# ok
-> gold ok
+
+ # review
+ > gold review john/floppy
+ # ok
+ > gold ok
 
 [John]
-# cleanup
-> git co floppy
-> gold cleanup
+
+ # cleanup
+ > git co floppy
+ > gold cleanup

data/lib/gold.rb

@@ -12,7 +12,7 @@ require 'yaml'
 # TODO: move Settings inside each project ?
 
 class Gold
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 
   DefaultSettings = {
     'gold_branch'     => 'gold',                  # name of local branch tracking gold master (in developer's local git)
@@ -31,7 +31,7 @@ class Gold
     '4. developer_name'  => 'developer\'s account on remote repository',
     '5. developer_email' => 'developer\'s email',
     '6. reviewer'        => 'reviewer\'s email',
-    '7. gold_master'     => 'reviewer only: name of current "gold" branch'
+    '7. gold_master'     => 'name of current "gold" branch (usually "master")'
   }
 
   DefaultSettings.keys.each do |k|
@@ -70,7 +70,7 @@ class Gold
     return error("Could not create settings file #{settings_path.inspect}.") unless create_settings_file
     return error("Could create remote #{gold_remote}.") unless system("git remote add #{gold_remote} #{gold_repository}")
     return error("Could not fetch #{gold_remote}.") unless system("git fetch #{gold_remote}")
-    return error("Could not create #{gold_branch} branch.") unless system("git checkout --track -b #{gold_branch} #{gold_remote}/master")
+    return error("Could not create #{gold_branch} branch.") unless system("git checkout --track -b #{gold_branch} #{gold_remote}/#{gold_master}")
   end
 
   def rebase

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: gold
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 +01:00
+date: 2010-04-16 00:00:00 +02:00
 default_executable: gold
 dependencies: []
 
@@ -33,11 +38,11 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
-- README.txt
+- README.rdoc
 - bin/gold
 files: 
 - History.txt
-- README.txt
+- README.rdoc
 - bin/gold
 - lib/gold.rb
 has_rdoc: true
@@ -47,25 +52,27 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: gold
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Gold is a simple executable that helps git teamwork.