avm-tools 0.66.0 → 0.67.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fadfbad4ae6f17cae7e5137761710e454d858b08f56b0f666956d7f84c9787b
-  data.tar.gz: 30bceb50691d6c31bd34980c0985f4a689d16075f01ffba2495441d67913e312
+  metadata.gz: 916ea6c3a654cc81c07739fffab5013f51cf9e83a7cf8b1163abef48c6fa7ea8
+  data.tar.gz: 7393ff7addec4974fccb0b95b1b6bc5e625e05decc8e695696a1511f4d40c472
 SHA512:
-  metadata.gz: 5c88f25a0c0a7ae293d3c7b40f8708cfcdbfe92ace54a85c0b028751b75a044aa0c9ad437d16b3d47e0895bee0338119c6ea18cbf1328124dab7189f28852353
-  data.tar.gz: eab8e705b2d927f0d196117592a5273ce01f3f55e67e2074691500e44164eed3df86e50e69ece788f77c01fc4b06f39f3aeb670f389ab992c7d539ebc1206eca
+  metadata.gz: 70c1fa8e342208bfd2af99796da13e6cad4d86bb1e28f15b92212c5255fbb5de56dbd88a70ac89c84106a82dac44c1429c3bbf1524932034ef797bc690e4c7b3
+  data.tar.gz: 2b20f95259f5603547d3484d5771babb52eeaa43be785b0afe16460ac0bac584d8143ec70df2f53e6e567fdd99ad19498375a78eccb7f876c7ad445b44496f83

data/lib/avm/instances/configuration/_locale.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'avm/patches/eac_ruby_gems_utils/gem'
+require 'i18n'
+
+module Avm
+  module Instances
+    class Configuration < ::EacRubyUtils::Configs
+      LOCALE_KEY = :locale
+
+      def locale
+        read_entry(LOCALE_KEY) || ::I18n.default_locale
+      end
+    end
+  end
+end

data/lib/avm/local_projects/instance.rb

@@ -4,6 +4,7 @@ require 'avm/instances/configuration'
 require 'eac_launcher/paths/real'
 require 'eac_ruby_utils/core_ext'
 require 'avm/projects/stereotypes'
+require 'i18n'
 
 module Avm
   module LocalProjects
@@ -16,12 +17,20 @@ module Avm
 
       delegate :to_s, to: :path
 
+      def locale
+        configuration.if_present(&:locale) || ::I18n.default_locale
+      end
+
       # Backward compatibility with [EacLauncher::Paths::Logical].
       # @return [EacLauncher::Paths::Real].
       def real
         ::EacLauncher::Paths::Real.new(path.to_path)
       end
 
+      def run_job(job, job_args = [])
+        stereotypes.each { |stereotype| run_stereotype_job(stereotype, job, job_args) }
+      end
+
       private
 
       # @return [Avm::Instances::Configuration]
@@ -29,6 +38,16 @@ module Avm
         ::Avm::Instances::Configuration.find_in_path(path)
       end
 
+      def run_stereotype_job(stereotype, job, job_args)
+        job_class_method = "#{job}_class"
+        if stereotype.send(job_class_method).present?
+          puts stereotype.label + ": #{job} class found. Running..."
+          stereotype.send(job_class_method).new(self, *job_args).run
+        else
+          puts stereotype.label + ": #{job} class not found"
+        end
+      end
+
       def stereotypes_uncached
         ::Avm::Projects::Stereotypes.list.select { |s| s.match?(self) }
       end

data/lib/avm/patches/i18n.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'avm/self'
+require 'i18n'
+
+module Avm
+  module Patches
+    module I18n
+      class << self
+        def setup_i18n
+          ::I18n.load_path += locale_files_paths.map(&:to_path)
+        end
+
+        def locale_files_paths
+          ::Avm::Self.root.join('locale').glob('*.yml')
+        end
+      end
+    end
+  end
+end
+
+::Avm::Patches::I18n.setup_i18n

data/lib/avm/patches/object/i18n.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'avm/patches/i18n'
+
+class Object
+  def translate(entry_suffix, values = {})
+    ::I18n.translate(translate_entry_full(entry_suffix), values)
+  end
+
+  def translate_entry_full(entry_suffix)
+    "#{translate_entry_self_prefix}.#{entry_suffix}"
+  end
+
+  def translate_entry_self_prefix
+    self.class.name.underscore.gsub('/', '.')
+  end
+end

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/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/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.66.0'
+    VERSION = '0.67.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/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/gem.rb

@@ -54,7 +54,7 @@ module EacRubyGemsUtils
     end
 
     def version
-      /VERSION\s*=\s*[\'\"]([^\'\"]+)[\'\"]/.if_match(version_file.read) { |m| m[1] }
+      version_file.value
     end
 
     private
@@ -76,6 +76,10 @@ module EacRubyGemsUtils
     end
 
     def version_file_uncached
+      ::EacRubyGemsUtils::Gem::VersionFile.new(version_file_path)
+    end
+
+    def version_file_path_uncached
       root.join('lib', *namespace_parts, 'version.rb')
     end
   end

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/gem/version_file.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacRubyGemsUtils
+  class Gem
+    class VersionFile
+      common_constructor :path
+
+      VERSION_LINE_PATTERN = /\A(\s*)VERSION\s*=\s*[\'\"]([^\'\"]+)[\'\"](\s*)\z/.freeze
+
+      def value
+        path.read.each_line do |line|
+          VERSION_LINE_PATTERN.if_match(line.rstrip, false) do |m|
+            ::Gem::Version.new(m[2])
+          end
+        end
+      end
+
+      def value=(new_value)
+        path.write(new_value_content(new_value))
+      end
+
+      private
+
+      def new_value_content(new_value)
+        path.read.each_line
+            .map { |line| new_value_line(line, new_value) }
+            .join
+      end
+
+      def new_value_line(line, new_value)
+        m = VERSION_LINE_PATTERN.match(line)
+        return line unless m
+
+        "#{m[1]}VERSION = '#{new_value}'#{m[3]}"
+      end
+    end
+  end
+end

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyGemsUtils
-  VERSION = '0.6.2'
+  VERSION = '0.7.0'
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/if_respond.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/object/blank'
+
+class Object
+  # @return +block.call(self.method_name)+ if +self+ responds to +method_name+, +default_value+
+  # otherwise.
+  def if_respond(method_name, default_value = nil)
+    return default_value unless respond_to?(method_name)
+
+    value = send(method_name)
+
+    block_given? ? yield(value) : value
+  end
+
+  # @return +yield+ if +self+ is blank.
+  def if_blank
+    return yield if blank? && block_given?
+
+    self
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.43.0'
+  VERSION = '0.44.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.66.0
+  version: 0.67.0
 platform: ruby
 authors:
 - Esquilo Azul Company
@@ -361,6 +361,7 @@ files:
 - lib/avm/instances/base/auto_values/web.rb
 - lib/avm/instances/base/dockerizable.rb
 - lib/avm/instances/configuration.rb
+- lib/avm/instances/configuration/_locale.rb
 - lib/avm/instances/configuration/_rubocop.rb
 - lib/avm/instances/configuration/_tests.rb
 - lib/avm/instances/entries.rb
@@ -376,9 +377,10 @@ files:
 - lib/avm/launcher/instances/settings.rb
 - lib/avm/local_projects.rb
 - lib/avm/local_projects/instance.rb
-- lib/avm/local_projects/jobs/update.rb
 - lib/avm/patches.rb
 - lib/avm/patches/eac_ruby_gems_utils/gem.rb
+- lib/avm/patches/i18n.rb
+- lib/avm/patches/object/i18n.rb
 - lib/avm/patches/object/template.rb
 - lib/avm/path_string.rb
 - lib/avm/projects.rb
@@ -400,6 +402,7 @@ files:
 - lib/avm/projects/stereotypes/ruby_gem/local_project_mixin.rb
 - lib/avm/projects/stereotypes/ruby_gem/publish.rb
 - lib/avm/projects/stereotypes/ruby_gem/update.rb
+- lib/avm/projects/stereotypes/ruby_gem/version_bump.rb
 - lib/avm/rails.rb
 - lib/avm/rails/runners.rb
 - lib/avm/rails/runners/bundle.rb
@@ -494,6 +497,7 @@ files:
 - lib/avm/tools/runner/local_project/ruby/bundler/gemfile_lock.rb
 - lib/avm/tools/runner/local_project/test.rb
 - lib/avm/tools/runner/local_project/update.rb
+- lib/avm/tools/runner/local_project/version_bump.rb
 - lib/avm/tools/runner/ruby.rb
 - lib/avm/tools/runner/ruby/gems.rb
 - lib/avm/tools/runner/ruby/gems/generate.rb
@@ -501,6 +505,7 @@ files:
 - lib/avm/tools/runner/self.rb
 - lib/avm/tools/runner/self/docker.rb
 - lib/avm/tools/version.rb
+- lib/avm/version.rb
 - lib/eac_launcher.rb
 - lib/eac_launcher/context.rb
 - lib/eac_launcher/context/instance_discovery.rb
@@ -785,6 +790,7 @@ files:
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils.rb
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/gem.rb
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/gem/command.rb
+- vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/gem/version_file.rb
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests.rb
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/base.rb
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/minitest.rb
@@ -890,6 +896,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/asserts.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/if_present.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/if_respond.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/template.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/to_pathname.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname.rb

data/lib/avm/local_projects/jobs/update.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module LocalProjects
-    module Jobs
-      class Update
-        enable_console_speaker
-        common_constructor :instance
-
-        def run
-          instance.stereotypes.each { |stereotype| run_stereotype(stereotype) }
-        end
-
-        private
-
-        def run_stereotype(stereotype)
-          if stereotype.update_class.present?
-            puts stereotype.label + ': update class found. Running...'
-            stereotype.update_class.new(instance).run
-          else
-            puts stereotype.label + ': update class not found'
-          end
-        end
-      end
-    end
-  end
-end