avm-tools 0.94.3 → 0.99.0

data/lib/avm/git/revision_test.rb

@@ -8,7 +8,7 @@ module Avm
   module Git
     class RevisionTest
       enable_simple_cache
-      enable_console_speaker
+      enable_speaker
       common_constructor :git, :sha1, :options
 
       def banner

data/lib/avm/git/subrepo_check.rb

@@ -7,7 +7,7 @@ module Avm
   module Git
     class SubrepoCheck
       require_sub __FILE__, include_modules: true
-      enable_console_speaker
+      enable_speaker
       enable_simple_cache
 
       BLANK_TEXT = 'BLANK'

data/lib/avm/git/subrepo_checks.rb

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Git
     class SubrepoChecks
-      enable_console_speaker
+      enable_speaker
       enable_simple_cache
       attr_accessor :check_remote, :fix_parent
       common_constructor :repository

data/lib/avm/instances/base.rb

@@ -3,16 +3,13 @@
 require 'eac_ruby_utils/require_sub'
 require 'eac_ruby_utils/simple_cache'
 require 'avm/instances/entries'
-require 'avm/instances/entry_keys'
-::EacRubyUtils.require_sub(__FILE__)
 
 module Avm
   module Instances
     class Base
-      include ::EacRubyUtils::Listable
-      include ::EacRubyUtils::SimpleCache
-      include ::Avm::Instances::Base::AutoValues
-      include ::Avm::Instances::Base::Dockerizable
+      enable_listable
+      enable_simple_cache
+      require_sub __FILE__, include_modules: true
       include ::Avm::Instances::Entries
 
       lists.add_string :access, :local, :ssh
@@ -36,11 +33,8 @@ module Avm
         end
       end
 
-      attr_reader :application, :suffix
-
-      def initialize(application, suffix)
-        @application = application
-        @suffix = suffix.to_s
+      common_constructor :application, :suffix do
+        self.suffix = suffix.to_s
       end
 
       def id
@@ -63,7 +57,7 @@ module Avm
       private
 
       def source_instance_uncached
-        ::Avm::Instances::Base.by_id(read_entry(::Avm::Instances::EntryKeys::SOURCE_INSTANCE_ID))
+        ::Avm::Instances::Base.by_id(source_instance_id)
       end
     end
   end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'avm/instances/entry_keys'
+
+module Avm
+  module Instances
+    class Base
+      module EntryKeys
+        ::Avm::Instances::EntryKeys.all.each do |key|
+          define_method key.to_s.variableize do
+            read_entry(key)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/instances/entries.rb

@@ -25,7 +25,7 @@ module Avm
 
       def full_entry_path(entry_suffix)
         unless entry_suffix.is_a?(::Array)
-          entry_suffix = ::EacRubyUtils::PathsHash.parse_entry_key(entry_suffix.to_s)
+          entry_suffix = ::EacConfig::PathsHash.parse_entry_key(entry_suffix.to_s)
         end
         (path_prefix + entry_suffix).join('.')
       end

data/lib/avm/instances/entry.rb

@@ -37,7 +37,7 @@ module Avm
         if suffix.is_a?(::Array)
           suffix.dup
         else
-          ::EacRubyUtils::PathsHash.parse_entry_key(suffix.to_s)
+          ::EacConfig::PathsHash.parse_entry_key(suffix.to_s)
         end
       end
 

data/lib/avm/launcher/context/instance_manager/cached_instance.rb

@@ -8,7 +8,7 @@ module Avm
     class Context
       class InstanceManager
         class CachedInstance
-          enable_console_speaker
+          enable_speaker
           enable_simple_cache
           common_constructor :cached_instances, :data
 

data/lib/avm/launcher/instances/base.rb

@@ -10,7 +10,7 @@ module Avm
         class << self
           def extend_object(object)
             object.extend ::EacRubyUtils::SimpleCache
-            object.extend ::EacRubyUtils::Console::Speaker
+            object.extend ::EacCli::Speaker
             object.extend ::Avm::Launcher::Instances::Base::Cache
             super
           end

data/lib/avm/launcher/instances/runner_helper.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'avm/core_ext'
+
+module Avm
+  module Launcher
+    module Instances
+      class RunnerHelper
+        def context
+          @context ||= ::EacLauncher::Context.current
+        end
+
+        def find_instances(instance_name)
+          context.instances.select { |instance| instance_match?(instance, instance_name) }
+        end
+
+        def instance_match?(instance, instance_name)
+          ::File.fnmatch?(instance_name, instance.name)
+        end
+
+        def instances
+          if parsed.all?
+            context.instances
+          elsif parsed.pending?
+            context.pending_instances
+          else
+            parsed.instance_path.flat_map { |p| find_instances(p) }
+          end
+        end
+
+        def instance_stereotypes(instance)
+          instance.stereotypes.map(&:label).join(', ')
+        end
+
+        def instance_label(instance)
+          "#{instance.name} [#{instance_stereotypes(instance)}]"
+        end
+      end
+    end
+  end
+end

data/lib/avm/patches/class.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)

data/lib/avm/patches/eac_ruby_gems_utils.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)

data/lib/avm/patches/eac_ruby_gems_utils/gem.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/instances/configuration'
+require 'avm/apps/sources/configuration'
 require 'eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
 
@@ -13,7 +13,7 @@ module Avm
         private
 
         def configuration_uncached
-          ::Avm::Instances::Configuration.find_in_path(root)
+          ::Avm::Apps::Sources::Configuration.find_in_path(root)
         end
 
         def gemfile_path_uncached

data/lib/avm/patches/object.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)

data/lib/avm/patches/object/fs_cache.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'avm/self'
+require 'eac_ruby_utils/core_ext'
+
+class Object
+  class << self
+    def avm_fs_cache
+      ::Avm::Self.application.fs_cache.child(name.variableize)
+    end
+  end
+
+  def avm_fs_cache
+    self.class.avm_fs_cache.child(avm_fs_cache_object_id)
+  end
+end

data/lib/avm/patches/object/template.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/self/root'
-require 'eac_ruby_utils/patches/object/template'
+require 'eac_templates/patches/object/template'
 
-::EacRubyUtils::Templates::Searcher.default.included_paths <<
+::EacTemplates::Searcher.default.included_paths <<
   ::Avm::Self.root.join('template').to_path

data/lib/avm/projects/stereotypes/git/update.rb

@@ -10,7 +10,7 @@ module Avm
         class Update
           require_sub __FILE__
           enable_simple_cache
-          enable_console_speaker
+          enable_speaker
           common_constructor :instance
 
           delegate :git_repo, to: :instance

data/lib/avm/projects/stereotypes/git/update/subrepo.rb

@@ -13,7 +13,7 @@ module Avm
 
             require_sub __FILE__, include_modules: true
             enable_simple_cache
-            enable_console_speaker
+            enable_speaker
             common_constructor :parent_update, :subpath do
               self.subpath = subpath.to_pathname
             end

data/lib/avm/projects/stereotypes/ruby_gem/publish.rb

@@ -4,7 +4,7 @@ require 'curb'
 require 'json'
 require 'eac_ruby_utils/simple_cache'
 require 'rubygems'
-require 'eac_ruby_utils/console/speaker'
+require 'eac_cli/speaker'
 require 'eac_launcher/publish/base'
 require 'eac_launcher/publish/check_result'
 require 'eac_launcher/ruby/gem'
@@ -15,7 +15,7 @@ module Avm
       class RubyGem
         class Publish < ::EacLauncher::Publish::Base
           include ::EacRubyUtils::SimpleCache
-          include ::EacRubyUtils::Console::Speaker
+          include ::EacCli::Speaker
 
           protected
 

data/lib/avm/projects/stereotypes/ruby_gem/update.rb

@@ -10,7 +10,7 @@ module Avm
         class Update
           TRANSLATE_CLASS = self
 
-          enable_console_speaker
+          enable_speaker
           common_constructor :instance
 
           def run

data/lib/avm/projects/stereotypes/ruby_gem/version_bump.rb

@@ -8,7 +8,7 @@ module Avm
     module Stereotypes
       class RubyGem
         class VersionBump
-          enable_console_speaker
+          enable_speaker
           common_constructor :instance, :target_version
 
           def run

data/lib/avm/ruby/bundler.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Ruby
+    module Bundler
+      require_sub __FILE__
+    end
+  end
+end

data/lib/avm/ruby/bundler/incompatible_parser.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Ruby
+    module Bundler
+      class IncompatibleParser
+        require_sub __FILE__
+
+        enable_simple_cache
+        attr_reader :gems_in_conflict
+
+        def initialize(path)
+          @gems_in_conflict = ::Avm::Ruby::Bundler::IncompatibleParser::LineBuffer
+                              .from_file(path).gems_in_conflict.freeze
+        end
+
+        def data
+          gems_in_conflict.map(&:data)
+        end
+      end
+    end
+  end
+end

data/lib/avm/ruby/bundler/incompatible_parser/depends_on.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/ruby/bundler/incompatible_parser/line_parser_base'
+
+module Avm
+  module Ruby
+    module Bundler
+      class IncompatibleParser
+        class DependsOn < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
+          LINE_PARSER = /(.+) was resolved to (.+), which depends on/
+                        .to_parser { |m| new(m[1], m[2]) }
+
+          common_constructor :gem_name, :version do
+            self.version = ::Gem::Version.new(version)
+          end
+
+          def data
+            { gem_name: gem_name, version: version }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/ruby/bundler/incompatible_parser/gem_conflict.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/ruby/bundler/incompatible_parser/line_parser_base'
+
+module Avm
+  module Ruby
+    module Bundler
+      class IncompatibleParser
+        class GemConflict < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
+          LINE_PARSER = /Bundler could not find compatible versions for gem "(.+)":/
+                        .to_parser { |m| new(m[1]) }
+
+          enable_simple_cache
+          common_constructor :gem_name
+
+          def add_depends_on(depends_on)
+            @depends_on_stack ||= []
+            @depends_on_stack << depends_on
+          end
+
+          def add_version_requirement(version_requirement)
+            version_requirement.stack = @depends_on_stack
+            versions_requirements << version_requirement
+            @depends_on_stack = nil
+          end
+
+          def data
+            { gem_name: gem_name, versions_requirements: versions_requirements.map(&:data) }
+          end
+
+          def versions_requirements
+            @versions_requirements ||= []
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/ruby/bundler/incompatible_parser/in_gemfile.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/ruby/bundler/incompatible_parser/line_parser_base'
+
+module Avm
+  module Ruby
+    module Bundler
+      class IncompatibleParser
+        class InGemfile < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
+          LINE_PARSER = /In Gemfile:/
+                        .to_parser { |_m| new }
+
+          common_constructor
+        end
+      end
+    end
+  end
+end

data/lib/avm/ruby/bundler/incompatible_parser/line_buffer.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/ruby/bundler/incompatible_parser/gem_conflict'
+require 'avm/ruby/bundler/incompatible_parser/line_factory'
+
+module Avm
+  module Ruby
+    module Bundler
+      class IncompatibleParser
+        class LineBuffer
+          class << self
+            def from_file(path)
+              new(::File.read(path.to_s))
+            end
+          end
+
+          attr_reader :gems_in_conflict
+
+          def initialize(content)
+            self.gems_in_conflict = []
+            self.parsing_required = false
+            content.each_line { |string_line| add_line(LineFactory.new(string_line)) }
+          end
+
+          private
+
+          attr_accessor :parsing_required
+          attr_writer :gems_in_conflict
+
+          def add_line(line)
+            return if line.blank?
+
+            return if LineFactory::TYPES.any? do |type|
+              next false unless line.result.is_a?(type)
+
+              send("on_#{type.name.demodulize.underscore.variableize}_line", line.result)
+              true
+            end
+
+            return unless parsing_required
+
+            raise(::ArgumentError, "Unparsed line: \"#{line.content}\"")
+          end
+
+          def on_gem_conflict_line(result)
+            self.parsing_required = true
+            gems_in_conflict << result
+          end
+
+          def on_in_gemfile_line(result)
+            # Do nothing
+          end
+
+          def on_depends_on_line(result)
+            current_gem_conflict.add_depends_on(result)
+          end
+
+          def on_version_requirement_line(result)
+            current_gem_conflict.add_version_requirement(result)
+          end
+
+          def current_gem_conflict
+            raise 'No gems in conflict' if gems_in_conflict.none?
+            raise 'Last gem is blank' if gems_in_conflict.last.blank?
+
+            gems_in_conflict.last
+          end
+        end
+      end
+    end
+  end
+end