eac_tools 0.36.0 → 0.37.0

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/projects/stereotype'
 require 'avm/launcher/errors/base'
+require 'avm/launcher/stereotype'
 
 module Avm
-  module Launcher
-    module Git
+  module Git
+    module Launcher
       module SubWarpBase
         private
 
@@ -17,7 +17,7 @@ module Avm
         end
 
         def find_parent_instance(current)
-          if ::Avm::Projects::Stereotype.git_stereotypes.any? { |s| current.stereotype?(s) }
+          if ::Avm::Launcher::Stereotype.git_stereotypes.any? { |s| current.stereotype?(s) }
             return current
           end
 

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'
+require 'avm/git/launcher_stereotypes/git/publish'
 
 module Avm
-  module Launcher
-    module Git
+  module Git
+    module Launcher
       # Métodos abstratos:
       #  * source_instance
       #  * source_remote_name
@@ -15,7 +15,7 @@ module Avm
       class WarpBase < ::Avm::Launcher::Paths::Real
         include ::EacRubyUtils::SimpleCache
 
-        TARGET_REMOTE = ::Avm::Projects::Stereotypes::Git::Publish::PUBLISH_GIT_REMOTE_NAME
+        TARGET_REMOTE = ::Avm::Git::LauncherStereotypes::Git::Publish::PUBLISH_GIT_REMOTE_NAME
 
         def initialize(instance)
           @instance = instance
@@ -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-tools/lib/avm/projects/stereotypes → avm-git/lib/avm/git/launcher_stereotypes}/git/local_project_mixin.rb

@@ -4,8 +4,8 @@ require 'eac_git/local'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Projects
-    module Stereotypes
+  module Git
+    module LauncherStereotypes
       class Git
         module LocalProjectMixin
           # @return [EacGit::Local]

data/sub/{avm-tools/lib/avm/projects/stereotypes → avm-git/lib/avm/git/launcher_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
+  module Git
+    module LauncherStereotypes
       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 → avm-git/lib/avm/git/launcher_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
+  module Git
+    module LauncherStereotypes
       class Git
-        class Warp < ::Avm::Launcher::Git::WarpBase
+        class Warp < ::Avm::Git::Launcher::WarpBase
           private
 
           def current_ref
@@ -18,7 +18,7 @@ module Avm
           end
 
           def source_remote_name
-            ::Avm::Projects::Stereotypes::Git::Publish::PUBLISH_GIT_REMOTE_NAME
+            ::Avm::Git::LauncherStereotypes::Git::Publish::PUBLISH_GIT_REMOTE_NAME
           end
         end
       end

data/sub/{avm-tools/lib/avm/projects/stereotypes → avm-git/lib/avm/git/launcher_stereotypes}/git.rb

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

data/sub/avm-git/lib/avm/git/launcher_stereotypes/git_subrepo/publish.rb

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

data/sub/{avm-tools/lib/avm/projects/stereotypes → avm-git/lib/avm/git/launcher_stereotypes}/git_subrepo/warp.rb

@@ -1,17 +1,17 @@
 # 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'
 
 module Avm
-  module Projects
-    module Stereotypes
+  module Git
+    module LauncherStereotypes
       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 → avm-git/lib/avm/git/launcher_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
+  module Git
+    module LauncherStereotypes
       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-git/lib/avm/git/launcher_stereotypes/git_subtree/publish.rb

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

data/sub/{avm-tools/lib/avm/projects/stereotypes → avm-git/lib/avm/git/launcher_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
+  module Git
+    module LauncherStereotypes
       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 → avm-git/lib/avm/git/launcher_stereotypes}/git_subtree.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require 'avm/projects/stereotype'
-require 'avm/projects/stereotypes/git'
+require 'avm/launcher/stereotype'
+require 'avm/git/launcher_stereotypes/git'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Projects
-    module Stereotypes
+  module Git
+    module LauncherStereotypes
       class GitSubtree
         require_sub __FILE__
-        include Avm::Projects::Stereotype
+        include Avm::Launcher::Stereotype
 
         class << self
           def match?(path)
@@ -29,7 +29,7 @@ module Avm
           def parent_git(parent_path)
             return nil unless parent_path
 
-            if ::Avm::Projects::Stereotypes::Git.match?(parent_path)
+            if ::Avm::Git::LauncherStereotypes::Git.match?(parent_path)
               parent_path
             else
               parent_git(parent_path.parent_path)
@@ -37,12 +37,12 @@ module Avm
           end
 
           def other_git_stereotype?(path)
-            ::Avm::Projects::Stereotypes::Git.match?(path) ||
-              ::Avm::Projects::Stereotypes::GitSubrepo.match?(path)
+            ::Avm::Git::LauncherStereotypes::Git.match?(path) ||
+              ::Avm::Git::LauncherStereotypes::GitSubrepo.match?(path)
           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-git/lib/avm/git/launcher_stereotypes/provider.rb

@@ -0,0 +1,22 @@
+# 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 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module LauncherStereotypes
+      class Provider
+        STEREOTYPES = [::Avm::Git::LauncherStereotypes::Git,
+                       ::Avm::Git::LauncherStereotypes::GitSubrepo,
+                       ::Avm::Git::LauncherStereotypes::GitSubtree].freeze
+
+        def all
+          STEREOTYPES
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module LauncherStereotypes
+      require_sub __FILE__
+    end
+  end
+end

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.7.0'
   end
 end

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'avm/launcher/git/base'
+require 'avm/git/launcher/base'
 
-RSpec.describe ::Avm::Launcher::Git::Base do
-  context 'new non-bare repository' do
+RSpec.describe ::Avm::Git::Launcher::Base do
+  context 'new non-bare repository' do # rubocop:disable RSpec/ContextWording
     let(:repo) do
       r = described_class.new(::Dir.mktmpdir)
       r.git
@@ -13,12 +13,12 @@ RSpec.describe ::Avm::Launcher::Git::Base do
     describe '#remote_exist?' do
       it { expect(repo.remote_exist?('origin')).to eq(false) }
 
-      context 'after remote added' do
+      context 'after remote added' do # rubocop:disable RSpec/ContextWording, RSpec/NestedGroups:
         before { repo.execute!('remote', 'add', 'origin', 'file:///path/to/remote') }
 
         it { expect(repo.remote_exist?('origin')).to eq(true) }
 
-        context 'after remote removed' do
+        context 'after remote removed' do # rubocop:disable RSpec/ContextWording, RSpec/NestedGroups:
           before { repo.execute!('remote', 'remove', 'origin') }
 
           it { expect(repo.remote_exist?('origin')).to eq(false) }
@@ -29,12 +29,12 @@ RSpec.describe ::Avm::Launcher::Git::Base do
     describe '#assert_remote_url' do
       it { expect(repo.remote_exist?('origin')).to eq(false) }
 
-      context 'after asserted remote URL "/remote1"' do
+      context 'after asserted remote URL "/remote1"' do # rubocop:disable RSpec/ContextWording, RSpec/NestedGroups:
         before { repo.assert_remote_url('origin', '/remote1') }
 
         it { expect(repo.git.remote('origin').url).to eq('/remote1') }
 
-        context 'after asserted remote URL "/remote2"' do
+        context 'after asserted remote URL "/remote2"' do # rubocop:disable RSpec/ContextWording, RSpec/NestedGroups:
           before { repo.assert_remote_url('origin', '/remote2') }
 
           it { expect(repo.git.remote('origin').url).to eq('/remote2') }

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

@@ -15,11 +15,11 @@ Gem::Specification.new do |s|
   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.49'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.24'
   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.7'
   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.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/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_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/sub/avm-tools/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/sub/avm-tools/lib/avm/tools/version.rb

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

data/sub/avm-tools/spec/lib/avm/{launcher/ruby → eac_ruby_base1/launcher}/gem/build_spec.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/object'
-require 'avm/launcher/ruby/gem/build'
+require 'avm/eac_ruby_base1/launcher/gem/build'
 
-RSpec.describe ::Avm::Launcher::Ruby::Gem::Build do
+RSpec.describe ::Avm::EacRubyBase1::Launcher::Gem::Build do
   describe '#output_file' do
     let(:gem_dir) { ::File.join(DUMMY_DIR, 'ruby_gem_stub') }
 
-    it 'builds .gem file' do
+    it 'builds .gem file' do # rubocop:disable RSpec/ExampleLength
       expect(::File.directory?(gem_dir)).to eq true
       build = described_class.new(gem_dir)
 
@@ -32,7 +32,7 @@ RSpec.describe ::Avm::Launcher::Ruby::Gem::Build do
       expect(build.builded?).to eq false
     end
 
-    def assert_open(build)
+    def assert_open(build) # rubocop:disable Metrics/AbcSize
       expect(build.output_file.present?).to eq true
       expect(build.builded?).to eq true
       expect(::File.exist?(build.output_file)).to eq true

data/sub/avm-tools/spec/lib/avm/{launcher/ruby → eac_ruby_base1/launcher}/gem/specification_spec.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-RSpec.describe ::Avm::Launcher::Ruby::Gem::Specification do
+RSpec.describe ::Avm::EacRubyBase1::Launcher::Gem::Specification do
   let(:gemspec_file) { ::File.join(DUMMY_DIR, 'ruby_gem_stub', 'ruby_gem_stub.gemspec') }
   let(:instance) { described_class.new(gemspec_file) }
 
   describe '#parse_version_file' do
-    it 'parses valid version file' do
+    it 'parses valid version file' do # rubocop:disable RSpec/MultipleExpectations
       file = ::File.join(DUMMY_DIR, 'ruby_gem_stub', 'lib', 'ruby_gem_stub', 'version.rb')
       expect(::File.exist?(file)).to eq true
       version = described_class.parse_version_file(file)
       expect(version).to eq('1.0.0.pre.stub')
     end
 
-    it 'does not parse invalid version file' do
+    it 'does not parse invalid version file' do # rubocop:disable RSpec/MultipleExpectations
       file = __FILE__
       expect(::File.exist?(file)).to eq true
       version = described_class.parse_version_file(file)