gollum-lib 4.2.2-java → 4.2.3-java

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -2
  3. data/README.md +1 -2
  4. data/gemspec.rb +2 -2
  5. data/gollum-lib.gemspec +5 -1
  6. data/lib/gollum-lib/filter/plantuml.rb +11 -2
  7. data/lib/gollum-lib/version.rb +1 -1
  8. metadata +58 -58
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d251ccb17ef08c54c7619aff450d52fee60afd1a
4
- data.tar.gz: 94929bd617697704de1c9be1b1e5fe643b1a11e3
3
+ metadata.gz: 6ded07e2b36fec1626c023f0322369999ab006f5
4
+ data.tar.gz: 8766a772511fde18d35363f9b918203bd372f07e
5
5
  SHA512:
6
- metadata.gz: 46672d43228533de53ac6b584b1207bdf5e92d0efb90117a68d8f9ec0ce283007bef43b7d46854273abaa53d4e80fd0a7b7f32ded2a38a5c7503d38e71857dd9
7
- data.tar.gz: e0eeea8a09af09489d7b7790ef73a9488f4a8aeba797fd092ff5703ef66db87ef1af4ac78b68f24ce52ed8e768bcbf1a33c2215dd728618ea8c241d821553370
6
+ metadata.gz: 7b853a8b58932f43096f924133b21427534e8f2f6af234feba33a44dc874c6aef1a0c0cc207b85087e3ff641183aeb4f3183793e84416ad233974e12036be181
7
+ data.tar.gz: e023f0be2a3efdcf1d7707cc0da7d711eab8fd150896d31a8935cae898a39f99b1d1a6355e9fa5b9a4896a68e4c11a67cd03a1c6d96147dc759020569bbecdcf
data/Gemfile CHANGED
@@ -1,3 +1,2 @@
1
1
  source 'https://rubygems.org'
2
-
3
- gemspec :name => RUBY_PLATFORM == 'java' ? 'gollum-lib_java' : 'gollum-lib'
2
+ gemspec :name => 'gollum-lib'
data/README.md CHANGED
@@ -19,8 +19,7 @@ Gollum-lib follows the rules of [Semantic Versioning](http://semver.org/) and us
19
19
 
20
20
  ## SYSTEM REQUIREMENTS
21
21
 
22
- - Python 2.5+ (2.7.3 recommended)
23
- - Ruby 1.9.3+ (1.9.3 recommended)
22
+ - Ruby 1.9.3+ (>2.0 recommended)
24
23
  - Unix like operating system (OS X, Ubuntu, Debian, and more)
25
24
  - Will not work on Windows with the default [grit](https://github.com/github/grit) adapter, but might work via JRuby (please let us know!)
26
25
 
data/gemspec.rb CHANGED
@@ -8,7 +8,7 @@ def specification(version, default_adapter, platform = nil)
8
8
  s.name = 'gollum-lib'
9
9
  s.version = version
10
10
  s.platform = platform if platform
11
- s.date = '2016-11-18'
11
+ s.date = '2017-04-04'
12
12
  s.rubyforge_project = 'gollum-lib'
13
13
  s.license = 'MIT'
14
14
 
@@ -29,7 +29,7 @@ def specification(version, default_adapter, platform = nil)
29
29
  s.add_dependency 'nokogiri', '~> 1.6.4'
30
30
  s.add_dependency 'stringex', '~> 2.6'
31
31
  s.add_dependency 'sanitize', '~> 2.1'
32
- s.add_dependency 'github-markup', '~> 1.4'
32
+ s.add_dependency 'github-markup', '~> 1.6'
33
33
  s.add_dependency 'gemojione', '~> 2.2'
34
34
 
35
35
  s.add_development_dependency 'org-ruby', '~> 0.9.9'
data/gollum-lib.gemspec CHANGED
@@ -1,4 +1,8 @@
1
1
  require File.join(File.dirname(__FILE__), 'gemspec.rb')
2
2
  require File.join(File.dirname(__FILE__), 'lib', 'gollum-lib', 'version.rb')
3
- default_adapter = ['gollum-grit_adapter', '~> 1.0']
3
+ if RUBY_PLATFORM == 'java' then
4
+ default_adapter = ['gollum-rjgit_adapter', '~> 0.3']
5
+ else
6
+ default_adapter = ['gollum-grit_adapter', '~> 1.0']
7
+ end
4
8
  Gem::Specification.new &specification(Gollum::Lib::VERSION, default_adapter)
data/lib/gollum-lib/filter/plantuml.rb CHANGED
@@ -45,10 +45,11 @@ class Gollum::Filter::PlantUML < Gollum::Filter
45
45
  # test: Set to true when running tests to skip the server check.
46
46
  #
47
47
  class Configuration
48
- attr_accessor :url, :test
48
+ attr_accessor :url, :test, :verify_ssl
49
49
 
50
50
  def initialize
51
51
  @url = DEFAULT_URL
52
+ @verify_ssl = true
52
53
  @test = false
53
54
  end
54
55
  end
@@ -97,6 +98,10 @@ class Gollum::Filter::PlantUML < Gollum::Filter
97
98
  PlantUML::configuration.test
98
99
  end
99
100
 
101
+ def verify_ssl?
102
+ PlantUML::configuration.verify_ssl
103
+ end
104
+
100
105
  def render_plantuml(id, code)
101
106
  if check_server
102
107
  plantuml_url = gen_url(code)
@@ -159,7 +164,11 @@ class Gollum::Filter::PlantUML < Gollum::Filter
159
164
  def check_server
160
165
  return true if test?
161
166
  check_url = "#{server_url}/SyfFKj2rKt3CoKnELR1Io4ZDoSa70000"
162
- response = Net::HTTP.get_response(URI(check_url))
167
+ uri = URI.parse(check_url)
168
+ http = Net::HTTP.new(uri.host, uri.port)
169
+ http.use_ssl = true if uri.scheme == 'https'
170
+ http.verify_mode = OpenSSL::SSL::VERIFY_NONE unless verify_ssl?
171
+ response = http.request_get(uri.request_uri)
163
172
  return response.is_a?(Net::HTTPSuccess)
164
173
  rescue
165
174
  return false
data/lib/gollum-lib/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Gollum
2
2
  module Lib
3
- VERSION = '4.2.2'
3
+ VERSION = '4.2.3'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gollum-lib
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.2.2
4
+ version: 4.2.3
5
5
  platform: java
6
6
  authors:
7
7
  - Tom Preston-Werner
@@ -9,356 +9,356 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-11-18 00:00:00.000000000 Z
12
+ date: 2017-04-04 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: gollum-rjgit_adapter
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - ~>
18
+ - - "~>"
19
19
  - !ruby/object:Gem::Version
20
20
  version: '0.3'
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
- - - ~>
25
+ - - "~>"
26
26
  - !ruby/object:Gem::Version
27
27
  version: '0.3'
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: rouge
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - ~>
32
+ - - "~>"
33
33
  - !ruby/object:Gem::Version
34
34
  version: '2.0'
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
- - - ~>
39
+ - - "~>"
40
40
  - !ruby/object:Gem::Version
41
41
  version: '2.0'
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: nokogiri
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
- - - ~>
46
+ - - "~>"
47
47
  - !ruby/object:Gem::Version
48
48
  version: 1.6.4
49
49
  type: :runtime
50
50
  prerelease: false
51
51
  version_requirements: !ruby/object:Gem::Requirement
52
52
  requirements:
53
- - - ~>
53
+ - - "~>"
54
54
  - !ruby/object:Gem::Version
55
55
  version: 1.6.4
56
56
  - !ruby/object:Gem::Dependency
57
57
  name: stringex
58
58
  requirement: !ruby/object:Gem::Requirement
59
59
  requirements:
60
- - - ~>
60
+ - - "~>"
61
61
  - !ruby/object:Gem::Version
62
62
  version: '2.6'
63
63
  type: :runtime
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
66
66
  requirements:
67
- - - ~>
67
+ - - "~>"
68
68
  - !ruby/object:Gem::Version
69
69
  version: '2.6'
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: sanitize
72
72
  requirement: !ruby/object:Gem::Requirement
73
73
  requirements:
74
- - - ~>
74
+ - - "~>"
75
75
  - !ruby/object:Gem::Version
76
76
  version: '2.1'
77
77
  type: :runtime
78
78
  prerelease: false
79
79
  version_requirements: !ruby/object:Gem::Requirement
80
80
  requirements:
81
- - - ~>
81
+ - - "~>"
82
82
  - !ruby/object:Gem::Version
83
83
  version: '2.1'
84
84
  - !ruby/object:Gem::Dependency
85
85
  name: github-markup
86
86
  requirement: !ruby/object:Gem::Requirement
87
87
  requirements:
88
- - - ~>
88
+ - - "~>"
89
89
  - !ruby/object:Gem::Version
90
- version: '1.4'
90
+ version: '1.6'
91
91
  type: :runtime
92
92
  prerelease: false
93
93
  version_requirements: !ruby/object:Gem::Requirement
94
94
  requirements:
95
- - - ~>
95
+ - - "~>"
96
96
  - !ruby/object:Gem::Version
97
- version: '1.4'
97
+ version: '1.6'
98
98
  - !ruby/object:Gem::Dependency
99
99
  name: gemojione
100
100
  requirement: !ruby/object:Gem::Requirement
101
101
  requirements:
102
- - - ~>
102
+ - - "~>"
103
103
  - !ruby/object:Gem::Version
104
104
  version: '2.2'
105
105
  type: :runtime
106
106
  prerelease: false
107
107
  version_requirements: !ruby/object:Gem::Requirement
108
108
  requirements:
109
- - - ~>
109
+ - - "~>"
110
110
  - !ruby/object:Gem::Version
111
111
  version: '2.2'
112
112
  - !ruby/object:Gem::Dependency
113
113
  name: org-ruby
114
114
  requirement: !ruby/object:Gem::Requirement
115
115
  requirements:
116
- - - ~>
116
+ - - "~>"
117
117
  - !ruby/object:Gem::Version
118
118
  version: 0.9.9
119
119
  type: :development
120
120
  prerelease: false
121
121
  version_requirements: !ruby/object:Gem::Requirement
122
122
  requirements:
123
- - - ~>
123
+ - - "~>"
124
124
  - !ruby/object:Gem::Version
125
125
  version: 0.9.9
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: kramdown
128
128
  requirement: !ruby/object:Gem::Requirement
129
129
  requirements:
130
- - - ~>
130
+ - - "~>"
131
131
  - !ruby/object:Gem::Version
132
132
  version: 1.6.0
133
133
  type: :development
134
134
  prerelease: false
135
135
  version_requirements: !ruby/object:Gem::Requirement
136
136
  requirements:
137
- - - ~>
137
+ - - "~>"
138
138
  - !ruby/object:Gem::Version
139
139
  version: 1.6.0
140
140
  - !ruby/object:Gem::Dependency
141
141
  name: RedCloth
142
142
  requirement: !ruby/object:Gem::Requirement
143
143
  requirements:
144
- - - ~>
144
+ - - "~>"
145
145
  - !ruby/object:Gem::Version
146
146
  version: 4.2.9
147
147
  type: :development
148
148
  prerelease: false
149
149
  version_requirements: !ruby/object:Gem::Requirement
150
150
  requirements:
151
- - - ~>
151
+ - - "~>"
152
152
  - !ruby/object:Gem::Version
153
153
  version: 4.2.9
154
154
  - !ruby/object:Gem::Dependency
155
155
  name: mocha
156
156
  requirement: !ruby/object:Gem::Requirement
157
157
  requirements:
158
- - - ~>
158
+ - - "~>"
159
159
  - !ruby/object:Gem::Version
160
160
  version: 1.1.0
161
161
  type: :development
162
162
  prerelease: false
163
163
  version_requirements: !ruby/object:Gem::Requirement
164
164
  requirements:
165
- - - ~>
165
+ - - "~>"
166
166
  - !ruby/object:Gem::Version
167
167
  version: 1.1.0
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: shoulda
170
170
  requirement: !ruby/object:Gem::Requirement
171
171
  requirements:
172
- - - ~>
172
+ - - "~>"
173
173
  - !ruby/object:Gem::Version
174
174
  version: 3.5.0
175
175
  type: :development
176
176
  prerelease: false
177
177
  version_requirements: !ruby/object:Gem::Requirement
178
178
  requirements:
179
- - - ~>
179
+ - - "~>"
180
180
  - !ruby/object:Gem::Version
181
181
  version: 3.5.0
182
182
  - !ruby/object:Gem::Dependency
183
183
  name: wikicloth
184
184
  requirement: !ruby/object:Gem::Requirement
185
185
  requirements:
186
- - - ~>
186
+ - - "~>"
187
187
  - !ruby/object:Gem::Version
188
188
  version: 0.8.3
189
189
  type: :development
190
190
  prerelease: false
191
191
  version_requirements: !ruby/object:Gem::Requirement
192
192
  requirements:
193
- - - ~>
193
+ - - "~>"
194
194
  - !ruby/object:Gem::Version
195
195
  version: 0.8.3
196
196
  - !ruby/object:Gem::Dependency
197
197
  name: rake
198
198
  requirement: !ruby/object:Gem::Requirement
199
199
  requirements:
200
- - - ~>
200
+ - - "~>"
201
201
  - !ruby/object:Gem::Version
202
202
  version: 10.4.0
203
203
  type: :development
204
204
  prerelease: false
205
205
  version_requirements: !ruby/object:Gem::Requirement
206
206
  requirements:
207
- - - ~>
207
+ - - "~>"
208
208
  - !ruby/object:Gem::Version
209
209
  version: 10.4.0
210
210
  - !ruby/object:Gem::Dependency
211
211
  name: pry
212
212
  requirement: !ruby/object:Gem::Requirement
213
213
  requirements:
214
- - - ~>
214
+ - - "~>"
215
215
  - !ruby/object:Gem::Version
216
216
  version: 0.10.1
217
217
  type: :development
218
218
  prerelease: false
219
219
  version_requirements: !ruby/object:Gem::Requirement
220
220
  requirements:
221
- - - ~>
221
+ - - "~>"
222
222
  - !ruby/object:Gem::Version
223
223
  version: 0.10.1
224
224
  - !ruby/object:Gem::Dependency
225
225
  name: rb-readline
226
226
  requirement: !ruby/object:Gem::Requirement
227
227
  requirements:
228
- - - ~>
228
+ - - "~>"
229
229
  - !ruby/object:Gem::Version
230
230
  version: 0.5.1
231
231
  type: :development
232
232
  prerelease: false
233
233
  version_requirements: !ruby/object:Gem::Requirement
234
234
  requirements:
235
- - - ~>
235
+ - - "~>"
236
236
  - !ruby/object:Gem::Version
237
237
  version: 0.5.1
238
238
  - !ruby/object:Gem::Dependency
239
239
  name: test-unit
240
240
  requirement: !ruby/object:Gem::Requirement
241
241
  requirements:
242
- - - ~>
242
+ - - "~>"
243
243
  - !ruby/object:Gem::Version
244
244
  version: 3.1.5
245
245
  type: :development
246
246
  prerelease: false
247
247
  version_requirements: !ruby/object:Gem::Requirement
248
248
  requirements:
249
- - - ~>
249
+ - - "~>"
250
250
  - !ruby/object:Gem::Version
251
251
  version: 3.1.5
252
252
  - !ruby/object:Gem::Dependency
253
253
  name: minitest-reporters
254
254
  requirement: !ruby/object:Gem::Requirement
255
255
  requirements:
256
- - - ~>
256
+ - - "~>"
257
257
  - !ruby/object:Gem::Version
258
258
  version: 0.14.16
259
259
  type: :development
260
260
  prerelease: false
261
261
  version_requirements: !ruby/object:Gem::Requirement
262
262
  requirements:
263
- - - ~>
263
+ - - "~>"
264
264
  - !ruby/object:Gem::Version
265
265
  version: 0.14.16
266
266
  - !ruby/object:Gem::Dependency
267
267
  name: nokogiri-diff
268
268
  requirement: !ruby/object:Gem::Requirement
269
269
  requirements:
270
- - - ~>
270
+ - - "~>"
271
271
  - !ruby/object:Gem::Version
272
272
  version: 0.2.0
273
273
  type: :development
274
274
  prerelease: false
275
275
  version_requirements: !ruby/object:Gem::Requirement
276
276
  requirements:
277
- - - ~>
277
+ - - "~>"
278
278
  - !ruby/object:Gem::Version
279
279
  version: 0.2.0
280
280
  - !ruby/object:Gem::Dependency
281
281
  name: guard
282
282
  requirement: !ruby/object:Gem::Requirement
283
283
  requirements:
284
- - - ~>
284
+ - - "~>"
285
285
  - !ruby/object:Gem::Version
286
286
  version: 2.8.2
287
287
  type: :development
288
288
  prerelease: false
289
289
  version_requirements: !ruby/object:Gem::Requirement
290
290
  requirements:
291
- - - ~>
291
+ - - "~>"
292
292
  - !ruby/object:Gem::Version
293
293
  version: 2.8.2
294
294
  - !ruby/object:Gem::Dependency
295
295
  name: guard-minitest
296
296
  requirement: !ruby/object:Gem::Requirement
297
297
  requirements:
298
- - - ~>
298
+ - - "~>"
299
299
  - !ruby/object:Gem::Version
300
300
  version: 2.3.2
301
301
  type: :development
302
302
  prerelease: false
303
303
  version_requirements: !ruby/object:Gem::Requirement
304
304
  requirements:
305
- - - ~>
305
+ - - "~>"
306
306
  - !ruby/object:Gem::Version
307
307
  version: 2.3.2
308
308
  - !ruby/object:Gem::Dependency
309
309
  name: rb-inotify
310
310
  requirement: !ruby/object:Gem::Requirement
311
311
  requirements:
312
- - - ~>
312
+ - - "~>"
313
313
  - !ruby/object:Gem::Version
314
314
  version: 0.9.3
315
315
  type: :development
316
316
  prerelease: false
317
317
  version_requirements: !ruby/object:Gem::Requirement
318
318
  requirements:
319
- - - ~>
319
+ - - "~>"
320
320
  - !ruby/object:Gem::Version
321
321
  version: 0.9.3
322
322
  - !ruby/object:Gem::Dependency
323
323
  name: rb-fsevent
324
324
  requirement: !ruby/object:Gem::Requirement
325
325
  requirements:
326
- - - ~>
326
+ - - "~>"
327
327
  - !ruby/object:Gem::Version
328
328
  version: 0.9.4
329
329
  type: :development
330
330
  prerelease: false
331
331
  version_requirements: !ruby/object:Gem::Requirement
332
332
  requirements:
333
- - - ~>
333
+ - - "~>"
334
334
  - !ruby/object:Gem::Version
335
335
  version: 0.9.4
336
336
  - !ruby/object:Gem::Dependency
337
337
  name: rb-fchange
338
338
  requirement: !ruby/object:Gem::Requirement
339
339
  requirements:
340
- - - ~>
340
+ - - "~>"
341
341
  - !ruby/object:Gem::Version
342
342
  version: 0.0.6
343
343
  type: :development
344
344
  prerelease: false
345
345
  version_requirements: !ruby/object:Gem::Requirement
346
346
  requirements:
347
- - - ~>
347
+ - - "~>"
348
348
  - !ruby/object:Gem::Version
349
349
  version: 0.0.6
350
350
  - !ruby/object:Gem::Dependency
351
351
  name: twitter_cldr
352
352
  requirement: !ruby/object:Gem::Requirement
353
353
  requirements:
354
- - - ~>
354
+ - - "~>"
355
355
  - !ruby/object:Gem::Version
356
356
  version: 3.1.0
357
357
  type: :development
358
358
  prerelease: false
359
359
  version_requirements: !ruby/object:Gem::Requirement
360
360
  requirements:
361
- - - ~>
361
+ - - "~>"
362
362
  - !ruby/object:Gem::Version
363
363
  version: 3.1.0
364
364
  description: A simple, Git-powered wiki with a sweet API and local frontend.
@@ -419,22 +419,22 @@ licenses:
419
419
  metadata: {}
420
420
  post_install_message:
421
421
  rdoc_options:
422
- - --charset=UTF-8
422
+ - "--charset=UTF-8"
423
423
  require_paths:
424
424
  - lib
425
425
  required_ruby_version: !ruby/object:Gem::Requirement
426
426
  requirements:
427
- - - '>='
427
+ - - ">="
428
428
  - !ruby/object:Gem::Version
429
429
  version: '1.9'
430
430
  required_rubygems_version: !ruby/object:Gem::Requirement
431
431
  requirements:
432
- - - '>='
432
+ - - ">="
433
433
  - !ruby/object:Gem::Version
434
434
  version: '0'
435
435
  requirements: []
436
436
  rubyforge_project: gollum-lib
437
- rubygems_version: 2.2.2
437
+ rubygems_version: 2.6.11
438
438
  signing_key:
439
439
  specification_version: 2
440
440
  summary: A simple, Git-powered wiki.