avm-tools 0.93.0 → 0.95.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff6d2b367a6cca1ba76094f9847bfc4155a3c9abe9665b582c572cb35567320b
-  data.tar.gz: 3aea3baa7f0e41dc0566d2d4411e1cf4c78e852aae4787f33d002a274dd4f3b2
+  metadata.gz: 43ee05798fe159fe0fffa66e10aa7260aa8e29a7fe7f37786b29a89b051f600b
+  data.tar.gz: 86dbc1695a7dfe69cf4c33d2d5aae928a7cc05448305e41f4a23205636ea39ff
 SHA512:
-  metadata.gz: 73222b5a84ab23aacbc5088f0c9a297babcae52fa5427ebcae52053c697250ac4aa8a3e91940a4f82dd5d5f5bf39f12fb730c1d9883ae44cccf606419a241117
-  data.tar.gz: f76583694406760f366788cc4535095604adf4eaaf784350d425d3d820764c4a531a317fde4ddab56abd496b85895cf55dc9825046c3c4fa09059d66934d4992
+  metadata.gz: 52f50815a47e9373174a9f6b39e64d0f16cc5a6cf2a39f5bd540f1f90f3bbad6e3361607cdd7a37d225f746bb7f36717e99b344fbd35882f64013c33d56b5e51
+  data.tar.gz: dc15c004e0c6c67ebcaaa7b230c0210c5fbde1ca567a1b405fbea7148732b998f3919c74815be22ded25cd21cffbf4a3e0b6d82406a78e507dc89d6ff4fd41e8

data/lib/avm/eac_webapp_base0/instance.rb

@@ -9,6 +9,7 @@ require 'avm/eac_webapp_base0/deploy/file_unit'
 module Avm
   module EacWebappBase0
     class Instance < ::Avm::Instances::Base
+      require_sub __FILE__
       include ::Avm::Postgresql::InstanceWith
 
       FILES_UNITS = [].freeze
@@ -26,8 +27,10 @@ module Avm
       end
 
       def run_subcommand(subcommand_class, argv)
-        parent = ::OpenStruct.new(instance: self)
-        subcommand_class.new(argv: argv, parent: parent).run
+        subcommand_class.create(
+          argv: argv,
+          parent: ::Avm::EacWebappBase0::Instance::SubcommandParent.new(self)
+        ).run
       end
 
       def data_package

data/lib/avm/eac_webapp_base0/instance/subcommand_parent.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    class Instance < ::Avm::Instances::Base
+      class SubcommandParent
+        enable_simple_cache
+        common_constructor :instance
+
+        private
+
+        def runner_context_uncached
+          ::EacCli::Runner::Context.new(self, argv: runner_argv)
+        end
+
+        def runner_argv
+          [instance.class.name.split('::')[-2].dasherize, instance.id]
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_webapp_base0/runner/data.rb

@@ -9,6 +9,7 @@ module Avm
         require_sub __FILE__
         runner_with :help, :subcommands do
           desc 'Data utilities for EacRailsBase0 instances.'
+          subcommands
         end
       end
     end

data/lib/avm/eac_webapp_base0/runner/data/dump.rb

@@ -15,7 +15,7 @@ module Avm
 
           runner_with :help do
             desc 'Dump utility for EacRailsBase instance.'
-            bool_opt '-w', 'rewrite', 'Forces dump overwrite.'
+            bool_opt '-w', '--rewrite', 'Forces dump overwrite.'
             arg_opt '-p', '--dump-path', 'Set DUMP_PATH variable.'
           end
 

data/lib/avm/eac_webapp_base0/runner/data/load.rb

@@ -9,7 +9,7 @@ module Avm
     class Runner < ::Avm::Instances::Runner
       class Data
         class Load
-          runner_with :ĥelp do
+          runner_with :help do
             desc 'Load utility for EacRailsBase instance.'
             arg_opt '-S', '--source-instance', 'Informa a instância a ser extraída o dump.'
             pos_arg :dump_path, optional: true

data/lib/avm/git/auto_commit/commit_info.rb

@@ -8,10 +8,11 @@ module Avm
       class CommitInfo
         enable_immutable
 
-        immutable_accessor :fixup
+        immutable_accessor :fixup, :message
 
         def git_commit_args
           r = fixup.if_present([]) { |v| ['--fixup', v.sha1] }
+          r += message.if_present([]) { |v| ['--message', v] }
           return r if r.any?
 
           raise 'Argument list is empty'

data/lib/avm/git/auto_commit/rules.rb

@@ -2,13 +2,13 @@
 
 require 'eac_ruby_utils/core_ext'
 
+::EacRubyUtils.require_sub __FILE__
+
 module Avm
   module Git
     module AutoCommit
       module Rules
-        require_sub __FILE__
-
-        RULES_CLASSES = %w[last manual nth unique]
+        RULES_CLASSES = %w[last manual new nth unique]
                         .map { |key| ::Avm::Git::AutoCommit::Rules.const_get(key.camelcase) }
 
         class << self
@@ -22,7 +22,7 @@ module Avm
           def rule_class_by_key(key)
             RULES_CLASSES.find { |klass| klass.keys.include?(key) } ||
               raise("Rule not find with key \"#{key}\" (Available: " +
-                RULES_CLASSES.flat_map(&:keys) + ')')
+                RULES_CLASSES.flat_map(&:keys).join(', ') + ')')
           end
         end
       end

data/lib/avm/git/auto_commit/rules/new.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'avm/git/auto_commit/rules/base'
+require 'avm/git/auto_commit_path'
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        class New < ::Avm::Git::AutoCommit::Rules::Base
+          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
+            def auto_commit_path
+              ::Avm::Git::AutoCommitPath.new(file.git, file.path)
+            end
+
+            def commit_info
+              new_commit_info.message(auto_commit_path.commit_message)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/auto_commit/rules/nth.rb

@@ -7,6 +7,14 @@ module Avm
     module AutoCommit
       module Rules
         class Nth < ::Avm::Git::AutoCommit::Rules::Base
+          SHORT_KEY = 't'
+
+          class << self
+            def short_key
+              SHORT_KEY
+            end
+          end
+
           common_constructor :number do
             self.number = number.to_i
           end

data/lib/avm/git/auto_commit_path.rb

@@ -6,31 +6,10 @@ module Avm
   module Git
     class AutoCommitPath
       require_sub __FILE__, include_modules: true
-      enable_console_speaker
       common_constructor :git, :path do
         self.path = path.to_pathname
       end
 
-      CLASS_NAME_PATTERNS = [%r{lib/((?!.*/lib/).+)\.rb\z}, %r{app/[^/]+/(.+)\.rb\z}].freeze
-
-      def run
-        banner
-        commit
-      end
-
-      def banner
-        infom "Checking \"#{relative_path}\""
-        infov '  * Class name', class_name
-        infov '  * Commit message', commit_message
-      end
-
-      def commit
-        infom '  * Commiting...'
-        git.system!('reset', 'HEAD')
-        git.system!('add', '--', relative_path.to_path)
-        git.system!('commit', '-m', commit_message, '--', relative_path.to_path)
-      end
-
       def class_name
         ruby_class_name || relative_path.to_path
       end

data/lib/avm/git/file_auto_fixup.rb

@@ -10,10 +10,16 @@ module Avm
       enable_simple_cache
       enable_listable
 
-      common_constructor :git, :path, :rules
+      common_constructor :git, :path, :rules do
+        self.path = path.to_pathname.expand_path(git.root_path)
+      end
 
       COMMITS_SEARCH_INTERVAL = 'origin/master..HEAD'
 
+      def git_relative_path
+        path.to_pathname.relative_path_from(git.root_path)
+      end
+
       def run
         start_banner
         run_commit || warn("No rule returned commit information for \"#{path}\"")
@@ -22,7 +28,7 @@ module Avm
       private
 
       def commit_args
-        commit_info.if_present([], &:git_commit_args) + ['--', path]
+        commit_info.if_present([], &:git_commit_args) + ['--', git_relative_path]
       end
 
       def commit_info_uncached
@@ -38,11 +44,21 @@ module Avm
         return false if commit_info.blank?
 
         infov '  Commit arguments', ::Shellwords.join(commit_args)
-        git.execute!('commit', *commit_args)
+        run_git_add_and_commit
         success '  Commited'
         true
       end
 
+      def run_git_add_and_commit
+        git.execute!('reset', '--soft', 'HEAD')
+        if path.exist?
+          git.execute!('add', git_relative_path)
+        else
+          git.execute!('rm', '-f', git_relative_path)
+        end
+        git.execute!('commit', *commit_args)
+      end
+
       def commits_uncached
         git.execute!('log', '--pretty=format:%H', COMMITS_SEARCH_INTERVAL, '--', path)
            .each_line.map { |sha1| ::Avm::Git::Commit.new(git, sha1.strip) }

data/lib/avm/ruby/bundler.rb

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

data/lib/avm/ruby/bundler/incompatible_parser.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Ruby
+    module Bundler
+      class IncompatibleParser
+        require_sub __FILE__
+
+        enable_simple_cache
+        attr_reader :gems_in_conflict
+
+        def initialize(path)
+          @gems_in_conflict = ::Avm::Ruby::Bundler::IncompatibleParser::LineBuffer
+                              .from_file(path).gems_in_conflict.freeze
+        end
+
+        def data
+          gems_in_conflict.map(&:data)
+        end
+      end
+    end
+  end
+end

data/lib/avm/ruby/bundler/incompatible_parser/depends_on.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/ruby/bundler/incompatible_parser/line_parser_base'
+
+module Avm
+  module Ruby
+    module Bundler
+      class IncompatibleParser
+        class DependsOn < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
+          LINE_PARSER = /(.+) was resolved to (.+), which depends on/
+                        .to_parser { |m| new(m[1], m[2]) }
+
+          common_constructor :gem_name, :version do
+            self.version = ::Gem::Version.new(version)
+          end
+
+          def data
+            { gem_name: gem_name, version: version }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/ruby/bundler/incompatible_parser/gem_conflict.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/ruby/bundler/incompatible_parser/line_parser_base'
+
+module Avm
+  module Ruby
+    module Bundler
+      class IncompatibleParser
+        class GemConflict < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
+          LINE_PARSER = /Bundler could not find compatible versions for gem "(.+)":/
+                        .to_parser { |m| new(m[1]) }
+
+          enable_simple_cache
+          common_constructor :gem_name
+
+          def add_depends_on(depends_on)
+            @depends_on_stack ||= []
+            @depends_on_stack << depends_on
+          end
+
+          def add_version_requirement(version_requirement)
+            version_requirement.stack = @depends_on_stack
+            versions_requirements << version_requirement
+            @depends_on_stack = nil
+          end
+
+          def data
+            { gem_name: gem_name, versions_requirements: versions_requirements.map(&:data) }
+          end
+
+          def versions_requirements
+            @versions_requirements ||= []
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/ruby/bundler/incompatible_parser/in_gemfile.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/ruby/bundler/incompatible_parser/line_parser_base'
+
+module Avm
+  module Ruby
+    module Bundler
+      class IncompatibleParser
+        class InGemfile < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
+          LINE_PARSER = /In Gemfile:/
+                        .to_parser { |_m| new }
+
+          common_constructor
+        end
+      end
+    end
+  end
+end

data/lib/avm/ruby/bundler/incompatible_parser/line_buffer.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/ruby/bundler/incompatible_parser/gem_conflict'
+require 'avm/ruby/bundler/incompatible_parser/line_factory'
+
+module Avm
+  module Ruby
+    module Bundler
+      class IncompatibleParser
+        class LineBuffer
+          class << self
+            def from_file(path)
+              new(::File.read(path.to_s))
+            end
+          end
+
+          attr_reader :gems_in_conflict
+
+          def initialize(content)
+            self.gems_in_conflict = []
+            self.parsing_required = false
+            content.each_line { |string_line| add_line(LineFactory.new(string_line)) }
+          end
+
+          private
+
+          attr_accessor :parsing_required
+          attr_writer :gems_in_conflict
+
+          def add_line(line)
+            return if line.blank?
+
+            return if LineFactory::TYPES.any? do |type|
+              next false unless line.result.is_a?(type)
+
+              send("on_#{type.name.demodulize.underscore.variableize}_line", line.result)
+              true
+            end
+
+            return unless parsing_required
+
+            raise(::ArgumentError, "Unparsed line: \"#{line.content}\"")
+          end
+
+          def on_gem_conflict_line(result)
+            self.parsing_required = true
+            gems_in_conflict << result
+          end
+
+          def on_in_gemfile_line(result)
+            # Do nothing
+          end
+
+          def on_depends_on_line(result)
+            current_gem_conflict.add_depends_on(result)
+          end
+
+          def on_version_requirement_line(result)
+            current_gem_conflict.add_version_requirement(result)
+          end
+
+          def current_gem_conflict
+            raise 'No gems in conflict' if gems_in_conflict.none?
+            raise 'Last gem is blank' if gems_in_conflict.last.blank?
+
+            gems_in_conflict.last
+          end
+        end
+      end
+    end
+  end
+end