jbox-gitolite 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b1dfeab7848cf1eb5e130efcac532ca6afccde5
-  data.tar.gz: 34204cb193b90546c804005f37e55474ba74dd6a
+  metadata.gz: 924ca44ab58ad40b51697d19ae47757b2a38efeb
+  data.tar.gz: dffc990f7e0d90bfa9a74f09094a17debf32520e
 SHA512:
-  metadata.gz: 876e44980fe3a6b84a5a29bf814c87a1a76e69a67421151e409bd89b35d4de9ff7ad7fb8607bcd90ab2ca46c68cb568930a02334a1c38b4e172969dfd0848fcc
-  data.tar.gz: 376fb7682e0799684a75fb7dccb47d0bcc2f2c76e721d45f7070f2930533fd9a4b2d46bfabd946efd82b63fa696ab3b6c42357b0e5817ffd9189e6fc854d68b2
+  metadata.gz: 8deb10d40c33640b31d9fa29bf03e17d1060df4b655e22d8df745861d066df7ba9102578cb7415748a0268406b1168d395f7c5bcaef1d2efeed0195d1833b556
+  data.tar.gz: de7e145ed8e982a96ffbc40d940ee2d50dd3c23adf0bd24ad76ad49dd41852b51846b9161c90bae49a82720e19c3e160445a69d5a81a5cb0639249c015f1b64b

data/README.markdown

@@ -10,13 +10,13 @@ This gem can still have problems.  Please file an issue if you encounter a bug.
 * Allows for the bootstrapping of a gitolite-admin repository
 
 ## Requirements ##
-* Ruby 1.8.x or 1.9.x
+* Ruby 1.9.x or 2.0.x
 * a working [gitolite](https://github.com/sitaramc/gitolite) installation
 * the <tt>gitolite-admin</tt> repository checked out locally
 
 ## Installation ##
 
-    gem install gitolite
+    gem install jbox-gitolite
 
 ## Usage ##
 
@@ -108,17 +108,21 @@ This method can only be called on an existing gitolite-admin repo.  If you need
 
 ### Save changes ###
 
-    ga_repo.save
+    ga_repo.save(commit_message)
 
-When this method is called, all changes get written to the file system and staged in git.  For the time being, gitolite assumes full control of the gitolite-admin repository.  This means that any keys in the keydir that are not being tracked will be removed and any human changes to gitolite.conf will be erased.
+When this method is called, all changes get written to the file system and commited in git.  For the time being, gitolite assumes full control of the gitolite-admin repository.  This means that any keys in the keydir that are not being tracked will be removed and any human changes to gitolite.conf will be erased.
+The commit message is optional. A generic message is set if missing.
 
 ### Apply changes ###
     ga_repo.apply
 
-This method will commit all changes with a generic message (will be improved upon later) and push to <tt>origin master</tt>.
+This method will push all changes to <tt>origin master</tt>.
 
 ### Save and apply ###
-    ga_repo.save_and_apply
+    ga_repo.save_and_apply(commit_message)
+
+This method will add files, commit and push all changes to <tt>origin master</tt> in the same transaction.
+The commit message is optional. A generic message is set if missing.
 
 ### Updating remote changes ###
     #In order to avoid conflicts, this will perform a reset! by default
@@ -170,7 +174,9 @@ The gitolite gem, on the other hand, will <em>always</em> output groups so that
     @groupb = jim @groupa
 
 ## Issues ##
-* Gem is not thread safe.  For now, the gem will change directories in order to perform git operations.  It will, however, return to the old working directory once it is finished.  I am looking into making the gem thread safe.  Note that this is only an issue on Rubies that do not have a GIL (ex jRuby or Rubinius)
+* Gem is not fully thread safe.  For some method, the gem will change directories in order to perform git operations (only for <tt>reset, update and bootstrap method</tt>).
+The <tt>save, apply and save_and_apply</tt> methods are thread safe.
+Note that this is only an issue on Rubies that do not have a GIL (ex jRuby or Rubinius)
 
 # Contributing #
 * Tests!  If you ask me to pull changes that are not adequately tested,  I'm not going to do it.
@@ -184,7 +190,7 @@ The gitolite gem, on the other hand, will <em>always</em> output groups so that
 * Rdoc is coming eventually
 
 ## Future ##
+* Make the gem thread safe (finish the job)
 * support folders in the keydir
 * support include tags
 * cleanup methods to make adding and removing easier (like add_key should accept an array of keys)
-* Make the gem thread safe

data/lib/gitolite/gitolite_admin.rb

@@ -62,7 +62,7 @@ module Gitolite
 
     #Writes all changed aspects out to the file system
     #will also stage all changes
-    def save(commit_message)
+    def save(commit_message = DEFAULT_COMMIT_MSG)
       confdir = File.join(@gl_admin.working_dir, @confdir)
       keydir  = File.join(@gl_admin.working_dir, @keydir)
 

data/lib/gitolite/version.rb

@@ -1,3 +1,3 @@
 module Gitolite
-  VERSION = "1.1.8"
+  VERSION = "1.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbox-gitolite
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - Nicolas Rodriguez