avm 0.94.1 → 0.95.0

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.
Files changed (178) hide show
  1. checksums.yaml +4 -4
  2. data/lib/avm/application_scms/base.rb +1 -1
  3. data/lib/avm/application_scms.rb +1 -2
  4. data/lib/avm/application_stereotypes/base.rb +1 -1
  5. data/lib/avm/application_stereotypes.rb +1 -2
  6. data/lib/avm/applications/base/local_instance.rb +1 -1
  7. data/lib/avm/applications/base/local_source.rb +1 -1
  8. data/lib/avm/applications/base/naming.rb +1 -1
  9. data/lib/avm/applications/base/publishing.rb +1 -2
  10. data/lib/avm/applications/base/scm.rb +1 -1
  11. data/lib/avm/applications/base.rb +1 -1
  12. data/lib/avm/applications.rb +1 -2
  13. data/lib/avm/data/callbacks.rb +1 -1
  14. data/lib/avm/data/clearer.rb +1 -1
  15. data/lib/avm/data/dumper.rb +1 -2
  16. data/lib/avm/data/loader.rb +1 -2
  17. data/lib/avm/data/package/base_performer.rb +1 -1
  18. data/lib/avm/data/package/build_directory.rb +1 -2
  19. data/lib/avm/data/package/clear.rb +1 -1
  20. data/lib/avm/data/package/dump.rb +1 -1
  21. data/lib/avm/data/package/load.rb +1 -1
  22. data/lib/avm/data/package.rb +1 -1
  23. data/lib/avm/data/performer.rb +1 -2
  24. data/lib/avm/data/rotate.rb +1 -1
  25. data/lib/avm/data/unit.rb +2 -4
  26. data/lib/avm/data/unit_with_commands.rb +1 -1
  27. data/lib/avm/docker/container.rb +1 -1
  28. data/lib/avm/docker/image.rb +1 -1
  29. data/lib/avm/docker/runner.rb +1 -1
  30. data/lib/avm/docker.rb +1 -2
  31. data/lib/avm/entries/auto_values/entry.rb +1 -1
  32. data/lib/avm/entries/auto_values/uri_entry.rb +1 -1
  33. data/lib/avm/entries/auto_values.rb +1 -2
  34. data/lib/avm/entries/base/inherited_entry_value.rb +1 -1
  35. data/lib/avm/entries/base/uri_component_entry_value/default_value.rb +1 -1
  36. data/lib/avm/entries/base/uri_component_entry_value/inherited_value.rb +1 -1
  37. data/lib/avm/entries/base/uri_component_entry_value/url_entry_value.rb +1 -1
  38. data/lib/avm/entries/base/uri_component_entry_value.rb +1 -1
  39. data/lib/avm/entries/base/uri_components_entries_values/component_factory.rb +1 -1
  40. data/lib/avm/entries/base/uri_components_entries_values/generic_component.rb +1 -1
  41. data/lib/avm/entries/base/uri_components_entries_values/path_component.rb +1 -1
  42. data/lib/avm/entries/base/uri_components_entries_values/url_component.rb +1 -1
  43. data/lib/avm/entries/base/uri_components_entries_values.rb +3 -2
  44. data/lib/avm/entries/base.rb +1 -1
  45. data/lib/avm/entries/entry/no_context_entry.rb +1 -1
  46. data/lib/avm/entries/entry.rb +1 -3
  47. data/lib/avm/entries/jobs/variables_source/read_entry.rb +1 -1
  48. data/lib/avm/entries/jobs/variables_source.rb +1 -1
  49. data/lib/avm/entries/jobs.rb +1 -2
  50. data/lib/avm/entries/keys_constants_set.rb +1 -1
  51. data/lib/avm/entries/uri_builder.rb +1 -3
  52. data/lib/avm/entries.rb +1 -2
  53. data/lib/avm/executables.rb +1 -2
  54. data/lib/avm/file_formats/search_formatter.rb +2 -2
  55. data/lib/avm/file_formats/unknown.rb +1 -1
  56. data/lib/avm/file_formats.rb +1 -2
  57. data/lib/avm/files/appendable/file_content.rb +31 -0
  58. data/lib/avm/files/appendable/plain_directory.rb +30 -0
  59. data/lib/avm/files/appendable/resource_base.rb +19 -0
  60. data/lib/avm/files/appendable/tar_output_command.rb +31 -0
  61. data/lib/avm/files/appendable/templatized_directory.rb +40 -0
  62. data/lib/avm/files/appendable.rb +55 -0
  63. data/lib/avm/files/appender.rb +11 -0
  64. data/lib/avm/files/deploy.rb +71 -0
  65. data/lib/avm/files/text_replacer/gsub.rb +24 -0
  66. data/lib/avm/files/text_replacer.rb +32 -0
  67. data/lib/avm/instances/base/auto_values.rb +1 -1
  68. data/lib/avm/instances/base/dockerizable.rb +1 -1
  69. data/lib/avm/instances/base/processes.rb +1 -1
  70. data/lib/avm/instances/base/subcommand_parent.rb +1 -1
  71. data/lib/avm/instances/base.rb +1 -2
  72. data/lib/avm/instances/data/unit.rb +1 -1
  73. data/lib/avm/instances/data.rb +1 -2
  74. data/lib/avm/instances/entry_keys.rb +1 -1
  75. data/lib/avm/instances/ids.rb +2 -2
  76. data/lib/avm/instances/process.rb +1 -1
  77. data/lib/avm/instances.rb +1 -2
  78. data/lib/avm/launcher/context/instance_collector.rb +1 -1
  79. data/lib/avm/launcher/context/instance_discovery/root_instance_paths.rb +1 -1
  80. data/lib/avm/launcher/context/instance_discovery.rb +1 -1
  81. data/lib/avm/launcher/context/instance_manager/cached_instance.rb +1 -1
  82. data/lib/avm/launcher/context/instance_manager/cached_instances.rb +1 -1
  83. data/lib/avm/launcher/context/instance_manager.rb +1 -2
  84. data/lib/avm/launcher/context/settings.rb +1 -1
  85. data/lib/avm/launcher/context.rb +3 -7
  86. data/lib/avm/launcher/errors.rb +1 -2
  87. data/lib/avm/launcher/instances/base/publishing.rb +1 -1
  88. data/lib/avm/launcher/instances/base.rb +1 -3
  89. data/lib/avm/launcher/instances/runner_helper.rb +0 -1
  90. data/lib/avm/launcher/instances/settings.rb +1 -1
  91. data/lib/avm/launcher/instances.rb +1 -2
  92. data/lib/avm/launcher/paths/logical.rb +1 -1
  93. data/lib/avm/launcher/paths.rb +1 -2
  94. data/lib/avm/launcher/project.rb +1 -1
  95. data/lib/avm/launcher/publish/base.rb +1 -1
  96. data/lib/avm/launcher/publish/check_result.rb +1 -1
  97. data/lib/avm/launcher/publish.rb +2 -3
  98. data/lib/avm/launcher.rb +1 -2
  99. data/lib/avm/launcher_stereotypes.rb +1 -2
  100. data/lib/avm/registry/application_stereotypes/build_available.rb +1 -1
  101. data/lib/avm/registry/application_stereotypes/stereotype_builder.rb +1 -1
  102. data/lib/avm/registry/application_stereotypes.rb +1 -1
  103. data/lib/avm/registry/applications.rb +1 -1
  104. data/lib/avm/registry/config_objects.rb +1 -2
  105. data/lib/avm/registry/from_gems.rb +1 -2
  106. data/lib/avm/registry/launcher_stereotypes.rb +1 -1
  107. data/lib/avm/registry/with_path/cache.rb +1 -1
  108. data/lib/avm/registry/with_path.rb +1 -1
  109. data/lib/avm/registry.rb +1 -2
  110. data/lib/avm/result.rb +1 -2
  111. data/lib/avm/rspec/launcher_controller.rb +1 -1
  112. data/lib/avm/rspec/setup/launcher.rb +1 -1
  113. data/lib/avm/rspec/setup/source_generator.rb +1 -1
  114. data/lib/avm/rspec/setup.rb +1 -2
  115. data/lib/avm/rspec/shared_examples/avm_file_format_file_resource_name.rb +1 -1
  116. data/lib/avm/rspec/shared_examples/avm_file_formats_with_fixtures.rb +1 -1
  117. data/lib/avm/rspec/shared_examples/avm_source_generated.rb +1 -1
  118. data/lib/avm/rspec/shared_examples/entries_values.rb +1 -1
  119. data/lib/avm/rspec/shared_examples/with_config.rb +1 -1
  120. data/lib/avm/rspec.rb +1 -2
  121. data/lib/avm/runner_with/file_replacer.rb +32 -0
  122. data/lib/avm/runner_with/filesystem_renamer.rb +101 -0
  123. data/lib/avm/runner_with/filesystem_traverser.rb +52 -0
  124. data/lib/avm/runner_with.rb +9 -0
  125. data/lib/avm/scms/auto_commit/file_resource_name.rb +1 -1
  126. data/lib/avm/scms/auto_commit/for_file.rb +1 -1
  127. data/lib/avm/scms/auto_commit/rules/base.rb +1 -1
  128. data/lib/avm/scms/auto_commit/rules.rb +3 -3
  129. data/lib/avm/scms/auto_commit.rb +1 -2
  130. data/lib/avm/scms/base/branches.rb +1 -1
  131. data/lib/avm/scms/base/commits.rb +1 -1
  132. data/lib/avm/scms/base/milestones.rb +1 -1
  133. data/lib/avm/scms/base/remotes.rb +1 -1
  134. data/lib/avm/scms/base.rb +1 -1
  135. data/lib/avm/scms/branch.rb +1 -1
  136. data/lib/avm/scms/changed_file.rb +1 -1
  137. data/lib/avm/scms/commit.rb +1 -1
  138. data/lib/avm/scms/commit_info.rb +1 -1
  139. data/lib/avm/scms/interval.rb +1 -1
  140. data/lib/avm/scms/null/commit.rb +1 -1
  141. data/lib/avm/scms/null.rb +1 -3
  142. data/lib/avm/scms/remote.rb +1 -1
  143. data/lib/avm/scms.rb +1 -2
  144. data/lib/avm/self/docker_image.rb +1 -1
  145. data/lib/avm/source_generators/base.rb +2 -4
  146. data/lib/avm/source_generators/option_list.rb +1 -1
  147. data/lib/avm/source_generators.rb +1 -2
  148. data/lib/avm/sources/auto_commit/for_file.rb +1 -1
  149. data/lib/avm/sources/auto_commit.rb +1 -2
  150. data/lib/avm/sources/base/application.rb +1 -1
  151. data/lib/avm/sources/base/configuration.rb +1 -2
  152. data/lib/avm/sources/base/locale.rb +2 -4
  153. data/lib/avm/sources/base/organizational.rb +1 -1
  154. data/lib/avm/sources/base/parent.rb +1 -1
  155. data/lib/avm/sources/base/stereotype.rb +1 -1
  156. data/lib/avm/sources/base/sub/remove.rb +1 -1
  157. data/lib/avm/sources/base/sub.rb +1 -1
  158. data/lib/avm/sources/base/subs.rb +1 -1
  159. data/lib/avm/sources/base/subs_paths.rb +1 -1
  160. data/lib/avm/sources/base/testing.rb +1 -2
  161. data/lib/avm/sources/base/update.rb +1 -1
  162. data/lib/avm/sources/base/update_sub.rb +1 -1
  163. data/lib/avm/sources/base/update_subs.rb +1 -1
  164. data/lib/avm/sources/base/version_bump.rb +1 -1
  165. data/lib/avm/sources/base.rb +1 -1
  166. data/lib/avm/sources/configuration.rb +1 -1
  167. data/lib/avm/sources/issues.rb +1 -2
  168. data/lib/avm/sources/tests/builder.rb +1 -2
  169. data/lib/avm/sources/tests/performer.rb +1 -1
  170. data/lib/avm/sources/tests/single.rb +1 -1
  171. data/lib/avm/sources/tests.rb +1 -2
  172. data/lib/avm/sources.rb +1 -2
  173. data/lib/avm/sync.rb +1 -1
  174. data/lib/avm/version.rb +1 -1
  175. data/lib/avm/with/application_stereotype.rb +2 -4
  176. data/lib/avm/with/extra_subcommands.rb +1 -1
  177. data/lib/avm.rb +5 -2
  178. metadata +46 -6
@@ -0,0 +1,31 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+ require 'avm/files/appendable/resource_base'
5
+
6
+ module Avm
7
+ module Files
8
+ module Appendable
9
+ class FileContent < ::Avm::Files::Appendable::ResourceBase
10
+ attr_reader :target_path, :content
11
+
12
+ def initialize(deploy, target_path, content)
13
+ super(deploy)
14
+ @target_path = target_path
15
+ @content = content
16
+ end
17
+
18
+ def write_on(target_dir)
19
+ target_dir.join(target_path).write(content)
20
+ end
21
+
22
+ protected
23
+
24
+ # @return [Enumerable<Symbol>]
25
+ def to_s_attributes
26
+ %i[target_path content]
27
+ end
28
+ end
29
+ end
30
+ end
31
+ end
@@ -0,0 +1,30 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+ require 'avm/files/appendable/resource_base'
5
+
6
+ module Avm
7
+ module Files
8
+ module Appendable
9
+ class PlainDirectory < ::Avm::Files::Appendable::ResourceBase
10
+ attr_reader :source_path
11
+
12
+ def initialize(appender, source_path)
13
+ super(appender)
14
+ @source_path = source_path.to_pathname
15
+ end
16
+
17
+ def write_on(target_dir)
18
+ raise "\"#{source_path}\" is not a directory" unless source_path.directory?
19
+
20
+ ::FileUtils.cp_r("#{source_path}/.", target_dir.to_path)
21
+ end
22
+
23
+ # @return [Enumerable<Symbol>]
24
+ def to_s_attributes
25
+ [:source_path]
26
+ end
27
+ end
28
+ end
29
+ end
30
+ end
@@ -0,0 +1,19 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module Avm
6
+ module Files
7
+ module Appendable
8
+ class ResourceBase
9
+ acts_as_abstract :to_s_attributes
10
+ common_constructor :appender
11
+
12
+ def to_s
13
+ v_to_s = to_s_attributes.map { |k| "#{k}: #{send(k)}" }.join(', ')
14
+ "#{self.class.name}[#{v_to_s}]"
15
+ end
16
+ end
17
+ end
18
+ end
19
+ end
@@ -0,0 +1,31 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+ require 'eac_ruby_utils/envs'
5
+ require 'avm/files/appendable/resource_base'
6
+
7
+ module Avm
8
+ module Files
9
+ module Appendable
10
+ class TarOutputCommand < ::Avm::Files::Appendable::ResourceBase
11
+ attr_reader :command
12
+
13
+ def initialize(appender, command)
14
+ super(appender)
15
+ @command = command
16
+ end
17
+
18
+ def write_on(target_dir)
19
+ command.pipe(
20
+ ::EacRubyUtils::Envs.local.command('tar', '-xf', '-', '-C', target_dir)
21
+ ).execute!
22
+ end
23
+
24
+ # @return [Enumerable<Symbol>]
25
+ def to_s_attributes
26
+ [:command]
27
+ end
28
+ end
29
+ end
30
+ end
31
+ end
@@ -0,0 +1,40 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+ require 'avm/files/appendable/resource_base'
5
+ require 'eac_templates/variables/directory'
6
+
7
+ module Avm
8
+ module Files
9
+ module Appendable
10
+ class TemplatizedDirectory < ::Avm::Files::Appendable::ResourceBase
11
+ common_constructor :appender, :source_path, super_args: -> { [appender] }
12
+
13
+ # @return [Object]
14
+ def applier
15
+ return source_path if source_path.respond_to?(:apply)
16
+
17
+ applier_from_path
18
+ end
19
+
20
+ # @return [EacTemplates::Variables::Directory]
21
+ def applier_from_path
22
+ raise "\"#{source_path}\" is not a directory" unless ::File.directory?(source_path)
23
+
24
+ ::EacTemplates::Variables::Directory.new(source_path)
25
+ end
26
+
27
+ def write_on(target_dir)
28
+ raise 'Variables source not set' if appender.variables_source.blank?
29
+
30
+ applier.apply(appender.variables_source, target_dir)
31
+ end
32
+
33
+ # @return [Enumerable<Symbol>]
34
+ def to_s_attributes
35
+ [:source_path]
36
+ end
37
+ end
38
+ end
39
+ end
40
+ end
@@ -0,0 +1,55 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module Avm
6
+ module Files
7
+ module Appendable
8
+ require_sub __FILE__
9
+
10
+ attr_reader :variables_source
11
+
12
+ def appended
13
+ @appended ||= []
14
+ end
15
+
16
+ def append_templatized_directories(directories)
17
+ directories.each { |directory| append_templatized_directory(directory) }
18
+ self
19
+ end
20
+
21
+ def append_plain_directory(directory)
22
+ appended << ::Avm::Files::Appendable::PlainDirectory.new(self, directory)
23
+ self
24
+ end
25
+
26
+ def append_tar_output_command(tar_command)
27
+ appended << ::Avm::Files::Appendable::TarOutputCommand.new(self, tar_command)
28
+ self
29
+ end
30
+
31
+ def append_templatized_directory(directory)
32
+ appended << ::Avm::Files::Appendable::TemplatizedDirectory.new(self, directory)
33
+ self
34
+ end
35
+
36
+ def append_file_content(target_path, content)
37
+ appended << ::Avm::Files::Appendable::FileContent
38
+ .new(self, target_path, content)
39
+ self
40
+ end
41
+
42
+ def variables_source_set(source)
43
+ @variables_source = source
44
+ self
45
+ end
46
+
47
+ def write_appended_on(target_dir)
48
+ target_dir = target_dir.to_pathname
49
+ raise "\"#{target_dir}\" is not a directory" unless target_dir.directory?
50
+
51
+ appended.each { |append| append.write_on(target_dir) }
52
+ end
53
+ end
54
+ end
55
+ end
@@ -0,0 +1,11 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'avm/files/appendable'
4
+
5
+ module Avm
6
+ module Files
7
+ class Appender
8
+ include ::Avm::Files::Appendable
9
+ end
10
+ end
11
+ end
@@ -0,0 +1,71 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'addressable'
4
+ require 'avm/files/appendable'
5
+ require 'eac_ruby_utils/core_ext'
6
+
7
+ module Avm
8
+ module Files
9
+ class Deploy
10
+ include ::Avm::Files::Appendable
11
+ enable_simple_cache
12
+
13
+ attr_reader :build_dir, :target_env, :target_path
14
+
15
+ common_constructor :target_env, :target_path
16
+
17
+ def run
18
+ on_build_dir do
19
+ copy_content_to_build_dir
20
+ mkdir_target
21
+ clear_content
22
+ send_untar_package
23
+ set_target_permission
24
+ end
25
+ end
26
+
27
+ private
28
+
29
+ def on_build_dir
30
+ @build_dir = ::Dir.mktmpdir
31
+ yield
32
+ ensure
33
+ ::FileUtils.rm_rf(@build_dir)
34
+ end
35
+
36
+ def copy_content_to_build_dir
37
+ write_appended_on(build_dir)
38
+ end
39
+
40
+ def mkdir_target
41
+ target_env.command('mkdir', '-p', target_path).execute!
42
+ end
43
+
44
+ def clear_content
45
+ target_env.command(
46
+ 'find', target_path, '-mindepth', '1', '-maxdepth', '1', '-exec', 'rm', '-rf', '{}', ';'
47
+ ).execute!
48
+ end
49
+
50
+ def send_untar_package
51
+ tar_build_command.pipe(untar_build_command).execute!
52
+ end
53
+
54
+ def set_target_permission
55
+ target_env.command('chmod', '755', target_path).execute!
56
+ end
57
+
58
+ def tar_build_command
59
+ source_env.command('tar', '-czO', '-C', build_dir, '.')
60
+ end
61
+
62
+ def untar_build_command
63
+ target_env.command('tar', '-xzf', '-', '-C', target_path)
64
+ end
65
+
66
+ def source_env
67
+ ::EacRubyUtils::Envs.local
68
+ end
69
+ end
70
+ end
71
+ end
@@ -0,0 +1,24 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module Avm
6
+ module Files
7
+ class TextReplacer
8
+ class Gsub
9
+ common_constructor :from, :to do
10
+ self.from = from
11
+ self.to = to
12
+ end
13
+
14
+ def apply(input)
15
+ input.gsub(from, to)
16
+ end
17
+
18
+ def to_s
19
+ "\"#{from}\" => \"#{to}\""
20
+ end
21
+ end
22
+ end
23
+ end
24
+ end
@@ -0,0 +1,32 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module Avm
6
+ module Files
7
+ class TextReplacer
8
+ require_sub __FILE__
9
+ enable_immutable
10
+
11
+ immutable_accessor :replacement, type: :array
12
+
13
+ def apply(input)
14
+ replacements.inject(input) { |a, e| e.apply(a) }
15
+ end
16
+
17
+ def file_apply(file)
18
+ file = file.to_pathname
19
+ input = file.read
20
+ output = apply(file.read)
21
+ return false if output == input
22
+
23
+ file.write(output)
24
+ true
25
+ end
26
+
27
+ def gsub(from, to)
28
+ replacement(::Avm::Files::TextReplacer::Gsub.new(from, to))
29
+ end
30
+ end
31
+ end
32
+ end
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_ruby_utils/core_ext'
3
+ require 'eac_ruby_utils'
4
4
 
5
5
  module Avm
6
6
  module Instances
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'eac_docker/executables'
4
- require 'eac_ruby_utils/core_ext'
4
+ require 'eac_ruby_utils'
5
5
  require 'avm/docker/container'
6
6
 
7
7
  module Avm
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_ruby_utils/core_ext'
3
+ require 'eac_ruby_utils'
4
4
 
5
5
  module Avm
6
6
  module Instances
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'eac_cli/runner/context'
4
- require 'eac_ruby_utils/core_ext'
4
+ require 'eac_ruby_utils'
5
5
 
6
6
  module Avm
7
7
  module Instances
@@ -4,8 +4,7 @@ require 'avm/instances/ids'
4
4
  require 'avm/applications/base/local_instance'
5
5
  require 'avm/with/application_stereotype'
6
6
  require 'avm/with/extra_subcommands'
7
- require 'eac_ruby_utils/require_sub'
8
- require 'eac_ruby_utils/simple_cache'
7
+ require 'eac_ruby_utils'
9
8
  require 'avm/entries/base'
10
9
 
11
10
  module Avm
@@ -2,7 +2,7 @@
2
2
 
3
3
  require 'avm/data/unit_with_commands'
4
4
  require 'avm/instances/data/loading_denied_error'
5
- require 'eac_ruby_utils/core_ext'
5
+ require 'eac_ruby_utils'
6
6
 
7
7
  module Avm
8
8
  module Instances
@@ -1,11 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_ruby_utils/core_ext'
3
+ require 'eac_ruby_utils'
4
4
 
5
5
  module Avm
6
6
  module Instances
7
7
  module Data
8
- require_sub __FILE__
9
8
  end
10
9
  end
11
10
  end
@@ -2,7 +2,7 @@
2
2
 
3
3
  require 'avm/entries/keys_constants_set'
4
4
  require 'avm/entries/uri_builder'
5
- require 'eac_ruby_utils/core_ext'
5
+ require 'eac_ruby_utils'
6
6
 
7
7
  module Avm
8
8
  module Instances
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_ruby_utils/core_ext'
3
+ require 'eac_ruby_utils'
4
4
 
5
5
  module Avm
6
6
  module Instances
@@ -21,7 +21,7 @@ module Avm
21
21
 
22
22
  # @param id [String]
23
23
  # @return [String]
24
- def parse!(id)
24
+ def parse!(id) # rubocop:disable Rails/Delegate
25
25
  ID_PARSER.parse!(id)
26
26
  end
27
27
  end
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_ruby_utils/core_ext'
3
+ require 'eac_ruby_utils'
4
4
 
5
5
  module Avm
6
6
  module Instances
data/lib/avm/instances.rb CHANGED
@@ -1,9 +1,8 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_ruby_utils/core_ext'
3
+ require 'eac_ruby_utils'
4
4
 
5
5
  module Avm
6
6
  module Instances
7
- require_sub __FILE__
8
7
  end
9
8
  end
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_ruby_utils/core_ext'
3
+ require 'eac_ruby_utils'
4
4
 
5
5
  module Avm
6
6
  module Launcher
@@ -2,7 +2,7 @@
2
2
 
3
3
  require 'ruby-progressbar'
4
4
  require 'avm/launcher/instances/base'
5
- require 'eac_ruby_utils/core_ext'
5
+ require 'eac_ruby_utils'
6
6
 
7
7
  module Avm
8
8
  module Launcher
@@ -2,7 +2,7 @@
2
2
 
3
3
  require 'ruby-progressbar'
4
4
  require 'avm/launcher/instances/base'
5
- require 'eac_ruby_utils/core_ext'
5
+ require 'eac_ruby_utils'
6
6
 
7
7
  module Avm
8
8
  module Launcher
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'avm/launcher/instances/base'
4
- require 'eac_ruby_utils/core_ext'
4
+ require 'eac_ruby_utils'
5
5
 
6
6
  module Avm
7
7
  module Launcher
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'avm/launcher/context/instance_manager/cached_instance'
4
- require 'eac_ruby_utils/core_ext'
4
+ require 'eac_ruby_utils'
5
5
 
6
6
  module Avm
7
7
  module Launcher
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_ruby_utils/core_ext'
3
+ require 'eac_ruby_utils'
4
4
  require 'avm/launcher/publish/check_result'
5
5
  require('yaml')
6
6
 
@@ -8,7 +8,6 @@ module Avm
8
8
  module Launcher
9
9
  class Context
10
10
  class InstanceManager
11
- require_sub __FILE__
12
11
  enable_simple_cache
13
12
  common_constructor :context
14
13
 
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'avm/launcher/instances/settings'
4
- require 'eac_ruby_utils/simple_cache'
4
+ require 'eac_ruby_utils'
5
5
  require 'yaml'
6
6
 
7
7
  module Avm
@@ -4,7 +4,7 @@ require 'active_support/core_ext/hash/indifferent_access'
4
4
  require 'avm/launcher/context/instance_manager'
5
5
  require 'eac_fs/contexts'
6
6
  require 'eac_fs/core_ext'
7
- require 'eac_ruby_utils/simple_cache'
7
+ require 'eac_ruby_utils'
8
8
  require 'eac_cli/speaker'
9
9
  require 'avm/launcher/context/instance_discovery'
10
10
  require 'avm/launcher/context/settings'
@@ -52,13 +52,9 @@ module Avm
52
52
  instances.find { |i| i.name == name }
53
53
  end
54
54
 
55
- def instances
56
- @instance_manager.instances
57
- end
55
+ delegate :instances, to: :@instance_manager
58
56
 
59
- def pending_instances
60
- @instance_manager.pending_instances
61
- end
57
+ delegate :pending_instances, to: :@instance_manager
62
58
 
63
59
  private
64
60
 
@@ -1,11 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_ruby_utils/core_ext'
3
+ require 'eac_ruby_utils'
4
4
 
5
5
  module Avm
6
6
  module Launcher
7
7
  module Errors
8
- require_sub __FILE__
9
8
  end
10
9
  end
11
10
  end
@@ -18,7 +18,7 @@ module Avm
18
18
  # @return [Boolean]
19
19
  def publish_by_context?(stereotype)
20
20
  filter = ::Avm::Launcher::Context.current.publish_options[:stereotype]
21
- filter.blank? ? true : filter == stereotype.name.demodulize
21
+ filter.blank? || filter == stereotype.name.demodulize
22
22
  end
23
23
 
24
24
  # @return [Boolean]
@@ -2,7 +2,7 @@
2
2
 
3
3
  require 'avm/launcher/errors/non_project'
4
4
  require 'avm/registry'
5
- require 'eac_ruby_utils/speaker/sender'
5
+ require 'eac_ruby_utils'
6
6
 
7
7
  module Avm
8
8
  module Launcher
@@ -28,8 +28,6 @@ module Avm
28
28
  end
29
29
  end
30
30
 
31
- require_sub __FILE__
32
-
33
31
  attr_accessor :parent
34
32
 
35
33
  # @return [Avm::Applications::Base]
@@ -1,7 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'avm/launcher/context'
4
- require 'avm/tools/core_ext'
5
4
  require 'avm/launcher/context/instance_collector'
6
5
 
7
6
  module Avm
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_ruby_utils/core_ext'
3
+ require 'eac_ruby_utils'
4
4
 
5
5
  module Avm
6
6
  module Launcher
@@ -1,11 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_ruby_utils/core_ext'
3
+ require 'eac_ruby_utils'
4
4
 
5
5
  module Avm
6
6
  module Launcher
7
7
  module Instances
8
- require_sub __FILE__
9
8
  end
10
9
  end
11
10
  end
@@ -2,7 +2,7 @@
2
2
 
3
3
  require 'avm/launcher/paths/real'
4
4
  require 'avm/launcher/stereotype'
5
- require 'eac_ruby_utils/core_ext'
5
+ require 'eac_ruby_utils'
6
6
 
7
7
  module Avm
8
8
  module Launcher
@@ -1,11 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_ruby_utils/core_ext'
3
+ require 'eac_ruby_utils'
4
4
 
5
5
  module Avm
6
6
  module Launcher
7
7
  module Paths
8
- require_sub __FILE__
9
8
  end
10
9
  end
11
10
  end