jbox-gitolite 1.2.3 → 1.2.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +7 -0
- data/lib/gitolite/gitolite_admin.rb +15 -9
- data/lib/gitolite/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b4253d62c4de6da94cf98aaf8256530f1220ed4b
|
4
|
+
data.tar.gz: d49c94d508240a776dd40e7a340689c619312efa
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7e245a4c9dfdc7555c34456f80b0603aa1c20df05ec822e4809a782f2a4a000f23622d6348cca1e9c374067cbe6bc67d462af6ec7d151aff7847fb0d81ce589e
|
7
|
+
data.tar.gz: 67e90dbb7cd7834c1c287555eeecfcf39c60689ee76f60cd899946b929e43554bf7fb88b2b494091bce330b39fe54d1eb7770eec5f3e78e8440309c5726d729d
|
data/README.md
CHANGED
@@ -4,6 +4,8 @@
|
|
4
4
|
|
5
5
|
This gem is designed to provide a Ruby interface to the [Gitolite](https://github.com/sitaramc/gitolite) Git backend system.
|
6
6
|
|
7
|
+
It is based on [gitlab-grit](https://github.com/gitlabhq/grit) to manage the repository.
|
8
|
+
|
7
9
|
It provides these functionalities :
|
8
10
|
|
9
11
|
* [SSH Public Keys Management](https://github.com/jbox-web/gitolite/wiki/Features#wiki-ssh-public-keys-management)
|
@@ -12,6 +14,11 @@ It provides these functionalities :
|
|
12
14
|
|
13
15
|
You can follow announcements [here](https://github.com/jbox-web/gitolite/wiki/Announcements) or take a look at the [roadmap](https://github.com/jbox-web/gitolite/wiki/Roadmap).
|
14
16
|
|
17
|
+
You'll find a new implementation of this library here : https://github.com/oliverguenther/gitolite-rugged.
|
18
|
+
|
19
|
+
The new one is based on https://github.com/libgit2/rugged and provide the same functionalities.
|
20
|
+
|
21
|
+
|
15
22
|
## Code status
|
16
23
|
|
17
24
|
* [![Gem Version](https://badge.fury.io/rb/jbox-gitolite.svg)](http://badge.fury.io/rb/jbox-gitolite)
|
@@ -9,6 +9,9 @@ module Gitolite
|
|
9
9
|
DEBUG = false
|
10
10
|
TIMEOUT = 10
|
11
11
|
|
12
|
+
# See here form mode details :https://github.com/gitlabhq/grit/blob/master/lib/grit/git.rb#L283
|
13
|
+
RAISE_ERROR = true
|
14
|
+
|
12
15
|
# Gitolite gem's default commit message
|
13
16
|
DEFAULT_COMMIT_MSG = "Committed by the gitolite gem"
|
14
17
|
|
@@ -80,7 +83,10 @@ module Gitolite
|
|
80
83
|
@config_file = options[:config_file] || CONFIG_FILE
|
81
84
|
@conf_dir = options[:conf_dir] || CONF_DIR
|
82
85
|
@key_dir = options[:key_dir] || KEY_DIR
|
83
|
-
|
86
|
+
git_env = options[:env] || {}
|
87
|
+
git_raise = options[:raise] || RAISE_ERROR
|
88
|
+
|
89
|
+
@git_options = {:env => git_env, :raise => git_raise}
|
84
90
|
|
85
91
|
@config_file_path = File.join(@path, @conf_dir, @config_file)
|
86
92
|
@conf_dir_path = File.join(@path, @conf_dir)
|
@@ -125,8 +131,8 @@ module Gitolite
|
|
125
131
|
# git repo to HEAD and reloading the entire repository
|
126
132
|
# Note that this will also delete all untracked files
|
127
133
|
def reset!
|
128
|
-
@gl_admin.git.native(:reset,
|
129
|
-
@gl_admin.git.native(:clean,
|
134
|
+
@gl_admin.git.native(:reset, @git_options.merge(:hard => true), 'HEAD')
|
135
|
+
@gl_admin.git.native(:clean, @git_options.merge(:d => true, :q => true, :f => true))
|
130
136
|
reload!
|
131
137
|
end
|
132
138
|
|
@@ -146,7 +152,7 @@ module Gitolite
|
|
146
152
|
#Process config file (if loaded, i.e. may be modified)
|
147
153
|
if @config
|
148
154
|
new_conf = @config.to_file(@conf_dir_path)
|
149
|
-
@gl_admin.git.native(:add,
|
155
|
+
@gl_admin.git.native(:add, @git_options, new_conf)
|
150
156
|
end
|
151
157
|
|
152
158
|
#Process ssh keys (if loaded, i.e. may be modified)
|
@@ -156,7 +162,7 @@ module Gitolite
|
|
156
162
|
|
157
163
|
to_remove = (files - keys).map { |f| File.join(@key_dir, f) }
|
158
164
|
to_remove.each do |key|
|
159
|
-
@gl_admin.git.native(:rm,
|
165
|
+
@gl_admin.git.native(:rm, @git_options, key)
|
160
166
|
end
|
161
167
|
|
162
168
|
@ssh_keys.each_value do |key|
|
@@ -164,7 +170,7 @@ module Gitolite
|
|
164
170
|
next if key.respond_to?(:dirty?) && !key.dirty?
|
165
171
|
key.each do |k|
|
166
172
|
new_key = k.to_file(@key_dir_path)
|
167
|
-
@gl_admin.git.native(:add,
|
173
|
+
@gl_admin.git.native(:add, @git_options, new_key)
|
168
174
|
end
|
169
175
|
end
|
170
176
|
end
|
@@ -179,13 +185,13 @@ module Gitolite
|
|
179
185
|
args << "--author='#{options[:author]}'"
|
180
186
|
end
|
181
187
|
|
182
|
-
@gl_admin.git.native(:commit,
|
188
|
+
@gl_admin.git.native(:commit, @git_options, *args)
|
183
189
|
end
|
184
190
|
|
185
191
|
|
186
192
|
# Push back to origin
|
187
193
|
def apply
|
188
|
-
@gl_admin.git.native(:push,
|
194
|
+
@gl_admin.git.native(:push, @git_options, "origin", "master")
|
189
195
|
end
|
190
196
|
|
191
197
|
|
@@ -202,7 +208,7 @@ module Gitolite
|
|
202
208
|
|
203
209
|
reset! if options[:reset]
|
204
210
|
|
205
|
-
@gl_admin.git.native(:pull,
|
211
|
+
@gl_admin.git.native(:pull, @git_options.merge(:rebase => options[:rebase]), "origin", "master")
|
206
212
|
|
207
213
|
reload!
|
208
214
|
end
|
data/lib/gitolite/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: jbox-gitolite
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.2.
|
4
|
+
version: 1.2.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Nicolas Rodriguez
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-07-
|
11
|
+
date: 2014-07-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|