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
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ad117874b0eb67142f85a2e4418a5bfc1ffe4b13b9ca5e055669238a1a48dc03
|
4
|
+
data.tar.gz: fde307fe4e42f7a814ff2cb7d5f81059e60945e55584cfdcfbf0aad95824e7e9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c07bc41c85952a91374ca3f54be94ac22f475d798e1bd649162824f643dacf7cc77dfa4ee89c7280e9a515266a4b13432c76939f3bba63e92cc50cfadbe8238b
|
7
|
+
data.tar.gz: ec10f8a6286610fd7df1cfc105da7b4e6103078fa0f35d19edf8775a2b0b6c26d2457bb9babdfaa5c16e25f071cd6464baceaffe44e28ccf1a453e26989fcc34
|
data/lib/avm/app_src.rb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
require 'avm/apps/sources/configuration'
|
4
|
-
require '
|
4
|
+
require 'avm/launcher/paths/real'
|
5
5
|
require 'eac_ruby_utils/core_ext'
|
6
6
|
require 'avm/projects/stereotypes'
|
7
7
|
require 'i18n'
|
@@ -20,10 +20,10 @@ module Avm
|
|
20
20
|
configuration.if_present(&:locale) || ::I18n.default_locale
|
21
21
|
end
|
22
22
|
|
23
|
-
# Backward compatibility with [
|
24
|
-
# @return [
|
23
|
+
# Backward compatibility with [Avm::Launcher::Paths::Logical].
|
24
|
+
# @return [Avm::Launcher::Paths::Real].
|
25
25
|
def real
|
26
|
-
::
|
26
|
+
::Avm::Launcher::Paths::Real.new(path.to_path)
|
27
27
|
end
|
28
28
|
|
29
29
|
def run_job(job, job_args = [])
|
data/lib/avm/git/commit/file.rb
CHANGED
@@ -12,7 +12,7 @@ module Avm
|
|
12
12
|
|
13
13
|
attr_reader :git, :diff_tree
|
14
14
|
|
15
|
-
# git: [
|
15
|
+
# git: [Avm::Launcher::Git::Base]
|
16
16
|
# diff_tree_tree: a line of command "git diff-tree --no-commit-id -r --full-index"'s output
|
17
17
|
def initialize(git, diff_tree_line)
|
18
18
|
@git = git
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require '
|
3
|
+
require 'avm/launcher/git/base'
|
4
4
|
require 'eac_cli/speaker'
|
5
5
|
require 'eac_ruby_utils/options_consumer'
|
6
6
|
require 'eac_ruby_utils/require_sub'
|
@@ -21,7 +21,7 @@ module Avm
|
|
21
21
|
dir, @skip_validations = consumer.consume_all(:dir, :skip_validations)
|
22
22
|
validate_skip_validations
|
23
23
|
consumer.validate
|
24
|
-
@git = ::
|
24
|
+
@git = ::Avm::Launcher::Git::Base.new(dir)
|
25
25
|
end
|
26
26
|
|
27
27
|
def start_banner
|
@@ -0,0 +1,83 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'active_support/core_ext/hash/indifferent_access'
|
4
|
+
require 'avm/launcher/context/instance_manager'
|
5
|
+
require 'eac_ruby_utils/simple_cache'
|
6
|
+
require 'eac_cli/speaker'
|
7
|
+
require 'avm/launcher/context/instance_discovery'
|
8
|
+
require 'avm/launcher/context/settings'
|
9
|
+
require 'avm/launcher/paths/logical'
|
10
|
+
require 'avm/launcher/project'
|
11
|
+
|
12
|
+
module Avm
|
13
|
+
module Launcher
|
14
|
+
class Context
|
15
|
+
include ::EacRubyUtils::SimpleCache
|
16
|
+
include ::EacCli::Speaker
|
17
|
+
|
18
|
+
DEFAULT_PROJECTS_ROOT = '.'
|
19
|
+
DEFAULT_SETTINGS_FILE = ::File.join(ENV['HOME'], '.config', 'eac_launcher', 'settings.yml')
|
20
|
+
DEFAULT_CACHE_ROOT = ::File.join(ENV['HOME'], '.cache', 'eac_launcher')
|
21
|
+
|
22
|
+
class << self
|
23
|
+
attr_writer :current
|
24
|
+
|
25
|
+
def current
|
26
|
+
@current ||= default
|
27
|
+
end
|
28
|
+
|
29
|
+
def default
|
30
|
+
@default ||= Context.new
|
31
|
+
end
|
32
|
+
end
|
33
|
+
|
34
|
+
attr_reader :root, :settings, :cache_root
|
35
|
+
attr_accessor :publish_options, :recache, :instance_manager
|
36
|
+
|
37
|
+
def initialize(options = {})
|
38
|
+
@options = options.with_indifferent_access
|
39
|
+
@root = ::Avm::Launcher::Paths::Logical.new(self, nil, build_option(:projects_root), '/')
|
40
|
+
@settings = ::Avm::Launcher::Context::Settings.new(build_option(:settings_file))
|
41
|
+
@cache_root = build_option(:cache_root)
|
42
|
+
@publish_options = { new: false, confirm: false, stereotype: nil }
|
43
|
+
@instance_manager = ::Avm::Launcher::Context::InstanceManager.new(self)
|
44
|
+
@recache = false
|
45
|
+
end
|
46
|
+
|
47
|
+
def instance(name)
|
48
|
+
instances.find { |i| i.name == name }
|
49
|
+
end
|
50
|
+
|
51
|
+
def instances
|
52
|
+
@instance_manager.instances
|
53
|
+
end
|
54
|
+
|
55
|
+
def pending_instances
|
56
|
+
@instance_manager.pending_instances
|
57
|
+
end
|
58
|
+
|
59
|
+
private
|
60
|
+
|
61
|
+
def build_option(key)
|
62
|
+
@options[key] || env_option(key) || default_option(key)
|
63
|
+
end
|
64
|
+
|
65
|
+
def env_option(key)
|
66
|
+
ENV["EAC_LAUNCHER_#{key}".underscore.upcase]
|
67
|
+
end
|
68
|
+
|
69
|
+
def default_option(key)
|
70
|
+
self.class.const_get("DEFAULT_#{key}".underscore.upcase)
|
71
|
+
end
|
72
|
+
|
73
|
+
def projects_uncached
|
74
|
+
r = {}
|
75
|
+
instances.each do |i|
|
76
|
+
r[i.project_name] ||= []
|
77
|
+
r[i.project_name] << i
|
78
|
+
end
|
79
|
+
r.map { |name, instances| ::Avm::Launcher::Project.new(name, instances) }
|
80
|
+
end
|
81
|
+
end
|
82
|
+
end
|
83
|
+
end
|
@@ -0,0 +1,56 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'ruby-progressbar'
|
4
|
+
require 'avm/launcher/instances/base'
|
5
|
+
|
6
|
+
module Avm
|
7
|
+
module Launcher
|
8
|
+
class Context
|
9
|
+
class InstanceDiscovery
|
10
|
+
attr_reader :instances
|
11
|
+
|
12
|
+
def initialize(context)
|
13
|
+
@context = context
|
14
|
+
@progress = ::ProgressBar.create(title: 'Instance discovery', total: 1)
|
15
|
+
@instances = path_instances(@context.root, nil)
|
16
|
+
ensure
|
17
|
+
@progress&.finish
|
18
|
+
end
|
19
|
+
|
20
|
+
private
|
21
|
+
|
22
|
+
def path_instances(path, parent_instance)
|
23
|
+
update_progress_format(path)
|
24
|
+
on_rescued_path_instances(path) do |r|
|
25
|
+
if path.project?
|
26
|
+
parent_instance = ::Avm::Launcher::Instances::Base.instanciate(path, parent_instance)
|
27
|
+
r << path
|
28
|
+
end
|
29
|
+
children = path.children
|
30
|
+
update_progress_count(children)
|
31
|
+
r.concat(children.flat_map { |c| path_instances(c, parent_instance) })
|
32
|
+
end
|
33
|
+
end
|
34
|
+
|
35
|
+
def on_rescued_path_instances(path)
|
36
|
+
r = []
|
37
|
+
begin
|
38
|
+
yield(r) if path.included?
|
39
|
+
rescue StandardError => e
|
40
|
+
warn("#{path}: #{e}")
|
41
|
+
end
|
42
|
+
r
|
43
|
+
end
|
44
|
+
|
45
|
+
def update_progress_format(path)
|
46
|
+
@progress.format = "%t (Paths: %c/%C, Current: #{path.logical}) |%B| %a"
|
47
|
+
end
|
48
|
+
|
49
|
+
def update_progress_count(children)
|
50
|
+
@progress.total += children.count
|
51
|
+
@progress.increment
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|
55
|
+
end
|
56
|
+
end
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
require 'eac_ruby_utils/core_ext'
|
4
|
-
require '
|
4
|
+
require 'avm/launcher/publish/check_result'
|
5
5
|
require('yaml')
|
6
6
|
|
7
7
|
module Avm
|
@@ -31,7 +31,7 @@ module Avm
|
|
31
31
|
end
|
32
32
|
|
33
33
|
def search_instances
|
34
|
-
cache_instances(::
|
34
|
+
cache_instances(::Avm::Launcher::Context::InstanceDiscovery.new(context).instances)
|
35
35
|
end
|
36
36
|
|
37
37
|
def cached_instances
|
@@ -67,7 +67,7 @@ module Avm
|
|
67
67
|
return false unless data[instance.logical][:publish_state].is_a?(Hash)
|
68
68
|
|
69
69
|
data[instance.logical][:publish_state].any? do |_k, v|
|
70
|
-
::
|
70
|
+
::Avm::Launcher::Publish::CheckResult.pending_status?(v)
|
71
71
|
end
|
72
72
|
end
|
73
73
|
end
|
@@ -0,0 +1,53 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'avm/launcher/instances/settings'
|
4
|
+
require 'eac_ruby_utils/simple_cache'
|
5
|
+
require 'yaml'
|
6
|
+
|
7
|
+
module Avm
|
8
|
+
module Launcher
|
9
|
+
class Context
|
10
|
+
class Settings
|
11
|
+
include ::EacRubyUtils::SimpleCache
|
12
|
+
|
13
|
+
def initialize(file)
|
14
|
+
unless ::File.exist?(file)
|
15
|
+
::FileUtils.mkdir_p(::File.dirname(file))
|
16
|
+
::File.write(file, {}.to_yaml)
|
17
|
+
end
|
18
|
+
@data = YAML.load_file(file)
|
19
|
+
end
|
20
|
+
|
21
|
+
def instance_settings(instance)
|
22
|
+
::Avm::Launcher::Instances::Settings.new(value(['Instances', instance.name]))
|
23
|
+
end
|
24
|
+
|
25
|
+
private
|
26
|
+
|
27
|
+
def excluded_projects_uncached
|
28
|
+
enum_value(%w[Projects Exclude])
|
29
|
+
end
|
30
|
+
|
31
|
+
def excluded_paths_uncached
|
32
|
+
enum_value(%w[Paths Exclude])
|
33
|
+
end
|
34
|
+
|
35
|
+
def enum_value(path)
|
36
|
+
r = value(path)
|
37
|
+
r.is_a?(Enumerable) ? r : []
|
38
|
+
end
|
39
|
+
|
40
|
+
def value(path)
|
41
|
+
node_value(@data, path)
|
42
|
+
end
|
43
|
+
|
44
|
+
def node_value(data, path)
|
45
|
+
return data if path.empty?
|
46
|
+
return nil unless data.is_a?(Hash)
|
47
|
+
|
48
|
+
node_value(data[path.first], path.drop(1))
|
49
|
+
end
|
50
|
+
end
|
51
|
+
end
|
52
|
+
end
|
53
|
+
end
|
@@ -0,0 +1,86 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'eac_git/local'
|
4
|
+
require 'eac_ruby_utils/core_ext'
|
5
|
+
require 'eac_ruby_utils/envs'
|
6
|
+
require 'avm/launcher/paths/real'
|
7
|
+
require 'avm/launcher/git/error'
|
8
|
+
|
9
|
+
module Avm
|
10
|
+
module Launcher
|
11
|
+
module Git
|
12
|
+
class Base < ::Avm::Launcher::Paths::Real
|
13
|
+
require_sub __FILE__
|
14
|
+
enable_simple_cache
|
15
|
+
extend ::Avm::Launcher::Git::Base::ClassMethods
|
16
|
+
include ::Avm::Launcher::Git::Base::DirtyFiles
|
17
|
+
include ::Avm::Launcher::Git::Base::Remotes
|
18
|
+
include ::Avm::Launcher::Git::Base::Subrepo
|
19
|
+
include ::Avm::Launcher::Git::Base::Underlying
|
20
|
+
|
21
|
+
attr_reader :eac_git
|
22
|
+
delegate :descendant?, :merge_base, :rev_parse, to: :eac_git
|
23
|
+
|
24
|
+
def initialize(path)
|
25
|
+
super(path)
|
26
|
+
|
27
|
+
@eac_git = ::EacGit::Local.new(path)
|
28
|
+
end
|
29
|
+
|
30
|
+
def init_bare
|
31
|
+
FileUtils.mkdir_p(self)
|
32
|
+
::EacRubyUtils::Envs.local.command('git', 'init', '--bare', self).execute! unless
|
33
|
+
File.exist?(subpath('.git'))
|
34
|
+
end
|
35
|
+
|
36
|
+
# @return [Pathname]
|
37
|
+
def root_path
|
38
|
+
@root_path ||= self.class.find_root(to_s)
|
39
|
+
end
|
40
|
+
|
41
|
+
def descendant?(descendant, ancestor)
|
42
|
+
base = merge_base(descendant, ancestor)
|
43
|
+
return false if base.blank?
|
44
|
+
|
45
|
+
revparse = execute!('rev-parse', '--verify', ancestor).strip
|
46
|
+
base == revparse
|
47
|
+
end
|
48
|
+
|
49
|
+
def subtree_split(prefix)
|
50
|
+
execute!('subtree', '-q', 'split', '-P', prefix).strip
|
51
|
+
end
|
52
|
+
|
53
|
+
def push(remote_name, refspecs, options = {})
|
54
|
+
refspecs = [refspecs] unless refspecs.is_a?(Array)
|
55
|
+
args = ['push']
|
56
|
+
args << '--dry-run' if options[:dryrun]
|
57
|
+
args << '--force' if options[:force]
|
58
|
+
system!(args + [remote_name] + refspecs)
|
59
|
+
end
|
60
|
+
|
61
|
+
def push_all(remote_name)
|
62
|
+
system!('push', '--all', remote_name)
|
63
|
+
system!('push', '--tags', remote_name)
|
64
|
+
end
|
65
|
+
|
66
|
+
def fetch(remote_name, options = {})
|
67
|
+
args = ['fetch', '-p', remote_name]
|
68
|
+
args += %w[--tags --prune-tags --force] if options[:tags]
|
69
|
+
execute!(*args)
|
70
|
+
end
|
71
|
+
|
72
|
+
def current_branch
|
73
|
+
execute!(%w[symbolic-ref -q HEAD]).gsub(%r{\Arefs/heads/}, '').strip
|
74
|
+
end
|
75
|
+
|
76
|
+
def reset_hard(ref)
|
77
|
+
execute!('reset', '--hard', ref)
|
78
|
+
end
|
79
|
+
|
80
|
+
def raise(message)
|
81
|
+
::Kernel.raise Avm::Launcher::Git::Error.new(self, message)
|
82
|
+
end
|
83
|
+
end
|
84
|
+
end
|
85
|
+
end
|
86
|
+
end
|
@@ -0,0 +1,28 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Avm
|
4
|
+
module Launcher
|
5
|
+
module Git
|
6
|
+
class Base < ::Avm::Launcher::Paths::Real
|
7
|
+
module ClassMethods
|
8
|
+
# @return [Avm::Launcher::Git::Base]
|
9
|
+
def by_root(search_base_path)
|
10
|
+
new(find_root(search_base_path).to_path)
|
11
|
+
end
|
12
|
+
|
13
|
+
# Searches the root path for the Git repository which includes +search_base_path+.
|
14
|
+
# @return [Pathname]
|
15
|
+
def find_root(search_base_path)
|
16
|
+
path = search_base_path.to_pathname.expand_path
|
17
|
+
loop do
|
18
|
+
return path if path.join('.git').exist?
|
19
|
+
raise "\".git\" not found for \"#{search_base_path}\"" if path.parent.root?
|
20
|
+
|
21
|
+
path = path.parent
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|