avm-tools 0.136.2 → 0.138.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a16025cdb4bf25acd67dc6129fd68ce1fdeeafc2b983c5251d98bd7768189cb
-  data.tar.gz: 27290fc522bfb67f5635fc1d946e73d28c0c3be073c29401724f15dcce114f65
+  metadata.gz: e7bf83b886d7158f37723c559d52eab9c7212390f673937cd81fa75209b7f6ff
+  data.tar.gz: 88797a72e234d4fa2900365cf3793fd7f2ea91ae9f8f804e8d624bc2946c3f17
 SHA512:
-  metadata.gz: d1c3f2b1a5633e78d96793be7b29af113fd25a03a3931a9d849b41d83c4a25a3a8850265c4807cc202384b0fa7aa9627f11b3d162e58fc739c450cb3cd339323
-  data.tar.gz: 28a42aabc9c7421010c20e2cb732b8942c306a98e88d659a57221990a3a2e8732cf2a171a3278653a2abe0faa33c056aaaf7cc2f253c8c59ab579dac9b3b9df8
+  metadata.gz: 3ea44e51d1adf4b4607f08f12437c6cda8bb26a180ff1b3be138cf492e4b025e0364be3e6a70bcc35704c9755a087636e111f7ffb187ebfed1654e0943489aa7
+  data.tar.gz: 504f1b7e9c8e8019452078ba76abc89a13daee3969a8e25cb4a4a671e26c297a4efd8bf3ba34b383efde402217644c1779552ff9eef03b32892b4e0f6ab30ca8

data/lib/avm/tools/runner/{app_src → source}/info.rb

@@ -5,7 +5,7 @@ require 'avm/tools/core_ext'
 module Avm
   module Tools
     class Runner
-      class AppSrc
+      class Source < ::Avm::Sources::Runner
         class Info
           SOURCE_PROPERTIES = {
             path: 'Path',

data/lib/avm/tools/runner/{app_src → source}/issue/complete.rb

@@ -6,7 +6,7 @@ require 'avm/git/issue/complete'
 module Avm
   module Tools
     class Runner
-      class AppSrc
+      class Source < ::Avm::Sources::Runner
         class Issue
           class Complete
             runner_with :confirmation, :help do

data/lib/avm/tools/runner/{app_src → source}/issue/deliver.rb

@@ -6,7 +6,7 @@ require 'avm/git/issue/deliver'
 module Avm
   module Tools
     class Runner
-      class AppSrc
+      class Source < ::Avm::Sources::Runner
         class Issue
           class Deliver
             runner_with :confirmation, :help do

data/lib/avm/tools/runner/{app_src → source}/issue.rb

@@ -5,7 +5,7 @@ require 'avm/tools/core_ext'
 module Avm
   module Tools
     class Runner
-      class AppSrc
+      class Source < ::Avm::Sources::Runner
         class Issue
           require_sub __FILE__
           runner_with :help, :subcommands do

data/lib/avm/tools/runner/{app_src → source}/subs.rb

@@ -5,7 +5,7 @@ require 'avm/tools/core_ext'
 module Avm
   module Tools
     class Runner
-      class AppSrc
+      class Source < ::Avm::Sources::Runner
         class Subs
           PADDING = '  '
 

data/lib/avm/tools/runner/{app_src → source}/test.rb

@@ -6,7 +6,7 @@ require 'avm/sources/tests/builder'
 module Avm
   module Tools
     class Runner
-      class AppSrc
+      class Source < ::Avm::Sources::Runner
         class Test
           runner_with :help do
             desc 'Test local project.'
@@ -83,7 +83,7 @@ module Avm
           def unit_result(unit)
             (
               [unit.result.to_label] +
-              %i[stdout stderr].map { |label| "#{label.to_s.upcase}: #{unit.logs[label]}" }
+                %i[stdout stderr].map { |label| "#{label.to_s.upcase}: #{unit.logs[label]}" }
             ).join(' | '.blue)
           end
         end

data/lib/avm/tools/runner/{app_src → source}/update.rb

@@ -5,7 +5,7 @@ require 'avm/tools/core_ext'
 module Avm
   module Tools
     class Runner
-      class AppSrc
+      class Source < ::Avm::Sources::Runner
         class Update
           runner_with :help do
             desc 'Update local project.'

data/lib/avm/tools/runner/{app_src → source}/version_bump.rb

@@ -6,7 +6,7 @@ require 'eac_cli/core_ext'
 module Avm
   module Tools
     class Runner
-      class AppSrc
+      class Source < ::Avm::Sources::Runner
         class VersionBump
           runner_with :help, :confirmation do
             desc 'Bump version of a local project.'

data/lib/avm/tools/runner/{app_src.rb → source.rb}

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require 'avm/sources/runner'
-require 'avm/tools/app_src'
+require 'avm/tools/source'
 require 'eac_cli/core_ext'
 
 module Avm
   module Tools
     class Runner
-      class AppSrc < ::Avm::Sources::Runner
+      class Source < ::Avm::Sources::Runner
         require_sub __FILE__
 
         def instance_banner
@@ -22,7 +22,7 @@ module Avm
         private
 
         def instance_uncached
-          ::Avm::Tools::AppSrc.new(source_path)
+          ::Avm::Tools::Source.new(source_path)
         end
       end
     end

data/lib/avm/tools/{app_src.rb → source.rb}

@@ -10,7 +10,7 @@ require 'i18n'
 
 module Avm
   module Tools
-    class AppSrc
+    class Source
       enable_simple_cache
       common_constructor :path do
         self.path = path.to_pathname

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.136.2'
+    VERSION = '0.138.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.136.2
+  version: 0.138.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2022-10-02 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.44'
+        version: '0.45'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.44'
+        version: '0.45'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ruby_base1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ubuntu_base0
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +155,7 @@ dependencies:
         version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -165,7 +165,7 @@ dependencies:
         version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.12.3
 - !ruby/object:Gem::Dependency
   name: eac_ruby_base0
   requirement: !ruby/object:Gem::Requirement
@@ -313,22 +313,8 @@ files:
 - lib/avm/projects/stereotypes/ruby_gem/publish.rb
 - lib/avm/stereotypes.rb
 - lib/avm/tools.rb
-- lib/avm/tools/app_src.rb
 - lib/avm/tools/core_ext.rb
 - lib/avm/tools/runner.rb
-- lib/avm/tools/runner/app_src.rb
-- lib/avm/tools/runner/app_src/info.rb
-- lib/avm/tools/runner/app_src/issue.rb
-- lib/avm/tools/runner/app_src/issue/complete.rb
-- lib/avm/tools/runner/app_src/issue/deliver.rb
-- lib/avm/tools/runner/app_src/ruby.rb
-- lib/avm/tools/runner/app_src/ruby/bundler.rb
-- lib/avm/tools/runner/app_src/ruby/bundler/gemfile_lock.rb
-- lib/avm/tools/runner/app_src/ruby/bundler/gemfile_lock/git.rb
-- lib/avm/tools/runner/app_src/subs.rb
-- lib/avm/tools/runner/app_src/test.rb
-- lib/avm/tools/runner/app_src/update.rb
-- lib/avm/tools/runner/app_src/version_bump.rb
 - lib/avm/tools/runner/application_stereotypes.rb
 - lib/avm/tools/runner/application_stereotypes/list.rb
 - lib/avm/tools/runner/config.rb
@@ -356,8 +342,18 @@ files:
 - lib/avm/tools/runner/self.rb
 - lib/avm/tools/runner/self/docker.rb
 - lib/avm/tools/runner/self/registry.rb
+- lib/avm/tools/runner/source.rb
+- lib/avm/tools/runner/source/info.rb
+- lib/avm/tools/runner/source/issue.rb
+- lib/avm/tools/runner/source/issue/complete.rb
+- lib/avm/tools/runner/source/issue/deliver.rb
+- lib/avm/tools/runner/source/subs.rb
+- lib/avm/tools/runner/source/test.rb
+- lib/avm/tools/runner/source/update.rb
+- lib/avm/tools/runner/source/version_bump.rb
 - lib/avm/tools/runner/source_generate.rb
 - lib/avm/tools/self.rb
+- lib/avm/tools/source.rb
 - lib/avm/tools/version.rb
 - locale/en.yml
 - locale/pt-BR.yml

data/lib/avm/tools/runner/app_src/ruby/bundler/gemfile_lock/git.rb

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_base0/core_ext'
-
-module Avm
-  module Tools
-    class Runner
-      class AppSrc
-        class Ruby
-          class Bundler
-            class GemfileLock
-              module Git
-                private
-
-                def git_continue
-                  return unless check_capability(__method__, :git_repo, :continue)
-
-                  infom "Adding \"#{gemfile_lock}\"..."
-                  instance.git_repo.command('add', gemfile_lock).execute!
-                  if rebase_conflict?
-                    git_continue_run('rebase')
-                  elsif cherry_conflict?
-                    git_continue_run('cherry-pick')
-                  else
-                    raise 'Unknown how to continue'
-                  end
-                end
-
-                def git_continue_run(command)
-                  infom "\"#{command}\" --continue..."
-                  cmd = instance.git_repo.command(command, '--continue')
-                          .envvar('GIT_EDITOR', 'true')
-                  return unless !cmd.system && !conflict?
-
-                  fatal_error "\"#{cmd}\" failed and there is no conflict"
-                end
-
-                def git_reset_checkout
-                  return unless check_capability(__method__, :git_repo, nil)
-
-                  git_reset_gemfile_lock
-                  git_checkout_gemfile_lock
-                end
-
-                def git_checkout_gemfile_lock
-                  infom 'Checkouting...'
-                  instance.git_repo.command('checkout', '--', gemfile_lock).system!
-                end
-
-                def git_reset_gemfile_lock
-                  infom 'Reseting...'
-                  instance.git_repo.command('reset', gemfile_lock).system! if
-                  ::File.exist?(gemfile_lock)
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/tools/runner/app_src/ruby/bundler/gemfile_lock.rb

@@ -1,105 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_base0/core_ext'
-
-module Avm
-  module Tools
-    class Runner
-      class AppSrc
-        class Ruby
-          class Bundler
-            class GemfileLock
-              require_sub __FILE__, include_modules: true
-              runner_with :help do
-                desc 'Manipulage a "Gemfile.lock" file.'
-                bool_opt '-c', '--continue', 'Continue Git rebase/cherry-pick.'
-                bool_opt '-i', '--install', 'Run "bundle install".'
-                bool_opt '-u', '--update', 'Run "bundle update".'
-                bool_opt '-r', '--recursive', 'Run until Git rebase/cherry-pick is finished.'
-                bool_opt '-a', '--all', 'Same as "-cirud".'
-                bool_opt '-d', '--delete', 'Delete Gemfile.lock'
-              end
-
-              def run
-                loop do
-                  git_reset_checkout
-                  delete_gemfile_lock
-                  bundle_update
-                  bundle_install
-                  git_continue
-                  break if complete?
-                end
-              end
-
-              private
-
-              def complete?
-                !option_or_all?(:recursive) || !conflict?
-              end
-
-              def delete_gemfile_lock
-                return unless check_capability(__method__, nil, :delete)
-
-                ::FileUtils.rm_f(gemfile_lock)
-              end
-
-              def rebasing?
-                instance.git_repo.root_path.join('.git', 'rebase-merge').exist?
-              end
-
-              def bundle_install
-                return unless check_capability(__method__, :ruby_gem, :install)
-
-                infom '"bundle install"...'
-                bundle_run('install')
-              end
-
-              def bundle_update
-                return unless check_capability(__method__, :ruby_gem, :update)
-
-                infom '"bundle update"...'
-                bundle_run('update')
-              end
-
-              def gemfile_lock
-                'Gemfile.lock'
-              end
-
-              def bundle_run(*args)
-                instance.ruby_gem.bundle(*args).system!
-              end
-
-              def conflict?
-                rebase_conflict? || cherry_conflict?
-              end
-
-              def rebase_conflict?
-                instance.git_repo.root_path.join('.git', 'REBASE_HEAD').exist?
-              end
-
-              def cherry_conflict?
-                instance.git_repo.root_path.join('.git', 'CHERRY_PICK_HEAD').exist?
-              end
-
-              def option_or_all?(option)
-                parsed[option] || parsed.all?
-              end
-
-              def instance
-                runner_context.call(:instance)
-              end
-
-              def check_capability(caller, capability, option)
-                return false unless option.blank? || option_or_all?(option)
-                return true if capability.if_present(true) { |v| instance.respond_to?(v) }
-
-                warn "Cannot run #{caller}: instance has no capability \"#{capability}\""
-                false
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/tools/runner/app_src/ruby/bundler.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_base0/core_ext'
-
-module Avm
-  module Tools
-    class Runner
-      class AppSrc
-        class Ruby
-          class Bundler
-            require_sub __FILE__
-            runner_with :help, :subcommands do
-              desc 'Ruby\'s bundler utitilies for local projects.'
-              subcommands
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/tools/runner/app_src/ruby.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/core_ext'
-
-module Avm
-  module Tools
-    class Runner
-      class AppSrc
-        class Ruby
-          require_sub __FILE__
-          runner_with :help, :subcommands do
-            desc 'Ruby utitilies for local projects.'
-            subcommands
-          end
-        end
-      end
-    end
-  end
-end