avm-tools 0.66.0 → 0.69.2

data/lib/avm/projects/stereotype.rb

@@ -37,6 +37,7 @@ module Avm
           local_project_mixin: ::Module,
           publish: ::Class,
           update: ::Class,
+          version_bump: ::Class,
           warp: ::Class
         }.each do |name, is_a|
           define_method "#{name}_#{is_a.name.underscore}" do

data/lib/avm/projects/stereotypes/git_subrepo/warp.rb

@@ -32,7 +32,7 @@ module Avm
             return if parent_git_warped.rev_parse(subrepo_parent_hash) &&
                       parent_git_warped.descendant?('HEAD', subrepo_parent_hash)
 
-            raise EacLauncher::Instances::Errors::Base,
+            raise Avm::Launcher::Errors::Base,
                   "Subrepo parent hash \"#{subrepo_parent_hash}\"" \
                   " not found in \"#{parent_git_warped}\""
           end
@@ -42,7 +42,7 @@ module Avm
             h = data['Pull Parent']
             return h if h.present?
 
-            raise EacLauncher::Instances::Errors::Base, "Subrepo parent hash is blank: #{data}"
+            raise Avm::Launcher::Errors::Base, "Subrepo parent hash is blank: #{data}"
           end
 
           def init_aux

data/lib/avm/projects/stereotypes/rails_application.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 require 'avm/projects/stereotype'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Projects
     module Stereotypes
       class RailsApplication
+        require_sub __FILE__
         include Avm::Projects::Stereotype
 
         class << self

data/lib/avm/projects/stereotypes/rails_application/local_project_mixin.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'avm/projects/stereotypes/ruby_gem/local_project_mixin'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Projects
+    module Stereotypes
+      class RailsApplication
+        module LocalProjectMixin
+          common_concern do
+            include ::Avm::Projects::Stereotypes::RubyGem::LocalProjectMixin
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/projects/stereotypes/rails_application/update.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/projects/stereotypes/ruby_gem/update'
+
+module Avm
+  module Projects
+    module Stereotypes
+      class RailsApplication
+        class Update < ::Avm::Projects::Stereotypes::RubyGem::Update
+        end
+      end
+    end
+  end
+end

data/lib/avm/projects/stereotypes/ruby_gem/local_project_mixin.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/patches/eac_ruby_gems_utils/gem'
+require 'avm/version'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -12,6 +13,14 @@ module Avm
           def ruby_gem
             @ruby_gem ||= ::EacRubyGemsUtils::Gem.new(path)
           end
+
+          def version
+            ruby_gem.version.if_present { |v| ::Avm::Version.new(v) }
+          end
+
+          def version=(value)
+            ruby_gem.version_file.value = value
+          end
         end
       end
     end

data/lib/avm/projects/stereotypes/ruby_gem/version_bump.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'avm/patches/object/i18n'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Projects
+    module Stereotypes
+      class RubyGem
+        class VersionBump
+          enable_console_speaker
+          common_constructor :instance, :target_version
+
+          def run
+            git_checkout
+            change_version
+            bundle_run
+            git_commit
+          end
+
+          private
+
+          def bundle_run
+            infom 'Running "bundle install"...'
+            instance.ruby_gem.bundle('install').execute!
+          end
+
+          def change_version
+            infom 'Setting project version...'
+            instance.version = target_version
+          end
+
+          def git_checkout
+            return unless instance.respond_to?(:git_repo)
+
+            infom "Checkouting #{changing_files.map(&:to_path).join(', ')}..."
+            instance.git_repo.command('checkout', '--',
+                                      *changing_files.map(&:to_path)).execute!
+          end
+
+          def git_commit
+            return unless instance.respond_to?(:git_repo)
+
+            infom "Commiting #{changing_files.map(&:to_path).join(', ')}..."
+            instance.git_repo.command('commit', '-m', git_commit_message, '--',
+                                      *changing_files.map(&:to_path)).execute!
+          end
+
+          def git_commit_message
+            ::I18n.default_locale = instance.locale
+            translate(__method__, version: target_version)
+          end
+
+          def changing_files
+            [instance.ruby_gem.gemfile_lock_path, instance.ruby_gem.version_file_path]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/stereotypes/eac_wordpress_base0/apache_host.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_webapp_base0/apache_host'
+require 'avm/eac_webapp_base0/apache_host'
 
 module Avm
   module Stereotypes
     module EacWordpressBase0
-      class ApacheHost < ::Avm::Stereotypes::EacWebappBase0::ApacheHost
+      class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
         def document_root
           instance.read_entry(:fs_path)
         end

data/lib/avm/stereotypes/eac_wordpress_base0/deploy.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_webapp_base0/deploy'
+require 'avm/eac_webapp_base0/deploy'
 
 module Avm
   module Stereotypes
     module EacWordpressBase0
-      class Deploy < ::Avm::Stereotypes::EacWebappBase0::Deploy
+      class Deploy < ::Avm::EacWebappBase0::Deploy
       end
     end
   end

data/lib/avm/stereotypes/eac_wordpress_base0/instance.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 require 'avm/instances/entry_keys'
-require 'avm/stereotypes/eac_webapp_base0/instance'
+require 'avm/eac_webapp_base0/instance'
 
 module Avm
   module Stereotypes
     module EacWordpressBase0
-      class Instance < ::Avm::Stereotypes::EacWebappBase0::Instance
+      class Instance < ::Avm::EacWebappBase0::Instance
         FILES_UNITS = { uploads: 'wp-content/uploads', themes: 'wp-content/themes' }.freeze
 
         def database_unit

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

@@ -2,7 +2,7 @@
 
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_ruby_utils/simple_cache'
-require 'avm/stereotypes/eac_rails_base0/instance'
+require 'avm/eac_rails_base0/instance'
 require 'eac_ruby_utils/require_sub'
 ::EacRubyUtils.require_sub(__FILE__)
 
@@ -26,7 +26,7 @@ module Avm
         private
 
         def instance_uncached
-          ::Avm::Stereotypes::EacRailsBase0::Instance.by_id(options['<instance_id>'])
+          ::Avm::EacRailsBase0::Instance.by_id(options['<instance_id>'])
         end
       end
     end

data/lib/avm/tools/runner/eac_rails_base0/apache_host.rb

@@ -1,37 +1,14 @@
 # frozen_string_literal: true
 
+require 'avm/eac_webapp_base0/runner/apache_host'
 require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
-require 'avm/stereotypes/eac_rails_base0/apache_host'
+require 'avm/eac_rails_base0/apache_host'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class ApacheHost < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::Console::Speaker
-
-          DOC = <<~DOCOPT
-            Deploy for EacRailsBase0 instance.
-
-            Usage:
-              __PROGRAM__ [options]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                       Show this screen.
-          DOCOPT
-
-          def run
-            result = ::Avm::Stereotypes::EacRailsBase0::ApacheHost.new(
-              context(:instance)
-            ).run
-            if result.error?
-              fatal_error result.to_s
-            else
-              infov 'Result', result.label
-            end
-          end
+        class ApacheHost < ::Avm::EacWebappBase0::Runner::ApacheHost
         end
       end
     end

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_webapp_base0/runner/data'
+require 'avm/eac_webapp_base0/runner/data'
 require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Data < ::Avm::Stereotypes::EacWebappBase0::Runner::Data
+        class Data < ::Avm::EacWebappBase0::Runner::Data
         end
       end
     end

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

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

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_webapp_base0/runner/data'
+require 'avm/eac_webapp_base0/runner/data'
 require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_webapp_base0/runner/data/dump'
+require 'avm/eac_webapp_base0/runner/data/dump'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacRedmineBase0 < ::EacRubyUtils::Console::DocoptRunner
         class Data < ::EacRubyUtils::Console::DocoptRunner
-          class Dump < ::Avm::Stereotypes::EacWebappBase0::Runner::Data::Dump
+          class Dump < ::Avm::EacWebappBase0::Runner::Data::Dump
           end
         end
       end

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

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

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/rails/runners/runner'
 require 'eac_cli/default_runner'
 
 module Avm

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

@@ -1,37 +1,15 @@
 # frozen_string_literal: true
 
+require 'avm/eac_webapp_base0/runner/apache_host'
+require 'eac_cli/default_runner'
 require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
 require 'avm/stereotypes/eac_wordpress_base0/apache_host'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacWordpressBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class ApacheHost < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::Console::Speaker
-
-          DOC = <<~DOCOPT
-            Configure Apache virtual host for EacWordpressBase0 instance.
-
-            Usage:
-              __PROGRAM__ [options]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                       Show this screen.
-          DOCOPT
-
-          def run
-            result = ::Avm::Stereotypes::EacWordpressBase0::ApacheHost.new(
-              context(:instance)
-            ).run
-            if result.error?
-              fatal_error result.to_s
-            else
-              infov 'Result', result.label
-            end
-          end
+        class ApacheHost < ::Avm::EacWebappBase0::Runner::ApacheHost
         end
       end
     end

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_webapp_base0/runner/data'
+require 'avm/eac_webapp_base0/runner/data'
 require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacWordpressBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Data < ::Avm::Stereotypes::EacWebappBase0::Runner::Data
+        class Data < ::Avm::EacWebappBase0::Runner::Data
         end
       end
     end

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/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