avm-tools 0.140.0 → 0.142.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed2d914555d3c58362e1295400822e92705cae0150e957fd451d9bb88605bf52
-  data.tar.gz: 0fa211ad333f697fc6c07bb89205552f64e5be5730795e5828cb6b652eef500b
+  metadata.gz: fe25f338167f5636022fc92f0b877749a2570818f651aeac18a042a0021f8832
+  data.tar.gz: d87ded2806e33294657eec147b9127910217f8605b599146ff9df5cc60fb172c
 SHA512:
-  metadata.gz: 153e38b2a7f25f90736f65388c2cdc61a011aefeee2247fdd94f0165624af5dc73b78cb7a7d31a39bec85e37712ec745b80eca5ac36f7eb2bd7a3aa129860af0
-  data.tar.gz: bf4e32eaf0b13d24215b29fde58b9d0dc44335050fad19ab86d6f970312d260ea63b6244e70372ccb72ada83e199bdf4d69ae2acb96c220090a4e6f3952821b8
+  metadata.gz: 0ecf9e0b73723b00a7d151d27974864b65635b4999fd21b6cac25e2ea2648da5c38bc8efc664e06d0813ba0699e06922c074cb6dd45fcaf7beaa6704556b483c
+  data.tar.gz: 7ec47592d0538d5eb64457f4af96f4dbd5cf9881efd8001afe7432dd2a5194de3cdbba010a39cae72db74f4aa056d5d4750d56888b0573d4a3f86cbfd25d546f

data/lib/avm/projects/stereotypes.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require 'avm/git/launcher_stereotypes/git'
+require 'avm/git/launcher_stereotypes/git_subrepo'
+require 'avm/git/launcher_stereotypes/git_subtree'
+require 'avm/eac_ruby_base1/launcher_stereotypes/base'
 require 'eac_ruby_utils/core_ext'
 
 module Avm

data/lib/avm/tools/runner/files/format.rb

@@ -2,7 +2,7 @@
 
 require 'avm/files/formatter'
 require 'eac_cli/core_ext'
-require 'avm/launcher/git/base'
+require 'avm/git/launcher/base'
 
 module Avm
   module Tools
@@ -29,7 +29,7 @@ module Avm
           end
 
           def git
-            @git ||= ::Avm::Launcher::Git::Base.new('.')
+            @git ||= ::Avm::Git::Launcher::Base.new('.')
           end
 
           def git_dirty_files

data/lib/avm/tools/runner/git/commit.rb

@@ -2,7 +2,7 @@
 
 require 'eac_cli/speaker'
 require 'eac_ruby_utils/simple_cache'
-require 'avm/launcher/git/base'
+require 'avm/git/launcher/base'
 require 'filesize'
 require 'avm/git/commit'
 
@@ -76,7 +76,7 @@ module Avm
           end
 
           def git_uncached
-            ::Avm::Launcher::Git::Base.new(runner_context.call(:repository_path))
+            ::Avm::Git::Launcher::Base.new(runner_context.call(:repository_path))
           end
 
           def commit_uncached

data/lib/avm/tools/runner/git/deploy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/launcher/git/base'
+require 'avm/git/launcher/base'
 require 'avm/git/commit'
 require 'eac_config/node'
 
@@ -57,7 +57,7 @@ module Avm
           end
 
           def git_uncached
-            ::Avm::Launcher::Git::Base.new(git_repository_path)
+            ::Avm::Git::Launcher::Base.new(git_repository_path)
           end
 
           def git_repository_path

data/lib/avm/tools/runner/git.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/tools/core_ext'
-require 'avm/launcher/git/base'
+require 'avm/git/launcher/base'
 
 module Avm
   module Tools
@@ -23,7 +23,7 @@ module Avm
         end
 
         def git
-          @git ||= ::Avm::Launcher::Git::Base.by_root(repository_path)
+          @git ||= ::Avm::Git::Launcher::Base.by_root(repository_path)
         end
 
         # @return [[EacGit::Local]]

data/lib/avm/tools/runner/launcher_stereotypes/list.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'avm/launcher/stereotype'
+require 'avm/projects/stereotypes'
+require 'avm/tools/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class LauncherStereotypes
+        class List
+          runner_with :help, :output do
+            bool_opt '-d', '--deprecated'
+          end
+
+          def run
+            infov 'Found', stereotypes.count
+            run_output
+          end
+
+          def output_content
+            stereotypes.map { |s| "#{s}\n" }.join
+          end
+
+          private
+
+          def stereotypes
+            (parsed.deprecated? ? deprecated_stereotypes : registry_stereotypes)
+          end
+
+          def registry_stereotypes
+            ::Avm::Registry.launcher_stereotypes.available.sort_by { |s| [s.name] }
+          end
+
+          def deprecated_stereotypes
+            ::Avm::Launcher::Stereotype.stereotypes.sort_by { |s| [s.stereotype_name] }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/launcher_stereotypes.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class LauncherStereotypes
+        require_sub __FILE__
+        runner_with :help, :subcommands do
+          subcommands
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.140.0'
+    VERSION = '0.142.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.140.0
+  version: 0.142.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -36,28 +36,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.49'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.49'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ruby_base1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.24'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.24'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ubuntu_base0
   requirement: !ruby/object:Gem::Requirement
@@ -98,14 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
@@ -252,39 +252,8 @@ files:
 - Gemfile
 - exe/avm
 - lib/avm.rb
-- lib/avm/launcher/git.rb
-- lib/avm/launcher/git/base.rb
-- lib/avm/launcher/git/base/class_methods.rb
-- lib/avm/launcher/git/base/dirty_files.rb
-- lib/avm/launcher/git/base/remotes.rb
-- lib/avm/launcher/git/base/subrepo.rb
-- lib/avm/launcher/git/base/underlying.rb
-- lib/avm/launcher/git/error.rb
-- lib/avm/launcher/git/mirror_update.rb
-- lib/avm/launcher/git/publish_base.rb
-- lib/avm/launcher/git/remote.rb
-- lib/avm/launcher/git/sub_warp_base.rb
-- lib/avm/launcher/git/warp_base.rb
-- lib/avm/launcher/ruby.rb
-- lib/avm/launcher/ruby/gem.rb
-- lib/avm/launcher/ruby/gem/build.rb
-- lib/avm/launcher/ruby/gem/specification.rb
 - lib/avm/projects.rb
-- lib/avm/projects/stereotype.rb
 - lib/avm/projects/stereotypes.rb
-- lib/avm/projects/stereotypes/git.rb
-- lib/avm/projects/stereotypes/git/local_project_mixin.rb
-- lib/avm/projects/stereotypes/git/publish.rb
-- lib/avm/projects/stereotypes/git/warp.rb
-- lib/avm/projects/stereotypes/git_subrepo.rb
-- lib/avm/projects/stereotypes/git_subrepo/publish.rb
-- lib/avm/projects/stereotypes/git_subrepo/warp.rb
-- lib/avm/projects/stereotypes/git_subtree.rb
-- lib/avm/projects/stereotypes/git_subtree/publish.rb
-- lib/avm/projects/stereotypes/git_subtree/warp.rb
-- lib/avm/projects/stereotypes/ruby_gem.rb
-- lib/avm/projects/stereotypes/ruby_gem/local_project_mixin.rb
-- lib/avm/projects/stereotypes/ruby_gem/publish.rb
 - lib/avm/tools.rb
 - lib/avm/tools/core_ext.rb
 - lib/avm/tools/runner.rb
@@ -312,6 +281,8 @@ files:
 - lib/avm/tools/runner/launcher/instances.rb
 - lib/avm/tools/runner/launcher/projects.rb
 - lib/avm/tools/runner/launcher/publish.rb
+- lib/avm/tools/runner/launcher_stereotypes.rb
+- lib/avm/tools/runner/launcher_stereotypes/list.rb
 - lib/avm/tools/runner/self.rb
 - lib/avm/tools/runner/self/docker.rb
 - lib/avm/tools/runner/self/registry.rb

data/lib/avm/launcher/git/base/class_methods.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module Launcher
-    module Git
-      class Base < ::Avm::Launcher::Paths::Real
-        module ClassMethods
-          # @return [Avm::Launcher::Git::Base]
-          def by_root(search_base_path)
-            new(find_root(search_base_path).to_path)
-          end
-
-          # Searches the root path for the Git repository which includes +search_base_path+.
-          # @return [Pathname]
-          def find_root(search_base_path)
-            path = search_base_path.to_pathname.expand_path
-            loop do
-              return path if path.join('.git').exist?
-              raise "\".git\" not found for \"#{search_base_path}\"" if path.parent.root?
-
-              path = path.parent
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/launcher/git/base/dirty_files.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/core_ext/object'
-
-module Avm
-  module Launcher
-    module Git
-      class Base < ::Avm::Launcher::Paths::Real
-        module DirtyFiles
-          delegate :dirty?, to: :eac_git
-
-          def dirty_files
-            eac_git.dirty_files.map do |df|
-              ::OpenStruct.new(
-                df.to_h.merge(path: df.path.to_path, absolute_path: df.absolute_path.to_path)
-              )
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/launcher/git/base/remotes.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'avm/launcher/git/remote'
-
-module Avm
-  module Launcher
-    module Git
-      class Base < ::Avm::Launcher::Paths::Real
-        module Remotes
-          # @return [Avm::Launcher::Git::Remote]
-          def remote(name)
-            ::Avm::Launcher::Git::Remote.new(self, name)
-          end
-
-          def remote_hashs(remote_name)
-            remote(remote_name).ls
-          end
-
-          def remote_exist?(remote_name)
-            remote(remote_name).exist?
-          end
-
-          def assert_remote_url(remote_name, url)
-            r = git.remote(remote_name)
-            if !r.url || r.url != url
-              r.remove if r.url
-              git.add_remote(remote_name, url)
-            end
-            r
-          end
-
-          def remote_branch_sha(remote_name, branch_name)
-            remote_hashs(remote_name)["refs/heads/#{branch_name}"]
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/launcher/git/base/subrepo.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/core_ext/object'
-
-module Avm
-  module Launcher
-    module Git
-      class Base < ::Avm::Launcher::Paths::Real
-        module Subrepo
-          def subrepo_status(subrepo_path)
-            s = execute!('subrepo', 'status', subrepo_path.gsub(%r{\A/}, ''))
-            raise s.strip.to_s if s.include?('is not a subrepo')
-
-            r = subrepo_status_parse_output(s)
-            raise "Empty subrepo status for |#{s}|\n" unless r.any?
-
-            r
-          end
-
-          def subrepo_remote_url(subrepo_path)
-            h = subrepo_status(subrepo_path)
-            url = h['Remote URL']
-            return url if url.present?
-
-            raise "Remote URL is blank for subrepo \"#{subrepo_path}\" (Subrepo status: #{h})"
-          end
-
-          private
-
-          def subrepo_status_parse_output(output)
-            r = {}.with_indifferent_access
-            output.each_line do |l|
-              m = /\A([^\:]+)\:(.*)\z/.match(l.strip)
-              next unless m && m[2].present?
-
-              r[m[1].strip] = m[2].strip
-            end
-            r
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/launcher/git/base/underlying.rb

@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_git/executables'
-require 'eac_ruby_utils/envs'
-require 'git'
-require 'avm/launcher/paths/real'
-
-module Avm
-  module Launcher
-    module Git
-      class Base < ::Avm::Launcher::Paths::Real
-        module Underlying
-          def command(*args)
-            args, options = build_args(args)
-            r = ::EacGit::Executables.git.command(*args)
-            (options[:exit_outputs] || {}).each do |status_code, result|
-              r = r.status_result(status_code, result)
-            end
-            r
-          end
-
-          def execute(*args)
-            command(*args).execute
-          end
-
-          def execute!(*args)
-            command(*args).execute!
-          end
-
-          def system!(*args)
-            command(*args).system!
-          end
-
-          def init
-            git
-            self
-          end
-
-          private
-
-          def build_args(args)
-            options = {}
-            if args.last.is_a?(Hash)
-              options = args.last
-              args.pop
-            end
-            args = args.first if args.first.is_a?(Array)
-            [['-C', self, '--no-pager'] + args, options]
-          end
-
-          def git_uncached
-            FileUtils.mkdir_p(self)
-            if File.exist?(subpath('.git'))
-              ::Git.open(self)
-            else
-              ::Git.init(self)
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_git/local'
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/envs'
-require 'avm/launcher/paths/real'
-require 'avm/launcher/git/error'
-
-module Avm
-  module Launcher
-    module Git
-      class Base < ::Avm::Launcher::Paths::Real
-        require_sub __FILE__
-        enable_simple_cache
-        extend ::Avm::Launcher::Git::Base::ClassMethods
-        include ::Avm::Launcher::Git::Base::DirtyFiles
-        include ::Avm::Launcher::Git::Base::Remotes
-        include ::Avm::Launcher::Git::Base::Subrepo
-        include ::Avm::Launcher::Git::Base::Underlying
-
-        attr_reader :eac_git
-        delegate :descendant?, :merge_base, :rev_parse, to: :eac_git
-
-        def initialize(path)
-          super(path)
-
-          @eac_git = ::EacGit::Local.new(path)
-        end
-
-        def init_bare
-          FileUtils.mkdir_p(self)
-          ::EacRubyUtils::Envs.local.command('git', 'init', '--bare', self).execute! unless
-          File.exist?(subpath('.git'))
-        end
-
-        # @return [Pathname]
-        def root_path
-          @root_path ||= self.class.find_root(to_s)
-        end
-
-        def descendant?(descendant, ancestor)
-          base = merge_base(descendant, ancestor)
-          return false if base.blank?
-
-          revparse = execute!('rev-parse', '--verify', ancestor).strip
-          base == revparse
-        end
-
-        def subtree_split(prefix)
-          execute!('subtree', '-q', 'split', '-P', prefix).strip
-        end
-
-        def push(remote_name, refspecs, options = {})
-          refspecs = [refspecs] unless refspecs.is_a?(Array)
-          args = ['push']
-          args << '--dry-run' if options[:dryrun]
-          args << '--force' if options[:force]
-          system!(args + [remote_name] + refspecs)
-        end
-
-        def push_all(remote_name)
-          system!('push', '--all', remote_name)
-          system!('push', '--tags', remote_name)
-        end
-
-        def fetch(remote_name, options = {})
-          args = ['fetch', '-p', remote_name]
-          args += %w[--tags --prune-tags --force] if options[:tags]
-          execute!(*args)
-        end
-
-        def current_branch
-          execute!(%w[symbolic-ref -q HEAD]).gsub(%r{\Arefs/heads/}, '').strip
-        end
-
-        def reset_hard(ref)
-          execute!('reset', '--hard', ref)
-        end
-
-        def raise(message)
-          ::Kernel.raise Avm::Launcher::Git::Error.new(self, message)
-        end
-      end
-    end
-  end
-end

data/lib/avm/launcher/git/error.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module Launcher
-    module Git
-      class Error < StandardError
-        def initialize(git_instance, message)
-          super("#{message} (Repository: #{git_instance})")
-        end
-      end
-    end
-  end
-end

data/lib/avm/launcher/git/mirror_update.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/launcher/git/base'
-
-module Avm
-  module Launcher
-    module Git
-      class MirrorUpdate < ::Avm::Launcher::Paths::Real
-        include ::EacRubyUtils::SimpleCache
-
-        def initialize(target_path, source_path, source_rev)
-          super(target_path)
-          @target_git = ::Avm::Launcher::Git::Base.new(self)
-          @source_git = ::Avm::Launcher::Git::Base.new(source_path)
-          @source_rev = source_rev
-          run
-        end
-
-        private
-
-        def run
-          fetch_remote_source
-          reset_source_rev
-        end
-
-        def fetch_remote_source
-          @target_git.git
-          @target_git.assert_remote_url('origin', @source_git)
-          @target_git.fetch('origin', tags: true)
-        end
-
-        def reset_source_rev
-          @target_git.reset_hard(@source_git.rev_parse(@source_rev, true))
-        end
-      end
-    end
-  end
-end