avm-tools 0.93.0 → 0.95.0

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/ruby/bundler/incompatible_parser/depends_on'
+require 'avm/ruby/bundler/incompatible_parser/gem_conflict'
+require 'avm/ruby/bundler/incompatible_parser/in_gemfile'
+
+module Avm
+  module Ruby
+    module Bundler
+      class IncompatibleParser
+        class LineFactory
+          TYPES = [GemConflict, InGemfile, DependsOn, VersionRequirement].freeze
+
+          enable_simple_cache
+          common_constructor :content do
+            self.content = content.strip
+          end
+
+          delegate :blank?, to: :content
+
+          private
+
+          def result_uncached
+            TYPES.lazy.map { |type| type.parse(content) }.find(&:present?)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Ruby
+    module Bundler
+      class IncompatibleParser
+        class LineParserBase
+          class << self
+            def parse(line_content)
+              const_get('LINE_PARSER').parse(line_content)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# 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 VersionRequirement < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
+          LINE_PARSER = /\A([a-z][a-z_0-9]*)(?: \((.+)\))?\z/
+                        .to_parser { |m| new(m[1], m[2]) }
+
+          enable_simple_cache
+          attr_accessor :stack
+
+          common_constructor :gem_name, :requirements_source
+
+          def data
+            { requirements_source: requirements_source, stack: stack.map(&:data) }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/ruby/gems/generator.rb

@@ -8,7 +8,7 @@ module Avm
     module Gems
       class Generator
         IDENT = '  '
-        JOBS = %w[root_directory gemspec root_lib version_lib static gemfile_lock rspec].freeze
+        JOBS = %w[root_directory gemspec root_lib version_lib static gemfile_lock].freeze
         TEMPLATE_VARIABLES = %w[lib_path name root_module].freeze
 
         enable_console_speaker
@@ -92,10 +92,6 @@ module Avm
           template_apply('root_lib', "lib/#{lib_path}.rb")
         end
 
-        def generate_rspec
-          self_gem.bundle('exec', 'rspec').chdir_root.execute!
-        end
-
         def generate_static
           template.child('static').apply(self, root_directory)
         end

data/lib/avm/tools/runner/eac_redmine_base0/core_update.rb

@@ -1,18 +1,14 @@
 # frozen_string_literal: true
 
 require 'avm/eac_redmine_base0/core_update'
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
+require 'eac_cli/core_ext'
 
 module Avm
   module Tools
     class Runner
       class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
-        class CoreUpdate < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacCli::DefaultRunner
-
-          runner_definition do
+        class CoreUpdate
+          runner_with :help do
             arg_opt '-u', '--url', 'Core\'s package URL.'
             arg_opt '-v', '--version', 'Core\'s version.'
             desc 'Update instance\' core.'
@@ -32,7 +28,7 @@ module Avm
           end
 
           def update
-            ::Avm::EacRedmineBase0::CoreUpdate.new(context(:instance), version, url).run
+            ::Avm::EacRedmineBase0::CoreUpdate.new(runner_context.call(:instance), version, url).run
           end
 
           def url
@@ -40,7 +36,7 @@ module Avm
           end
 
           def url_by_version
-            options.fetch('--version').if_present do |v|
+            parsed.version.if_present do |v|
               "https://www.redmine.org/releases/redmine-#{v}.tar.gz"
             end
           end
@@ -52,11 +48,11 @@ module Avm
           end
 
           def version
-            options.fetch('--version') || version_by_url
+            parsed.version || version_by_url
           end
 
           def version_by_url
-            options.fetch('--url').if_present do |v|
+            parsed.url.if_present do |v|
               /(\d+.\d+.\d+)/.if_match(v, false) { |m| m[1] }
             end
           end

data/lib/avm/tools/runner/git/auto_commit.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require 'avm/git/auto_commit_path'
-require 'avm/files/formatter'
 require 'eac_cli/core_ext'
+require 'avm/files/formatter'
+require 'avm/git/file_auto_fixup'
+require 'avm/git/auto_commit/rules'
 
 module Avm
   module Tools
@@ -10,54 +11,53 @@ module Avm
       class Git
         class AutoCommit
           runner_with :help do
-            desc 'Commit with message based in content commited.'
+            desc 'Auto fixup files.'
             bool_opt '-d', '--dirty', 'Select dirty files.'
             bool_opt '-f', '--format', 'Format files before commit.'
-            pos_arg 'paths', repeat: true, optional: true
+            arg_opt '-r', '--rule', 'Apply a rule in the specified order.', repeat: true
+            pos_arg :files, repeat: true, optional: true
           end
 
           def run
-            clear_stage
-            banner
             format_files
-            run_paths
+            files.each do |file|
+              ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file, rules).run
+            end
           end
 
           private
 
-          def banner
-            infov 'Paths', paths.count
+          def files_uncached
+            (files_from_option + dirty_files).sort.uniq
           end
 
-          def clear_stage
-            infom 'Clearing stage...'
-            runner_context.call(:git).system!('reset', 'HEAD')
-          end
-
-          def dirty_paths
-            return [] unless parsed.dirty?
-
-            runner_context.call(:git).dirty_files.map do |d|
-              runner_context.call(:git).root_path.join / d.path
-            end
+          def files_from_option
+            parsed.files.map { |p| p.to_pathname.expand_path }
           end
 
           def format_files
             return unless parsed.format?
 
             infom 'Formating files...'
-            ::Avm::Files::Formatter.new(paths.map(&:path),
-                                        ::Avm::Files::Formatter::OPTION_APPLY => true).run
+            ::Avm::Files::Formatter.new(files, ::Avm::Files::Formatter::OPTION_APPLY => true).run
           end
 
-          def paths_uncached
-            (parsed.paths.map { |p| p.to_pathname.expand_path } + dirty_paths)
-              .reject(&:directory?).sort.uniq
-              .map { |path| ::Avm::Git::AutoCommitPath.new(runner_context.call(:git), path) }
+          def dirty_files
+            return [] unless parsed.dirty?
+
+            runner_context.call(:git).dirty_files.map do |file|
+              file.path.to_pathname.expand_path(runner_context.call(:git).root_path)
+            end
+          end
+
+          def rules
+            parsed.rule.map do |rule_string|
+              ::Avm::Git::AutoCommit::Rules.parse(rule_string)
+            end
           end
 
-          def run_paths
-            paths.each(&:run)
+          def select
+            parsed.last? ? 1 : parsed.select
           end
         end
       end

data/lib/avm/tools/runner/git/subrepo/fix.rb

@@ -30,7 +30,7 @@ module Avm
               local_repos.dirty_files.each do |file|
                 infov '  * Ammending', file.path
                 ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file.path,
-                                              ::Avm::Git::FileAutoFixup::OPTION_UNIQUE => true).run
+                                              [::Avm::Git::AutoCommit::Rules::Unique.new]).run
               end
             end
 

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

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/patches/eac_ruby_gems_utils/gem'
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
+require 'eac_cli/core_ext'
 
 module Avm
   module Tools
@@ -11,9 +9,7 @@ module Avm
       class LocalProject
         class Ruby
           require_sub __FILE__
-          include ::EacCli::DefaultRunner
-
-          runner_definition do
+          runner_with :help, :subcommands do
             desc 'Ruby utitilies for local projects.'
             subcommands
           end

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

@@ -1,19 +1,15 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_base0/core_ext'
 
 module Avm
   module Tools
     class Runner
       class LocalProject
         class Ruby
-          class Bundler < ::EacRubyUtils::Console::DocoptRunner
+          class Bundler
             require_sub __FILE__
-            include ::EacCli::DefaultRunner
-
-            runner_definition do
+            runner_with :help, :subcommands do
               desc 'Ruby\'s bundler utitilies for local projects.'
               subcommands
             end

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

@@ -1,18 +1,15 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_base0/core_ext'
 
 module Avm
   module Tools
     class Runner
       class LocalProject
         class Ruby
-          class Bundler < ::EacRubyUtils::Console::DocoptRunner
-            class GemfileLock < ::EacRubyUtils::Console::DocoptRunner
-              include ::EacCli::DefaultRunner
-
-              runner_definition do
+          class Bundler
+            class GemfileLock
+              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".'
@@ -34,7 +31,7 @@ module Avm
               private
 
               def complete?
-                !option_or_all?('--recursive') || !conflict?
+                !option_or_all?(:recursive) || !conflict?
               end
 
               def rebasing?
@@ -51,21 +48,21 @@ module Avm
               end
 
               def bundle_install
-                return unless check_capability(__method__, :ruby_gem, '--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')
+                return unless check_capability(__method__, :ruby_gem, :update)
 
                 infom '"bundle update"...'
                 bundle_run('update')
               end
 
               def git_continue
-                return unless check_capability(__method__, :git_repo, '--continue')
+                return unless check_capability(__method__, :git_repo, :continue)
 
                 infom "Adding \"#{gemfile_lock}\"..."
                 instance.git_repo.command('add', gemfile_lock).execute!
@@ -115,11 +112,11 @@ module Avm
               end
 
               def option_or_all?(option)
-                options.fetch(option) || options.fetch('--all')
+                parsed[option] || parsed.all?
               end
 
               def instance
-                context(:instance)
+                runner_context.call(:instance)
               end
 
               def check_capability(caller, capability, option)

data/lib/avm/tools/runner/local_project/ruby/bundler/incompatible.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require 'avm/fs_cache'
+require 'avm/ruby/bundler/incompatible_parser'
+require 'eac_ruby_base0/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class LocalProject
+        class Ruby
+          class Bundler
+            class Incompatible
+              runner_with :help do
+                desc 'Identify incompatible gems in a "Gemfile.lock" file.'
+                bool_opt '-l', '--last', 'Process the last \"bundle update\" result.'
+              end
+
+              def run
+                infov 'Cache path', fs_cache.content_path
+                infov 'Cached?', fs_cache.cached?
+                parser.gems_in_conflict.each do |gem_in_conflict|
+                  print_gem_in_conflict(gem_in_conflict)
+                end
+              end
+
+              private
+
+              def bundle_update
+                infom 'Running "bundle update"...'
+                instance.ruby_gem.bundle('update').execute[:stdout]
+              end
+
+              def content_path
+                fs_cache.write(bundle_update) unless fs_cache.cached? && parsed.last?
+                fs_cache.content_path
+              end
+
+              def fs_cache_uncached
+                ::Avm.fs_cache.child(self.class.name.variableize)
+                     .child(instance.path.to_s.variableize)
+              end
+
+              def gem_title(gem_in_conflict)
+                gem_in_conflict.gem_name
+              end
+
+              def instance
+                runner_context.call(:instance)
+              end
+
+              def parser_uncached
+                ::Avm::Ruby::Bundler::IncompatibleParser.new(content_path)
+              end
+
+              def print_gem_in_conflict(gem_in_conflict)
+                infov 'Gem', gem_title(gem_in_conflict)
+                gem_in_conflict.versions_requirements.each do |requirement|
+                  print_requirement(requirement)
+                end
+              end
+
+              def print_requirement(req)
+                infov '  ' + requirement_title(req), requirement_value(req)
+              end
+
+              def requirement_stack(req)
+                req.stack.map { |d| "#{d.gem_name} (#{d.version})" }.join(' > '.green)
+              end
+
+              def requirement_title(req)
+                req.requirements_source.if_present('*')
+              end
+
+              def requirement_value(req)
+                requirement_stack(req)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end