jbox-gitolite 1.1.9 → 1.1.10

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.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +6 -0
  3. data/README.markdown +1 -1
  4. data/Rakefile +2 -0
  5. data/gitolite.gemspec +3 -1
  6. data/lib/gitolite/gitolite_admin.rb +5 -5
  7. data/lib/gitolite/version.rb +1 -1
  8. data/spec/repo_spec.rb +0 -1
  9. data/spec/spec_helper.rb +5 -0
  10. metadata +75 -25
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 924ca44ab58ad40b51697d19ae47757b2a38efeb
4
- data.tar.gz: dffc990f7e0d90bfa9a74f09094a17debf32520e
3
+ metadata.gz: 2b2c9b563847ffc8bdca2044d65da8a8a8efcd2a
4
+ data.tar.gz: 9c7e61206ac0aeae49440f6c41e0f5b776c1f453
5
5
  SHA512:
6
- metadata.gz: 8deb10d40c33640b31d9fa29bf03e17d1060df4b655e22d8df745861d066df7ba9102578cb7415748a0268406b1168d395f7c5bcaef1d2efeed0195d1833b556
7
- data.tar.gz: de7e145ed8e982a96ffbc40d940ee2d50dd3c23adf0bd24ad76ad49dd41852b51846b9161c90bae49a82720e19c3e160445a69d5a81a5cb0639249c015f1b64b
6
+ metadata.gz: 57785aa12ad576d43f83cda8d89ba37c064533d0265a4c476ac31853f0022bea6d8f291bc96ff43164d403cfd15d814249a047d3cb01c31e4b06660ec08cc5bb
7
+ data.tar.gz: 1d7e3a63fdf86ab86da9d32addfcd4b9756124011f8c9343fbc592c91565991c3f2bcf55eab7c98960ef0b06d943c589aa9b236bb5a37d2d9b7a466dff120214
data/.travis.yml CHANGED
@@ -1,4 +1,10 @@
1
1
  language: ruby
2
2
  rvm:
3
3
  - 1.9.3
4
+ - jruby-19mode
4
5
  - rbx-19mode
6
+ jdk:
7
+ - openjdk6
8
+ gemfile:
9
+ - Gemfile
10
+
data/README.markdown CHANGED
@@ -1,4 +1,4 @@
1
- # gitolite [![Build Status](https://secure.travis-ci.org/wingrunr21/gitolite.png)](http://travis-ci.org/wingrunr21/gitolite)
1
+ # gitolite [![Build Status](https://travis-ci.org/jbox-web/gitolite.png)](https://travis-ci.org/jbox-web/gitolite)
2
2
 
3
3
  This gem is designed to provide a Ruby interface to the [gitolite](https://github.com/sitaramc/gitolite) git backend system. I am aiming to provide all management functionality that is available via the gitolite-admin repository (like SSH keys, repository permissions, etc)
4
4
 
data/Rakefile CHANGED
@@ -2,6 +2,8 @@ require 'bundler'
2
2
  Bundler::GemHelper.install_tasks
3
3
  require 'rspec/core/rake_task'
4
4
 
5
+ require 'ci/reporter/rake/rspec'
6
+
5
7
  # Rake tasks from https://github.com/mojombo/rakegem/blob/master/Rakefile
6
8
 
7
9
  # Helper Functions
data/gitolite.gemspec CHANGED
@@ -18,7 +18,9 @@ Gem::Specification.new do |s|
18
18
  s.add_development_dependency "rspec", "~> 2.9.0"
19
19
  s.add_development_dependency "forgery", "~> 0.5.0"
20
20
  s.add_development_dependency "rdoc", "~> 3.12"
21
- s.add_development_dependency "simplecov", "~> 0.6.2"
21
+ s.add_development_dependency "simplecov"
22
+ s.add_development_dependency "simplecov-rcov"
23
+ s.add_development_dependency "ci_reporter"
22
24
  s.add_development_dependency "rake", "~> 10.0.2"
23
25
 
24
26
  s.add_dependency "gitlab-grit", "~> 2.6.0"
data/lib/gitolite/gitolite_admin.rb CHANGED
@@ -7,6 +7,7 @@ module Gitolite
7
7
  CONF = "gitolite.conf"
8
8
  CONFDIR = "conf"
9
9
  KEYDIR = "keydir"
10
+ DEBUG = false
10
11
 
11
12
  #Gitolite gem's default git commit message
12
13
  DEFAULT_COMMIT_MSG = "Committed by the gitolite gem"
@@ -20,6 +21,7 @@ module Gitolite
20
21
  @conf = options[:conf] || CONF
21
22
  @confdir = options[:confdir] || CONFDIR
22
23
  @keydir = options[:keydir] || KEYDIR
24
+ Grit.debug = options[:debug] || DEBUG
23
25
  end
24
26
 
25
27
  # This method will bootstrap a gitolite-admin repo
@@ -92,7 +94,7 @@ module Gitolite
92
94
  end
93
95
  end
94
96
 
95
- @gl_admin.commit_index(commit_message)
97
+ @gl_admin.git.native(:commit, {:chdir => @gl_admin.working_dir}, '-a', '-m', commit_message)
96
98
  end
97
99
 
98
100
  # This method will destroy all local tracked changes, resetting the local gitolite
@@ -126,13 +128,11 @@ module Gitolite
126
128
 
127
129
  # Updates the repo with changes from remote master
128
130
  def update(options = {})
129
- options = {:reset => true, :rebase => false }.merge(options)
131
+ options = {:reset => true, :rebase => false}.merge(options)
130
132
 
131
133
  reset! if options[:reset]
132
134
 
133
- Dir.chdir(@gl_admin.working_dir) do
134
- @gl_admin.git.pull({:rebase => options[:rebase]}, "origin", "master")
135
- end
135
+ @gl_admin.git.native(:pull, {:chdir => @gl_admin.working_dir, :rebase => options[:rebase]}, "origin", "master")
136
136
 
137
137
  reload!
138
138
  end
data/lib/gitolite/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Gitolite
2
- VERSION = "1.1.9"
2
+ VERSION = "1.1.10"
3
3
  end
data/spec/repo_spec.rb CHANGED
@@ -1,4 +1,3 @@
1
- require 'hashery'
2
1
  require 'gitolite/config/repo'
3
2
  require 'spec_helper'
4
3
 
data/spec/spec_helper.rb CHANGED
@@ -1,2 +1,7 @@
1
1
  require 'forgery'
2
2
  require 'tmpdir'
3
+
4
+ require 'simplecov'
5
+ require 'simplecov-rcov'
6
+ SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
7
+ SimpleCov.start 'rails'
metadata CHANGED
@@ -1,111 +1,139 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jbox-gitolite
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.9
4
+ version: 1.1.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nicolas Rodriguez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-08-22 00:00:00.000000000 Z
11
+ date: 2014-03-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: 2.9.0
20
20
  type: :development
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: 2.9.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: forgery
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: 0.5.0
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: 0.5.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rdoc
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ~>
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
47
  version: '3.12'
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ~>
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
54
  version: '3.12'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: simplecov
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ~>
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
- version: 0.6.2
61
+ version: '0'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ~>
66
+ - - ">="
67
67
  - !ruby/object:Gem::Version
68
- version: 0.6.2
68
+ version: '0'
69
+ - !ruby/object:Gem::Dependency
70
+ name: simplecov-rcov
71
+ requirement: !ruby/object:Gem::Requirement
72
+ requirements:
73
+ - - ">="
74
+ - !ruby/object:Gem::Version
75
+ version: '0'
76
+ type: :development
77
+ prerelease: false
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - ">="
81
+ - !ruby/object:Gem::Version
82
+ version: '0'
83
+ - !ruby/object:Gem::Dependency
84
+ name: ci_reporter
85
+ requirement: !ruby/object:Gem::Requirement
86
+ requirements:
87
+ - - ">="
88
+ - !ruby/object:Gem::Version
89
+ version: '0'
90
+ type: :development
91
+ prerelease: false
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - ">="
95
+ - !ruby/object:Gem::Version
96
+ version: '0'
69
97
  - !ruby/object:Gem::Dependency
70
98
  name: rake
71
99
  requirement: !ruby/object:Gem::Requirement
72
100
  requirements:
73
- - - ~>
101
+ - - "~>"
74
102
  - !ruby/object:Gem::Version
75
103
  version: 10.0.2
76
104
  type: :development
77
105
  prerelease: false
78
106
  version_requirements: !ruby/object:Gem::Requirement
79
107
  requirements:
80
- - - ~>
108
+ - - "~>"
81
109
  - !ruby/object:Gem::Version
82
110
  version: 10.0.2
83
111
  - !ruby/object:Gem::Dependency
84
112
  name: gitlab-grit
85
113
  requirement: !ruby/object:Gem::Requirement
86
114
  requirements:
87
- - - ~>
115
+ - - "~>"
88
116
  - !ruby/object:Gem::Version
89
117
  version: 2.6.0
90
118
  type: :runtime
91
119
  prerelease: false
92
120
  version_requirements: !ruby/object:Gem::Requirement
93
121
  requirements:
94
- - - ~>
122
+ - - "~>"
95
123
  - !ruby/object:Gem::Version
96
124
  version: 2.6.0
97
125
  - !ruby/object:Gem::Dependency
98
126
  name: gratr19
99
127
  requirement: !ruby/object:Gem::Requirement
100
128
  requirements:
101
- - - ~>
129
+ - - "~>"
102
130
  - !ruby/object:Gem::Version
103
131
  version: 0.4.4.1
104
132
  type: :runtime
105
133
  prerelease: false
106
134
  version_requirements: !ruby/object:Gem::Requirement
107
135
  requirements:
108
- - - ~>
136
+ - - "~>"
109
137
  - !ruby/object:Gem::Version
110
138
  version: 0.4.4.1
111
139
  description: This gem is designed to provide a Ruby interface to the gitolite git
@@ -117,9 +145,9 @@ executables: []
117
145
  extensions: []
118
146
  extra_rdoc_files: []
119
147
  files:
120
- - .gemtest
121
- - .gitignore
122
- - .travis.yml
148
+ - ".gemtest"
149
+ - ".gitignore"
150
+ - ".travis.yml"
123
151
  - Gemfile
124
152
  - LICENSE
125
153
  - README.markdown
@@ -165,19 +193,41 @@ require_paths:
165
193
  - lib
166
194
  required_ruby_version: !ruby/object:Gem::Requirement
167
195
  requirements:
168
- - - '>='
196
+ - - ">="
169
197
  - !ruby/object:Gem::Version
170
198
  version: '0'
171
199
  required_rubygems_version: !ruby/object:Gem::Requirement
172
200
  requirements:
173
- - - '>='
201
+ - - ">="
174
202
  - !ruby/object:Gem::Version
175
203
  version: '0'
176
204
  requirements: []
177
205
  rubyforge_project: jbox-gitolite
178
- rubygems_version: 2.0.3
206
+ rubygems_version: 2.2.2
179
207
  signing_key:
180
208
  specification_version: 4
181
209
  summary: A Ruby gem for manipulating the gitolite git backend via the gitolite-admin
182
210
  repository.
183
- test_files: []
211
+ test_files:
212
+ - spec/concurrency_spec.rb
213
+ - spec/config_spec.rb
214
+ - spec/configs/complicated.conf
215
+ - spec/configs/simple.conf
216
+ - spec/dirty_proxy_spec.rb
217
+ - spec/gitolite_admin_spec.rb
218
+ - spec/group_spec.rb
219
+ - spec/keys/bob-ins@zilla-site.com@desktop.pub
220
+ - spec/keys/bob.joe@test.zilla.com@desktop.pub
221
+ - spec/keys/bob.pub
222
+ - spec/keys/bob@desktop.pub
223
+ - spec/keys/bob@foo-bar.pub
224
+ - spec/keys/bob@zilla.com.pub
225
+ - spec/keys/bob@zilla.com@desktop.pub
226
+ - spec/keys/jakub123.pub
227
+ - spec/keys/jakub123@foo.net.pub
228
+ - spec/keys/joe-bob@god-zilla.com@desktop.pub
229
+ - spec/keys/joe@sch.ool.edu.pub
230
+ - spec/keys/joe@sch.ool.edu@desktop.pub
231
+ - spec/repo_spec.rb
232
+ - spec/spec_helper.rb
233
+ - spec/ssh_key_spec.rb