avm-tools 0.94.0 → 0.96.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5c0c0b3a077d30739e756476f997c1d74acc2f6cbf52ba89ca55efecc87879a
-  data.tar.gz: e26b9535c059c92e9a401db8552d33ca16f8ee38bf9743100cb61cbcf2d27c39
+  metadata.gz: 6ef7523f40504ec0ae7da047ae97a104ee39e70cfc7ce6a799391615e8a62acf
+  data.tar.gz: cc8d89ba7e4f9025fd0553f4f4d448d7b11c3a65d07ec5f46646619f7b517baa
 SHA512:
-  metadata.gz: ce8b71b8307d328e7a8ecb64d6c860eea72a47c22a769de30c101686b7089b9e6ee1d05a932c311139e3ba554bff03fae9d091cd9c1eb97ae2cb6d8135e8ee6b
-  data.tar.gz: eb891b911edc41e6989ab28f59f79b47e9d49ad18454cb8178a49f3e87f79f3b36206057476aa524d7a197d333228f551dfcce43553ae4aac2369382e62b94bf
+  metadata.gz: 06e6b348ab5fdd9c2df75c7959dc1b9ef6202e44fde8af352603c3f8883de2c5ec5abd46f0fb0f6771e7a78befdf97fd109f17c6622dffb942ae758ac54a3998
+  data.tar.gz: 32835edd010fc51fdd12ca6a0c85c4950c946463ec067de823f96d4bb24dc70bfae8e94fe4d1c3cfa66a882b2e8566b0ea3c79bd46ffd9c0a51edd699207deb9

data/lib/avm/app_src.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'avm/instances/configuration'
+require 'eac_launcher/paths/real'
+require 'eac_ruby_utils/core_ext'
+require 'avm/projects/stereotypes'
+require 'i18n'
+
+module Avm
+  class AppSrc
+    enable_simple_cache
+    common_constructor :path do
+      self.path = path.to_pathname
+      source_stereotypes_mixins
+    end
+
+    delegate :to_s, to: :path
+
+    def locale
+      configuration.if_present(&:locale) || ::I18n.default_locale
+    end
+
+    # Backward compatibility with [EacLauncher::Paths::Logical].
+    # @return [EacLauncher::Paths::Real].
+    def real
+      ::EacLauncher::Paths::Real.new(path.to_path)
+    end
+
+    def run_job(job, job_args = [])
+      stereotypes.each { |stereotype| run_stereotype_job(stereotype, job, job_args) }
+    end
+
+    private
+
+    # @return [Avm::Instances::Configuration]
+    def configuration_uncached
+      ::Avm::Instances::Configuration.find_in_path(path)
+    end
+
+    def run_stereotype_job(stereotype, job, job_args)
+      job_class_method = "#{job}_class"
+      if stereotype.send(job_class_method).present?
+        puts stereotype.label + ": #{job} class found. Running..."
+        stereotype.send(job_class_method).new(self, *job_args).run
+      else
+        puts stereotype.label + ": #{job} class not found"
+      end
+    end
+
+    def stereotypes_uncached
+      ::Avm::Projects::Stereotypes.list.select { |s| s.match?(self) }
+    end
+
+    def source_stereotypes_mixins
+      stereotypes.each do |s|
+        s.local_project_mixin_module.if_present { |v| singleton_class.include(v) }
+      end
+    end
+  end
+end

data/lib/avm/core_ext.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'avm/patches'
+require 'eac_ruby_base0/core_ext'

data/lib/avm/eac_webapp_base0/instance.rb

@@ -9,6 +9,7 @@ require 'avm/eac_webapp_base0/deploy/file_unit'
 module Avm
   module EacWebappBase0
     class Instance < ::Avm::Instances::Base
+      require_sub __FILE__
       include ::Avm::Postgresql::InstanceWith
 
       FILES_UNITS = [].freeze
@@ -26,8 +27,10 @@ module Avm
       end
 
       def run_subcommand(subcommand_class, argv)
-        parent = ::OpenStruct.new(instance: self)
-        subcommand_class.new(argv: argv, parent: parent).run
+        subcommand_class.create(
+          argv: argv,
+          parent: ::Avm::EacWebappBase0::Instance::SubcommandParent.new(self)
+        ).run
       end
 
       def data_package

data/lib/avm/eac_webapp_base0/instance/subcommand_parent.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    class Instance < ::Avm::Instances::Base
+      class SubcommandParent
+        enable_simple_cache
+        common_constructor :instance
+
+        private
+
+        def runner_context_uncached
+          ::EacCli::Runner::Context.new(self, argv: runner_argv)
+        end
+
+        def runner_argv
+          [instance.class.name.split('::')[-2].dasherize, instance.id]
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_webapp_base0/runner/data.rb

@@ -9,6 +9,7 @@ module Avm
         require_sub __FILE__
         runner_with :help, :subcommands do
           desc 'Data utilities for EacRailsBase0 instances.'
+          subcommands
         end
       end
     end

data/lib/avm/eac_webapp_base0/runner/data/dump.rb

@@ -15,7 +15,7 @@ module Avm
 
           runner_with :help do
             desc 'Dump utility for EacRailsBase instance.'
-            bool_opt '-w', 'rewrite', 'Forces dump overwrite.'
+            bool_opt '-w', '--rewrite', 'Forces dump overwrite.'
             arg_opt '-p', '--dump-path', 'Set DUMP_PATH variable.'
           end
 

data/lib/avm/eac_webapp_base0/runner/data/load.rb

@@ -9,7 +9,7 @@ module Avm
     class Runner < ::Avm::Instances::Runner
       class Data
         class Load
-          runner_with :ĥelp do
+          runner_with :help do
             desc 'Load utility for EacRailsBase instance.'
             arg_opt '-S', '--source-instance', 'Informa a instância a ser extraída o dump.'
             pos_arg :dump_path, optional: true

data/lib/avm/git/file_auto_fixup.rb

@@ -11,7 +11,7 @@ module Avm
       enable_listable
 
       common_constructor :git, :path, :rules do
-        self.path = path.to_pathname
+        self.path = path.to_pathname.expand_path(git.root_path)
       end
 
       COMMITS_SEARCH_INTERVAL = 'origin/master..HEAD'
@@ -44,11 +44,21 @@ module Avm
         return false if commit_info.blank?
 
         infov '  Commit arguments', ::Shellwords.join(commit_args)
-        git.execute!('commit', *commit_args)
+        run_git_add_and_commit
         success '  Commited'
         true
       end
 
+      def run_git_add_and_commit
+        git.execute!('reset', '--soft', 'HEAD')
+        if path.exist?
+          git.execute!('add', git_relative_path)
+        else
+          git.execute!('rm', '-f', git_relative_path)
+        end
+        git.execute!('commit', *commit_args)
+      end
+
       def commits_uncached
         git.execute!('log', '--pretty=format:%H', COMMITS_SEARCH_INTERVAL, '--', path)
            .each_line.map { |sha1| ::Avm::Git::Commit.new(git, sha1.strip) }

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/launcher/instances/runner_helper.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/console/speaker'
+
+module Avm
+  module Launcher
+    module Instances
+      class RunnerHelper < ::EacRubyUtils::Console::DocoptRunner
+        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/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/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