giblish 1.0.0 → 2.0.0.pre.alpha1
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/.github/workflows/unit_tests.yml +1 -1
- data/.ruby-version +1 -1
- data/giblish.gemspec +7 -6
- data/lib/giblish/application.rb +4 -4
- data/lib/giblish/cmdline.rb +2 -2
- data/lib/giblish/configurator.rb +4 -4
- data/lib/giblish/docattr_providers.rb +3 -3
- data/lib/giblish/indexbuilders/dotdigraphadoc.rb +4 -4
- data/lib/giblish/search/headingindexer.rb +1 -1
- data/lib/giblish/search/searchquery.rb +6 -6
- data/lib/giblish/version.rb +1 -1
- metadata +17 -23
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8dc5f7111b85423074f87986b2750ce3fa61dbf4364331a80481d0d5cc881673
|
4
|
+
data.tar.gz: 53fd77b1ac62eec70539e744950cfc8f121532f9639eb2bcb860d6142443474f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: baa8d72424dc2cb581e90bf383849cb8043b13ca1aed2c5fe3a4b1d9a20aedccf69f6ac9936e7439ae1887074bf274a47553907bce1ce78decd68da207ca3b91
|
7
|
+
data.tar.gz: b579918b4aa8c68d0f9e1ac57a878e3279b3c8404e6f5e677e91859a6af45983feaca033bf051eff56ac7e4f45556f13faa5b79a7bbcb7fc47f18684b5fa952f
|
data/.ruby-version
CHANGED
@@ -1 +1 @@
|
|
1
|
-
3.
|
1
|
+
3.1.2
|
data/giblish.gemspec
CHANGED
@@ -45,11 +45,12 @@ Gem::Specification.new do |spec|
|
|
45
45
|
spec.require_paths = ["lib"]
|
46
46
|
|
47
47
|
# Development deps
|
48
|
-
spec.add_development_dependency "minitest", "~> 5.
|
49
|
-
spec.add_development_dependency "standard", "~> 1.
|
48
|
+
spec.add_development_dependency "minitest", "~> 5.16"
|
49
|
+
spec.add_development_dependency "standard", "~> 1.16"
|
50
50
|
spec.add_development_dependency "rake", "~> 13.0"
|
51
51
|
spec.add_development_dependency "oga", "~> 3.3"
|
52
|
-
spec.add_development_dependency "thor", "~> 0.20.3"
|
52
|
+
# spec.add_development_dependency "thor", "~> 0.20.3"
|
53
|
+
spec.add_development_dependency "thor", "~> 1.2"
|
53
54
|
spec.add_development_dependency "asciidoctor-mathematical", "~> 0.3.5"
|
54
55
|
# needed for the sinatra-based apps
|
55
56
|
spec.add_development_dependency "sinatra", "~>2.1"
|
@@ -64,8 +65,8 @@ Gem::Specification.new do |spec|
|
|
64
65
|
spec.add_runtime_dependency "warning", "~>1.2"
|
65
66
|
spec.add_runtime_dependency "asciidoctor", "~>2.0", ">= 2.0.17"
|
66
67
|
spec.add_runtime_dependency "asciidoctor-diagram", ["~> 2.2"]
|
67
|
-
spec.add_runtime_dependency "asciidoctor-pdf", ["~>
|
68
|
-
spec.add_runtime_dependency "git", "~> 1.
|
69
|
-
spec.add_runtime_dependency "rouge", "~> 3.
|
68
|
+
spec.add_runtime_dependency "asciidoctor-pdf", ["~> 2.3"]
|
69
|
+
spec.add_runtime_dependency "git", "~> 1.12"
|
70
|
+
spec.add_runtime_dependency "rouge", "~> 3.30"
|
70
71
|
spec.add_runtime_dependency "prawn-svg", "~> 0.32.0"
|
71
72
|
end
|
data/lib/giblish/application.rb
CHANGED
@@ -232,10 +232,10 @@ module Giblish
|
|
232
232
|
|
233
233
|
def select_conversion(user_opts)
|
234
234
|
case user_opts
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
|
235
|
+
in {branch_regex: _} | {tag_regex: _}
|
236
|
+
GitRepoConvert.new(user_opts)
|
237
|
+
else
|
238
|
+
DirTreeConvert.new(user_opts)
|
239
239
|
end
|
240
240
|
end
|
241
241
|
end
|
data/lib/giblish/cmdline.rb
CHANGED
@@ -285,12 +285,12 @@ module Giblish
|
|
285
285
|
end
|
286
286
|
|
287
287
|
if opts.make_searchable && opts.format != "html"
|
288
|
-
raise OptionParser::InvalidArgument, "Error: The --make-searchable option "\
|
288
|
+
raise OptionParser::InvalidArgument, "Error: The --make-searchable option " \
|
289
289
|
"is only supported for html rendering."
|
290
290
|
end
|
291
291
|
|
292
292
|
if opts.search_action_path && !opts.make_searchable
|
293
|
-
raise OptionParser::InvalidArgument, "Error: The --server-search-path "\
|
293
|
+
raise OptionParser::InvalidArgument, "Error: The --server-search-path " \
|
294
294
|
"flag is only supported in combination with the --make-searchable (-m) flag."
|
295
295
|
end
|
296
296
|
end
|
data/lib/giblish/configurator.rb
CHANGED
@@ -86,10 +86,10 @@ module Giblish
|
|
86
86
|
)
|
87
87
|
|
88
88
|
layout_config = case config_opts
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
89
|
+
in format: "html" then HtmlLayoutConfig.new(config_opts)
|
90
|
+
in format: "pdf" then PdfLayoutConfig.new(config_opts)
|
91
|
+
else
|
92
|
+
raise OptionParser::InvalidArgument, "The given cmd line flags are not supported: #{config_opts.inspect}"
|
93
93
|
end
|
94
94
|
|
95
95
|
# setup all options from the chosen layout configuration but
|
@@ -43,7 +43,7 @@ module Giblish
|
|
43
43
|
# pdf_font_dirs:: one or more Pathnames to each font dir that shall be
|
44
44
|
# checked for fonts
|
45
45
|
def initialize(pdf_style_path, *pdf_font_dirs)
|
46
|
-
@
|
46
|
+
@pdf_theme_path = pdf_style_path
|
47
47
|
# one can specify multiple font dirs as:
|
48
48
|
# -a pdf-fontsdir="path/to/fonts;path/to/more-fonts"
|
49
49
|
# Always use the GEM_FONTS_DIR token to load the adoc-pdf gem's font dirs as well
|
@@ -52,8 +52,8 @@ module Giblish
|
|
52
52
|
|
53
53
|
def document_attributes(src_node, dst_node, dst_top)
|
54
54
|
result = {
|
55
|
-
"pdf-
|
56
|
-
"pdf-
|
55
|
+
"pdf-theme" => @pdf_theme_path.basename.to_s,
|
56
|
+
"pdf-themesdir" => @pdf_theme_path.dirname.to_s,
|
57
57
|
"icons" => "font"
|
58
58
|
}
|
59
59
|
result["pdf-fontsdir"] = @pdf_fontsdir unless @pdf_fontsdir.nil?
|
@@ -115,10 +115,10 @@ module Giblish
|
|
115
115
|
# out-of-the-box for pdf).
|
116
116
|
rp = conv_info.dst_rel_path
|
117
117
|
dot_entry += case rp.extname
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
118
|
+
when ".html"
|
119
|
+
", URL=\"#{rp}\" ]"
|
120
|
+
else
|
121
|
+
" ]"
|
122
122
|
end
|
123
123
|
doc_dict[doc_id] = dot_entry
|
124
124
|
end
|
@@ -181,7 +181,7 @@ module Giblish
|
|
181
181
|
# we did not get a heading, this is ok as well but we can not
|
182
182
|
# index it
|
183
183
|
Giblog.logger.debug do
|
184
|
-
"Did not index the anchor: #{match_str} at "\
|
184
|
+
"Did not index the anchor: #{match_str} at " \
|
185
185
|
"line #{line_no}, probably not associated with a heading."
|
186
186
|
end
|
187
187
|
end
|
@@ -7,12 +7,12 @@ module Giblish
|
|
7
7
|
|
8
8
|
def initialize(uri: nil, query_params: nil)
|
9
9
|
@parameters = case [uri, query_params]
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
10
|
+
in [String, nil]
|
11
|
+
uri_2_params(uri)
|
12
|
+
in [nil, _]
|
13
|
+
validate_parameters(query_params)
|
14
|
+
else
|
15
|
+
raise ArgumentError, "You must supply one of 'uri: [String]' or 'query_params: [Hash]' got: #{query_params}"
|
16
16
|
end
|
17
17
|
end
|
18
18
|
|
data/lib/giblish/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: giblish
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 2.0.0.pre.alpha1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Anders Rillbert
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-08-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: minitest
|
@@ -16,28 +16,28 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: '5.
|
19
|
+
version: '5.16'
|
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
|
-
version: '5.
|
26
|
+
version: '5.16'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: standard
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: '1.
|
33
|
+
version: '1.16'
|
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
|
-
version: '1.
|
40
|
+
version: '1.16'
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: rake
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -72,14 +72,14 @@ dependencies:
|
|
72
72
|
requirements:
|
73
73
|
- - "~>"
|
74
74
|
- !ruby/object:Gem::Version
|
75
|
-
version:
|
75
|
+
version: '1.2'
|
76
76
|
type: :development
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
80
|
- - "~>"
|
81
81
|
- !ruby/object:Gem::Version
|
82
|
-
version:
|
82
|
+
version: '1.2'
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
84
|
name: asciidoctor-mathematical
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
@@ -218,48 +218,42 @@ dependencies:
|
|
218
218
|
requirements:
|
219
219
|
- - "~>"
|
220
220
|
- !ruby/object:Gem::Version
|
221
|
-
version: '
|
222
|
-
- - ">="
|
223
|
-
- !ruby/object:Gem::Version
|
224
|
-
version: 1.6.2
|
221
|
+
version: '2.3'
|
225
222
|
type: :runtime
|
226
223
|
prerelease: false
|
227
224
|
version_requirements: !ruby/object:Gem::Requirement
|
228
225
|
requirements:
|
229
226
|
- - "~>"
|
230
227
|
- !ruby/object:Gem::Version
|
231
|
-
version: '
|
232
|
-
- - ">="
|
233
|
-
- !ruby/object:Gem::Version
|
234
|
-
version: 1.6.2
|
228
|
+
version: '2.3'
|
235
229
|
- !ruby/object:Gem::Dependency
|
236
230
|
name: git
|
237
231
|
requirement: !ruby/object:Gem::Requirement
|
238
232
|
requirements:
|
239
233
|
- - "~>"
|
240
234
|
- !ruby/object:Gem::Version
|
241
|
-
version: '1.
|
235
|
+
version: '1.12'
|
242
236
|
type: :runtime
|
243
237
|
prerelease: false
|
244
238
|
version_requirements: !ruby/object:Gem::Requirement
|
245
239
|
requirements:
|
246
240
|
- - "~>"
|
247
241
|
- !ruby/object:Gem::Version
|
248
|
-
version: '1.
|
242
|
+
version: '1.12'
|
249
243
|
- !ruby/object:Gem::Dependency
|
250
244
|
name: rouge
|
251
245
|
requirement: !ruby/object:Gem::Requirement
|
252
246
|
requirements:
|
253
247
|
- - "~>"
|
254
248
|
- !ruby/object:Gem::Version
|
255
|
-
version: '3.
|
249
|
+
version: '3.30'
|
256
250
|
type: :runtime
|
257
251
|
prerelease: false
|
258
252
|
version_requirements: !ruby/object:Gem::Requirement
|
259
253
|
requirements:
|
260
254
|
- - "~>"
|
261
255
|
- !ruby/object:Gem::Version
|
262
|
-
version: '3.
|
256
|
+
version: '3.30'
|
263
257
|
- !ruby/object:Gem::Dependency
|
264
258
|
name: prawn-svg
|
265
259
|
requirement: !ruby/object:Gem::Requirement
|
@@ -384,11 +378,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
384
378
|
version: '0'
|
385
379
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
386
380
|
requirements:
|
387
|
-
- - "
|
381
|
+
- - ">"
|
388
382
|
- !ruby/object:Gem::Version
|
389
|
-
version:
|
383
|
+
version: 1.3.1
|
390
384
|
requirements: []
|
391
|
-
rubygems_version: 3.
|
385
|
+
rubygems_version: 3.3.7
|
392
386
|
signing_key:
|
393
387
|
specification_version: 4
|
394
388
|
summary: A tool for publishing asciidoc docs stored in git repos
|