avm-tools 0.105.0 → 0.109.0

data/vendor/avm-git/lib/avm/git/scms/git.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'avm/scms/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        require_sub __FILE__
+        include ::Comparable
+
+        COMMIT_DIRTY_DEFAULT_MESSAGE = 'Dirty files.'
+
+        def <=>(other)
+          git_repo <=> other.git_repo
+        end
+
+        # @return [Avm::Git::Scms::Git::Commit,nil]
+        def commitize(source)
+          if source.is_a?(::Avm::Git::Scms::Git::Commit)
+            return source if source.git_repo == self
+
+            raise 'Not same Git repository'
+          end
+          git_repo.commitize(source).if_present do |v|
+            ::Avm::Git::Scms::Git::Commit.new(self, v)
+          end
+        end
+
+        # @return [Avm::Git::Scms::Git::Commit,nil]
+        def commit_dirty(message = nil)
+          return nil unless git_repo.dirty?
+
+          git_repo.command('add', '.').execute!
+          git_repo.command('commit', '-m',
+                           message.call_if_proc.if_present(COMMIT_DIRTY_DEFAULT_MESSAGE)).execute!
+          commitize(git_repo.head)
+        end
+
+        # @return [Avm::Git::Scms::Git::Commit,nil]
+        def commit_if_change(message = nil)
+          tracker = ::Avm::Git::Scms::Git::ChangeTracker.new(self, message)
+          tracker.start
+          yield
+          tracker.stop
+        end
+
+        def git_repo
+          @git_repo ||= ::EacGit::Local.new(path)
+        end
+
+        # @return [Avm::Git::Scms::Git::Commit]
+        def reset_and_commit(commit_to_reset, message)
+          git_repo.command('reset', '--soft', commitize(commit_to_reset).git_commit.id).execute!
+          commit_dirty(message)
+        end
+
+        def valid?
+          path.join('.git').exist?
+        end
+      end
+    end
+  end
+end

data/vendor/avm-git/lib/avm/git/scms/git_subrepo.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'avm/scms/base'
+require 'eac_git/local'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class GitSubrepo < ::Avm::Scms::Base
+        def commit_if_change(_message)
+          nyi
+        end
+
+        def update
+          git_subrepo.command('clean').execute!
+          git_subrepo.command('pull').execute!
+        end
+
+        # @return [EacGit::Local]
+        def git_repo
+          @git_repo ||= ::EacGit::Local.find(path)
+        end
+
+        # @return [EacGit::Local::Subrepo]
+        def git_subrepo
+          @git_subrepo ||= git_repo.subrepo(subpath)
+        end
+
+        # @return [Pathname]
+        def subpath
+          path.expand_path.relative_path_from(git_repo.root_path.expand_path)
+        end
+
+        def valid?
+          path.join('.gitrepo').file?
+        end
+      end
+    end
+  end
+end

data/vendor/avm-git/lib/avm/git/scms/provider.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'avm/git/scms/git'
+require 'avm/git/scms/git_subrepo'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Provider
+        SCMS = [::Avm::Git::Scms::Git, ::Avm::Git::Scms::GitSubrepo].freeze
+
+        def all
+          SCMS
+        end
+      end
+    end
+  end
+end

data/vendor/{avm-apps/lib/avm/apps/jobs.rb → avm-git/lib/avm/git/scms.rb}

@@ -3,8 +3,8 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Apps
-    module Jobs
+  module Git
+    module Scms
       require_sub __FILE__
     end
   end

data/vendor/{avm-apps/lib/avm/apps → avm-git/lib/avm/git}/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Avm
-  module Apps
-    VERSION = '0.4.1'
+  module Git
+    VERSION = '0.1.0'
   end
 end

data/vendor/{avm → avm-git}/lib/avm/git.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Git
+    require_sub __FILE__
+
     DEFAULT_REMOTE_NAME = 'origin'
   end
 end

data/vendor/{avm → avm-git}/spec/lib/avm/git/auto_commit_path_spec.rb

@@ -9,9 +9,10 @@ RSpec.describe ::Avm::Git::AutoCommitPath, git: true do
     {
       'app/models/mynamespace/the_class.rb' => 'Mynamespace::TheClass',
       'lib/ruby/lib/cliutils/eac_redmine_base0/activity.rb' => 'Cliutils::EacRedmineBase0::Activity'
-    }.each do |path, expected_class_name|
-      context "when path is \"#{path}\"" do
-        let(:instance) { described_class.new(git, "#{git}/#{path}") }
+    }.each do |relative_path, expected_class_name|
+      context "when path is \"#{relative_path}\"" do
+        let(:path) { git.root_path.join(relative_path) }
+        let(:instance) { described_class.new(git, path) }
 
         it { expect(instance.class_name).to eq(expected_class_name) }
       end

data/vendor/avm-git/spec/lib/avm/git/scms/git_spec.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+require 'avm/git/scms/git'
+
+::RSpec.describe ::Avm::Git::Scms::Git do
+  include_examples 'in_avm_registry', 'scms'
+end

data/vendor/avm-git/spec/lib/avm/git/scms/git_subrepo_spec.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+require 'avm/git/scms/git_subrepo'
+
+::RSpec.describe ::Avm::Git::Scms::GitSubrepo do
+  include_examples 'in_avm_registry', 'scms'
+end

data/vendor/avm-git/spec/rubocop_spec.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+::EacRubyUtils::Rspec.default_setup.describe_rubocop

data/vendor/avm-git/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/rspec/default_setup'
+::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))

data/vendor/eac_cli/lib/eac_cli/config.rb

@@ -3,16 +3,19 @@
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
-  class Config
+  class Config < ::SimpleDelegator
     require_sub __FILE__
-    attr_reader :sub
 
     def initialize(sub_node)
-      @sub = sub_node
+      super(sub_node)
     end
 
     def entry(path, options = {})
       ::EacCli::Config::Entry.new(self, path, options)
     end
+
+    def sub
+      __getobj__
+    end
   end
 end

data/vendor/eac_cli/lib/eac_cli/definition/argument_option.rb

@@ -13,7 +13,7 @@ module EacCli
         repeat? ? previous_value + [new_value] : new_value
       end
 
-      def default_value
+      def default_default_value
         repeat? ? [] : nil
       end
     end

data/vendor/eac_cli/lib/eac_cli/definition/base_option.rb

@@ -18,7 +18,7 @@ module EacCli
 
       enable_listable
       enable_abstract_methods :build_value, :default_value
-      lists.add_symbol :option, :optional, :usage, :repeat, :required
+      lists.add_symbol :option, :default, :optional, :usage, :repeat, :required
       common_constructor :short, :long, :description, :options, default: [{}] do
         raise 'Nor short neither long selector was set' if short.blank? && long.blank?
 
@@ -27,6 +27,14 @@ module EacCli
         )
       end
 
+      def default_value
+        default_value? ? options[OPTION_DEFAULT] : default_default_value
+      end
+
+      def default_value?
+        options.key?(OPTION_DEFAULT)
+      end
+
       def identifier
         [long, short].each do |v|
           v.to_s.if_present { |vv| return vv.variableize.to_sym }

data/vendor/eac_cli/lib/eac_cli/definition/boolean_option.rb

@@ -14,6 +14,12 @@ module EacCli
       end
 
       def default_value
+        return super unless default_value?
+
+        raise "Unallowed default value for boolean options (Option: #{self})"
+      end
+
+      def default_default_value
         repeat? ? 0 : false
       end
     end

data/vendor/eac_cli/lib/eac_cli/runner_with/help/builder.rb

@@ -36,9 +36,9 @@ module EacCli
         end
 
         def option_definition(option)
-          self.class.option_usage_full(option) + option.description.if_present('') do |v|
-            OPTION_DESC_SEP + v
-          end
+          [self.class.option_usage_full(option), option.description,
+           option.default_value? ? "[Default: \"#{option.default_value}\"]" : nil]
+            .reject(&:blank?).join(OPTION_DESC_SEP)
         end
 
         def section(header, include_header = true)

data/vendor/eac_cli/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.22.2'
+  VERSION = '0.23.1'
 end

data/vendor/eac_cli/spec/lib/eac_cli/runner_spec.rb

@@ -13,6 +13,7 @@ RSpec.describe ::EacCli::Runner do
         bool_opt '-p', '--opt2', 'A boolean option'
         arg_opt '-q', '--opt4', 'A repeatable argument option.', repeat: true
         bool_opt '-r', '--opt5', 'A repeatable boolean option', repeat: true
+        arg_opt '-s', '--opt6', 'A argument option with default value', default: 'DEFAULT'
         pos_arg :pos1
         pos_arg :pos2, repeat: true, optional: true
         alt do
@@ -28,9 +29,9 @@ RSpec.describe ::EacCli::Runner do
   let(:parsed_actual) { instance.parsed.to_h.symbolize_keys }
 
   context 'when all args are supplied' do
-    let(:argv) { %w[--opt1 aaa --opt2 bbb ccc ddd] }
+    let(:argv) { %w[--opt1 aaa --opt2 bbb ccc ddd --opt6 6] }
     let(:parsed_expected) do
-      { opt1: 'aaa', opt2: true, opt3: false, opt4: [], opt5: 0, pos1: 'bbb',
+      { opt1: 'aaa', opt2: true, opt3: false, opt4: [], opt5: 0, opt6: '6', pos1: 'bbb',
         pos2: %w[ccc ddd] }
     end
 
@@ -65,7 +66,7 @@ RSpec.describe ::EacCli::Runner do
   context 'when only required args are supplied' do
     let(:argv) { %w[bbb] }
     let(:parsed_expected) do
-      { opt1: nil, opt2: false, opt3: false, opt4: [], opt5: 0, pos1: 'bbb',
+      { opt1: nil, opt2: false, opt3: false, opt4: [], opt5: 0, opt6: 'DEFAULT', pos1: 'bbb',
         pos2: [] }
     end
 
@@ -87,7 +88,7 @@ RSpec.describe ::EacCli::Runner do
   context 'when alternative args are supplied' do
     let(:argv) { %w[--opt3] }
     let(:parsed_expected) do
-      { opt1: nil, opt2: false, opt3: true, opt4: [], opt5: 0, pos1: nil,
+      { opt1: nil, opt2: false, opt3: true, opt4: [], opt5: 0, opt6: 'DEFAULT', pos1: nil,
         pos2: [] }
     end
 
@@ -98,7 +99,7 @@ RSpec.describe ::EacCli::Runner do
   context 'when repeated options are supplied' do
     let(:argv) { %w[--opt5 -rrr --opt4=A -q B --opt4 C AAA] }
     let(:parsed_expected) do
-      { opt1: nil, opt2: false, opt3: false, opt4: %w[A B C], opt5: 4, pos1: 'AAA',
+      { opt1: nil, opt2: false, opt3: false, opt4: %w[A B C], opt5: 4, opt6: 'DEFAULT', pos1: 'AAA',
         pos2: [] }
     end
 

data/vendor/eac_fs/Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec

data/vendor/eac_fs/eac_fs.gemspec

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'eac_fs/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'eac_fs'
+  s.version     = EacFs::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib}/**/*']
+
+  s.add_dependency 'content-type'
+  s.add_dependency 'eac_ruby_utils', '~> 0.70'
+  s.add_dependency 'ruby-filemagic'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.3'
+end

data/vendor/{eac_ruby_utils/lib/eac_ruby_utils/filesystem_cache.rb → eac_fs/lib/eac_fs/cache.rb}

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
-module EacRubyUtils
-  class FilesystemCache
+require 'eac_ruby_utils/core_ext'
+require 'fileutils'
+
+module EacFs
+  class Cache
+    enable_context
+
     CONTENT_FILE_NAME = '__content__'
 
     attr_reader :path

data/{lib/avm → vendor/eac_fs/lib/eac_fs}/cached_download.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'avm/fs_cache'
-require 'eac_ruby_utils/core_ext'
+require 'eac_fs/patches'
+require 'eac_ruby_utils/fs/temp'
 
 module Avm
   class CachedDownload
@@ -9,7 +9,7 @@ module Avm
 
     def initialize(url, parent_fs_cache = nil)
       @url = url
-      @fs_cache = (parent_fs_cache || ::Avm.fs_cache).child(url.parameterize)
+      @fs_cache = (parent_fs_cache || fs_cache).child(url.parameterize)
     end
 
     def assert
@@ -25,7 +25,7 @@ module Avm
     end
 
     def path
-      @path ||= fs_cache.content_path.to_pathname
+      fs_cache.content_path.to_pathname
     end
 
     private

data/vendor/eac_fs/lib/eac_fs/file_info.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'content-type'
+require 'filemagic'
+
+module EacFs
+  class FileInfo
+    UNKNOWN_CONTENT_TYPE_STRING = 'application/octet-stream'
+    UNKNOWN_CONTENT_TYPE = ::ContentType.parse(UNKNOWN_CONTENT_TYPE_STRING)
+
+    enable_simple_cache
+    attr_reader :magic_string
+
+    def initialize(path)
+      @magic_string = ::FileMagic.new(FileMagic::MAGIC_MIME).file(path.to_pathname.to_path)
+    end
+
+    delegate :charset, :mime_type, :subtype, :type, to: :content_type
+
+    private
+
+    def content_type_uncached
+      ::ContentType.parse(magic_string)
+    rescue ::Parslet::ParseFailed
+      UNKNOWN_CONTENT_TYPE
+    end
+  end
+end

data/vendor/eac_fs/lib/eac_fs/patches/module/fs_cache.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'eac_fs/cache'
+
+class Module
+  # @return [EacFs::Cache]
+  def fs_cache
+    ::EacFs::Cache.context.current.child('fs_cache', *name.split('::'))
+  end
+end

data/vendor/eac_fs/lib/eac_fs/patches/module.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)

data/vendor/eac_fs/lib/eac_fs/patches/object/fs_cache.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'eac_fs/patches/module/fs_cache'
+
+class Object
+  # @return [EacFs::Cache]
+  def fs_cache
+    self.class.fs_cache.child(fs_cache_object_id)
+  end
+
+  # @return [String]
+  def fs_cache_object_id
+    raise 'Abstract method hit'
+  end
+end

data/vendor/eac_fs/lib/eac_fs/patches/object.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)

data/vendor/eac_fs/lib/eac_fs/patches/pathname/info.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'eac_fs/file_info'
+require 'pathname'
+
+class Pathname
+  # Shortcut for `EacFs::FileInfo.new(self)`.
+  # @return [EacFs::FileInfo]
+  def info
+    ::EacFs::FileInfo.new(self)
+  end
+end

data/vendor/eac_fs/lib/eac_fs/patches/pathname.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)

data/vendor/{avm/lib/avm/files.rb → eac_fs/lib/eac_fs/patches.rb}

@@ -2,8 +2,3 @@
 
 require 'eac_ruby_utils/require_sub'
 ::EacRubyUtils.require_sub(__FILE__)
-
-module Avm
-  module Files
-  end
-end

data/vendor/eac_fs/lib/eac_fs/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module EacFs
+  VERSION = '0.5.0'
+end

data/vendor/eac_fs/lib/eac_fs.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacFs
+  require_sub __FILE__
+end

data/vendor/{eac_ruby_utils/spec/lib/eac_ruby_utils/filesystem_cache_spec.rb → eac_fs/spec/lib/eac_fs/cache_spec.rb}

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/object/blank'
-require 'eac_ruby_utils/filesystem_cache'
+require 'eac_fs/cache'
 
-RSpec.describe ::EacRubyUtils::FilesystemCache do
+RSpec.describe ::EacFs::Cache do
   let(:tmpdir) { ::Dir.mktmpdir }
   let(:instance) { described_class.new(tmpdir, 'instance') }
 

data/vendor/eac_fs/spec/rubocop_spec.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+::EacRubyUtils::Rspec.default_setup.describe_rubocop

data/vendor/eac_fs/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/rspec/default_setup'
+::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))

data/vendor/eac_git/lib/eac_git/local/commit/archive.rb

@@ -9,7 +9,7 @@ module EacGit
         # @return [EacRubyUtils::Envs::Command]
         def archive_to_dir(path)
           path = path.to_pathname
-          repo.command('archive', '--format=tar', hash).pipe(
+          repo.command('archive', '--format=tar', id).pipe(
             ::EacGit::Executables.tar.command('-xC', path)
           )
         end