avm-tools 0.64.2 → 0.69.0

data/lib/avm/tools/runner/eac_wordpress_base0/deploy.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_webapp_base0/runner/deploy'
+require 'avm/eac_webapp_base0/runner/deploy'
 require 'avm/stereotypes/eac_wordpress_base0/deploy'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacWordpressBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Deploy < ::Avm::Stereotypes::EacWebappBase0::Runner::Deploy
+        class Deploy < ::Avm::EacWebappBase0::Runner::Deploy
         end
       end
     end

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

@@ -17,6 +17,11 @@ module Avm
           subcommands
         end
 
+        def instance_banner
+          infov 'Instance', instance
+          infov 'Stereotypes', instance.stereotypes.map(&:label).join(', ')
+        end
+
         private
 
         def instance_uncached

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

@@ -0,0 +1,24 @@
+# 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'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+        class Ruby < ::EacRubyUtils::Console::DocoptRunner
+          require_sub __FILE__
+          include ::EacCli::DefaultRunner
+
+          runner_definition do
+            desc 'Ruby utitilies for local projects.'
+            subcommands
+          end
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -0,0 +1,138 @@
+# frozen_string_literal: true
+
+require 'eac_cli/default_runner'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+        class Ruby < ::EacRubyUtils::Console::DocoptRunner
+          class Bundler < ::EacRubyUtils::Console::DocoptRunner
+            class GemfileLock < ::EacRubyUtils::Console::DocoptRunner
+              include ::EacCli::DefaultRunner
+
+              runner_definition 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 "-ciru".'
+              end
+
+              def run
+                loop do
+                  git_reset_checkout
+                  bundle_update
+                  bundle_install
+                  git_continue
+                  break if complete?
+                end
+              end
+
+              private
+
+              def complete?
+                !option_or_all?('--recursive') || !conflict?
+              end
+
+              def rebasing?
+                instance.git_repo.root_path.join('.git', 'rebase-merge').exist?
+              end
+
+              def git_reset_checkout
+                return unless check_capability(__method__, :git_repo, nil)
+
+                infom 'Reseting...'
+                instance.git_repo.command('reset', gemfile_lock).system!
+                infom 'Checkouting...'
+                instance.git_repo.command('checkout', '--', gemfile_lock).system!
+              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 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 gemfile_lock
+                'Gemfile.lock'
+              end
+
+              def git_uncached
+                ::EacGit::Local.new(git_path)
+              end
+
+              def bundle_run(*args)
+                instance.ruby_gem.bundle(*args).system!
+              end
+
+              def git_path
+                '.'
+              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)
+                options.fetch(option) || options.fetch('--all')
+              end
+
+              def instance
+                context(:instance)
+              end
+
+              def check_capability(caller, capability, option)
+                return false unless option.blank? || option_or_all?(option)
+                return true if instance.respond_to?(capability)
+
+                warn "Cannot run #{caller}: instance has no capability \"#{capability}\""
+                false
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+        class Test < ::EacRubyUtils::Console::DocoptRunner
+          include ::EacCli::DefaultRunner
+
+          runner_definition do
+            desc 'Test local project.'
+          end
+
+          def run
+            context(:instance_banner)
+            infov 'Test command', test_command
+            if test_command.present?
+              test_command.system!
+            else
+              fatal_error 'No test command found'
+            end
+          end
+
+          def test_command
+            context(:instance).configuration.if_present(&:any_test_command)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/local_projects/jobs/update'
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_ruby_utils/core_ext'
 
@@ -17,7 +16,7 @@ module Avm
 
           def run
             infov 'Path', context(:instance).path
-            ::Avm::LocalProjects::Jobs::Update.new(context(:instance)).run
+            context(:instance).run_job(:update)
           end
         end
       end

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

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require 'avm/version'
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+        class VersionBump < ::EacRubyUtils::Console::DocoptRunner
+          include ::EacCli::DefaultRunner
+
+          runner_definition do
+            desc 'Bump version of a local project.'
+            arg_opt '-n', '--new', 'Set new version.'
+            arg_opt '-s', '--segment', 'Increment de <segment>-th segment (Left-most is 0)'
+            bool_opt '-M', '--major', 'Same as --segment=0.'
+            bool_opt '-m', '--minor', 'Same as --segment=1.'
+            bool_opt '-p', '--patch', 'Same as --segment=2.'
+            bool_opt '-y', '--yes', 'Bump without confirmation.'
+          end
+
+          def run
+            start_banner
+            version_changed? ? run_version_changed : run_version_unchanged
+          end
+
+          def run_version_changed
+            infom 'Version changed'
+            if confirm?
+              context(:instance).run_job(:version_bump, target_version)
+              success 'Bumped'
+            else
+              fatal_error 'Bump unconfirmed'
+            end
+          end
+
+          def run_version_unchanged
+            success 'Version unchanged'
+          end
+
+          def start_banner
+            context(:instance_banner)
+            infov 'Current version', current_version.if_present('-')
+            infov 'Target version', target_version.if_present('-')
+          end
+
+          def confirm?
+            options.fetch('--yes') || request_input('Confirm version bump?', bool: true)
+          end
+
+          def current_version_uncached
+            context(:instance).if_respond('version')
+          end
+
+          def target_version_uncached
+            r = current_version
+            %w[new segment major minor patch].each do |option|
+              option_value = options.fetch("--#{option}")
+              next if option_value.blank?
+
+              r = send("target_version_from_#{option}", r, option_value)
+            end
+            r
+          end
+
+          def target_version_from_new(_current, option_value)
+            ::Avm::Version.new(option_value)
+          end
+
+          def target_version_from_segment(current, option_value)
+            current.increment_segment(option_value.to_i)
+          end
+
+          %w[major minor patch].each_with_index do |segment, segment_index|
+            define_method "target_version_from_#{segment}" do |current, _option_value|
+              target_version_from_segment(current, segment_index)
+            end
+          end
+
+          def version_changed?
+            target_version != current_version
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.64.2'
+    VERSION = '0.69.0'
   end
 end

data/lib/avm/version.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Avm
+  # A sequence of segments of integer versions (Ex.: 2, 1.0.1, 3.0.0.0.0).
+  class Version
+    include ::Comparable
+
+    SEGMENT_SEPARATOR = '.'
+
+    class << self
+      def segments_from_mixed(segments)
+        (segments.is_a?(::Enumerable) ? segments.to_a : segments.to_s.split(SEGMENT_SEPARATOR))
+          .map(&:to_i)
+      end
+    end
+
+    attr_reader :segments
+
+    def initialize(segments)
+      @segments = self.class.segments_from_mixed(segments).freeze
+    end
+
+    delegate :[], to: :segments
+
+    def <=>(other)
+      segments <=> other.segments
+    end
+
+    def to_s
+      segments.join(SEGMENT_SEPARATOR)
+    end
+
+    # @return [Avm::Version]
+    def increment_segment(segment_index)
+      x = [segments.count, segment_index + 1].max.times.map do |index|
+        value = index < segments.count ? segments[index] : 0
+        next value if index < segment_index
+        next value + 1 if index == segment_index
+
+        0
+      end
+      self.class.new x
+    end
+  end
+end

data/lib/eac_launcher/git/sub_warp_base.rb

@@ -12,7 +12,7 @@ module EacLauncher
         r = find_parent_instance(instance.parent)
         return r if r
 
-        ::EacLauncher::Instances::Errors::Base.new('Git parent not found')
+        ::Avm::Launcher::Errors::Base.new('Git parent not found')
       end
 
       def find_parent_instance(current)

data/lib/eac_launcher/publish/base.rb

@@ -35,7 +35,7 @@ module EacLauncher
 
       def check_with_rescue
         internal_check
-      rescue ::EacLauncher::Instances::Errors::Base => e
+      rescue ::Avm::Launcher::Errors::Base => e
         ::EacLauncher::Publish::CheckResult.blocked("Error: #{e}")
       rescue ::EacLauncher::Git::Error => e
         ::EacLauncher::Publish::CheckResult.blocked("Git error: #{e}")

data/vendor/eac_cli/Gemfile

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