eac_tools 0.56.1 → 0.58.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (21) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +22 -22
  3. data/lib/eac_tools/version.rb +1 -1
  4. data/sub/avm/lib/avm/launcher/publish/base.rb +6 -1
  5. data/sub/avm/lib/avm/version.rb +1 -1
  6. data/sub/avm-eac_asciidoctor_base0/avm-eac_asciidoctor_base0.gemspec +2 -2
  7. data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/{header_macro_value.rb → header_lines.rb} +1 -1
  8. data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document.rb +4 -3
  9. data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/version.rb +1 -1
  10. data/sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/source_generators/base_spec_files/no_options/content/body.adoc +0 -2
  11. data/sub/avm-eac_asciidoctor_base0/template/avm/eac_asciidoctor_base0/source_generators/base/content/body.adoc +0 -2
  12. data/sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec +3 -3
  13. data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/version.rb +1 -1
  14. data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec +3 -3
  15. data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/nodejs.rb +22 -0
  16. data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/version.rb +1 -1
  17. data/sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/deploy/config/install.sh.template +4 -1
  18. data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec +2 -2
  19. data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/instances/mixin.rb +1 -1
  20. data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb +1 -1
  21. metadata +22 -15
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 949ef60a80a3a91c57e7ae1feae75288c8f12cb7ceee676b9a5c29b155995b09
4
- data.tar.gz: a2fa387df7aee4bf7fa9581ae1bf54e1062c8b6d647fdcec6199833d9a035d43
3
+ metadata.gz: ff15266dd0fd06d6c50c3b3e2970122497b2de3fbfe81256f8f137b8f014b138
4
+ data.tar.gz: e33174a9d250c9f677321323f6d5fc18eeb7e54b215cf1f9de606b8387efbaf6
5
5
  SHA512:
6
- metadata.gz: d8ab6afc8b93ddc9e43503f833d66dbccfb64db57a156b98cbe9e28f818fbef6adb8fc8dbd61114450d7065e9cc84b967e1accd83134cea71bc4ae1b3f27bd03
7
- data.tar.gz: 36cf6388a7729e7ae847b8b68731197bef2598bb85487ceca70b04d594c020b9a7a3362d4ba83d83e3863944ef701979b5acb554af73d41ede9f21a7d1ebf828
6
+ metadata.gz: 8b19995fc569e17ca90ce26cb98e46e6bf0da5dfe429e97897cbe738bbfedda45f1dac6a071cb9b09c112536b26c46ceb47c21200f471c52bc159e3e4ed5317e
7
+ data.tar.gz: ba05f3546c0bba6967385775acfb6cc5d3991f2833e98e02cc0e9e9d9956739ad1b00b94759a97e58d245fd6c1030df4aee950efbc6d72f77009a0b0c2a934b1
data/Gemfile.lock CHANGED
@@ -1,19 +1,19 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- eac_tools (0.56.1)
5
- avm (~> 0.66)
6
- avm-eac_asciidoctor_base0 (~> 0.15)
4
+ eac_tools (0.58.0)
5
+ avm (~> 0.66, >= 0.66.1)
6
+ avm-eac_asciidoctor_base0 (~> 0.16)
7
7
  avm-eac_generic_base0 (~> 0.12)
8
8
  avm-eac_latex_base0 (~> 0.3)
9
9
  avm-eac_php_base0 (~> 0.4, >= 0.4.1)
10
10
  avm-eac_postgresql_base0 (~> 0.2, >= 0.2.3)
11
11
  avm-eac_python_base0 (~> 0.2, >= 0.2.1)
12
12
  avm-eac_rails_base0 (~> 0.10)
13
- avm-eac_rails_base1 (~> 0.8, >= 0.8.1)
14
- avm-eac_redmine_base0 (~> 0.18, >= 0.18.2)
13
+ avm-eac_rails_base1 (~> 0.8, >= 0.8.2)
14
+ avm-eac_redmine_base0 (~> 0.19)
15
15
  avm-eac_redmine_plugin_base0 (~> 0.4)
16
- avm-eac_ruby_base1 (~> 0.30)
16
+ avm-eac_ruby_base1 (~> 0.30, >= 0.30.1)
17
17
  avm-eac_webapp_base0 (~> 0.14)
18
18
  avm-eac_wordpress_base0 (~> 0.3)
19
19
  avm-git (~> 0.13, >= 0.13.1)
@@ -37,10 +37,10 @@ PATH
37
37
  PATH
38
38
  remote: sub/avm-eac_asciidoctor_base0
39
39
  specs:
40
- avm-eac_asciidoctor_base0 (0.15.0)
40
+ avm-eac_asciidoctor_base0 (0.16.0)
41
41
  asciidoctor (~> 2.0, >= 2.0.18)
42
- avm-eac_webapp_base0 (~> 0.13, >= 0.13.1)
43
- eac_ruby_utils (~> 0.110, >= 0.110.1)
42
+ avm-eac_webapp_base0 (~> 0.14)
43
+ eac_ruby_utils (~> 0.112)
44
44
  os (~> 1.1, >= 1.1.4)
45
45
  rouge (~> 3.30)
46
46
 
@@ -91,19 +91,19 @@ PATH
91
91
  PATH
92
92
  remote: sub/avm-eac_rails_base1
93
93
  specs:
94
- avm-eac_rails_base1 (0.8.1)
95
- avm (~> 0.65)
96
- avm-eac_ruby_base1 (~> 0.30)
97
- avm-eac_webapp_base0 (~> 0.13, >= 0.13.1)
94
+ avm-eac_rails_base1 (0.8.2)
95
+ avm (~> 0.66, >= 0.66.1)
96
+ avm-eac_ruby_base1 (~> 0.30, >= 0.30.1)
97
+ avm-eac_webapp_base0 (~> 0.14)
98
98
  eac_ruby_utils (~> 0.112)
99
99
 
100
100
  PATH
101
101
  remote: sub/avm-eac_redmine_base0
102
102
  specs:
103
- avm-eac_redmine_base0 (0.18.2)
104
- avm (~> 0.65)
105
- avm-eac_generic_base0 (~> 0.11)
106
- avm-eac_rails_base1 (~> 0.8, >= 0.8.1)
103
+ avm-eac_redmine_base0 (0.19.0)
104
+ avm (~> 0.66, >= 0.66.1)
105
+ avm-eac_generic_base0 (~> 0.12)
106
+ avm-eac_rails_base1 (~> 0.8, >= 0.8.2)
107
107
  avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.1)
108
108
  curb (~> 0.9, >= 0.9.11)
109
109
  eac_fs (~> 0.16)
@@ -120,10 +120,10 @@ PATH
120
120
  PATH
121
121
  remote: sub/avm-eac_ruby_base1
122
122
  specs:
123
- avm-eac_ruby_base1 (0.30.0)
123
+ avm-eac_ruby_base1 (0.30.1)
124
124
  aranha-parsers (~> 0.17)
125
- avm (~> 0.65)
126
- avm-eac_generic_base0 (~> 0.11)
125
+ avm (~> 0.66, >= 0.66.1)
126
+ avm-eac_generic_base0 (~> 0.12)
127
127
  eac_ruby_utils (~> 0.112)
128
128
 
129
129
  PATH
@@ -194,7 +194,7 @@ PATH
194
194
  PATH
195
195
  remote: sub/avm
196
196
  specs:
197
- avm (0.66.0)
197
+ avm (0.66.1)
198
198
  aranha-parsers (~> 0.17)
199
199
  eac_cli (~> 0.30, >= 0.30.1)
200
200
  eac_config (~> 0.12)
@@ -272,7 +272,7 @@ GEM
272
272
  minitest (>= 5.1)
273
273
  tzinfo (~> 2.0)
274
274
  zeitwerk (~> 2.3)
275
- addressable (2.8.2)
275
+ addressable (2.8.3)
276
276
  public_suffix (>= 2.0.2, < 6.0)
277
277
  asciidoctor (2.0.18)
278
278
  ast (2.4.2)
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacTools
4
- VERSION = '0.56.1'
4
+ VERSION = '0.58.0'
5
5
  end
@@ -34,7 +34,12 @@ module Avm
34
34
  def check_with_rescue
35
35
  internal_check
36
36
  rescue ::Avm::Launcher::Errors::Base => e
37
- ::Avm::Launcher::Publish::CheckResult.blocked("Error: #{e}")
37
+ ::Avm::Launcher::Publish::CheckResult.blocked("Error: #{error_message(e)}")
38
+ end
39
+
40
+ # @return [String]
41
+ def error_message(error)
42
+ error.to_s + error.cause.if_present('') { |v| " / Caused by: #{error_message(v)}" }
38
43
  end
39
44
  end
40
45
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Avm
4
- VERSION = '0.66.0'
4
+ VERSION = '0.66.1'
5
5
  end
@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
13
13
  s.files = Dir['{lib,template}/**/*']
14
14
 
15
15
  s.add_dependency 'asciidoctor', '~> 2.0', '>= 2.0.18'
16
- s.add_dependency 'avm-eac_webapp_base0', '~> 0.13', '>= 0.13.1'
17
- s.add_dependency 'eac_ruby_utils', '~> 0.110', '>= 0.110.1'
16
+ s.add_dependency 'avm-eac_webapp_base0', '~> 0.14'
17
+ s.add_dependency 'eac_ruby_utils', '~> 0.112'
18
18
  s.add_dependency 'os', '~> 1.1', '>= 1.1.4'
19
19
  s.add_dependency 'rouge', '~> 3.30'
20
20
 
@@ -7,7 +7,7 @@ module Avm
7
7
  module Instances
8
8
  class Build
9
9
  class Document
10
- class HeaderMacroValue
10
+ class HeaderLines
11
11
  enable_method_class
12
12
  enable_settings_provider
13
13
  enable_simple_cache
@@ -50,9 +50,10 @@ module Avm
50
50
 
51
51
  # @return [String]
52
52
  def pre_processed_body_source_content
53
- source_document.body_path.read.each_line
54
- .flat_map { |line| pre_process_line(line.rstrip) }
55
- .map { |line| "#{line.rstrip}\n" }.join
53
+ (
54
+ header_lines + [''] + source_document.body_path.read.each_line
55
+ .flat_map { |line| pre_process_line(line.rstrip) }
56
+ ).map { |line| "#{line.rstrip}\n" }.join
56
57
  end
57
58
 
58
59
  def tree_documents_count
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacAsciidoctorBase0
5
- VERSION = '0.15.0'
5
+ VERSION = '0.16.0'
6
6
  end
7
7
  end
@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib,template}/**/*']
14
14
 
15
- s.add_dependency 'avm', '~> 0.65'
16
- s.add_dependency 'avm-eac_ruby_base1', '~> 0.30'
17
- s.add_dependency 'avm-eac_webapp_base0', '~> 0.13', '>= 0.13.1'
15
+ s.add_dependency 'avm', '~> 0.66', '>= 0.66.1'
16
+ s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.1'
17
+ s.add_dependency 'avm-eac_webapp_base0', '~> 0.14'
18
18
  s.add_dependency 'eac_ruby_utils', '~> 0.112'
19
19
 
20
20
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRailsBase1
5
- VERSION = '0.8.1'
5
+ VERSION = '0.8.2'
6
6
  end
7
7
  end
@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib,locale,template}/**/*']
14
14
 
15
- s.add_dependency 'avm', '~> 0.65'
16
- s.add_dependency 'avm-eac_generic_base0', '~> 0.11'
17
- s.add_dependency 'avm-eac_rails_base1', '~> 0.8', '>= 0.8.1'
15
+ s.add_dependency 'avm', '~> 0.66', '>= 0.66.1'
16
+ s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
17
+ s.add_dependency 'avm-eac_rails_base1', '~> 0.8', '>= 0.8.2'
18
18
  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.1'
19
19
  s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
20
20
  s.add_dependency 'eac_fs', '~> 0.16'
@@ -0,0 +1,22 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'avm/eac_rails_base1/instances/base'
4
+ require 'eac_ruby_utils/core_ext'
5
+
6
+ module Avm
7
+ module EacRedmineBase0
8
+ module Instances
9
+ class Base < ::Avm::EacRailsBase1::Instances::Base
10
+ module Nodejs
11
+ DEFAULT_NODEJS_VERSION = '19.8.1'
12
+ NODEJS_VERSION_KEY = 'nodejs.version'
13
+
14
+ def auto_install_nodejs_version
15
+ inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, NODEJS_VERSION_KEY) ||
16
+ DEFAULT_NODEJS_VERSION
17
+ end
18
+ end
19
+ end
20
+ end
21
+ end
22
+ end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRedmineBase0
5
- VERSION = '0.18.2'
5
+ VERSION = '0.19.0'
6
6
  end
7
7
  end
@@ -1,5 +1,8 @@
1
1
  # Ruby
2
- export rvm_ruby='ruby-%%RUBY.VERSION%%'
2
+ export ruby_version='%%INSTALL.RUBY.VERSION%%'
3
+
4
+ # NodeJs
5
+ export nodejs_version='%%INSTALL.NODEJS.VERSION%%'
3
6
 
4
7
  # Database
5
8
  export postgresql_internal='%%DATABASE_INTERNAL%%'
@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
13
13
  s.files = Dir['{lib,locale,template}/**/*']
14
14
 
15
15
  s.add_dependency 'aranha-parsers', '~> 0.17'
16
- s.add_dependency 'avm', '~> 0.65'
17
- s.add_dependency 'avm-eac_generic_base0', '~> 0.11'
16
+ s.add_dependency 'avm', '~> 0.66', '>= 0.66.1'
17
+ s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
18
18
  s.add_dependency 'eac_ruby_utils', '~> 0.112'
19
19
 
20
20
  s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
@@ -9,7 +9,7 @@ module Avm
9
9
  DEFAULT_RUBY_VERSION = '2.7.7'
10
10
  RUBY_VERSION_KEY = 'ruby.version'
11
11
 
12
- def auto_ruby_version
12
+ def auto_install_ruby_version
13
13
  inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, RUBY_VERSION_KEY) ||
14
14
  DEFAULT_RUBY_VERSION
15
15
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRubyBase1
5
- VERSION = '0.30.0'
5
+ VERSION = '0.30.1'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: eac_tools
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.56.1
4
+ version: 0.58.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Put here the authors
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-04-01 00:00:00.000000000 Z
11
+ date: 2023-04-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: avm
@@ -17,6 +17,9 @@ dependencies:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0.66'
20
+ - - ">="
21
+ - !ruby/object:Gem::Version
22
+ version: 0.66.1
20
23
  type: :runtime
21
24
  prerelease: false
22
25
  version_requirements: !ruby/object:Gem::Requirement
@@ -24,20 +27,23 @@ dependencies:
24
27
  - - "~>"
25
28
  - !ruby/object:Gem::Version
26
29
  version: '0.66'
30
+ - - ">="
31
+ - !ruby/object:Gem::Version
32
+ version: 0.66.1
27
33
  - !ruby/object:Gem::Dependency
28
34
  name: avm-eac_asciidoctor_base0
29
35
  requirement: !ruby/object:Gem::Requirement
30
36
  requirements:
31
37
  - - "~>"
32
38
  - !ruby/object:Gem::Version
33
- version: '0.15'
39
+ version: '0.16'
34
40
  type: :runtime
35
41
  prerelease: false
36
42
  version_requirements: !ruby/object:Gem::Requirement
37
43
  requirements:
38
44
  - - "~>"
39
45
  - !ruby/object:Gem::Version
40
- version: '0.15'
46
+ version: '0.16'
41
47
  - !ruby/object:Gem::Dependency
42
48
  name: avm-eac_generic_base0
43
49
  requirement: !ruby/object:Gem::Requirement
@@ -149,7 +155,7 @@ dependencies:
149
155
  version: '0.8'
150
156
  - - ">="
151
157
  - !ruby/object:Gem::Version
152
- version: 0.8.1
158
+ version: 0.8.2
153
159
  type: :runtime
154
160
  prerelease: false
155
161
  version_requirements: !ruby/object:Gem::Requirement
@@ -159,27 +165,21 @@ dependencies:
159
165
  version: '0.8'
160
166
  - - ">="
161
167
  - !ruby/object:Gem::Version
162
- version: 0.8.1
168
+ version: 0.8.2
163
169
  - !ruby/object:Gem::Dependency
164
170
  name: avm-eac_redmine_base0
165
171
  requirement: !ruby/object:Gem::Requirement
166
172
  requirements:
167
173
  - - "~>"
168
174
  - !ruby/object:Gem::Version
169
- version: '0.18'
170
- - - ">="
171
- - !ruby/object:Gem::Version
172
- version: 0.18.2
175
+ version: '0.19'
173
176
  type: :runtime
174
177
  prerelease: false
175
178
  version_requirements: !ruby/object:Gem::Requirement
176
179
  requirements:
177
180
  - - "~>"
178
181
  - !ruby/object:Gem::Version
179
- version: '0.18'
180
- - - ">="
181
- - !ruby/object:Gem::Version
182
- version: 0.18.2
182
+ version: '0.19'
183
183
  - !ruby/object:Gem::Dependency
184
184
  name: avm-eac_redmine_plugin_base0
185
185
  requirement: !ruby/object:Gem::Requirement
@@ -201,6 +201,9 @@ dependencies:
201
201
  - - "~>"
202
202
  - !ruby/object:Gem::Version
203
203
  version: '0.30'
204
+ - - ">="
205
+ - !ruby/object:Gem::Version
206
+ version: 0.30.1
204
207
  type: :runtime
205
208
  prerelease: false
206
209
  version_requirements: !ruby/object:Gem::Requirement
@@ -208,6 +211,9 @@ dependencies:
208
211
  - - "~>"
209
212
  - !ruby/object:Gem::Version
210
213
  version: '0.30'
214
+ - - ">="
215
+ - !ruby/object:Gem::Version
216
+ version: 0.30.1
211
217
  - !ruby/object:Gem::Dependency
212
218
  name: avm-eac_webapp_base0
213
219
  requirement: !ruby/object:Gem::Requirement
@@ -370,7 +376,7 @@ files:
370
376
  - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build.rb
371
377
  - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document.rb
372
378
  - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/child_docs_macro_value.rb
373
- - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/header_macro_value.rb
379
+ - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/header_lines.rb
374
380
  - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/pre_process_line.rb
375
381
  - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/deploy.rb
376
382
  - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/source_generators.rb
@@ -592,6 +598,7 @@ files:
592
598
  - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/files.rb
593
599
  - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/gitolite.rb
594
600
  - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/install.rb
601
+ - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/nodejs.rb
595
602
  - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/web.rb
596
603
  - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/data_package.rb
597
604
  - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/deploy.rb