avm-eac_webapp_base0 0.22.3 → 0.24.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 59d5d6127f53e35dc7e3360509e44649833f2bf0e07fd2f16b212103f9f9c1da
4
- data.tar.gz: 1590392cf468aa21d890c971ede868c6ef10fb6b0d3c635a60a3b9498e34887f
3
+ metadata.gz: 00b8bb978cb68d1114a3e6399f60aabe927e5abaec1e4ff1e3d577f5349051f3
4
+ data.tar.gz: f2e023e2b8f2333fc3671500363d60ef71f793713a08c01f2b8598addac7caa9
5
5
  SHA512:
6
- metadata.gz: 4b992ca4f1fef269e3ab8235c21c0f0d1ccc09420c9ebc5a9c7a032da8e0eaa9c683c5f6e1da114fbb82c7714343f172fa61fcdcfa64040c8eda9b1aafdcf330
7
- data.tar.gz: cf12a2bdbfdbaf5205c0fa5b6db694cc2c7d0411ed0bf6519d4ab8952617dc83ee39c52e1a0360f1213986cd3689c00e3dd68a8e06387af8715665538dc84c4e
6
+ metadata.gz: bc080c991524cab5b1a377ba7fec7cc0a54e5c354855f3ea59b6e384f8767d390af2bf899f3b6d3c63a3dea2084e6b41277516c4ee68716aa9358ffb9d4aa578
7
+ data.tar.gz: c8f73284e3c94792f9e175b94c9b48ebe6942755106ca593472d4261363639f9c2b7b03b6146cc285f22d2d1a51ced861af591f669ce115cd7fe4b12f4d52a37
@@ -0,0 +1,80 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Avm
4
+ module EacWebappBase0
5
+ module Instances
6
+ class Build
7
+ acts_as_immutable
8
+ enable_memoized
9
+ enable_speaker
10
+ immutable_accessor :appended_directory, type: :array
11
+ immutable_accessor :commit_reference, :target_directory, :template, :variables_source,
12
+ :version
13
+ common_constructor :instance
14
+
15
+ # @return [Array<Object>]
16
+ def immutable_constructor_args
17
+ [instance]
18
+ end
19
+
20
+ # @return [void]
21
+ def perform
22
+ on_source_dir do
23
+ build_content
24
+ append_instance_content
25
+ end
26
+ end
27
+
28
+ protected
29
+
30
+ attr_accessor :source_dir
31
+
32
+ def append_instance_content
33
+ ::Avm::Files::Appender
34
+ .new
35
+ .variables_source_set(variables_source)
36
+ .append_templatized_directory(template)
37
+ .append_templatized_directories(appended_directories)
38
+ .append_file_content(version_target_path, version)
39
+ .write_appended_on(target_directory)
40
+ end
41
+
42
+ def build_content
43
+ ::FileUtils.copy_entry(source_dir.to_path, target_directory.to_path)
44
+ end
45
+
46
+ def build_dir_env
47
+ ::EacRubyUtils::Envs.local
48
+ end
49
+
50
+ # @return [void]
51
+ def on_source_dir
52
+ self.source_dir = ::EacRubyUtils::Fs::Temp.directory
53
+ write_source
54
+ yield
55
+ ensure
56
+ source_dir&.remove
57
+ end
58
+
59
+ # @return [Avm::Sources::Base]
60
+ memoize def source
61
+ instance.application.local_source.class.new(source_dir)
62
+ end
63
+
64
+ # @return [String]
65
+ def version_target_path
66
+ ::Avm::EacWebappBase0::Instances::Base::DeployInfo::DEPLOY_INFO_SUBPATH
67
+ end
68
+
69
+ # @return [void]
70
+ def write_source
71
+ infom 'Writing Git source code...'
72
+ instance.application.local_source.scm.commit(commit_reference).deploy_to_env_path(
73
+ build_dir_env,
74
+ source_dir
75
+ ).variables_source_set(variables_source).run
76
+ end
77
+ end
78
+ end
79
+ end
80
+ end
@@ -9,18 +9,21 @@ module Avm
9
9
 
10
10
  attr_accessor :build_dir
11
11
 
12
- def append_instance_content
13
- ::Avm::Files::Appender
14
- .new
15
- .variables_source_set(variables_source)
16
- .append_templatized_directory(eac_template)
17
- .append_templatized_directories(appended_directories)
18
- .append_file_content(version_target_path, version)
19
- .write_appended_on(build_dir)
12
+ # @return [void]
13
+ def build
14
+ build_class.new(instance)
15
+ .appended_directories(appended_directories)
16
+ .commit_reference(commit_reference)
17
+ .target_directory(build_dir)
18
+ .template(eac_template)
19
+ .variables_source(variables_source)
20
+ .version(version)
21
+ .perform
20
22
  end
21
23
 
22
- def build_dir_env
23
- ::EacRubyUtils::Envs.local
24
+ # @return [Class<Avm::EacWebappBase0::Instances::Build>]
25
+ def build_class
26
+ ::Avm::EacWebappBase0::Instances::Build
24
27
  end
25
28
 
26
29
  def create_build_dir
@@ -30,14 +33,6 @@ module Avm
30
33
  def remove_build_dir
31
34
  build_dir&.remove
32
35
  end
33
-
34
- 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
40
- end
41
36
  end
42
37
  end
43
38
  end
@@ -32,11 +32,6 @@ module Avm
32
32
  def version_number
33
33
  instance.application.local_source.version.if_present(&:to_s)
34
34
  end
35
-
36
- # @return [String]
37
- def version_target_path
38
- ::Avm::EacWebappBase0::Instances::Base::DeployInfo::DEPLOY_INFO_SUBPATH
39
- end
40
35
  end
41
36
  end
42
37
  end
@@ -9,7 +9,9 @@ module Avm
9
9
  DEFAULT_REMOTE_READ = true
10
10
  DEFAULT_REMOTE_WRITE = true
11
11
 
12
- def commit_reference_uncached
12
+ enable_memoized
13
+
14
+ memoize def commit_reference
13
15
  git_fetch
14
16
  r = git.rev_parse(git_reference_found)
15
17
  return r if r
@@ -17,7 +19,12 @@ module Avm
17
19
  raise ::Avm::Result::Error, "No commit SHA1 found for \"#{git_reference_found}\""
18
20
  end
19
21
 
20
- def git_fetch_uncached
22
+ # @return [EacGit::Local]
23
+ memoize def git
24
+ scm.git_repo
25
+ end
26
+
27
+ memoize def git_fetch
21
28
  return unless remote_read?
22
29
 
23
30
  infom "Fetching remote \"#{git_remote_name}\" from \"#{git_repository_path}\"..."
@@ -28,7 +35,7 @@ module Avm
28
35
  options[OPTION_REFERENCE] || DEFAULT_REFERENCE
29
36
  end
30
37
 
31
- def git_reference_found_uncached
38
+ memoize def git_reference_found
32
39
  %w[git_reference instance_branch master_branch].map { |b| send(b) }.find(&:present?) ||
33
40
  raise(
34
41
  ::Avm::Result::Error,
@@ -36,7 +43,7 @@ module Avm
36
43
  )
37
44
  end
38
45
 
39
- def git_remote_hashs_uncached
46
+ memoize def git_remote_hashs
40
47
  return {} unless remote_read?
41
48
 
42
49
  git.remote(git_remote_name).ls.hashes
@@ -50,11 +57,6 @@ module Avm
50
57
  instance.source_instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
51
58
  end
52
59
 
53
- # @return [EacGit::Local]
54
- def git_uncached
55
- scm.git_repo
56
- end
57
-
58
60
  def instance_branch
59
61
  remote_branch(instance.id)
60
62
  end
@@ -11,8 +11,8 @@ 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 build install] + [REQUEST_TEST_JOB] +
15
+ %w[assert_instance_branch]).freeze
16
16
 
17
17
  include ::Avm::Entries::Jobs::Base
18
18
 
@@ -38,11 +38,6 @@ module Avm
38
38
  infov 'Appended directories', appended_directories
39
39
  end
40
40
 
41
- def setup_files_units
42
- instance.data_package.units.values.map(&:installation_files_data).select(&:present?)
43
- .each { |unit_install| setup_files_unit(unit_install.key, unit_install.subpath) }
44
- end
45
-
46
41
  def assert_instance_branch
47
42
  return unless remote_write?
48
43
 
@@ -59,6 +54,18 @@ module Avm
59
54
 
60
55
  protected
61
56
 
57
+ # @return [void]
58
+ # @raise [Avm::Result::Error]
59
+ def install
60
+ result = install_class.new(instance).package_directory_set(build_dir).perform
61
+ raise ::Avm::Result::Error, result.to_s if result.error?
62
+ end
63
+
64
+ # @return [Class<Avm::EacWebappBase0::Instances::Install>]
65
+ def install_class
66
+ ::Avm::EacWebappBase0::Instances::Install
67
+ end
68
+
62
69
  def jobs
63
70
  r = super
64
71
  r.delete(REQUEST_TEST_JOB) if options[OPTION_NO_REQUEST_TEST]
@@ -3,13 +3,13 @@
3
3
  module Avm
4
4
  module EacWebappBase0
5
5
  module Instances
6
- class Deploy
6
+ class Install
7
7
  class SetupFilesUnit < ::SimpleDelegator
8
8
  enable_method_class
9
9
  attr_reader :data_key, :fs_path_subpath
10
10
 
11
- def initialize(deploy, data_key, fs_path_subpath)
12
- super(deploy)
11
+ def initialize(install, data_key, fs_path_subpath)
12
+ super(install)
13
13
  @data_key = data_key
14
14
  @fs_path_subpath = fs_path_subpath
15
15
  end
@@ -0,0 +1,41 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Avm
4
+ module EacWebappBase0
5
+ module Instances
6
+ class Install
7
+ JOBS = %w[write_on_target setup_files_units].freeze
8
+
9
+ include ::Avm::Entries::Jobs::Base
10
+
11
+ attr_reader :package_directory
12
+
13
+ # @param directory [Pathname]
14
+ # @return [self]
15
+ def package_directory_set(directory)
16
+ @package_directory = directory
17
+ self
18
+ end
19
+
20
+ # @return [Avm::Result]
21
+ def perform
22
+ instance.on_disabled_processes { run }
23
+ end
24
+
25
+ def setup_files_units
26
+ instance.data_package.units.values.map(&:installation_files_data).select(&:present?) # rubocop:disable Rails/CompactBlank
27
+ .each { |unit_install| setup_files_unit(unit_install.key, unit_install.subpath) }
28
+ end
29
+
30
+ def write_on_target
31
+ ::Avm::Files::Deploy.new(
32
+ instance.host_env,
33
+ instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
34
+ ).append_plain_directory(package_directory).run
35
+ end
36
+
37
+ require_sub __FILE__, require_mode: :kernel
38
+ end
39
+ end
40
+ end
41
+ end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacWebappBase0
5
- VERSION = '0.22.3'
5
+ VERSION = '0.24.0'
6
6
  end
7
7
  end
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.3
4
+ version: 0.24.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-07-26 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,40 +15,34 @@ dependencies:
16
15
  requirements:
17
16
  - - "~>"
18
17
  - !ruby/object:Gem::Version
19
- version: '0.102'
20
- - - ">="
21
- - !ruby/object:Gem::Version
22
- version: 0.102.3
18
+ version: '0.103'
23
19
  type: :runtime
24
20
  prerelease: false
25
21
  version_requirements: !ruby/object:Gem::Requirement
26
22
  requirements:
27
23
  - - "~>"
28
24
  - !ruby/object:Gem::Version
29
- version: '0.102'
30
- - - ">="
31
- - !ruby/object:Gem::Version
32
- version: 0.102.3
25
+ version: '0.103'
33
26
  - !ruby/object:Gem::Dependency
34
27
  name: avm-eac_generic_base0
35
28
  requirement: !ruby/object:Gem::Requirement
36
29
  requirements:
37
30
  - - "~>"
38
31
  - !ruby/object:Gem::Version
39
- version: '0.15'
32
+ version: '0.16'
40
33
  - - ">="
41
34
  - !ruby/object:Gem::Version
42
- version: 0.15.3
35
+ version: 0.16.1
43
36
  type: :runtime
44
37
  prerelease: false
45
38
  version_requirements: !ruby/object:Gem::Requirement
46
39
  requirements:
47
40
  - - "~>"
48
41
  - !ruby/object:Gem::Version
49
- version: '0.15'
42
+ version: '0.16'
50
43
  - - ">="
51
44
  - !ruby/object:Gem::Version
52
- version: 0.15.3
45
+ version: 0.16.1
53
46
  - !ruby/object:Gem::Dependency
54
47
  name: avm-eac_postgresql_base0
55
48
  requirement: !ruby/object:Gem::Requirement
@@ -73,7 +66,7 @@ dependencies:
73
66
  version: '0.7'
74
67
  - - ">="
75
68
  - !ruby/object:Gem::Version
76
- version: 0.7.1
69
+ version: 0.7.2
77
70
  type: :runtime
78
71
  prerelease: false
79
72
  version_requirements: !ruby/object:Gem::Requirement
@@ -83,7 +76,7 @@ dependencies:
83
76
  version: '0.7'
84
77
  - - ">="
85
78
  - !ruby/object:Gem::Version
86
- version: 0.7.1
79
+ version: 0.7.2
87
80
  - !ruby/object:Gem::Dependency
88
81
  name: eac_ruby_base1
89
82
  requirement: !ruby/object:Gem::Requirement
@@ -93,7 +86,7 @@ dependencies:
93
86
  version: '0.1'
94
87
  - - ">="
95
88
  - !ruby/object:Gem::Version
96
- version: 0.1.1
89
+ version: 0.1.2
97
90
  type: :runtime
98
91
  prerelease: false
99
92
  version_requirements: !ruby/object:Gem::Requirement
@@ -103,7 +96,21 @@ dependencies:
103
96
  version: '0.1'
104
97
  - - ">="
105
98
  - !ruby/object:Gem::Version
106
- version: 0.1.1
99
+ version: 0.1.2
100
+ - !ruby/object:Gem::Dependency
101
+ name: eac_ruby_utils
102
+ requirement: !ruby/object:Gem::Requirement
103
+ requirements:
104
+ - - "~>"
105
+ - !ruby/object:Gem::Version
106
+ version: '0.136'
107
+ type: :runtime
108
+ prerelease: false
109
+ version_requirements: !ruby/object:Gem::Requirement
110
+ requirements:
111
+ - - "~>"
112
+ - !ruby/object:Gem::Version
113
+ version: '0.136'
107
114
  - !ruby/object:Gem::Dependency
108
115
  name: htmlbeautifier
109
116
  requirement: !ruby/object:Gem::Requirement
@@ -130,16 +137,14 @@ dependencies:
130
137
  requirements:
131
138
  - - "~>"
132
139
  - !ruby/object:Gem::Version
133
- version: '0.14'
140
+ version: '0.16'
134
141
  type: :development
135
142
  prerelease: false
136
143
  version_requirements: !ruby/object:Gem::Requirement
137
144
  requirements:
138
145
  - - "~>"
139
146
  - !ruby/object:Gem::Version
140
- version: '0.14'
141
- description:
142
- email:
147
+ version: '0.16'
143
148
  executables: []
144
149
  extensions: []
145
150
  extra_rdoc_files: []
@@ -161,14 +166,15 @@ files:
161
166
  - lib/avm/eac_webapp_base0/instances/base/deploy.rb
162
167
  - lib/avm/eac_webapp_base0/instances/base/deploy_info.rb
163
168
  - lib/avm/eac_webapp_base0/instances/base/install.rb
169
+ - lib/avm/eac_webapp_base0/instances/build.rb
164
170
  - lib/avm/eac_webapp_base0/instances/deploy.rb
165
171
  - lib/avm/eac_webapp_base0/instances/deploy/appended_directories.rb
166
172
  - lib/avm/eac_webapp_base0/instances/deploy/build.rb
167
173
  - lib/avm/eac_webapp_base0/instances/deploy/info.rb
168
174
  - lib/avm/eac_webapp_base0/instances/deploy/scm.rb
169
- - lib/avm/eac_webapp_base0/instances/deploy/setup_files_unit.rb
170
- - lib/avm/eac_webapp_base0/instances/deploy/write_on_target.rb
171
175
  - lib/avm/eac_webapp_base0/instances/deploy_info.rb
176
+ - lib/avm/eac_webapp_base0/instances/install.rb
177
+ - lib/avm/eac_webapp_base0/instances/install/setup_files_unit.rb
172
178
  - lib/avm/eac_webapp_base0/instances/processes/web_server.rb
173
179
  - lib/avm/eac_webapp_base0/instances/runners/apache_host.rb
174
180
  - lib/avm/eac_webapp_base0/instances/runners/apache_path.rb
@@ -179,10 +185,8 @@ files:
179
185
  - template/avm/eac_webapp_base0/instances/apache_host/no_ssl.conf
180
186
  - template/avm/eac_webapp_base0/instances/apache_path/default.conf
181
187
  - template/avm/eac_webapp_base0/instances/deploy/.keep
182
- homepage:
183
188
  licenses: []
184
189
  metadata: {}
185
- post_install_message:
186
190
  rdoc_options: []
187
191
  require_paths:
188
192
  - lib
@@ -197,8 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
197
201
  - !ruby/object:Gem::Version
198
202
  version: '0'
199
203
  requirements: []
200
- rubygems_version: 3.4.19
201
- signing_key:
204
+ rubygems_version: 3.6.9
202
205
  specification_version: 4
203
206
  summary: Put here de description.
204
207
  test_files: []
@@ -1,18 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module Avm
4
- module EacWebappBase0
5
- module Instances
6
- class Deploy
7
- module WriteOnTarget
8
- def write_on_target
9
- ::Avm::Files::Deploy.new(
10
- instance.host_env,
11
- instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
12
- ).append_plain_directory(build_dir).run
13
- end
14
- end
15
- end
16
- end
17
- end
18
- end