avm-tools 0.99.1 → 0.102.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad117874b0eb67142f85a2e4418a5bfc1ffe4b13b9ca5e055669238a1a48dc03
-  data.tar.gz: fde307fe4e42f7a814ff2cb7d5f81059e60945e55584cfdcfbf0aad95824e7e9
+  metadata.gz: c1dc265a8c8828a917414ea4baac9765139517521d1d137df7893cf71c1c3b89
+  data.tar.gz: 46ec3d56d9ad2420929c24aba726b1a2e476bae418e90a793b106f95740ce5e1
 SHA512:
-  metadata.gz: c07bc41c85952a91374ca3f54be94ac22f475d798e1bd649162824f643dacf7cc77dfa4ee89c7280e9a515266a4b13432c76939f3bba63e92cc50cfadbe8238b
-  data.tar.gz: ec10f8a6286610fd7df1cfc105da7b4e6103078fa0f35d19edf8775a2b0b6c26d2457bb9babdfaa5c16e25f071cd6464baceaffe44e28ccf1a453e26989fcc34
+  metadata.gz: b2bde9ec40565deaf93c371d8c1df4443ff2ba084d4ab295493a585c4ed82d1f070625747a0ab7ac5fbed0424d1c4d7f2345beae7a03a6ef0efef13a4363e95a
+  data.tar.gz: ebf68de65906d8c17c31f4d49cbc3011afc0e793e25b70f01a25291d0c897526f4ef54beef345ffb9f7e08a49ba0b98e44b825e5feab19803c747d09917eae4c

data/lib/avm/app_src.rb

@@ -2,6 +2,7 @@
 
 require 'avm/apps/sources/configuration'
 require 'avm/launcher/paths/real'
+require 'avm/projects/stereotype/job_comparator'
 require 'eac_ruby_utils/core_ext'
 require 'avm/projects/stereotypes'
 require 'i18n'
@@ -27,7 +28,7 @@ module Avm
     end
 
     def run_job(job, job_args = [])
-      stereotypes.each { |stereotype| run_stereotype_job(stereotype, job, job_args) }
+      stereotypes_jobs(job, job_args).each(&:run)
     end
 
     private
@@ -37,14 +38,14 @@ module Avm
       ::Avm::Apps::Sources::Configuration.find_in_path(path)
     end
 
-    def run_stereotype_job(stereotype, job, job_args)
+    def stereotypes_jobs(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"
+      r = []
+      stereotypes.each do |stereotype|
+        r << stereotype.send(job_class_method).new(self, *job_args) if
+          stereotype.send(job_class_method).present?
       end
+      r.sort { |a, b| ::Avm::Projects::Stereotype::JobComparator.new(a, b).result }
     end
 
     def stereotypes_uncached

data/lib/avm/docker/image.rb

@@ -3,10 +3,11 @@
 require 'eac_ruby_utils/core_ext'
 require 'avm/executables'
 require 'avm/patches/object/template'
+require 'eac_docker/images/templatized'
 
 module Avm
   module Docker
-    class Image
+    class Image < ::EacDocker::Images::Templatized
       attr_reader :registry
       attr_accessor :snapshot
       attr_accessor :version
@@ -18,10 +19,9 @@ module Avm
       end
 
       def build(extra_args = [])
-        on_build_dir do
-          template.apply(self, build_dir)
-          run_docker_build(extra_args)
-        end
+        nyi "Extra args: #{extra_args}" if extra_args.any?
+
+        provide
       end
 
       def generator_version
@@ -32,9 +32,10 @@ module Avm
         ::Avm::Executables.docker.command.append(['push', tag]).system!
       end
 
-      def read_entry(path, _options = {})
+      def read_entry(path, options = {})
         method = path.gsub('.', '_')
         return send(method) if respond_to?(path, true)
+        return instance.read_entry(path, options) if respond_to?(:instance)
 
         raise "Method \"#{method}\" not found for entry \"#{path}\""
       end
@@ -66,23 +67,6 @@ module Avm
         r += '-snapshot' if snapshot
         r
       end
-
-      private
-
-      attr_reader :build_dir
-
-      def run_docker_build(extra_args)
-        ::Avm::Executables.docker.command.append(
-          ['build', '-t', tag] + extra_args + [build_dir]
-        ).system!
-      end
-
-      def on_build_dir
-        @build_dir = ::Dir.mktmpdir
-        yield
-      ensure
-        ::FileUtils.rm_rf(@build_dir)
-      end
     end
   end
 end

data/lib/avm/docker/registry.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 require 'avm/self/instance'
+require 'eac_docker/registry'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Docker
-    class Registry
+    class Registry < ::EacDocker::Registry
       class << self
         def default
           @default ||= new(::Avm::Self.instance.read_entry(
@@ -13,16 +14,6 @@ module Avm
                            ))
         end
       end
-
-      common_constructor :name
-
-      def to_s
-        name
-      end
-
-      def sub(suffix)
-        self.class.new("#{name}#{suffix}")
-      end
     end
   end
 end

data/lib/avm/docker/runner.rb

@@ -43,42 +43,68 @@ module Avm
         infov 'Registry name', registry
         infov 'Version?', version?
         infov 'Snapshot?', snapshot?
-        infov 'Image name', instance.docker_image.tag
+        infov 'Image name', docker_image.tag
         infov 'Build arguments', build_args
         infov 'Entrypoint arguments', entrypoint_args
       end
 
       def build
-        instance.docker_image.build(build_args)
+        docker_image.build(build_args)
+        success 'Docker image builded'
       end
 
       def build_args
         parsed.build_arg
       end
 
+      def docker_container
+        instance.docker_container
+      end
+
+      def docker_image
+        instance.docker_image
+      end
+
       def entrypoint_args
         parsed.entrypoint_arg
       end
 
       def push
-        instance.docker_image.push if parsed.push?
+        docker_image.push if parsed.push?
       end
 
       def container_run
         return unless parsed.run?
 
-        instance.docker_container.run(
+        docker_container.run(
           entrypoint_args: entrypoint_args,
           clear: parsed.clear?
         )
       end
 
       def registry_uncached
-        parsed.registry_name.if_present(::Avm::Docker::Registry.default) do |v|
-          ::Avm::Docker::Registry.new(v)
+        registry_from_option || registry_from_instance || registry_from_default ||
+          fatal_error('No registry defined')
+      end
+
+      def registry_from_option
+        parsed.registry_name.if_present { |v| ::Avm::Docker::Registry.new(v) }
+      end
+
+      def registry_from_instance
+        if if_respond(:use_default_registry?, true)
+          instance.docker_registry_optional.if_present { |v| ::Avm::Docker::Registry.new(v) }
+        else
+          ::Avm::Docker::Registry.new(instance.docker_registry)
         end
       end
 
+      def registry_from_default
+        return nil unless if_respond(:use_default_registry?, true)
+
+        ::Avm::Docker::Registry.default
+      end
+
       def snapshot?
         !parsed.no_snapshot?
       end

data/lib/avm/eac_rails_base1/runner/bundle.rb

@@ -8,8 +8,7 @@ module Avm
   module EacRailsBase1
     class Runner < ::Avm::EacWebappBase0::Runner
       class Bundle
-        runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle
-        runner_definition do
+        runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle, :help do
           desc 'Runs "bundle ...".'
           pos_arg :'bundle-args', repeat: true, optional: true
         end

data/lib/avm/eac_redmine_base0/docker_image.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'avm/core_ext'
+require 'avm/instances/docker_image'
+
+module Avm
+  module EacRedmineBase0
+    class DockerImage < ::Avm::Instances::DockerImage
+      enable_simple_cache
+
+      REDMINE_SOURCE_HOST_SUBPATH = 'redmine_source'
+
+      def avm_fs_cache_object_id
+        instance.id
+      end
+
+      def redmine_user
+        'redmine'
+      end
+
+      def redmine_user_home
+        "/home/#{redmine_user}"
+      end
+
+      def redmine_path
+        "#{redmine_user_home}/redmine_app"
+      end
+
+      def start_path
+        '/start.sh'
+      end
+
+      private
+
+      def git_repo_uncached
+        ::EacGit::Local.new(instance.source_instance.fs_path)
+      end
+
+      def redmine_source_git_id
+        git_repo.rev_parse('HEAD')
+      end
+
+      def redmine_source_path_uncached
+        r = provide_dir.join(REDMINE_SOURCE_HOST_SUBPATH)
+        ::FileUtils.rm_rf(r.to_path)
+        r.mkpath
+        git_repo.commit(redmine_source_git_id).archive_to_dir(r).system!
+        REDMINE_SOURCE_HOST_SUBPATH
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/instance.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/eac_redmine_base0/data_unit'
-require 'avm/eac_ubuntu_base0/docker_image'
+require 'avm/eac_redmine_base0/docker_image'
 require 'avm/eac_webapp_base0/instance'
 require 'avm/eac_rails_base1/instance'
 
@@ -11,7 +11,7 @@ module Avm
       FILES_UNITS = { files: 'files' }.freeze
 
       def docker_image_class
-        ::Avm::EacUbuntuBase0::DockerImage
+        ::Avm::EacRedmineBase0::DockerImage
       end
 
       def docker_run_arguments

data/lib/avm/git/auto_commit/rules/manual.rb

@@ -17,7 +17,7 @@ module Avm
               return nil unless file.commits.any?
 
               commits_banner
-              request_input('Which commit?', list: commits_by_position).if_present do |v|
+              input('Which commit?', list: commits_by_position).if_present do |v|
                 new_commit_info.fixup(v)
               end
             end

data/lib/avm/git/issue/complete.rb

@@ -1,18 +1,14 @@
 # frozen_string_literal: true
 
-require 'avm/launcher/git/base'
-require 'eac_cli/speaker'
-require 'eac_ruby_utils/options_consumer'
-require 'eac_ruby_utils/require_sub'
-require 'eac_ruby_utils/simple_cache'
-::EacRubyUtils.require_sub(__FILE__)
+require 'avm/core_ext'
 
 module Avm
   module Git
     module Issue
       class Complete
-        include ::EacRubyUtils::SimpleCache
-        include ::EacCli::Speaker
+        require_sub __FILE__, include_modules: true
+        enable_simple_cache
+        enable_speaker
 
         attr_reader :skip_validations
 

data/lib/avm/git/issue/complete/commits.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'avm/result'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module Commits
+          def commits_result
+            ::Avm::Result.success_or_error(commits.any?, 'yes', 'none')
+          end
+
+          def commits_uncached
+            return [] unless branch_hash && follow_master?
+
+            interval = remote_master_hash ? "#{remote_master_hash}..#{branch_hash}" : branch_hash
+            @git.execute!('rev-list', interval).each_line.map(&:strip)
+          end
+
+          def bifurcations_result
+            commits.each do |commit|
+              if multiple_parents?(commit)
+                return ::Avm::Result.error("#{commit} has multiple parents")
+              end
+            end
+            ::Avm::Result.success('no')
+          end
+
+          def multiple_parents?(commit)
+            commit_parents(commit).count > 1
+          end
+
+          def commit_parents(commit)
+            @git.execute!('log', '--pretty=%P', '-n', '1', commit).split(' ').map(&:strip)
+                .select(&:present?)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/issue/complete/git_subrepos.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'avm/git/subrepo_checks'
+require 'eac_git/local'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module GitSubrepos
+          def git_subrepos_result
+            return ::Avm::Result.error('Unclean workspace') unless clean_workspace?
+
+            infom 'Checking Git subrepos...'
+            r = ::Avm::Git::SubrepoChecks.new(::EacGit::Local.new(@git)).add_all_subrepos
+            r.check_remote = true
+            r.result
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/issue/complete/local_branch.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'avm/result'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module LocalBranch
+          def branch_uncached
+            @git.current_branch
+          end
+
+          def branch_hash_uncached
+            @git.rev_parse("refs/heads/#{branch}")
+          end
+
+          def branch_name
+            branch.split('/')[-1]
+          end
+
+          def branch_name_result
+            ::Avm::Result.success_or_error(issue_id.present?, branch_name)
+          end
+
+          def branch_hash_result
+            ::Avm::Result.success_or_error(
+              branch_hash.present?,
+              branch_hash
+            )
+          end
+
+          def follow_master_result
+            return ::Avm::Result.neutral('No branch hash') unless branch_hash
+
+            r = follow_master?
+            ::Avm::Result.success_or_error(r, 'yes', 'no')
+          end
+
+          def follow_master?
+            remote_master_hash ? @git.descendant?(branch_hash, remote_master_hash) : true
+          end
+
+          def remove_local_branch
+            info 'Removendo branch local...'
+            bn = branch_name
+            git(['checkout', branch_hash])
+            git(['branch', '-D', bn])
+          end
+        end
+      end
+    end
+  end
+end