eac_tools 0.23.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d37f8e08239e5bac225ad919b4805592413d710cf364e354098aedcd2a9ab758
-  data.tar.gz: 7f57813fb27c9757cc6c03b016d69a9e777ccec79a875d4b946ee7136642d04b
+  metadata.gz: b50382fd923923ea176726318a5adeed1194cdc1aac56b3d70c2211a030d2e86
+  data.tar.gz: f35a6fe715fc7d265f046e3692201a8edbab95e16cc324942956ab31804bff0d
 SHA512:
-  metadata.gz: a2027d28a82968c9d2e71b7699be1829e16b7752d7a727d018822e0dfc9f7b4bbf4bd24f491070071b30acd2c7bd61717cc0dbe102fec922ead1af734ac42f83
-  data.tar.gz: e5343d8c9b7b5b20d46ccf1393b2254babe9d2320739902a910fc86b61c9aa50555f9732485f01d79d52825e31d46a6fed87205f5131157b80af548eb48afc97
+  metadata.gz: 8495da6e5565b3b03901d8c11a4f5bfe1d08fbe02cfafed82d59c4d33c69e92a43f8042e78e29ac32416eeed25250ab46088e9ca21193e0a912db82c2987c3ef
+  data.tar.gz: 81f4b76062b762acd52c63f9b4ec03bbb8e7d599032d7235ea24f2f291001664c3674fbb4db74d0e8f31783e36760f7a59427e1893d38ad087eaa34b24d87b29

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.23.0)
-      avm (~> 0.35, >= 0.35.1)
+    eac_tools (0.25.0)
+      avm (~> 0.39)
       avm-eac_asciidoctor_base0 (~> 0.5)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_latex_base0 (~> 0.1, >= 0.1.2)
@@ -10,11 +10,11 @@ PATH
       avm-eac_rails_base1 (~> 0.5)
       avm-eac_redmine_base0 (~> 0.12)
       avm-eac_redmine_plugin_base0 (~> 0.3)
-      avm-eac_ruby_base1 (~> 0.19)
-      avm-eac_webapp_base0 (~> 0.4)
+      avm-eac_ruby_base1 (~> 0.19, >= 0.19.1)
+      avm-eac_webapp_base0 (~> 0.4, >= 0.4.1)
       avm-eac_wordpress_base0 (~> 0.1, >= 0.1.2)
-      avm-tools (~> 0.132, >= 0.132.1)
-      eac_ruby_utils (~> 0.98)
+      avm-tools (~> 0.133)
+      eac_ruby_utils (~> 0.101)
 
 PATH
   remote: sub/avm-eac_asciidoctor_base0
@@ -80,7 +80,7 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.19.0)
+    avm-eac_ruby_base1 (0.19.1)
       avm (~> 0.35, >= 0.35.1)
       avm-eac_generic_base0 (~> 0.5)
       eac_ruby_utils (~> 0.98)
@@ -88,12 +88,12 @@ PATH
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.4.0)
-      avm (~> 0.35, >= 0.35.1)
+    avm-eac_webapp_base0 (0.4.1)
+      avm (~> 0.39)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_postgresql_base0 (~> 0.2)
       avm-eac_ubuntu_base0 (~> 0.3)
-      eac_ruby_utils (~> 0.98)
+      eac_ruby_utils (~> 0.101)
 
 PATH
   remote: sub/avm-eac_wordpress_base0
@@ -106,16 +106,16 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.132.1)
+    avm-tools (0.133.0)
       aranha-parsers (~> 0.14, >= 0.14.1)
-      avm (~> 0.35, >= 0.35.1)
-      avm-eac_ruby_base1 (~> 0.19)
+      avm (~> 0.37)
+      avm-eac_ruby_base1 (~> 0.19, >= 0.19.1)
       avm-eac_ubuntu_base0 (~> 0.3)
       avm-files (~> 0.3, >= 0.3.2)
       avm-git (~> 0.4)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
-      eac_git (~> 0.12, >= 0.12.1)
+      eac_git (~> 0.12, >= 0.12.2)
       eac_ruby_base0 (~> 0.16, >= 0.16.6)
       eac_templates (~> 0.3, >= 0.3.1)
       git (~> 1.11)
@@ -124,12 +124,12 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.36.0)
+    avm (0.39.0)
       eac_cli (~> 0.27, >= 0.27.8)
-      eac_config (~> 0.10)
+      eac_config (~> 0.11)
       eac_docker (~> 0.4, >= 0.4.2)
-      eac_git (~> 0.12, >= 0.12.1)
-      eac_ruby_utils (~> 0.98)
+      eac_git (~> 0.12, >= 0.12.2)
+      eac_ruby_utils (~> 0.101)
       eac_templates (~> 0.3, >= 0.3.1)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
@@ -146,9 +146,9 @@ PATH
 PATH
   remote: sub/eac_config
   specs:
-    eac_config (0.10.0)
-      addressable
-      eac_ruby_utils (~> 0.97)
+    eac_config (0.11.0)
+      addressable (~> 2.8)
+      eac_ruby_utils (~> 0.100)
 
 PATH
   remote: sub/eac_docker
@@ -177,7 +177,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.98.0)
+    eac_ruby_utils (0.101.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.6)
       bundler
@@ -229,7 +229,7 @@ GEM
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.0)
-    eac_git (0.12.1)
+    eac_git (0.12.2)
       eac_ruby_utils (~> 0.83)
       parseconfig (~> 1.0, >= 1.0.8)
     eac_rest (0.6.1)

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.23.0'
+  VERSION = '0.25.0'
 end

data/sub/avm/avm.gemspec

@@ -13,10 +13,10 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'eac_cli', '~> 0.27', '>= 0.27.8'
-  s.add_dependency 'eac_config', '~> 0.10'
+  s.add_dependency 'eac_config', '~> 0.11'
   s.add_dependency 'eac_docker', '~> 0.4', '>= 0.4.2'
-  s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.98'
+  s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.2'
+  s.add_dependency 'eac_ruby_utils', '~> 0.101'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.1'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'

data/sub/avm/lib/avm/entries/base/inherited_entry_value.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'eac_config/entry_path'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class InheritedEntryValue
+        enable_method_class
+        common_constructor :entries_provider, :source_entry_suffix, :target_entry_suffix, :block,
+                           block_arg: true
+
+        def result
+          self_entry_value.if_present do |instance_id|
+            other_entry_value(instance_id).if_present(&block)
+          end
+        end
+
+        def other_entry_value(instance_id)
+          ::Avm::Instances::Base.by_id(instance_id).read_entry_optional(target_entry_suffix)
+        end
+
+        def self_entry_value
+          entries_provider.read_entry_optional(source_entry_suffix)
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/entries/base/uri_component_entry_value.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'eac_config/entry_path'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentEntryValue
+        enable_method_class
+
+        enable_listable
+        lists.add_symbol :option, :default_value, :inherited_value_block
+
+        common_constructor :entries_provider, :component_entry_path, :options, default: [{}] do
+          self.component_entry_path = ::EacConfig::EntryPath.assert(component_entry_path)
+          self.options = self.class.lists.option.hash_keys_validate!(options)
+        end
+
+        def default_value
+          options[OPTION_DEFAULT_VALUE].call_if_proc
+        end
+
+        def inherited_result
+          entries_provider.inherited_entry_value(
+            id_entry_path.to_string,
+            component_entry_path.to_string,
+            &inherited_value_block
+          )
+        end
+
+        def inherited_value_block
+          options[OPTION_INHERITED_VALUE_BLOCK]
+        end
+
+        # @return [EacConfig::EntryPath]
+        def id_entry_path
+          root_entry_path + %w[id]
+        end
+
+        # @return [String, nil]
+        def result
+          url_entry_value || inherited_result || default_value
+        end
+
+        # @return [EacConfig::EntryPath]
+        def root_entry_path
+          component_entry_path[0..-2]
+        end
+
+        # @return [Avm::Entries::Entry]
+        def url_entry
+          entries_provider.entry((root_entry_path + %w[url]).to_string)
+        end
+
+        def url_entry_value
+          return unless url_entry.context_found?
+
+          ::Avm::Entries::UriBuilder.from_source(url_entry.value.to_uri)
+            .avm_field_get(component)
+        end
+
+        # @return [String]
+        def component
+          component_entry_path.last
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/entries/base.rb

@@ -6,6 +6,8 @@ require 'avm/entries/entry'
 module Avm
   module Entries
     module Base
+      require_sub __FILE__, require_dependency: true
+
       def entries_provider_id
         id
       end
@@ -32,16 +34,6 @@ module Avm
         end
         (path_prefix + entry_suffix).join('.')
       end
-
-      def inherited_entry_value(source_entry_suffix, target_entry_suffix, &block)
-        read_entry_optional(source_entry_suffix).if_present do |instance_id|
-          other_entry_value(instance_id, target_entry_suffix).if_present(&block)
-        end
-      end
-
-      def other_entry_value(instance_id, entry_suffix)
-        ::Avm::Instances::Base.by_id(instance_id).read_entry_optional(entry_suffix)
-      end
     end
   end
 end

data/sub/avm/lib/avm/entries/entry.rb

@@ -10,7 +10,16 @@ module Avm
       common_constructor :parent, :suffix, :options
 
       def auto_value
-        ::Avm::Entries::AutoValues::Entry.new(parent, suffix).value
+        auto_value_entry.value
+      end
+
+      def auto_value_entry
+        @auto_value_entry ||= ::Avm::Entries::AutoValues::Entry.new(parent, suffix)
+      end
+
+      # @return [Boolean]
+      def context_found?
+        context_entry.found?
       end
 
       def full_path

data/sub/avm/lib/avm/entries/uri_builder.rb

@@ -42,6 +42,10 @@ module Avm
 
       common_constructor :data, default: [{}]
 
+      def avm_field_get(avm_field)
+        field_get(translate_field(avm_field))
+      end
+
       def field_get(name)
         data[name.to_sym].if_present(&:to_s)
       end

data/sub/avm/lib/avm/instances/base/auto_values/filesystem.rb

@@ -12,11 +12,6 @@ module Avm
                                   ::Avm::Instances::EntryKeys::FS_PATH) { |v| v + '/' + id }
           end
 
-          def auto_data_fs_path
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::DATA_FS_PATH) { |v| v + '/' + id }
-          end
-
           def auto_fs_url
             auto_fs_url_with_install || auto_fs_url_without_install
           end

data/sub/avm/lib/avm/instances/base/auto_values/install.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/entries/uri_builder'
 require 'avm/instances/entry_keys'
 
 module Avm
@@ -7,25 +8,29 @@ module Avm
     class Base
       module AutoValues
         module Install
-          def auto_install_groupname
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME) ||
-              read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
-          end
-
-          def auto_install_hostname
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME)
+          def auto_install_data_path
+            uri_component_entry_value(
+              ::Avm::Instances::EntryKeys::INSTALL_DATA_PATH,
+              inherited_value_block: ->(v) { v + '/' + id }
+            )
           end
 
-          def auto_install_port
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::INSTALL_PORT) || 22
+          def auto_install_groupname
+            uri_component_entry_value(
+              ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME,
+              default_value: lambda do
+                read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
+              end
+            )
           end
 
-          def auto_install_username
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::INSTALL_USERNAME)
+          ::Avm::Entries::UriBuilder::ENTRIES_FIELDS.each do |component|
+            method_suffix = "install_#{component}"
+            define_method "auto_#{method_suffix}" do
+              uri_component_entry_value(
+                ::Avm::Instances::EntryKeys.const_get(method_suffix.underscore.upcase)
+              )
+            end
           end
 
           def auto_install_url

data/sub/avm/lib/avm/instances/entry_keys.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
+require 'avm/entries/uri_builder'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Instances
     module EntryKeys
-      URI_FIELDS = %i[fragment hostname password path port query scheme url username].freeze
+      URI_FIELDS = ::Avm::Entries::UriBuilder::ENTRIES_FIELDS + %w[url]
 
       class << self
         def all
@@ -44,12 +45,12 @@ module Avm
       end
 
       {
-        '' => %w[data_fs_path fs_path name source_instance_id],
+        '' => %w[fs_path name source_instance_id],
         admin: URI_FIELDS + %w[api_key],
         database: URI_FIELDS + %w[id limit name system timeout extra],
         docker: %w[registry],
         fs: %w[url],
-        install: URI_FIELDS + %w[id groupname],
+        install: URI_FIELDS + %w[id data_path groupname],
         mailer: {
           '' => %w[id from reply_to],
           smtp: URI_FIELDS + %w[address domain authentication openssl_verify_mode starttls_auto tls]

data/sub/avm/lib/avm/sources/base/application.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'avm/applications/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Base
+      module Application
+        APPLICATION_NAME_KEY = 'application'
+
+        # @return [Avm::Applications::Base]
+        def application
+          @application ||= ::Avm::Applications::Base.new(application_id)
+        end
+
+        # @return [String]
+        def application_id
+          application_id_by_configuration || application_id_by_directory
+        end
+
+        # @return [String, nil]
+        def application_id_by_configuration
+          configuration.entry(APPLICATION_NAME_KEY).value
+        end
+
+        # @return [String]
+        def application_id_by_directory
+          path.basename.to_path
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/sources/base/configuration.rb

@@ -24,6 +24,8 @@ module Avm
 
         # @return [EacRubyUtils::Envs::Command, nil]
         def configuration_value_to_env_command(value)
+          return value if value.is_a?(::EacRubyUtils::Envs::Command)
+
           configuration_value_to_shell_words(value).if_present { |v| env.command(v).chdir(path) }
         end
 

data/sub/avm/lib/avm/sources/base/testing.rb

@@ -57,7 +57,7 @@ module Avm
 
         def configured_enumerable_value_as_test_commands(value)
           configured_hash_value_as_test_commands(
-            value.each_with_index.map { |v| ["test_#{v[1]}", v[0]] }.to_h
+            value.each_with_index.map { |v, i| ["test_#{i}", v] }.to_h
           )
         end
 

data/sub/avm/lib/avm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.36.0'
+  VERSION = '0.39.0'
 end

data/sub/avm/spec/lib/avm/instances/base_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe ::Avm::Instances::Base do
     {
       'app_0' => {
         fs_path: '/fs_root/app_0',
-        data_fs_path: '/data_fs_root/app_0',
+        ::Avm::Instances::EntryKeys::INSTALL_DATA_PATH => '/data_fs_root/app_0',
         ::Avm::Instances::EntryKeys::DATABASE_NAME => 'app_0',
         ::Avm::Instances::EntryKeys::DATABASE_USERNAME => 'user1',
         ::Avm::Instances::EntryKeys::DATABASE_PASSWORD => 'pass1',
@@ -57,6 +57,22 @@ RSpec.describe ::Avm::Instances::Base do
         ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME => 'group4',
         ::Avm::Instances::EntryKeys::INSTALL_URL => 'ssh://user4@host4.net'
       },
+      'app_5' => {
+        ::Avm::Instances::EntryKeys::INSTALL_SCHEME => 'ssh',
+        ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME => 'host5.net',
+        ::Avm::Instances::EntryKeys::INSTALL_PORT => '2222',
+        ::Avm::Instances::EntryKeys::INSTALL_USERNAME => 'user5',
+        ::Avm::Instances::EntryKeys::INSTALL_PASSWORD => 'passwd5',
+        ::Avm::Instances::EntryKeys::INSTALL_PATH => '/path/to/app5'
+      },
+      'app_6' => {
+        ::Avm::Instances::EntryKeys::INSTALL_SCHEME => 'ssh',
+        ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME => 'host5.net',
+        ::Avm::Instances::EntryKeys::INSTALL_PORT => '2222',
+        ::Avm::Instances::EntryKeys::INSTALL_USERNAME => 'user5',
+        ::Avm::Instances::EntryKeys::INSTALL_PASSWORD => 'passwd5',
+        ::Avm::Instances::EntryKeys::INSTALL_PATH => '/path/to/app5'
+      },
       'mailer_0' => {
         ::Avm::Instances::EntryKeys::MAILER_FROM => 'noreply@example.net',
         ::Avm::Instances::EntryKeys::MAILER_REPLY_TO => '',

data/sub/avm/spec/lib/avm/instances/base_spec_configs_storage.yml

@@ -4,9 +4,9 @@ app_0:
     id: app_1
 app_1:
   fs_path: /fs_root
-  data_fs_path: /data_fs_root
   install:
     id: app_2
+    data_path: /data_fs_root
   database:
     name: app_1_db
     username: user1
@@ -28,6 +28,12 @@ app_4:
     username: user4
     hostname: host4.net
     groupname: group4
+app_5:
+  install:
+    url: ssh://user5:passwd5@host5.net:2222/path/to/app5
+app_6:
+  install:
+    id: app_5
 mailer_0:
   mailer:
     from: 'noreply@example.net'

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.19.0'
+    VERSION = '0.19.1'
   end
 end

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec.rb

@@ -33,10 +33,17 @@ RSpec.describe ::Avm::EacRubyBase1::SourceGenerators::Base do
 
   def directory_to_h(dir)
     dir.children.map do |child|
-      [child.basename.to_path, fs_object_to_h(child)]
+      [fs_object_basename(child), fs_object_to_h(child)]
     end.to_h
   end
 
+  # @return [String]
+  def fs_object_basename(obj)
+    r = obj.basename.to_path
+    r = '.gitignore' if r == '_gitignore'
+    r
+  end
+
   def fs_object_to_h(obj)
     if obj.file?
       file_to_h(obj)

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/dashed-mygem/Gemfile.lock

@@ -0,0 +1 @@
+Is expected that this content be replaced by "TRUNCATED\n".

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/dashed-mygem/_gitignore

@@ -0,0 +1,2 @@
+/Gemfile.local
+/Gemfile.lock

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/mygem/Gemfile.lock

@@ -0,0 +1 @@
+Is expected that this content be replaced by "TRUNCATED\n".

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/mygem/_gitignore

@@ -0,0 +1,2 @@
+/Gemfile.local
+/Gemfile.lock

data/sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec

@@ -12,11 +12,11 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
+  s.add_dependency 'avm', '~> 0.39'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
   s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
-  s.add_dependency 'eac_ruby_utils', '~> 0.98'
+  s.add_dependency 'eac_ruby_utils', '~> 0.101'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/deploy/file_unit.rb

@@ -23,7 +23,7 @@ module Avm
         end
 
         def source_path
-          ::File.join(instance.read_entry(:data_fs_path), data_key.to_s)
+          ::File.join(instance.install_data_path, data_key.to_s)
         end
 
         def target_path

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
   end
 end

data/sub/avm-tools/avm-tools.gemspec

@@ -15,14 +15,14 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
-  s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.19'
+  s.add_dependency 'avm', '~> 0.37'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.19', '>= 0.19.1'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'avm-files', '~> 0.3', '>= 0.3.2'
   s.add_dependency 'avm-git', '~> 0.4'
   s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
-  s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.1'
+  s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.2'
   s.add_dependency 'eac_ruby_base0', '~> 0.16', '>= 0.16.6'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.1'
   s.add_dependency 'git', '~> 1.11'