nanoc-core 4.12.0 → 4.12.1
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/lib/nanoc/core.rb +0 -5
- data/lib/nanoc/core/compilation_item_rep_view.rb +1 -1
- data/lib/nanoc/core/config_loader.rb +2 -14
- data/lib/nanoc/core/version.rb +1 -1
- metadata +3 -17
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4967bb5538d055185b3c646d4364f75e01e63a337592b63b1df8896b011b1423
|
|
4
|
+
data.tar.gz: 472af023ca27a5f7a2f09c54ff43c978c83a4d0f86c265e52f75b5e0dc1c7beb
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a8cac018340546cc2950bbf3821df4f54be6e50c94eb91e07baa0aeafdc06f899438eb78d5b7f7cd5691c023230415a705bc7b69bcb70ca4621cd411c09d0d69
|
|
7
|
+
data.tar.gz: 6a56360bd58b3f779e86be59188e453a8f4add7b6626d4ae9f0c3624436fefd7c1ca5fc7836f7f566974c992ae0c67a3acd869eecbd9a31dfc8cf94bd75ee7c3
|
data/lib/nanoc/core.rb
CHANGED
|
@@ -16,7 +16,6 @@ require 'ddmetrics'
|
|
|
16
16
|
require 'ddplugin'
|
|
17
17
|
require 'hamster'
|
|
18
18
|
require 'slow_enumerator_tools'
|
|
19
|
-
require 'tomlrb'
|
|
20
19
|
require 'tty-platform'
|
|
21
20
|
require 'zeitwerk'
|
|
22
21
|
|
|
@@ -76,7 +75,3 @@ loader.eager_load
|
|
|
76
75
|
require_relative 'core/core_ext/array'
|
|
77
76
|
require_relative 'core/core_ext/hash'
|
|
78
77
|
require_relative 'core/core_ext/string'
|
|
79
|
-
|
|
80
|
-
# Tracking issue:
|
|
81
|
-
# https://github.com/nanoc/features/issues/40
|
|
82
|
-
Nanoc::Core::Feature.define('toml', version: '4.12')
|
|
@@ -34,7 +34,7 @@ module Nanoc
|
|
|
34
34
|
if res
|
|
35
35
|
start = Time.now
|
|
36
36
|
sleep 0.05 until File.file?(res) || Time.now - start > FILE_APPEAR_TIMEOUT
|
|
37
|
-
raise Nanoc::Core::Errors::InternalInconsistency, "File did not
|
|
37
|
+
raise Nanoc::Core::Errors::InternalInconsistency, "File raw_path did not appear in time (#{FILE_APPEAR_TIMEOUT}s): #{res}" unless File.file?(res)
|
|
38
38
|
end
|
|
39
39
|
|
|
40
40
|
res
|
|
@@ -29,12 +29,7 @@ module Nanoc
|
|
|
29
29
|
|
|
30
30
|
# @return [String]
|
|
31
31
|
def self.config_filename_for_cwd
|
|
32
|
-
filenames =
|
|
33
|
-
if Nanoc::Core::Feature.enabled?(Nanoc::Core::Feature::TOML)
|
|
34
|
-
%w[nanoc.yaml config.yaml nanoc.toml]
|
|
35
|
-
else
|
|
36
|
-
%w[nanoc.yaml config.yaml]
|
|
37
|
-
end
|
|
32
|
+
filenames = %w[nanoc.yaml config.yaml]
|
|
38
33
|
candidate = filenames.find { |f| File.file?(f) }
|
|
39
34
|
candidate && File.expand_path(candidate)
|
|
40
35
|
end
|
|
@@ -59,14 +54,7 @@ module Nanoc
|
|
|
59
54
|
end
|
|
60
55
|
|
|
61
56
|
def load_file(filename)
|
|
62
|
-
|
|
63
|
-
when '.yaml'
|
|
64
|
-
YAML.load_file(filename)
|
|
65
|
-
when '.toml'
|
|
66
|
-
Tomlrb.load_file(filename)
|
|
67
|
-
else
|
|
68
|
-
raise Nanoc::Core::Errors::InternalInconsistency, 'Unhandled config file extension'
|
|
69
|
-
end
|
|
57
|
+
YAML.load_file(filename)
|
|
70
58
|
end
|
|
71
59
|
|
|
72
60
|
# @api private
|
data/lib/nanoc/core/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: nanoc-core
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 4.12.
|
|
4
|
+
version: 4.12.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Denis Defreyne
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2021-
|
|
11
|
+
date: 2021-04-05 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: concurrent-ruby
|
|
@@ -108,20 +108,6 @@ dependencies:
|
|
|
108
108
|
- - "~>"
|
|
109
109
|
- !ruby/object:Gem::Version
|
|
110
110
|
version: '1.0'
|
|
111
|
-
- !ruby/object:Gem::Dependency
|
|
112
|
-
name: tomlrb
|
|
113
|
-
requirement: !ruby/object:Gem::Requirement
|
|
114
|
-
requirements:
|
|
115
|
-
- - "~>"
|
|
116
|
-
- !ruby/object:Gem::Version
|
|
117
|
-
version: '1.2'
|
|
118
|
-
type: :runtime
|
|
119
|
-
prerelease: false
|
|
120
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
121
|
-
requirements:
|
|
122
|
-
- - "~>"
|
|
123
|
-
- !ruby/object:Gem::Version
|
|
124
|
-
version: '1.2'
|
|
125
111
|
- !ruby/object:Gem::Dependency
|
|
126
112
|
name: tty-platform
|
|
127
113
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -314,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
314
300
|
- !ruby/object:Gem::Version
|
|
315
301
|
version: '0'
|
|
316
302
|
requirements: []
|
|
317
|
-
rubygems_version: 3.2.
|
|
303
|
+
rubygems_version: 3.2.15
|
|
318
304
|
signing_key:
|
|
319
305
|
specification_version: 4
|
|
320
306
|
summary: Core of Nanoc
|