avm-eac_webapp_base0 0.19.0 → 0.20.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/avm/eac_webapp_base0/file_formats/css.rb +1 -1
- data/lib/avm/eac_webapp_base0/file_formats/html.rb +1 -1
- data/lib/avm/eac_webapp_base0/file_formats/javascript.rb +1 -1
- data/lib/avm/eac_webapp_base0/file_formats/xml.rb +1 -1
- data/lib/avm/eac_webapp_base0/instances/deploy/build.rb +1 -1
- data/lib/avm/eac_webapp_base0/instances/deploy/scm.rb +16 -0
- data/lib/avm/eac_webapp_base0/instances/deploy.rb +4 -1
- data/lib/avm/eac_webapp_base0/instances/runners/deploy.rb +15 -1
- data/lib/avm/eac_webapp_base0/version.rb +1 -1
- data/template/avm/eac_webapp_base0/instances/deploy/.keep +1 -0
- metadata +9 -8
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1f605edaacbfbacfcf5c717e9442874bcf3c60266488eebaf314571b4a23517f
|
4
|
+
data.tar.gz: c452436630f5f48c3de0727f75d292850472ca9c2cbebbc24dbb94abc20b7308
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f21fe0e9c1bc992abac5a11776dcda5c9b8b569076effd0e28cdc1ec6b55eeec265220f1ec13dc3b96f37d25686f532b4bbb275f31695b1bcd2360cac6893c11
|
7
|
+
data.tar.gz: 63be677dab40f54899dad7ceeaeda5575e5427ace803a57b417f61786ccca602baf7c2aee21d6e469f45dba75b3f98ddf175f532e3119a3bdbbccf4cbe8c67e0
|
@@ -18,7 +18,7 @@ module Avm
|
|
18
18
|
::Avm::Files::Appender
|
19
19
|
.new
|
20
20
|
.variables_source_set(variables_source)
|
21
|
-
.append_templatized_directory(template
|
21
|
+
.append_templatized_directory(template)
|
22
22
|
.append_templatized_directories(appended_directories)
|
23
23
|
.append_file_content(version_target_path, version)
|
24
24
|
.write_appended_on(build_dir)
|
@@ -6,6 +6,8 @@ module Avm
|
|
6
6
|
class Deploy
|
7
7
|
module Scm
|
8
8
|
DEFAULT_REMOTE_NAME = 'origin'
|
9
|
+
DEFAULT_REMOTE_READ = true
|
10
|
+
DEFAULT_REMOTE_WRITE = true
|
9
11
|
|
10
12
|
def commit_reference_uncached
|
11
13
|
git_fetch
|
@@ -16,6 +18,8 @@ module Avm
|
|
16
18
|
end
|
17
19
|
|
18
20
|
def git_fetch_uncached
|
21
|
+
return unless remote_read?
|
22
|
+
|
19
23
|
infom "Fetching remote \"#{git_remote_name}\" from \"#{git_repository_path}\"..."
|
20
24
|
git.remote(git_remote_name).fetch
|
21
25
|
end
|
@@ -33,6 +37,8 @@ module Avm
|
|
33
37
|
end
|
34
38
|
|
35
39
|
def git_remote_hashs_uncached
|
40
|
+
return {} unless remote_read?
|
41
|
+
|
36
42
|
git.remote(git_remote_name).ls.hashes
|
37
43
|
end
|
38
44
|
|
@@ -61,6 +67,16 @@ module Avm
|
|
61
67
|
remote_branch('master')
|
62
68
|
end
|
63
69
|
|
70
|
+
# @return [Boolean]
|
71
|
+
def remote_read?
|
72
|
+
options.if_key(OPTION_REMOTE_READ, DEFAULT_REMOTE_READ).to_bool
|
73
|
+
end
|
74
|
+
|
75
|
+
# @return [Boolean]
|
76
|
+
def remote_write?
|
77
|
+
options.if_key(OPTION_REMOTE_WRITE, DEFAULT_REMOTE_WRITE).to_bool
|
78
|
+
end
|
79
|
+
|
64
80
|
# @return [Avm::Scms::Base]
|
65
81
|
def scm
|
66
82
|
instance.application.local_source.scm
|
@@ -20,7 +20,8 @@ module Avm
|
|
20
20
|
|
21
21
|
include ::Avm::Entries::Jobs::Base
|
22
22
|
|
23
|
-
lists.add_symbol :option, :appended_directories, :no_request_test, :reference
|
23
|
+
lists.add_symbol :option, :appended_directories, :no_request_test, :reference,
|
24
|
+
:remote_read, :remote_write
|
24
25
|
|
25
26
|
def option_list
|
26
27
|
::Avm::EacWebappBase0::Instances::Deploy.lists.option
|
@@ -47,6 +48,8 @@ module Avm
|
|
47
48
|
end
|
48
49
|
|
49
50
|
def assert_instance_branch
|
51
|
+
return unless remote_write?
|
52
|
+
|
50
53
|
infom 'Setting instance branch...'
|
51
54
|
git.command('push', git_remote_name, "#{commit_reference}:refs/heads/#{instance.id}",
|
52
55
|
'-f').execute!
|
@@ -14,6 +14,9 @@ module Avm
|
|
14
14
|
arg_opt '-r', '--reference', 'Git reference to deploy.'
|
15
15
|
arg_opt '-a', '--append-dirs', 'Append directories to deploy (List separated by ":").'
|
16
16
|
bool_opt '-T', '--no-request-test', 'Do not test web interface after deploy.'
|
17
|
+
bool_opt '--no-remote', 'Shortcut to "--no-remote-read --no-remote-write"'
|
18
|
+
bool_opt '--no-remote-read', 'Do not attempt to read on remote repository.'
|
19
|
+
bool_opt '--no-remote-write', 'Do not attempt to write on remote repository.'
|
17
20
|
end
|
18
21
|
|
19
22
|
def deploy_class
|
@@ -34,7 +37,18 @@ module Avm
|
|
34
37
|
def deploy_options
|
35
38
|
{ reference: parsed.reference,
|
36
39
|
appended_directories: ::Avm::PathString.paths(parsed.append_dirs),
|
37
|
-
no_request_test: parsed.no_request_test
|
40
|
+
no_request_test: parsed.no_request_test?, remote_read: remote_read?,
|
41
|
+
remote_write: remote_write? }
|
42
|
+
end
|
43
|
+
|
44
|
+
# @return [Boolean]
|
45
|
+
def remote_read?
|
46
|
+
!(parsed.no_remote_read? || parsed.no_remote?)
|
47
|
+
end
|
48
|
+
|
49
|
+
# @return [Boolean]
|
50
|
+
def remote_write?
|
51
|
+
!(parsed.no_remote_write? || parsed.no_remote?)
|
38
52
|
end
|
39
53
|
end
|
40
54
|
end
|
@@ -0,0 +1 @@
|
|
1
|
+
|
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.
|
4
|
+
version: 0.20.1
|
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: 2024-
|
11
|
+
date: 2024-08-22 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: avm
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: '0.
|
19
|
+
version: '0.94'
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: '0.
|
26
|
+
version: '0.94'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: avm-eac_generic_base0
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -84,28 +84,28 @@ dependencies:
|
|
84
84
|
requirements:
|
85
85
|
- - "~>"
|
86
86
|
- !ruby/object:Gem::Version
|
87
|
-
version: '0.
|
87
|
+
version: '0.8'
|
88
88
|
type: :runtime
|
89
89
|
prerelease: false
|
90
90
|
version_requirements: !ruby/object:Gem::Requirement
|
91
91
|
requirements:
|
92
92
|
- - "~>"
|
93
93
|
- !ruby/object:Gem::Version
|
94
|
-
version: '0.
|
94
|
+
version: '0.8'
|
95
95
|
- !ruby/object:Gem::Dependency
|
96
96
|
name: eac_ruby_utils
|
97
97
|
requirement: !ruby/object:Gem::Requirement
|
98
98
|
requirements:
|
99
99
|
- - "~>"
|
100
100
|
- !ruby/object:Gem::Version
|
101
|
-
version: '0.
|
101
|
+
version: '0.122'
|
102
102
|
type: :runtime
|
103
103
|
prerelease: false
|
104
104
|
version_requirements: !ruby/object:Gem::Requirement
|
105
105
|
requirements:
|
106
106
|
- - "~>"
|
107
107
|
- !ruby/object:Gem::Version
|
108
|
-
version: '0.
|
108
|
+
version: '0.122'
|
109
109
|
- !ruby/object:Gem::Dependency
|
110
110
|
name: htmlbeautifier
|
111
111
|
requirement: !ruby/object:Gem::Requirement
|
@@ -184,6 +184,7 @@ files:
|
|
184
184
|
- lib/avm/eac_webapp_base0/version.rb
|
185
185
|
- template/avm/eac_webapp_base0/instances/apache_host/no_ssl.conf
|
186
186
|
- template/avm/eac_webapp_base0/instances/apache_path/default.conf
|
187
|
+
- template/avm/eac_webapp_base0/instances/deploy/.keep
|
187
188
|
homepage:
|
188
189
|
licenses: []
|
189
190
|
metadata: {}
|