eac_tools 0.35.0 → 0.36.1

data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/warp_base.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/launcher/git/mirror_update'
+require 'avm/git/launcher/mirror_update'
 require 'avm/launcher/instances/error'
 require 'avm/git/vendor/github'
 require 'avm/projects/stereotypes/git/publish'
 
 module Avm
-  module Launcher
-    module Git
+  module Git
+    module Launcher
       # Métodos abstratos:
       #  * source_instance
       #  * source_remote_name
@@ -39,7 +39,7 @@ module Avm
 
         def update
           validate_source_current_revision
-          ::Avm::Launcher::Git::MirrorUpdate.new(
+          ::Avm::Git::Launcher::MirrorUpdate.new(
             path,
             source_instance.real,
             source_instance.options.git_current_revision
@@ -51,11 +51,11 @@ module Avm
         end
 
         def source_git_uncached
-          ::Avm::Launcher::Git::Base.new(source_instance.real)
+          ::Avm::Git::Launcher::Base.new(source_instance.real)
         end
 
         def cache_git_uncached
-          ::Avm::Launcher::Git::Base.new(update)
+          ::Avm::Git::Launcher::Base.new(update)
         end
 
         def target_remote_url

data/sub/avm-git/lib/avm/git/launcher.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'avm/git/launcher/base'
+require 'avm/git/launcher/error'
+require 'avm/git/launcher/mirror_update'
+require 'avm/git/launcher/publish_base'
+require 'avm/git/launcher/warp_base'

data/sub/avm-git/lib/avm/git/organize/repository.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/git/organize/reference_update'
 require 'eac_ruby_utils/core_ext'
 
 module Avm

data/sub/avm-git/lib/avm/git/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

data/sub/avm-tools/avm-tools.gemspec

@@ -10,16 +10,16 @@ Gem::Specification.new do |s|
   s.authors     = ['Esquilo Azul Company']
   s.summary     = 'Tools for AVM.'
 
-  s.files = Dir['{exe,lib,locale,template,sub}/**/*', 'Gemfile']
+  s.files = Dir['{exe,lib,template,sub}/**/*', 'Gemfile']
   s.bindir = 'exe'
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.3'
-  s.add_dependency 'avm', '~> 0.46'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.22'
+  s.add_dependency 'avm', '~> 0.48'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.23'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'avm-files', '~> 0.4', '>= 0.4.1'
-  s.add_dependency 'avm-git', '~> 0.5'
+  s.add_dependency 'avm-git', '~> 0.6'
   s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
   s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.3'

data/sub/avm-tools/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/sub/avm-tools/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/sub/avm-tools/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/sub/avm-tools/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/sub/avm-tools/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/sub/avm-tools/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/sub/avm-tools/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/sub/avm-tools/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/sub/avm-tools/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/sub/avm-tools/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/sub/avm-tools/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/sub/avm-tools/lib/avm/projects/stereotypes.rb

@@ -1,20 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/projects/stereotype'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Projects
     module Stereotypes
       require_sub __FILE__, base: nil
-
-      class << self
-        def list
-          @list ||= constants.map { |c| const_get(c) }
-                      .select { |c| c.included_modules.include?(Avm::Projects::Stereotype) }
-                      .freeze
-        end
-      end
     end
   end
 end

data/sub/avm-tools/lib/avm/tools/core_ext.rb

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

data/sub/avm-tools/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/sub/avm-tools/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/sub/avm-tools/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/sub/avm-tools/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/sub/avm-tools/lib/avm/tools/runner/launcher.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/tools/core_ext'
+require 'avm/projects/stereotypes'
 
 module Avm
   module Tools

data/sub/avm-tools/lib/avm/tools/runner/source/info.rb

@@ -48,10 +48,6 @@ module Avm
               infov "  * #{name}", command
             end
           end
-
-          def instance
-            runner_context.call(:instance)
-          end
         end
       end
     end

data/sub/avm-tools/lib/avm/tools/runner/source/test.rb

@@ -65,7 +65,7 @@ module Avm
           end
 
           def start_banner
-            runner_context.call(:instance_banner)
+            runner_context.call(:source_banner)
             infov 'Selected units', test_performer.units.count
           end
 

data/sub/avm-tools/lib/avm/tools/runner/source.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'avm/sources/runner'
-require 'avm/tools/source'
 require 'eac_cli/core_ext'
 
 module Avm
@@ -10,20 +9,9 @@ module Avm
       class Source < ::Avm::Sources::Runner
         require_sub __FILE__
 
-        def instance_banner
-          infov 'Instance', instance
-          infov 'Stereotypes', instance.stereotypes.map(&:label).join(', ')
-        end
-
         def subject
           source
         end
-
-        private
-
-        def instance_uncached
-          ::Avm::Tools::Source.new(source_path)
-        end
       end
     end
   end

data/sub/avm-tools/lib/avm/tools/version.rb

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

data/sub/avm-tools/spec/lib/avm/launcher/context_spec.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/launcher/context'
+require 'avm/launcher/stereotype'
 
 RSpec.describe ::Avm::Launcher::Context do
   describe '#instances' do
@@ -17,52 +18,65 @@ RSpec.describe ::Avm::Launcher::Context do
     end
 
     context 'subinstance mylib' do
+      let(:mylib_repos) do
+        r = init_remote('mylib_repos')
+        wc = init_git('mylib_wc')
+        touch_commit(wc, 'app.gemspec')
+        wc.execute!('remote', 'add', 'origin', r)
+        wc.execute!('push', 'origin', 'master')
+        r
+      end
+
       before do
         temp_context(::File.join(__dir__, 'context_spec.yml'))
+        mylib_repos
+      end
 
-        @repos = init_remote('mylib_repos')
+      context 'when sub is a GitSubrepo' do
+        let(:sub) { described_class.current.instance('/app/sub1') }
+        let(:instance) { described_class.current.instance('/app/sub1/mylib') }
 
-        wc = init_git('mylib_wc')
-        touch_commit(wc, 'init.rb')
-        wc.execute!('remote', 'add', 'origin', @repos)
-        wc.execute!('push', 'origin', 'master')
-      end
+        before do
+          app = init_git('app')
+          touch_commit(app, 'sub1/app.gemspec')
+          app.execute!('subrepo', 'clone', mylib_repos, 'sub1/mylib')
+        end
 
-      it 'recovers recursive subinstance GitSubrepo' do
-        app = init_git('app')
-        touch_commit(app, 'sub1/init.rb')
-        app.execute!('subrepo', 'clone', @repos, 'sub1/mylib')
-        sub = described_class.current.instance('/app/sub1')
-        expect(sub).to be_a(::Avm::Launcher::Instances::Base)
-        ::Avm::Projects::Stereotype.git_stereotypes.each do |s|
-          expect(sub.stereotypes).not_to include(s)
+        it { expect(sub).to be_a(::Avm::Launcher::Instances::Base) }
+        it do
+          ::Avm::Launcher::Stereotype.git_stereotypes
+            .each { |s| expect(sub.stereotypes).not_to include(s) }
         end
-        instance = described_class.current.instance('/app/sub1/mylib')
-        expect(instance).to be_a(::Avm::Launcher::Instances::Base)
-        expect(instance.stereotypes).to include(::Avm::Projects::Stereotypes::GitSubrepo)
+        it { expect(instance).to be_a(::Avm::Launcher::Instances::Base) }
+        it { expect(instance.stereotypes).to include(::Avm::Projects::Stereotypes::GitSubrepo) }
       end
 
-      it 'recovers recursive subinstance GitSubtree' do
-        app = init_git('app')
-        touch_commit(app, 'sub1/init.rb')
-        app.execute!('subtree', 'add', '-P', 'sub1/mylib', @repos, 'master')
-        app.execute!('remote', 'add', 'mylib', @repos)
-        sub = described_class.current.instance('/app/sub1')
-        expect(sub).to be_a(::Avm::Launcher::Instances::Base)
-        ::Avm::Projects::Stereotype.git_stereotypes.each do |s|
-          expect(sub.stereotypes).not_to include(s)
+      context 'when sub is a GitSubtree' do
+        let(:sub) { described_class.current.instance('/app/sub1') }
+        let(:instance) { described_class.current.instance('/app/sub1/mylib') }
+
+        before do
+          app = init_git('app')
+          touch_commit(app, 'sub1/app.gemspec')
+          app.execute!('subtree', 'add', '-P', 'sub1/mylib', mylib_repos, 'master')
+          app.execute!('remote', 'add', 'mylib', mylib_repos)
+        end
+
+        it { expect(sub).to be_a(::Avm::Launcher::Instances::Base) }
+        it do
+          ::Avm::Launcher::Stereotype.git_stereotypes
+            .each { |s| expect(sub.stereotypes).not_to include(s) }
         end
-        instance = described_class.current.instance('/app/sub1/mylib')
-        expect(instance).to be_a(::Avm::Launcher::Instances::Base)
-        expect(instance.stereotypes).to include(::Avm::Projects::Stereotypes::GitSubtree)
+        it { expect(instance).to be_a(::Avm::Launcher::Instances::Base) }
+        it { expect(instance.stereotypes).to include(::Avm::Projects::Stereotypes::GitSubtree) }
       end
 
       context 'subtree present' do
         before do
-          @app = init_git('subtree_main_app')
-          touch_commit(@app, 'file1')
-          @app.execute!('subtree', 'add', '-P', 'mylib', @repos, 'master')
-          @app.execute!('remote', 'add', 'mylib', @repos)
+          app = init_git('subtree_main_app')
+          touch_commit(app, 'file1')
+          app.execute!('subtree', 'add', '-P', 'mylib', mylib_repos, 'master')
+          app.execute!('remote', 'add', 'mylib', mylib_repos)
         end
 
         it 'recognizes subtree instance' do
@@ -77,7 +91,7 @@ RSpec.describe ::Avm::Launcher::Context do
           app = init_git('app') # HEAD: master
           touch_commit(app, 'file2')
           app.execute!('checkout', '-b', 'not_master') # HEAD: not_master
-          app.execute!('subrepo', 'clone', @repos, 'mylib')
+          app.execute!('subrepo', 'clone', mylib_repos, 'mylib')
           expect(described_class.current.instance('/app/mylib')).to be_nil
         end
       end
@@ -88,7 +102,7 @@ RSpec.describe ::Avm::Launcher::Context do
             app = init_git('app') # HEAD: master
             touch_commit(app, 'file2')
             app.execute!('checkout', '-b', 'not_master') # HEAD: not_master
-            app.execute!('subrepo', 'clone', @repos, 'mylib')
+            app.execute!('subrepo', 'clone', mylib_repos, 'mylib')
             expect(described_class.current.instance('/app/mylib')).to be_nil
           end
         end
@@ -98,7 +112,7 @@ RSpec.describe ::Avm::Launcher::Context do
             app = init_git('app') # HEAD: master
             touch_commit(app, 'file3')
             app.execute!('branch', '-f', 'not_master')
-            app.execute!('subrepo', 'clone', @repos, 'mylib')
+            app.execute!('subrepo', 'clone', mylib_repos, 'mylib')
             app.execute!('checkout', 'not_master') # HEAD: not_master
             expect(described_class.current.instance('/app/mylib'))
               .to be_a(::Avm::Launcher::Instances::Base)