avm-eac_webapp_base0 0.18.3 → 0.19.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/lib/avm/eac_webapp_base0/instances/base/deploy_info.rb +30 -0
  3. data/lib/avm/eac_webapp_base0/instances/deploy/info.rb +47 -0
  4. data/lib/avm/eac_webapp_base0/instances/deploy_info.rb +37 -0
  5. data/lib/avm/eac_webapp_base0/instances/runners/deploy_info.rb +28 -0
  6. data/lib/avm/eac_webapp_base0/version.rb +1 -1
  7. metadata +44 -33
  8. data/lib/avm/eac_webapp_base0/instances/deploy/version.rb +0 -26
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0cacdf03556abe3a06f06c3dd6ab10736aa22ad23350486a490fb2f9b46f68c0
4
- data.tar.gz: f4e6484240a369c2fc9665ea4bc6375e76a849528cf125f0d731c9d9c90ca9c2
3
+ metadata.gz: 2e4b96681351220f7b134bf2a7ed3587a97ac8dc8145f235db472ceb7166449a
4
+ data.tar.gz: 3736f87be214a3237f6649224c3b5e2c723678695f7b1a4e54b1f1453e232b80
5
5
  SHA512:
6
- metadata.gz: 593361d0429aa201535381417b1e98072a5ed9c2275e9b182e43738759e641e859b9f3fab3f1e4a714a3f92b68bea6da97c92ad30c434f39c9cf686876e7641f
7
- data.tar.gz: a4a2af14ef728e9969e87469a7dea3ab88dc624fa8f43df9b0d109dcc047c2ba31e6faaf19bb01d169f7bf02d82f23347601a23b0ce3bd081addbbd1cb328e33
6
+ metadata.gz: 1d5c62d48d765c0de62920835107ef5a120cb97bfa9048853fda9ef9d2ff68b42ae814662c0cf2753400063d6b0d7b88dde5822a6792712dbcdfdc1885340e8e
7
+ data.tar.gz: 64b2e4c165035afe151a8aa60bd452484805a9bc06eef6720e7057b5c44ea0e2901fd93d10900781a9c10c66dd6063334540f75c85e02ccad9251550a8486628
data/lib/avm/eac_webapp_base0/instances/base/deploy_info.rb ADDED
@@ -0,0 +1,30 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'avm/eac_webapp_base0/instances/deploy_info'
4
+ require 'avm/instances/base'
5
+
6
+ module Avm
7
+ module EacWebappBase0
8
+ module Instances
9
+ class Base < ::Avm::Instances::Base
10
+ module DeployInfo
11
+ common_concern
12
+
13
+ DEPLOY_INFO_SUBPATH = '.deploy.yaml'
14
+
15
+ # @return [Avm::EacWebappBase0::Instances::DeployInfo]
16
+ def deploy_info
17
+ ::Avm::EacWebappBase0::Instances::DeployInfo.from_string(
18
+ host_env.command('cat', deploy_info_path).execute!
19
+ )
20
+ end
21
+
22
+ # @return [Pathname]
23
+ def deploy_info_path
24
+ install_path.to_pathname.join(DEPLOY_INFO_SUBPATH)
25
+ end
26
+ end
27
+ end
28
+ end
29
+ end
30
+ end
data/lib/avm/eac_webapp_base0/instances/deploy/info.rb ADDED
@@ -0,0 +1,47 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'avm/eac_webapp_base0/instances/deploy_info'
4
+ require 'avm/eac_webapp_base0/instances/base/deploy_info'
5
+
6
+ module Avm
7
+ module EacWebappBase0
8
+ module Instances
9
+ class Deploy
10
+ module Info
11
+ # @return [Hash]
12
+ def deploy_info
13
+ ::Avm::EacWebappBase0::Instances::DeployInfo.from_hash(
14
+ {
15
+ instance_id: instance.id,
16
+ time: ::Time.now,
17
+ commit_id: commit_reference,
18
+ commit_refs: version_git_refs,
19
+ version: version_number
20
+ }
21
+ )
22
+ end
23
+
24
+ # @return [String]
25
+ def version
26
+ deploy_info.to_yaml
27
+ end
28
+
29
+ def version_git_refs
30
+ git_remote_hashs.select { |_name, sha1| sha1 == commit_reference }.keys
31
+ .map { |ref| ref.gsub(%r{\Arefs/}, '') }.reject { |ref| ref == 'HEAD' }
32
+ end
33
+
34
+ # @return [String, nil]
35
+ def version_number
36
+ instance.application.local_source.version.if_present(&:to_s)
37
+ end
38
+
39
+ # @return [String]
40
+ def version_target_path
41
+ ::Avm::EacWebappBase0::Instances::Base::DeployInfo::DEPLOY_INFO_SUBPATH
42
+ end
43
+ end
44
+ end
45
+ end
46
+ end
47
+ end
data/lib/avm/eac_webapp_base0/instances/deploy_info.rb ADDED
@@ -0,0 +1,37 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module Avm
6
+ module EacWebappBase0
7
+ module Instances
8
+ class DeployInfo
9
+ class << self
10
+ # @param hash [Hash]
11
+ # @return [Avm::EacWebappBase0::Instances::DeployInfo]
12
+ def from_hash(hash)
13
+ new(hash)
14
+ end
15
+
16
+ # @return string [String]
17
+ # @return [Avm::EacWebappBase0::Instances::DeployInfo]
18
+ def from_string(string)
19
+ from_hash(::EacRubyUtils::Yaml.load(string))
20
+ end
21
+ end
22
+
23
+ common_constructor :data do
24
+ self.data = data.with_indifferent_access
25
+ end
26
+
27
+ # @return [Hash]
28
+ delegate :to_h, to: :data
29
+
30
+ # @return [String]
31
+ def to_yaml
32
+ ::EacRubyUtils::Yaml.dump(to_h)
33
+ end
34
+ end
35
+ end
36
+ end
37
+ end
data/lib/avm/eac_webapp_base0/instances/runners/deploy_info.rb ADDED
@@ -0,0 +1,28 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'avm/instances/runner'
4
+ require 'avm/path_string'
5
+ require 'eac_cli/core_ext'
6
+
7
+ module Avm
8
+ module EacWebappBase0
9
+ module Instances
10
+ module Runners
11
+ class DeployInfo
12
+ runner_with :help, :output_item do
13
+ desc 'Fetch instance\'s last deploy information.'
14
+ end
15
+
16
+ def run
17
+ run_output
18
+ end
19
+
20
+ # @return [Hash]
21
+ def item_hash
22
+ instance.deploy_info.to_h
23
+ end
24
+ end
25
+ end
26
+ end
27
+ end
28
+ end
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.18.3'
5
+ VERSION = '0.19.0'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: avm-eac_webapp_base0
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.18.3
4
+ version: 0.19.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-11-23 00:00:00.000000000 Z
11
+ date: 2024-04-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: avm
@@ -16,40 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '0.84'
20
- - - ">="
21
- - !ruby/object:Gem::Version
22
- version: 0.84.2
19
+ version: '0.90'
23
20
  type: :runtime
24
21
  prerelease: false
25
22
  version_requirements: !ruby/object:Gem::Requirement
26
23
  requirements:
27
24
  - - "~>"
28
25
  - !ruby/object:Gem::Version
29
- version: '0.84'
30
- - - ">="
31
- - !ruby/object:Gem::Version
32
- version: 0.84.2
26
+ version: '0.90'
33
27
  - !ruby/object:Gem::Dependency
34
28
  name: avm-eac_generic_base0
35
29
  requirement: !ruby/object:Gem::Requirement
36
30
  requirements:
37
31
  - - "~>"
38
32
  - !ruby/object:Gem::Version
39
- version: '0.12'
40
- - - ">="
41
- - !ruby/object:Gem::Version
42
- version: 0.12.2
33
+ version: '0.13'
43
34
  type: :runtime
44
35
  prerelease: false
45
36
  version_requirements: !ruby/object:Gem::Requirement
46
37
  requirements:
47
38
  - - "~>"
48
39
  - !ruby/object:Gem::Version
49
- version: '0.12'
50
- - - ">="
51
- - !ruby/object:Gem::Version
52
- version: 0.12.2
40
+ version: '0.13'
53
41
  - !ruby/object:Gem::Dependency
54
42
  name: avm-eac_postgresql_base0
55
43
  requirement: !ruby/object:Gem::Requirement
@@ -59,7 +47,7 @@ dependencies:
59
47
  version: '0.5'
60
48
  - - ">="
61
49
  - !ruby/object:Gem::Version
62
- version: 0.5.2
50
+ version: 0.5.3
63
51
  type: :runtime
64
52
  prerelease: false
65
53
  version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +57,7 @@ dependencies:
69
57
  version: '0.5'
70
58
  - - ">="
71
59
  - !ruby/object:Gem::Version
72
- version: 0.5.2
60
+ version: 0.5.3
73
61
  - !ruby/object:Gem::Dependency
74
62
  name: avm-eac_ubuntu_base0
75
63
  requirement: !ruby/object:Gem::Requirement
@@ -77,6 +65,9 @@ dependencies:
77
65
  - - "~>"
78
66
  - !ruby/object:Gem::Version
79
67
  version: '0.5'
68
+ - - ">="
69
+ - !ruby/object:Gem::Version
70
+ version: 0.5.1
80
71
  type: :runtime
81
72
  prerelease: false
82
73
  version_requirements: !ruby/object:Gem::Requirement
@@ -84,54 +75,71 @@ dependencies:
84
75
  - - "~>"
85
76
  - !ruby/object:Gem::Version
86
77
  version: '0.5'
78
+ - - ">="
79
+ - !ruby/object:Gem::Version
80
+ version: 0.5.1
87
81
  - !ruby/object:Gem::Dependency
88
82
  name: avm-files
89
83
  requirement: !ruby/object:Gem::Requirement
90
84
  requirements:
91
85
  - - "~>"
92
86
  - !ruby/object:Gem::Version
93
- version: '0.6'
94
- - - ">="
95
- - !ruby/object:Gem::Version
96
- version: 0.6.2
87
+ version: '0.7'
97
88
  type: :runtime
98
89
  prerelease: false
99
90
  version_requirements: !ruby/object:Gem::Requirement
100
91
  requirements:
101
92
  - - "~>"
102
93
  - !ruby/object:Gem::Version
103
- version: '0.6'
104
- - - ">="
105
- - !ruby/object:Gem::Version
106
- version: 0.6.2
94
+ version: '0.7'
107
95
  - !ruby/object:Gem::Dependency
108
96
  name: eac_ruby_utils
109
97
  requirement: !ruby/object:Gem::Requirement
110
98
  requirements:
111
99
  - - "~>"
112
100
  - !ruby/object:Gem::Version
113
- version: '0.120'
101
+ version: '0.121'
114
102
  type: :runtime
115
103
  prerelease: false
116
104
  version_requirements: !ruby/object:Gem::Requirement
117
105
  requirements:
118
106
  - - "~>"
119
107
  - !ruby/object:Gem::Version
120
- version: '0.120'
108
+ version: '0.121'
109
+ - !ruby/object:Gem::Dependency
110
+ name: htmlbeautifier
111
+ requirement: !ruby/object:Gem::Requirement
112
+ requirements:
113
+ - - "~>"
114
+ - !ruby/object:Gem::Version
115
+ version: '1.4'
116
+ - - ">="
117
+ - !ruby/object:Gem::Version
118
+ version: 1.4.3
119
+ type: :runtime
120
+ prerelease: false
121
+ version_requirements: !ruby/object:Gem::Requirement
122
+ requirements:
123
+ - - "~>"
124
+ - !ruby/object:Gem::Version
125
+ version: '1.4'
126
+ - - ">="
127
+ - !ruby/object:Gem::Version
128
+ version: 1.4.3
121
129
  - !ruby/object:Gem::Dependency
122
130
  name: eac_ruby_gem_support
123
131
  requirement: !ruby/object:Gem::Requirement
124
132
  requirements:
125
133
  - - "~>"
126
134
  - !ruby/object:Gem::Version
127
- version: '0.9'
135
+ version: '0.10'
128
136
  type: :development
129
137
  prerelease: false
130
138
  version_requirements: !ruby/object:Gem::Requirement
131
139
  requirements:
132
140
  - - "~>"
133
141
  - !ruby/object:Gem::Version
134
- version: '0.9'
142
+ version: '0.10'
135
143
  description:
136
144
  email:
137
145
  executables: []
@@ -153,14 +161,16 @@ files:
153
161
  - lib/avm/eac_webapp_base0/instances/apache_path.rb
154
162
  - lib/avm/eac_webapp_base0/instances/base.rb
155
163
  - lib/avm/eac_webapp_base0/instances/base/apache.rb
164
+ - lib/avm/eac_webapp_base0/instances/base/deploy_info.rb
156
165
  - lib/avm/eac_webapp_base0/instances/base/install.rb
157
166
  - lib/avm/eac_webapp_base0/instances/deploy.rb
158
167
  - lib/avm/eac_webapp_base0/instances/deploy/appended_directories.rb
159
168
  - lib/avm/eac_webapp_base0/instances/deploy/build.rb
169
+ - lib/avm/eac_webapp_base0/instances/deploy/info.rb
160
170
  - lib/avm/eac_webapp_base0/instances/deploy/scm.rb
161
171
  - lib/avm/eac_webapp_base0/instances/deploy/setup_files_unit.rb
162
- - lib/avm/eac_webapp_base0/instances/deploy/version.rb
163
172
  - lib/avm/eac_webapp_base0/instances/deploy/write_on_target.rb
173
+ - lib/avm/eac_webapp_base0/instances/deploy_info.rb
164
174
  - lib/avm/eac_webapp_base0/instances/processes.rb
165
175
  - lib/avm/eac_webapp_base0/instances/processes/web_server.rb
166
176
  - lib/avm/eac_webapp_base0/instances/runners.rb
@@ -168,6 +178,7 @@ files:
168
178
  - lib/avm/eac_webapp_base0/instances/runners/apache_path.rb
169
179
  - lib/avm/eac_webapp_base0/instances/runners/data/load.rb
170
180
  - lib/avm/eac_webapp_base0/instances/runners/deploy.rb
181
+ - lib/avm/eac_webapp_base0/instances/runners/deploy_info.rb
171
182
  - lib/avm/eac_webapp_base0/sources.rb
172
183
  - lib/avm/eac_webapp_base0/sources/base.rb
173
184
  - lib/avm/eac_webapp_base0/version.rb
data/lib/avm/eac_webapp_base0/instances/deploy/version.rb DELETED
@@ -1,26 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module Avm
4
- module EacWebappBase0
5
- module Instances
6
- class Deploy
7
- module Version
8
- VERSION_TARGET_PATH = 'VERSION'
9
-
10
- def version
11
- ([::Time.now, commit_reference] + version_git_refs).join('|')
12
- end
13
-
14
- def version_git_refs
15
- git_remote_hashs.select { |_name, sha1| sha1 == commit_reference }.keys
16
- .map { |ref| ref.gsub(%r{\Arefs/}, '') }.reject { |ref| ref == 'HEAD' }
17
- end
18
-
19
- def version_target_path
20
- VERSION_TARGET_PATH
21
- end
22
- end
23
- end
24
- end
25
- end
26
- end