avm-eac_webapp_base0 0.9.2 → 0.10.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/avm/eac_webapp_base0/instances/deploy/build.rb +1 -1
- data/lib/avm/eac_webapp_base0/instances/deploy/{git_info.rb → scm.rb} +10 -5
- data/lib/avm/eac_webapp_base0/instances/deploy/version.rb +2 -2
- data/lib/avm/eac_webapp_base0/instances/deploy.rb +3 -2
- data/lib/avm/eac_webapp_base0/version.rb +1 -1
- metadata +7 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8edee65419d483890bcba0f8ada6555f374c637f49baab1ee0b1c3eed87b1a44
|
4
|
+
data.tar.gz: c233e77be942064f7e1c012f150709550ab76e421f61a2743b7d28de58fc113f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b8367487016eefc17ff0c8d8add87524608cced0af5fa74336ad08392446fa3d0ccf8a4fb5faf399b807d069414bbb0dbcb18465a7c5ea0aae254db6850cdf50
|
7
|
+
data.tar.gz: '08ecafa72654a72d3015f65b95350a9eb6494870886a386b33104666edcae547b5ae7bd075cea56238b59c6d859d11dd93f877d5fe8e2ea06b2c5b3fc2d1de09'
|
@@ -38,7 +38,7 @@ module Avm
|
|
38
38
|
|
39
39
|
def build_content
|
40
40
|
infom 'Writing Git source code...'
|
41
|
-
|
41
|
+
scm.commit(commit_reference).deploy_to_env_path(
|
42
42
|
build_dir_env,
|
43
43
|
build_dir
|
44
44
|
).variables_source_set(variables_source).run
|
@@ -4,8 +4,8 @@ module Avm
|
|
4
4
|
module EacWebappBase0
|
5
5
|
module Instances
|
6
6
|
class Deploy
|
7
|
-
module
|
8
|
-
def
|
7
|
+
module Scm
|
8
|
+
def commit_reference_uncached
|
9
9
|
git_fetch
|
10
10
|
r = git.rev_parse(git_reference_found)
|
11
11
|
return r if r
|
@@ -15,7 +15,7 @@ module Avm
|
|
15
15
|
|
16
16
|
def git_fetch_uncached
|
17
17
|
infom "Fetching remote \"#{git_remote_name}\" from \"#{git_repository_path}\"..."
|
18
|
-
git.
|
18
|
+
git.remote(git_remote_name).fetch
|
19
19
|
end
|
20
20
|
|
21
21
|
def git_reference
|
@@ -31,7 +31,7 @@ module Avm
|
|
31
31
|
end
|
32
32
|
|
33
33
|
def git_remote_hashs_uncached
|
34
|
-
git.
|
34
|
+
git.remote(git_remote_name).ls.hashes
|
35
35
|
end
|
36
36
|
|
37
37
|
def git_remote_name
|
@@ -44,7 +44,7 @@ module Avm
|
|
44
44
|
|
45
45
|
# @return [EacGit::Local]
|
46
46
|
def git_uncached
|
47
|
-
|
47
|
+
scm.git_repo
|
48
48
|
end
|
49
49
|
|
50
50
|
def instance_branch
|
@@ -58,6 +58,11 @@ module Avm
|
|
58
58
|
def master_branch
|
59
59
|
remote_branch('master')
|
60
60
|
end
|
61
|
+
|
62
|
+
# @return [Avm::Scms::Base]
|
63
|
+
def scm
|
64
|
+
instance.application.local_source.scm
|
65
|
+
end
|
61
66
|
end
|
62
67
|
end
|
63
68
|
end
|
@@ -8,11 +8,11 @@ module Avm
|
|
8
8
|
VERSION_TARGET_PATH = 'VERSION'
|
9
9
|
|
10
10
|
def version
|
11
|
-
([::Time.now,
|
11
|
+
([::Time.now, commit_reference] + version_git_refs).join('|')
|
12
12
|
end
|
13
13
|
|
14
14
|
def version_git_refs
|
15
|
-
git_remote_hashs.select { |_name, sha1| sha1 ==
|
15
|
+
git_remote_hashs.select { |_name, sha1| sha1 == commit_reference }.keys
|
16
16
|
.map { |ref| ref.gsub(%r{\Arefs/}, '') }.reject { |ref| ref == 'HEAD' }
|
17
17
|
end
|
18
18
|
|
@@ -38,7 +38,7 @@ module Avm
|
|
38
38
|
infov 'Git reference (User)', git_reference.if_present('- BLANK -')
|
39
39
|
infov 'Git remote name', git_remote_name
|
40
40
|
infov 'Git reference (Found)', git_reference_found
|
41
|
-
infov 'Git commit SHA1',
|
41
|
+
infov 'Git commit SHA1', commit_reference
|
42
42
|
infov 'Appended directories', appended_directories
|
43
43
|
end
|
44
44
|
|
@@ -50,7 +50,8 @@ module Avm
|
|
50
50
|
|
51
51
|
def assert_instance_branch
|
52
52
|
infom 'Setting instance branch...'
|
53
|
-
git.
|
53
|
+
git.command('push', git_remote_name, "#{commit_reference}:refs/heads/#{instance.id}",
|
54
|
+
'-f').execute!
|
54
55
|
end
|
55
56
|
|
56
57
|
def request_test
|
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.10.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: 2022-10-
|
11
|
+
date: 2022-10-16 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.50'
|
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.50'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: avm-eac_generic_base0
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -72,14 +72,14 @@ dependencies:
|
|
72
72
|
requirements:
|
73
73
|
- - "~>"
|
74
74
|
- !ruby/object:Gem::Version
|
75
|
-
version: '0.
|
75
|
+
version: '0.105'
|
76
76
|
type: :runtime
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
80
|
- - "~>"
|
81
81
|
- !ruby/object:Gem::Version
|
82
|
-
version: '0.
|
82
|
+
version: '0.105'
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
84
|
name: eac_ruby_gem_support
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
@@ -109,7 +109,7 @@ files:
|
|
109
109
|
- lib/avm/eac_webapp_base0/instances/deploy/appended_directories.rb
|
110
110
|
- lib/avm/eac_webapp_base0/instances/deploy/build.rb
|
111
111
|
- lib/avm/eac_webapp_base0/instances/deploy/file_unit.rb
|
112
|
-
- lib/avm/eac_webapp_base0/instances/deploy/
|
112
|
+
- lib/avm/eac_webapp_base0/instances/deploy/scm.rb
|
113
113
|
- lib/avm/eac_webapp_base0/instances/deploy/version.rb
|
114
114
|
- lib/avm/eac_webapp_base0/instances/deploy/write_on_target.rb
|
115
115
|
- lib/avm/eac_webapp_base0/instances/runners.rb
|