avm-tools 0.99.0 → 0.99.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/avm/app_src.rb +4 -4
- data/lib/avm/eac_webapp_base0/deploy.rb +1 -1
- data/lib/avm/eac_webapp_base0/deploy/git_info.rb +1 -1
- data/lib/avm/git/commit/file.rb +1 -1
- data/lib/avm/git/issue/complete.rb +2 -2
- data/lib/avm/git/subrepo_check.rb +1 -1
- data/lib/avm/git/subrepo_check/show_result.rb +1 -1
- data/lib/avm/git/subrepo_checks.rb +1 -1
- data/lib/avm/launcher/context.rb +83 -0
- data/lib/avm/launcher/context/instance_discovery.rb +56 -0
- data/lib/avm/launcher/context/instance_manager.rb +3 -3
- data/lib/avm/launcher/context/instance_manager/cached_instance.rb +1 -1
- data/lib/avm/launcher/context/settings.rb +53 -0
- data/lib/avm/launcher/git.rb +7 -0
- data/lib/avm/launcher/git/base.rb +86 -0
- data/lib/avm/launcher/git/base/class_methods.rb +28 -0
- data/lib/avm/launcher/git/base/dirty_files.rb +23 -0
- data/lib/avm/launcher/git/base/remotes.rb +40 -0
- data/lib/avm/launcher/git/base/subrepo.rb +44 -0
- data/lib/avm/launcher/git/base/underlying.rb +63 -0
- data/lib/avm/launcher/git/error.rb +13 -0
- data/lib/avm/launcher/git/mirror_update.rb +38 -0
- data/lib/avm/launcher/git/publish_base.rb +121 -0
- data/lib/avm/launcher/git/remote.rb +55 -0
- data/lib/avm/launcher/git/sub_warp_base.rb +33 -0
- data/lib/avm/launcher/git/warp_base.rb +56 -0
- data/lib/{eac_launcher → avm/launcher}/instances.rb +1 -1
- data/lib/avm/launcher/instances/base.rb +3 -3
- data/lib/avm/launcher/instances/base/cache.rb +1 -1
- data/lib/avm/launcher/instances/runner_helper.rb +1 -1
- data/lib/avm/launcher/paths.rb +4 -0
- data/lib/avm/launcher/paths/logical.rb +82 -0
- data/lib/avm/launcher/paths/real.rb +44 -0
- data/lib/avm/launcher/project.rb +18 -0
- data/lib/avm/launcher/publish.rb +4 -0
- data/lib/avm/launcher/publish/base.rb +47 -0
- data/lib/avm/launcher/publish/check_result.rb +67 -0
- data/lib/avm/launcher/ruby.rb +3 -0
- data/lib/avm/launcher/ruby/gem.rb +4 -0
- data/lib/avm/launcher/ruby/gem/build.rb +125 -0
- data/lib/avm/launcher/ruby/gem/specification.rb +63 -0
- data/lib/avm/launcher/vendor.rb +3 -0
- data/lib/avm/launcher/vendor/github.rb +20 -0
- data/lib/avm/projects/stereotypes/git/publish.rb +2 -2
- data/lib/avm/projects/stereotypes/git/update/subrepo.rb +2 -2
- data/lib/avm/projects/stereotypes/git/warp.rb +2 -2
- data/lib/avm/projects/stereotypes/git_subrepo.rb +2 -2
- data/lib/avm/projects/stereotypes/git_subrepo/publish.rb +2 -2
- data/lib/avm/projects/stereotypes/git_subrepo/warp.rb +11 -11
- data/lib/avm/projects/stereotypes/git_subtree/publish.rb +2 -2
- data/lib/avm/projects/stereotypes/git_subtree/warp.rb +4 -4
- data/lib/avm/projects/stereotypes/ruby_gem.rb +2 -2
- data/lib/avm/projects/stereotypes/ruby_gem/publish.rb +11 -11
- data/lib/avm/tools/runner/files/format.rb +2 -2
- data/lib/avm/tools/runner/git.rb +2 -2
- data/lib/avm/tools/runner/git/commit.rb +2 -2
- data/lib/avm/tools/runner/git/deploy.rb +2 -2
- data/lib/avm/tools/runner/launcher/instances.rb +1 -1
- data/lib/avm/tools/runner/launcher/projects.rb +3 -3
- data/lib/avm/tools/runner/launcher/publish.rb +2 -2
- data/lib/avm/tools/version.rb +1 -1
- metadata +32 -34
- data/lib/eac_launcher.rb +0 -13
- data/lib/eac_launcher/context.rb +0 -81
- data/lib/eac_launcher/context/instance_discovery.rb +0 -54
- data/lib/eac_launcher/context/settings.rb +0 -51
- data/lib/eac_launcher/git.rb +0 -7
- data/lib/eac_launcher/git/base.rb +0 -84
- data/lib/eac_launcher/git/base/class_methods.rb +0 -26
- data/lib/eac_launcher/git/base/dirty_files.rb +0 -21
- data/lib/eac_launcher/git/base/remotes.rb +0 -38
- data/lib/eac_launcher/git/base/subrepo.rb +0 -42
- data/lib/eac_launcher/git/base/underlying.rb +0 -61
- data/lib/eac_launcher/git/error.rb +0 -11
- data/lib/eac_launcher/git/mirror_update.rb +0 -36
- data/lib/eac_launcher/git/publish_base.rb +0 -119
- data/lib/eac_launcher/git/remote.rb +0 -53
- data/lib/eac_launcher/git/sub_warp_base.rb +0 -31
- data/lib/eac_launcher/git/warp_base.rb +0 -54
- data/lib/eac_launcher/paths.rb +0 -4
- data/lib/eac_launcher/paths/logical.rb +0 -80
- data/lib/eac_launcher/paths/real.rb +0 -42
- data/lib/eac_launcher/project.rb +0 -16
- data/lib/eac_launcher/publish.rb +0 -4
- data/lib/eac_launcher/publish/base.rb +0 -45
- data/lib/eac_launcher/publish/check_result.rb +0 -65
- data/lib/eac_launcher/ruby.rb +0 -3
- data/lib/eac_launcher/ruby/gem.rb +0 -4
- data/lib/eac_launcher/ruby/gem/build.rb +0 -123
- data/lib/eac_launcher/ruby/gem/specification.rb +0 -61
- data/lib/eac_launcher/vendor.rb +0 -3
- data/lib/eac_launcher/vendor/github.rb +0 -18
- data/lib/eac_launcher/version.rb +0 -5
@@ -0,0 +1,63 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'active_support/core_ext/object'
|
4
|
+
|
5
|
+
module Avm
|
6
|
+
module Launcher
|
7
|
+
module Ruby
|
8
|
+
module Gem
|
9
|
+
class Specification
|
10
|
+
class << self
|
11
|
+
def parse_version_file(file)
|
12
|
+
s = ::File.read(file)
|
13
|
+
m = /VERSION\s*=\s*[\'\"]([^\'\"]+)[\'\"]/.match(s)
|
14
|
+
m ? m[1] : nil
|
15
|
+
end
|
16
|
+
end
|
17
|
+
|
18
|
+
attr_reader :gemspec_file
|
19
|
+
|
20
|
+
def initialize(gemspec_file)
|
21
|
+
@gemspec_file = gemspec_file
|
22
|
+
end
|
23
|
+
|
24
|
+
def version
|
25
|
+
v = self.class.parse_version_file(version_file)
|
26
|
+
return v if v.present?
|
27
|
+
|
28
|
+
raise "Version not found on file \"#{version_file}\""
|
29
|
+
end
|
30
|
+
|
31
|
+
def name
|
32
|
+
::File.basename(gemspec_file).gsub(/\.gemspec\z/, '')
|
33
|
+
end
|
34
|
+
|
35
|
+
def full_name
|
36
|
+
"#{name}-#{version}"
|
37
|
+
end
|
38
|
+
|
39
|
+
def to_s
|
40
|
+
full_name
|
41
|
+
end
|
42
|
+
|
43
|
+
private
|
44
|
+
|
45
|
+
def gem_root
|
46
|
+
::File.dirname(gemspec_file)
|
47
|
+
end
|
48
|
+
|
49
|
+
def version_file
|
50
|
+
f = ::File.join(gem_root, 'lib', *namespace_parts, 'version.rb')
|
51
|
+
return f if ::File.exist?(f)
|
52
|
+
|
53
|
+
raise "Version file \"#{f}\" does not exist"
|
54
|
+
end
|
55
|
+
|
56
|
+
def namespace_parts
|
57
|
+
name.split('-')
|
58
|
+
end
|
59
|
+
end
|
60
|
+
end
|
61
|
+
end
|
62
|
+
end
|
63
|
+
end
|
@@ -0,0 +1,20 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Avm
|
4
|
+
module Launcher
|
5
|
+
module Vendor
|
6
|
+
module Github
|
7
|
+
class << self
|
8
|
+
def to_ssh_url(url)
|
9
|
+
return nil if url.blank?
|
10
|
+
|
11
|
+
url_no_dot_git = url.gsub(/\.git\z/, '')
|
12
|
+
|
13
|
+
m = %r{\Ahttps://github.com/([^/]+)/([^/]+)\z}.match(url_no_dot_git.to_s)
|
14
|
+
m ? "git@github.com:#{m[1]}/#{m[2]}.git" : url
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
@@ -1,12 +1,12 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require '
|
3
|
+
require 'avm/launcher/git/publish_base'
|
4
4
|
|
5
5
|
module Avm
|
6
6
|
module Projects
|
7
7
|
module Stereotypes
|
8
8
|
class Git
|
9
|
-
class Publish < ::
|
9
|
+
class Publish < ::Avm::Launcher::Git::PublishBase
|
10
10
|
PUBLISH_GIT_REMOTE_NAME = 'publish'
|
11
11
|
end
|
12
12
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require '
|
3
|
+
require 'avm/launcher/git/base'
|
4
4
|
require 'avm/git/commit'
|
5
5
|
|
6
6
|
module Avm
|
@@ -48,7 +48,7 @@ module Avm
|
|
48
48
|
infom 'Pulling subrepo...'
|
49
49
|
git_repo.command('subrepo', 'pull', '--force', subpath).execute!
|
50
50
|
::Avm::Git::Commit.new(
|
51
|
-
::
|
51
|
+
::Avm::Launcher::Git::Base.new(git_repo.root_path.to_path),
|
52
52
|
git_repo.rev_parse('HEAD')
|
53
53
|
)
|
54
54
|
end
|
@@ -1,12 +1,12 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require '
|
3
|
+
require 'avm/launcher/git/warp_base'
|
4
4
|
|
5
5
|
module Avm
|
6
6
|
module Projects
|
7
7
|
module Stereotypes
|
8
8
|
class Git
|
9
|
-
class Warp < ::
|
9
|
+
class Warp < ::Avm::Launcher::Git::WarpBase
|
10
10
|
private
|
11
11
|
|
12
12
|
def current_ref
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require '
|
3
|
+
require 'avm/launcher/git/error'
|
4
4
|
require 'eac_ruby_utils/core_ext'
|
5
5
|
require 'avm/projects/stereotype'
|
6
6
|
|
@@ -25,7 +25,7 @@ module Avm
|
|
25
25
|
m = /remote\s*=\s(.+)/.match(l)
|
26
26
|
return m[1] if m
|
27
27
|
end
|
28
|
-
raise ::
|
28
|
+
raise ::Avm::Launcher::Git::Error.new(path, '"remote = ... " not found')
|
29
29
|
end
|
30
30
|
end
|
31
31
|
end
|
@@ -1,12 +1,12 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require '
|
3
|
+
require 'avm/launcher/git/publish_base'
|
4
4
|
|
5
5
|
module Avm
|
6
6
|
module Projects
|
7
7
|
module Stereotypes
|
8
8
|
class GitSubrepo
|
9
|
-
class Publish < ::
|
9
|
+
class Publish < ::Avm::Launcher::Git::PublishBase
|
10
10
|
end
|
11
11
|
end
|
12
12
|
end
|
@@ -1,17 +1,17 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
require 'eac_ruby_utils/simple_cache'
|
4
|
-
require '
|
4
|
+
require 'avm/launcher/git/sub_warp_base'
|
5
5
|
require 'avm/launcher/errors/base'
|
6
|
-
require '
|
7
|
-
require '
|
6
|
+
require 'avm/launcher/paths/real'
|
7
|
+
require 'avm/launcher/vendor/github'
|
8
8
|
|
9
9
|
module Avm
|
10
10
|
module Projects
|
11
11
|
module Stereotypes
|
12
12
|
class GitSubrepo
|
13
|
-
class Warp < ::
|
14
|
-
include ::
|
13
|
+
class Warp < ::Avm::Launcher::Paths::Real
|
14
|
+
include ::Avm::Launcher::Git::SubWarpBase
|
15
15
|
include ::EacRubyUtils::SimpleCache
|
16
16
|
|
17
17
|
attr_reader :instance
|
@@ -46,11 +46,11 @@ module Avm
|
|
46
46
|
end
|
47
47
|
|
48
48
|
def init_aux
|
49
|
-
::
|
49
|
+
::Avm::Launcher::Git::Base.new(aux_path).init_bare
|
50
50
|
end
|
51
51
|
|
52
52
|
def parent_git_warped_uncached
|
53
|
-
::
|
53
|
+
::Avm::Launcher::Git::Base.new(parent_instance.warped)
|
54
54
|
end
|
55
55
|
|
56
56
|
def aux_path
|
@@ -58,7 +58,7 @@ module Avm
|
|
58
58
|
end
|
59
59
|
|
60
60
|
def warped_git_uncached
|
61
|
-
::
|
61
|
+
::Avm::Launcher::Git::Base.new(instance.cache_path('git_repository'))
|
62
62
|
end
|
63
63
|
|
64
64
|
def push_to_aux
|
@@ -68,16 +68,16 @@ module Avm
|
|
68
68
|
end
|
69
69
|
|
70
70
|
def reset
|
71
|
-
::
|
71
|
+
::Avm::Launcher::Git::MirrorUpdate.new(warped_git, aux_path, 'master')
|
72
72
|
end
|
73
73
|
|
74
74
|
def assert_target_remote
|
75
|
-
warped_git.assert_remote_url(::
|
75
|
+
warped_git.assert_remote_url(::Avm::Launcher::Git::WarpBase::TARGET_REMOTE,
|
76
76
|
target_remote_url)
|
77
77
|
end
|
78
78
|
|
79
79
|
def target_remote_url
|
80
|
-
::
|
80
|
+
::Avm::Launcher::Vendor::Github.to_ssh_url(
|
81
81
|
parent_git_warped.subrepo_remote_url(to_parent_git_path)
|
82
82
|
)
|
83
83
|
end
|
@@ -1,12 +1,12 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require '
|
3
|
+
require 'avm/launcher/git/publish_base'
|
4
4
|
|
5
5
|
module Avm
|
6
6
|
module Projects
|
7
7
|
module Stereotypes
|
8
8
|
class GitSubtree
|
9
|
-
class Publish < ::
|
9
|
+
class Publish < ::Avm::Launcher::Git::PublishBase
|
10
10
|
end
|
11
11
|
end
|
12
12
|
end
|
@@ -1,14 +1,14 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require '
|
4
|
-
require '
|
3
|
+
require 'avm/launcher/git/warp_base'
|
4
|
+
require 'avm/launcher/git/sub_warp_base'
|
5
5
|
|
6
6
|
module Avm
|
7
7
|
module Projects
|
8
8
|
module Stereotypes
|
9
9
|
class GitSubtree
|
10
|
-
class Warp < ::
|
11
|
-
include ::
|
10
|
+
class Warp < ::Avm::Launcher::Git::WarpBase
|
11
|
+
include ::Avm::Launcher::Git::SubWarpBase
|
12
12
|
|
13
13
|
private
|
14
14
|
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
require 'avm/projects/stereotype'
|
4
|
-
require '
|
4
|
+
require 'avm/launcher/ruby/gem/specification'
|
5
5
|
require 'eac_ruby_utils/core_ext'
|
6
6
|
|
7
7
|
module Avm
|
@@ -21,7 +21,7 @@ module Avm
|
|
21
21
|
end
|
22
22
|
|
23
23
|
def load_gemspec(gemspec_file)
|
24
|
-
::
|
24
|
+
::Avm::Launcher::Ruby::Gem::Specification.new(gemspec_file)
|
25
25
|
end
|
26
26
|
end
|
27
27
|
end
|
@@ -5,15 +5,15 @@ require 'json'
|
|
5
5
|
require 'eac_ruby_utils/simple_cache'
|
6
6
|
require 'rubygems'
|
7
7
|
require 'eac_cli/speaker'
|
8
|
-
require '
|
9
|
-
require '
|
10
|
-
require '
|
8
|
+
require 'avm/launcher/publish/base'
|
9
|
+
require 'avm/launcher/publish/check_result'
|
10
|
+
require 'avm/launcher/ruby/gem'
|
11
11
|
|
12
12
|
module Avm
|
13
13
|
module Projects
|
14
14
|
module Stereotypes
|
15
15
|
class RubyGem
|
16
|
-
class Publish < ::
|
16
|
+
class Publish < ::Avm::Launcher::Publish::Base
|
17
17
|
include ::EacRubyUtils::SimpleCache
|
18
18
|
include ::EacCli::Speaker
|
19
19
|
|
@@ -42,23 +42,23 @@ module Avm
|
|
42
42
|
end
|
43
43
|
|
44
44
|
def new_gem_disallowed_check_result
|
45
|
-
::
|
45
|
+
::Avm::Launcher::Publish::CheckResult.blocked(
|
46
46
|
"#{gem_spec.full_name} does not exist in RubyGems"
|
47
47
|
)
|
48
48
|
end
|
49
49
|
|
50
50
|
def version_published_check_result
|
51
|
-
::
|
51
|
+
::Avm::Launcher::Publish::CheckResult.updated("#{gem_spec.full_name} already pushed")
|
52
52
|
end
|
53
53
|
|
54
54
|
def outdated_version_check_result
|
55
|
-
::
|
55
|
+
::Avm::Launcher::Publish::CheckResult.outdated(
|
56
56
|
"#{gem_spec.full_name} is outdated (Max: #{gem_version_max})"
|
57
57
|
)
|
58
58
|
end
|
59
59
|
|
60
60
|
def version_unpublished_check_result
|
61
|
-
::
|
61
|
+
::Avm::Launcher::Publish::CheckResult.pending("#{gem_spec.full_name} not found " \
|
62
62
|
'in RubyGems')
|
63
63
|
end
|
64
64
|
|
@@ -71,7 +71,7 @@ module Avm
|
|
71
71
|
end
|
72
72
|
|
73
73
|
def gem_build_uncached
|
74
|
-
::
|
74
|
+
::Avm::Launcher::Ruby::Gem::Build.new(source)
|
75
75
|
end
|
76
76
|
|
77
77
|
def publish
|
@@ -82,7 +82,7 @@ module Avm
|
|
82
82
|
end
|
83
83
|
|
84
84
|
def new_gem_allowed?
|
85
|
-
::
|
85
|
+
::Avm::Launcher::Context.current.publish_options[:new]
|
86
86
|
end
|
87
87
|
|
88
88
|
def gem_published?
|
@@ -112,7 +112,7 @@ module Avm
|
|
112
112
|
def push_gem
|
113
113
|
info("Pushing gem #{gem_spec}...")
|
114
114
|
command = ['gem', 'push', gem_build.output_file]
|
115
|
-
unless ::
|
115
|
+
unless ::Avm::Launcher::Context.current.publish_options[:confirm]
|
116
116
|
command = %w[echo] + command + %w[(Dry-run)]
|
117
117
|
end
|
118
118
|
EacRubyUtils::Envs.local.command(command).system
|
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
require 'avm/files/formatter'
|
4
4
|
require 'eac_cli/core_ext'
|
5
|
-
require '
|
5
|
+
require 'avm/launcher/git/base'
|
6
6
|
|
7
7
|
module Avm
|
8
8
|
module Tools
|
@@ -29,7 +29,7 @@ module Avm
|
|
29
29
|
end
|
30
30
|
|
31
31
|
def git
|
32
|
-
@git ||= ::
|
32
|
+
@git ||= ::Avm::Launcher::Git::Base.new('.')
|
33
33
|
end
|
34
34
|
|
35
35
|
def git_dirty_files
|
data/lib/avm/tools/runner/git.rb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
require 'avm/core_ext'
|
4
|
-
require '
|
4
|
+
require 'avm/launcher/git/base'
|
5
5
|
|
6
6
|
module Avm
|
7
7
|
module Tools
|
@@ -23,7 +23,7 @@ module Avm
|
|
23
23
|
end
|
24
24
|
|
25
25
|
def git
|
26
|
-
@git ||= ::
|
26
|
+
@git ||= ::Avm::Launcher::Git::Base.by_root(repository_path)
|
27
27
|
end
|
28
28
|
|
29
29
|
# @return [[EacGit::Local]]
|
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
require 'eac_cli/speaker'
|
4
4
|
require 'eac_ruby_utils/simple_cache'
|
5
|
-
require '
|
5
|
+
require 'avm/launcher/git/base'
|
6
6
|
require 'filesize'
|
7
7
|
require 'avm/git/commit'
|
8
8
|
|
@@ -76,7 +76,7 @@ module Avm
|
|
76
76
|
end
|
77
77
|
|
78
78
|
def git_uncached
|
79
|
-
::
|
79
|
+
::Avm::Launcher::Git::Base.new(runner_context.call(:repository_path))
|
80
80
|
end
|
81
81
|
|
82
82
|
def commit_uncached
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require '
|
3
|
+
require 'avm/launcher/git/base'
|
4
4
|
require 'avm/git/commit'
|
5
5
|
|
6
6
|
module Avm
|
@@ -56,7 +56,7 @@ module Avm
|
|
56
56
|
end
|
57
57
|
|
58
58
|
def git_uncached
|
59
|
-
::
|
59
|
+
::Avm::Launcher::Git::Base.new(git_repository_path)
|
60
60
|
end
|
61
61
|
|
62
62
|
def git_repository_path
|