avm-tools 0.140.0 → 0.141.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed2d914555d3c58362e1295400822e92705cae0150e957fd451d9bb88605bf52
-  data.tar.gz: 0fa211ad333f697fc6c07bb89205552f64e5be5730795e5828cb6b652eef500b
+  metadata.gz: 60fac08c348fc622fef6058a07454042e877f79bb1905c53af18821cd0bc3b06
+  data.tar.gz: 81072003eb8144896fe1cc263a4fd090c6ee0532c8fb15066dcbdfdb5137ef05
 SHA512:
-  metadata.gz: 153e38b2a7f25f90736f65388c2cdc61a011aefeee2247fdd94f0165624af5dc73b78cb7a7d31a39bec85e37712ec745b80eca5ac36f7eb2bd7a3aa129860af0
-  data.tar.gz: bf4e32eaf0b13d24215b29fde58b9d0dc44335050fad19ab86d6f970312d260ea63b6244e70372ccb72ada83e199bdf4d69ae2acb96c220090a4e6f3952821b8
+  metadata.gz: d5bac08c0ad7cba5a5dcbde799f8d520a991edb1e5111771627556a5b5745a22d68f62698b8dd9fb4cf30487d0032da377e232c5ce9c0737af4d8a92ec47b1c7
+  data.tar.gz: 8401554316ce6e960953bc677ac69a82b145439c306726a036c16cd9ff6f6273d8448b5867d7c303b9552ff3e4cf3a57f291f6ca0eb4a9dadbd4e4bcc27968ed

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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avm/launcher/git/publish_base'
+require 'avm/git/launcher/publish_base'
 
 module Avm
   module Projects
     module Stereotypes
       class Git
-        class Publish < ::Avm::Launcher::Git::PublishBase
+        class Publish < ::Avm::Git::Launcher::PublishBase
           PUBLISH_GIT_REMOTE_NAME = 'publish'
         end
       end

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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avm/launcher/git/warp_base'
+require 'avm/git/launcher/warp_base'
 
 module Avm
   module Projects
     module Stereotypes
       class Git
-        class Warp < ::Avm::Launcher::Git::WarpBase
+        class Warp < ::Avm::Git::Launcher::WarpBase
           private
 
           def current_ref

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/projects/stereotype'
+require 'avm/launcher/stereotype'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -8,7 +8,7 @@ module Avm
     module Stereotypes
       class Git
         require_sub __FILE__
-        include Avm::Projects::Stereotype
+        include Avm::Launcher::Stereotype
 
         class << self
           def match?(path)

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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avm/launcher/git/publish_base'
+require 'avm/git/launcher/publish_base'
 
 module Avm
   module Projects
     module Stereotypes
       class GitSubrepo
-        class Publish < ::Avm::Launcher::Git::PublishBase
+        class Publish < ::Avm::Git::Launcher::PublishBase
         end
       end
     end

data/lib/avm/projects/stereotypes/git_subrepo/warp.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/simple_cache'
-require 'avm/launcher/git/sub_warp_base'
+require 'avm/git/launcher/sub_warp_base'
 require 'avm/launcher/errors/base'
 require 'avm/launcher/paths/real'
 require 'avm/git/vendor/github'
@@ -11,7 +11,7 @@ module Avm
     module Stereotypes
       class GitSubrepo
         class Warp < ::Avm::Launcher::Paths::Real
-          include ::Avm::Launcher::Git::SubWarpBase
+          include ::Avm::Git::Launcher::SubWarpBase
           include ::EacRubyUtils::SimpleCache
 
           attr_reader :instance
@@ -46,11 +46,11 @@ module Avm
           end
 
           def init_aux
-            ::Avm::Launcher::Git::Base.new(aux_path).init_bare
+            ::Avm::Git::Launcher::Base.new(aux_path).init_bare
           end
 
           def parent_git_warped_uncached
-            ::Avm::Launcher::Git::Base.new(parent_instance.warped)
+            ::Avm::Git::Launcher::Base.new(parent_instance.warped)
           end
 
           def aux_path
@@ -58,7 +58,7 @@ module Avm
           end
 
           def warped_git_uncached
-            ::Avm::Launcher::Git::Base.new(instance.cache_path('git_repository'))
+            ::Avm::Git::Launcher::Base.new(instance.cache_path('git_repository'))
           end
 
           def push_to_aux
@@ -68,11 +68,11 @@ module Avm
           end
 
           def reset
-            ::Avm::Launcher::Git::MirrorUpdate.new(warped_git, aux_path, 'master')
+            ::Avm::Git::Launcher::MirrorUpdate.new(warped_git, aux_path, 'master')
           end
 
           def assert_target_remote
-            warped_git.assert_remote_url(::Avm::Launcher::Git::WarpBase::TARGET_REMOTE,
+            warped_git.assert_remote_url(::Avm::Git::Launcher::WarpBase::TARGET_REMOTE,
                                          target_remote_url)
           end
 

data/lib/avm/projects/stereotypes/git_subrepo.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require 'avm/launcher/git/error'
+require 'avm/git/launcher/error'
 require 'eac_ruby_utils/core_ext'
-require 'avm/projects/stereotype'
+require 'avm/launcher/stereotype'
 
 module Avm
   module Projects
     module Stereotypes
       class GitSubrepo
         require_sub __FILE__
-        include Avm::Projects::Stereotype
+        include Avm::Launcher::Stereotype
 
         class << self
           def match?(path)
@@ -25,7 +25,7 @@ module Avm
               m = /remote\s*=\s(.+)/.match(l)
               return m[1] if m
             end
-            raise ::Avm::Launcher::Git::Error.new(path, '"remote = ... " not found')
+            raise ::Avm::Git::Launcher::Error.new(path, '"remote = ... " not found')
           end
         end
       end

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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avm/launcher/git/publish_base'
+require 'avm/git/launcher/publish_base'
 
 module Avm
   module Projects
     module Stereotypes
       class GitSubtree
-        class Publish < ::Avm::Launcher::Git::PublishBase
+        class Publish < ::Avm::Git::Launcher::PublishBase
         end
       end
     end

data/lib/avm/projects/stereotypes/git_subtree/warp.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'avm/launcher/git/warp_base'
-require 'avm/launcher/git/sub_warp_base'
+require 'avm/git/launcher/warp_base'
+require 'avm/git/launcher/sub_warp_base'
 
 module Avm
   module Projects
     module Stereotypes
       class GitSubtree
-        class Warp < ::Avm::Launcher::Git::WarpBase
-          include ::Avm::Launcher::Git::SubWarpBase
+        class Warp < ::Avm::Git::Launcher::WarpBase
+          include ::Avm::Git::Launcher::SubWarpBase
 
           private
 

data/lib/avm/projects/stereotypes/git_subtree.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/projects/stereotype'
+require 'avm/launcher/stereotype'
 require 'avm/projects/stereotypes/git'
 require 'eac_ruby_utils/core_ext'
 
@@ -9,7 +9,7 @@ module Avm
     module Stereotypes
       class GitSubtree
         require_sub __FILE__
-        include Avm::Projects::Stereotype
+        include Avm::Launcher::Stereotype
 
         class << self
           def match?(path)
@@ -42,7 +42,7 @@ module Avm
           end
 
           def other_nogit_stereotype?(path)
-            Avm::Projects::Stereotype.nogit_stereotypes.any? { |s| s.match?(path) }
+            Avm::Launcher::Stereotype.nogit_stereotypes.any? { |s| s.match?(path) }
           end
         end
       end

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

@@ -7,7 +7,7 @@ require 'rubygems'
 require 'eac_cli/speaker'
 require 'avm/launcher/publish/base'
 require 'avm/launcher/publish/check_result'
-require 'avm/launcher/ruby/gem'
+require 'avm/eac_ruby_base1/launcher/gem'
 
 module Avm
   module Projects
@@ -71,7 +71,7 @@ module Avm
           end
 
           def gem_build_uncached
-            ::Avm::Launcher::Ruby::Gem::Build.new(source)
+            ::Avm::EacRubyBase1::Launcher::Gem::Build.new(source)
           end
 
           def publish

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'avm/projects/stereotype'
-require 'avm/launcher/ruby/gem/specification'
+require 'avm/eac_ruby_base1/launcher/gem/specification'
+require 'avm/launcher/stereotype'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -9,7 +9,7 @@ module Avm
     module Stereotypes
       class RubyGem
         require_sub __FILE__
-        include Avm::Projects::Stereotype
+        include Avm::Launcher::Stereotype
 
         class << self
           def match?(path)
@@ -21,7 +21,7 @@ module Avm
           end
 
           def load_gemspec(gemspec_file)
-            ::Avm::Launcher::Ruby::Gem::Specification.new(gemspec_file)
+            ::Avm::EacRubyBase1::Launcher::Gem::Specification.new(gemspec_file)
           end
         end
       end

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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.140.0
+  version: 0.141.0
 platform: ruby
 authors:
 - Esquilo Azul Company
@@ -36,28 +36,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.48'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.48'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ruby_base1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.23'
 - !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.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
@@ -252,25 +252,7 @@ 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

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