jbox-gitolite 1.1.8 → 1.1.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.markdown +14 -8
- data/lib/gitolite/gitolite_admin.rb +1 -1
- data/lib/gitolite/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 924ca44ab58ad40b51697d19ae47757b2a38efeb
|
4
|
+
data.tar.gz: dffc990f7e0d90bfa9a74f09094a17debf32520e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8deb10d40c33640b31d9fa29bf03e17d1060df4b655e22d8df745861d066df7ba9102578cb7415748a0268406b1168d395f7c5bcaef1d2efeed0195d1833b556
|
7
|
+
data.tar.gz: de7e145ed8e982a96ffbc40d940ee2d50dd3c23adf0bd24ad76ad49dd41852b51846b9161c90bae49a82720e19c3e160445a69d5a81a5cb0639249c015f1b64b
|
data/README.markdown
CHANGED
@@ -10,13 +10,13 @@ This gem can still have problems. Please file an issue if you encounter a bug.
|
|
10
10
|
* Allows for the bootstrapping of a gitolite-admin repository
|
11
11
|
|
12
12
|
## Requirements ##
|
13
|
-
* Ruby 1.
|
13
|
+
* Ruby 1.9.x or 2.0.x
|
14
14
|
* a working [gitolite](https://github.com/sitaramc/gitolite) installation
|
15
15
|
* the <tt>gitolite-admin</tt> repository checked out locally
|
16
16
|
|
17
17
|
## Installation ##
|
18
18
|
|
19
|
-
gem install gitolite
|
19
|
+
gem install jbox-gitolite
|
20
20
|
|
21
21
|
## Usage ##
|
22
22
|
|
@@ -108,17 +108,21 @@ This method can only be called on an existing gitolite-admin repo. If you need
|
|
108
108
|
|
109
109
|
### Save changes ###
|
110
110
|
|
111
|
-
ga_repo.save
|
111
|
+
ga_repo.save(commit_message)
|
112
112
|
|
113
|
-
When this method is called, all changes get written to the file system and
|
113
|
+
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.
|
114
|
+
The commit message is optional. A generic message is set if missing.
|
114
115
|
|
115
116
|
### Apply changes ###
|
116
117
|
ga_repo.apply
|
117
118
|
|
118
|
-
This method will
|
119
|
+
This method will push all changes to <tt>origin master</tt>.
|
119
120
|
|
120
121
|
### Save and apply ###
|
121
|
-
ga_repo.save_and_apply
|
122
|
+
ga_repo.save_and_apply(commit_message)
|
123
|
+
|
124
|
+
This method will add files, commit and push all changes to <tt>origin master</tt> in the same transaction.
|
125
|
+
The commit message is optional. A generic message is set if missing.
|
122
126
|
|
123
127
|
### Updating remote changes ###
|
124
128
|
#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
|
|
170
174
|
@groupb = jim @groupa
|
171
175
|
|
172
176
|
## Issues ##
|
173
|
-
* Gem is not thread safe. For
|
177
|
+
* 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>).
|
178
|
+
The <tt>save, apply and save_and_apply</tt> methods are thread safe.
|
179
|
+
Note that this is only an issue on Rubies that do not have a GIL (ex jRuby or Rubinius)
|
174
180
|
|
175
181
|
# Contributing #
|
176
182
|
* 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
|
|
184
190
|
* Rdoc is coming eventually
|
185
191
|
|
186
192
|
## Future ##
|
193
|
+
* Make the gem thread safe (finish the job)
|
187
194
|
* support folders in the keydir
|
188
195
|
* support include tags
|
189
196
|
* cleanup methods to make adding and removing easier (like add_key should accept an array of keys)
|
190
|
-
* Make the gem thread safe
|
@@ -62,7 +62,7 @@ module Gitolite
|
|
62
62
|
|
63
63
|
#Writes all changed aspects out to the file system
|
64
64
|
#will also stage all changes
|
65
|
-
def save(commit_message)
|
65
|
+
def save(commit_message = DEFAULT_COMMIT_MSG)
|
66
66
|
confdir = File.join(@gl_admin.working_dir, @confdir)
|
67
67
|
keydir = File.join(@gl_admin.working_dir, @keydir)
|
68
68
|
|
data/lib/gitolite/version.rb
CHANGED