avm-eac_webapp_base0 0.22.2 → 0.23.0

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 (8) hide show
  1. checksums.yaml +4 -4
  2. data/lib/avm/eac_webapp_base0/instances/apache_host.rb +1 -1
  3. data/lib/avm/eac_webapp_base0/instances/apache_path.rb +1 -1
  4. data/lib/avm/eac_webapp_base0/instances/deploy/build.rb +23 -7
  5. data/lib/avm/eac_webapp_base0/instances/deploy.rb +5 -3
  6. data/lib/avm/eac_webapp_base0/version.rb +1 -1
  7. data/lib/avm/eac_webapp_base0.rb +6 -11
  8. metadata +39 -19
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 77099e2ea215b2b19eafad60060f2b35d7044e20d3a0960ff09b1a0fe63f0e45
4
- data.tar.gz: d9862f4ed665a846566a2c156adb0aba518ebec95944f2cd22e60c2b2a843b98
3
+ metadata.gz: 561006c7523ce0349da145777ad6fe52dfe7df13656f2591ffb650f2e86131b9
4
+ data.tar.gz: 4bb371c046f5a3c37b1e9de5ed5cc30e7bc9c39f9b13b535ca98d6f9c817e5d0
5
5
  SHA512:
6
- metadata.gz: 3986e7870294868a149e871edfd1933acfb8411a2e2f4633e8cc0758465a5df7c57b525c9021bbf71362bcd989f9106a68a438ab8c3c0e2dc8f847aaf33b3d98
7
- data.tar.gz: 63fb1bee34e1984c0bf809183af54f366c7e63caf91881ea34ede1e97faf32c21e6c7a916d503ed10de71eb97ec674ea8e2c167cee6ac94fbfb2944b2aba88bd
6
+ metadata.gz: 9f425dd9749463efaf1ca6e1c2b2c321ec95bbeeb21e4ab23f5488bd2bf4171e091069cb6fb54c023a1672b9dd2fc76285c2fdfe78d3b147fb01af24aff369df
7
+ data.tar.gz: '050982c2940abfa6c224837e687528fa9864cae98f1a82a8032f964491dbd0a5b1c7e836e5886593005c3c5762c4d5c969a8c1065c72b60667d3a1d42b8f2f5a'
data/lib/avm/eac_webapp_base0/instances/apache_host.rb CHANGED
@@ -16,7 +16,7 @@ module Avm
16
16
 
17
17
  def no_ssl_site_content
18
18
  ::Avm::EacWebappBase0::Instances::ApacheHost
19
- .template.child('no_ssl.conf')
19
+ .eac_template.child('no_ssl.conf')
20
20
  .apply(variables_source)
21
21
  end
22
22
 
data/lib/avm/eac_webapp_base0/instances/apache_path.rb CHANGED
@@ -8,7 +8,7 @@ module Avm
8
8
  include ::Avm::Entries::Jobs::Base
9
9
 
10
10
  def content
11
- ::Avm::EacWebappBase0::Instances::ApachePath.template.child('default.conf')
11
+ ::Avm::EacWebappBase0::Instances::ApachePath.eac_template.child('default.conf')
12
12
  .apply(variables_source)
13
13
  end
14
14
 
data/lib/avm/eac_webapp_base0/instances/deploy/build.rb CHANGED
@@ -5,15 +5,17 @@ module Avm
5
5
  module Instances
6
6
  class Deploy
7
7
  module Build
8
+ enable_memoized
9
+
8
10
  private
9
11
 
10
- attr_accessor :build_dir
12
+ attr_accessor :build_dir, :source_dir
11
13
 
12
14
  def append_instance_content
13
15
  ::Avm::Files::Appender
14
16
  .new
15
17
  .variables_source_set(variables_source)
16
- .append_templatized_directory(template)
18
+ .append_templatized_directory(eac_template)
17
19
  .append_templatized_directories(appended_directories)
18
20
  .append_file_content(version_target_path, version)
19
21
  .write_appended_on(build_dir)
@@ -27,16 +29,30 @@ module Avm
27
29
  self.build_dir = ::EacRubyUtils::Fs::Temp.directory
28
30
  end
29
31
 
32
+ def create_source_dir
33
+ self.source_dir = ::EacRubyUtils::Fs::Temp.directory
34
+ infom 'Writing Git source code...'
35
+ scm.commit(commit_reference).deploy_to_env_path(
36
+ build_dir_env,
37
+ source_dir
38
+ ).variables_source_set(variables_source).run
39
+ end
40
+
30
41
  def remove_build_dir
31
42
  build_dir&.remove
32
43
  end
33
44
 
45
+ def remove_source_dir
46
+ source_dir&.remove
47
+ end
48
+
49
+ # @return [Avm::Sources::Base]
50
+ memoize def source
51
+ instance.application.local_source.class.new(source_dir)
52
+ end
53
+
34
54
  def build_content
35
- infom 'Writing Git source code...'
36
- scm.commit(commit_reference).deploy_to_env_path(
37
- build_dir_env,
38
- build_dir
39
- ).variables_source_set(variables_source).run
55
+ ::FileUtils.copy_entry(source_dir.to_path, build_dir.to_path)
40
56
  end
41
57
  end
42
58
  end
data/lib/avm/eac_webapp_base0/instances/deploy.rb CHANGED
@@ -11,8 +11,9 @@ module Avm
11
11
  DEFAULT_REFERENCE = 'HEAD'
12
12
 
13
13
  REQUEST_TEST_JOB = 'request_test'
14
- JOBS = (%w[create_build_dir build_content append_instance_content write_on_target
15
- setup_files_units assert_instance_branch] + [REQUEST_TEST_JOB]).freeze
14
+ JOBS = (%w[create_build_dir create_source_dir build_content append_instance_content
15
+ write_on_target setup_files_units assert_instance_branch] +
16
+ [REQUEST_TEST_JOB]).freeze
16
17
 
17
18
  include ::Avm::Entries::Jobs::Base
18
19
 
@@ -27,6 +28,7 @@ module Avm
27
28
  super
28
29
  ensure
29
30
  remove_build_dir
31
+ remove_source_dir
30
32
  end
31
33
 
32
34
  def start_banner
@@ -39,7 +41,7 @@ module Avm
39
41
  end
40
42
 
41
43
  def setup_files_units
42
- instance.data_package.units.values.map(&:installation_files_data).select(&:present?)
44
+ instance.data_package.units.values.map(&:installation_files_data).select(&:present?) # rubocop:disable Rails/CompactBlank
43
45
  .each { |unit_install| setup_files_unit(unit_install.key, unit_install.subpath) }
44
46
  end
45
47
 
data/lib/avm/eac_webapp_base0/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacWebappBase0
5
- VERSION = '0.22.2'
5
+ VERSION = '0.23.0'
6
6
  end
7
7
  end
data/lib/avm/eac_webapp_base0.rb CHANGED
@@ -1,14 +1,9 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_ruby_utils'
4
- EacRubyUtils::RootModuleSetup.perform __FILE__
5
-
6
- module Avm
7
- module EacWebappBase0
8
- end
3
+ require 'eac_ruby_base1'
4
+ EacRubyBase1::RootModuleSetup.perform __FILE__ do
5
+ require 'avm'
6
+ require 'avm/eac_generic_base0'
7
+ require 'avm/eac_postgresql_base0'
8
+ require 'avm/eac_ubuntu_base0'
9
9
  end
10
-
11
- require 'avm'
12
- require 'avm/eac_generic_base0'
13
- require 'avm/eac_postgresql_base0'
14
- require 'avm/eac_ubuntu_base0'
metadata CHANGED
@@ -1,14 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: avm-eac_webapp_base0
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.22.2
4
+ version: 0.23.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Put here the authors
8
- autorequire:
9
8
  bindir: bin
10
9
  cert_chain: []
11
- date: 2026-06-24 00:00:00.000000000 Z
10
+ date: 1980-01-02 00:00:00.000000000 Z
12
11
  dependencies:
13
12
  - !ruby/object:Gem::Dependency
14
13
  name: avm
@@ -16,34 +15,34 @@ dependencies:
16
15
  requirements:
17
16
  - - "~>"
18
17
  - !ruby/object:Gem::Version
19
- version: '0.100'
18
+ version: '0.103'
20
19
  type: :runtime
21
20
  prerelease: false
22
21
  version_requirements: !ruby/object:Gem::Requirement
23
22
  requirements:
24
23
  - - "~>"
25
24
  - !ruby/object:Gem::Version
26
- version: '0.100'
25
+ version: '0.103'
27
26
  - !ruby/object:Gem::Dependency
28
27
  name: avm-eac_generic_base0
29
28
  requirement: !ruby/object:Gem::Requirement
30
29
  requirements:
31
30
  - - "~>"
32
31
  - !ruby/object:Gem::Version
33
- version: '0.15'
32
+ version: '0.16'
34
33
  - - ">="
35
34
  - !ruby/object:Gem::Version
36
- version: 0.15.2
35
+ version: 0.16.1
37
36
  type: :runtime
38
37
  prerelease: false
39
38
  version_requirements: !ruby/object:Gem::Requirement
40
39
  requirements:
41
40
  - - "~>"
42
41
  - !ruby/object:Gem::Version
43
- version: '0.15'
42
+ version: '0.16'
44
43
  - - ">="
45
44
  - !ruby/object:Gem::Version
46
- version: 0.15.2
45
+ version: 0.16.1
47
46
  - !ruby/object:Gem::Dependency
48
47
  name: avm-eac_postgresql_base0
49
48
  requirement: !ruby/object:Gem::Requirement
@@ -65,6 +64,9 @@ dependencies:
65
64
  - - "~>"
66
65
  - !ruby/object:Gem::Version
67
66
  version: '0.7'
67
+ - - ">="
68
+ - !ruby/object:Gem::Version
69
+ version: 0.7.2
68
70
  type: :runtime
69
71
  prerelease: false
70
72
  version_requirements: !ruby/object:Gem::Requirement
@@ -72,20 +74,43 @@ dependencies:
72
74
  - - "~>"
73
75
  - !ruby/object:Gem::Version
74
76
  version: '0.7'
77
+ - - ">="
78
+ - !ruby/object:Gem::Version
79
+ version: 0.7.2
80
+ - !ruby/object:Gem::Dependency
81
+ name: eac_ruby_base1
82
+ requirement: !ruby/object:Gem::Requirement
83
+ requirements:
84
+ - - "~>"
85
+ - !ruby/object:Gem::Version
86
+ version: '0.1'
87
+ - - ">="
88
+ - !ruby/object:Gem::Version
89
+ version: 0.1.2
90
+ type: :runtime
91
+ prerelease: false
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - "~>"
95
+ - !ruby/object:Gem::Version
96
+ version: '0.1'
97
+ - - ">="
98
+ - !ruby/object:Gem::Version
99
+ version: 0.1.2
75
100
  - !ruby/object:Gem::Dependency
76
101
  name: eac_ruby_utils
77
102
  requirement: !ruby/object:Gem::Requirement
78
103
  requirements:
79
104
  - - "~>"
80
105
  - !ruby/object:Gem::Version
81
- version: '0.131'
106
+ version: '0.136'
82
107
  type: :runtime
83
108
  prerelease: false
84
109
  version_requirements: !ruby/object:Gem::Requirement
85
110
  requirements:
86
111
  - - "~>"
87
112
  - !ruby/object:Gem::Version
88
- version: '0.131'
113
+ version: '0.136'
89
114
  - !ruby/object:Gem::Dependency
90
115
  name: htmlbeautifier
91
116
  requirement: !ruby/object:Gem::Requirement
@@ -112,16 +137,14 @@ dependencies:
112
137
  requirements:
113
138
  - - "~>"
114
139
  - !ruby/object:Gem::Version
115
- version: '0.13'
140
+ version: '0.15'
116
141
  type: :development
117
142
  prerelease: false
118
143
  version_requirements: !ruby/object:Gem::Requirement
119
144
  requirements:
120
145
  - - "~>"
121
146
  - !ruby/object:Gem::Version
122
- version: '0.13'
123
- description:
124
- email:
147
+ version: '0.15'
125
148
  executables: []
126
149
  extensions: []
127
150
  extra_rdoc_files: []
@@ -161,10 +184,8 @@ files:
161
184
  - template/avm/eac_webapp_base0/instances/apache_host/no_ssl.conf
162
185
  - template/avm/eac_webapp_base0/instances/apache_path/default.conf
163
186
  - template/avm/eac_webapp_base0/instances/deploy/.keep
164
- homepage:
165
187
  licenses: []
166
188
  metadata: {}
167
- post_install_message:
168
189
  rdoc_options: []
169
190
  require_paths:
170
191
  - lib
@@ -179,8 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
179
200
  - !ruby/object:Gem::Version
180
201
  version: '0'
181
202
  requirements: []
182
- rubygems_version: 3.4.19
183
- signing_key:
203
+ rubygems_version: 3.6.9
184
204
  specification_version: 4
185
205
  summary: Put here de description.
186
206
  test_files: []