eac_tools 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 107915a05b1fbd0d59621404605a2f620b5e276cdd06decb8a57198e2beb901f
-  data.tar.gz: 654a27855b25bdf9174a24339f89e2d5a47d4e8b5651cce205f831cec4b6e3f1
+  metadata.gz: 04cbda8d8b53185b46e806e22d26098771f627a4574eb028e9836905e700a27d
+  data.tar.gz: 7862b02bf94a320aee41d7ef63052b2049484a5f1540392268b41402b4eb6ba4
 SHA512:
-  metadata.gz: e02293121107031d6beb1017e9a7213063a784ea36b86f469bdf0ab4b57cdef7688cc0f387eea857d69b545a5e2b7906a695b99628ce625b1e2041bfcf01dc76
-  data.tar.gz: 262e1a80690e74215af7ba055fbf78773b3e2e007b90e741b9e2fab8fabcefec60b1cc386601e5937bce9511f88004fb8ed6066739f2418c86e849446a078073
+  metadata.gz: d51e79b98e8a886236b82b1cafbbe7e3f817cf4dcc18bce329f19d4d5a176a2ae10c78ed5ca871d6de8e79b31244687bccfd0a4fdca71bf88e9e806aa6faab28
+  data.tar.gz: 42d8f5266e63f7dac0bf2f952bea10d9ad342fd223c1f41ea7984aeb3f37bce37dc5389bd00da9411607badf39bfed74f24b3fac04dd4bd6a3b3b4a2b55c4736

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.21.0)
-      avm (~> 0.35)
+    eac_tools (0.22.0)
+      avm (~> 0.35, >= 0.35.1)
       avm-eac_asciidoctor_base0 (~> 0.4)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_latex_base0 (~> 0.1, >= 0.1.1)
@@ -10,10 +10,10 @@ PATH
       avm-eac_rails_base1 (~> 0.4, >= 0.4.2)
       avm-eac_redmine_base0 (~> 0.11)
       avm-eac_redmine_plugin_base0 (~> 0.3)
-      avm-eac_ruby_base1 (~> 0.18)
+      avm-eac_ruby_base1 (~> 0.19)
       avm-eac_webapp_base0 (~> 0.3, >= 0.3.1)
       avm-eac_wordpress_base0 (~> 0.1, >= 0.1.1)
-      avm-tools (~> 0.132)
+      avm-tools (~> 0.132, >= 0.132.1)
       eac_ruby_utils (~> 0.98)
 
 PATH
@@ -80,10 +80,10 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.18.0)
-      avm (~> 0.34)
-      avm-eac_generic_base0 (~> 0.2)
-      eac_ruby_utils (~> 0.95, >= 0.95.1)
+    avm-eac_ruby_base1 (0.19.0)
+      avm (~> 0.35, >= 0.35.1)
+      avm-eac_generic_base0 (~> 0.5)
+      eac_ruby_utils (~> 0.98)
 
 PATH
   remote: sub/avm-eac_webapp_base0
@@ -106,33 +106,33 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.132.0)
-      aranha-parsers (~> 0.4)
-      avm (~> 0.34)
-      avm-eac_ruby_base1 (~> 0.8)
+    avm-tools (0.132.1)
+      aranha-parsers (~> 0.14, >= 0.14.1)
+      avm (~> 0.35, >= 0.35.1)
+      avm-eac_ruby_base1 (~> 0.19)
       avm-eac_ubuntu_base0 (~> 0.3)
-      avm-files (~> 0.1)
-      avm-git (~> 0.3, >= 0.3.1)
-      clipboard (~> 1.3, >= 1.3.3)
-      curb (~> 0.9.10)
+      avm-files (~> 0.3, >= 0.3.2)
+      avm-git (~> 0.4)
+      clipboard (~> 1.3, >= 1.3.6)
+      curb (~> 0.9, >= 0.9.11)
       eac_git (~> 0.12, >= 0.12.1)
-      eac_ruby_base0 (~> 0.16, >= 0.16.4)
+      eac_ruby_base0 (~> 0.16, >= 0.16.6)
       eac_templates (~> 0.3, >= 0.3.1)
-      git (~> 1.7)
-      ruby-progressbar (~> 1.10, >= 1.10.1)
+      git (~> 1.11)
+      ruby-progressbar (~> 1.11)
 
 PATH
   remote: sub/avm
   specs:
-    avm (0.35.0)
-      eac_cli (~> 0.27, >= 0.27.6)
+    avm (0.35.1)
+      eac_cli (~> 0.27, >= 0.27.8)
       eac_config (~> 0.10)
-      eac_docker (~> 0.3)
-      eac_git (~> 0.6)
-      eac_ruby_utils (~> 0.97)
-      eac_templates (~> 0.1, >= 0.1.1)
+      eac_docker (~> 0.4, >= 0.4.2)
+      eac_git (~> 0.12, >= 0.12.1)
+      eac_ruby_utils (~> 0.98)
+      eac_templates (~> 0.3, >= 0.3.1)
       filesize (~> 0.2)
-      htmlbeautifier (~> 1.3, >= 1.3.1)
+      htmlbeautifier (~> 1.4, >= 1.4.2)
       minitar (~> 0.9)
 
 PATH

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.21.0'
+  VERSION = '0.22.0'
 end

data/sub/avm/avm.gemspec

@@ -12,14 +12,14 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'eac_cli', '~> 0.27', '>= 0.27.6'
+  s.add_dependency 'eac_cli', '~> 0.27', '>= 0.27.8'
   s.add_dependency 'eac_config', '~> 0.10'
-  s.add_dependency 'eac_docker', '~> 0.3'
-  s.add_dependency 'eac_git', '~> 0.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.97'
-  s.add_dependency 'eac_templates', '~> 0.1', '>= 0.1.1'
+  s.add_dependency 'eac_docker', '~> 0.4', '>= 0.4.2'
+  s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.98'
+  s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.1'
   s.add_dependency 'filesize', '~> 0.2'
-  s.add_dependency 'htmlbeautifier', '~> 1.3', '>= 1.3.1'
+  s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'
   s.add_dependency 'minitar', '~> 0.9'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '~> 0.14.1'

data/sub/avm/lib/avm/instances/runner.rb

@@ -7,10 +7,12 @@ module Avm
   module Instances
     class Runner < ::Avm::Runners::Base
       class << self
-        def instance_class
-          ::Avm.const_get(stereotype_name).const_get('Instance')
+        def application_stereotype
+          ::Avm::Registry.application_stereotypes.detect(stereotype_name)
         end
 
+        delegate :instance_class, to: :application_stereotype
+
         def stereotype_module
           ::Avm.const_get(stereotype_name)
         end

data/sub/avm/lib/avm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.35.0'
+  VERSION = '0.35.1'
 end

data/sub/avm/lib/avm/with/application_stereotype.rb

@@ -5,9 +5,7 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module With
     module ApplicationStereotype
-      common_concern do
-        include ClassMethods
-      end
+      common_concern
 
       module ClassMethods
         # @return [Avm::ApplicationStereotype::Base]

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.34'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.2'
-  s.add_dependency 'eac_ruby_utils', '~> 0.95', '>= 0.95.1'
+  s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
+  s.add_dependency 'eac_ruby_utils', '~> 0.98'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/bundler.rb

@@ -2,6 +2,7 @@
 
 require 'avm/eac_generic_base0/sources/base'
 require 'avm/eac_ruby_base1/sources/base/bundle_command'
+require 'avm/eac_ruby_base1/sources/bundle_update'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -18,6 +19,11 @@ module Avm
               .envvar_gemfile
           end
 
+          # @return [Avm::EacRubyBase1::Sources::BundleUpdate]
+          def bundle_update
+            ::Avm::EacRubyBase1::Sources::BundleUpdate.new(self)
+          end
+
           # @return [String]
           def configured_gemfile_path
             configuration_entry(CONFIGURED_GEMFILE_PATH_ENTRY_KEY).value

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/bundle_update.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      class BundleUpdate
+        common_constructor :source
+        delegate :bundle, to: :source
+
+        def execute!
+          bundle('update').execute! + bundle('install').execute!
+        end
+
+        def system!
+          bundle('update').system!
+          bundle('install').system!
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/update_dependencies_requirements.rb

@@ -9,7 +9,7 @@ module Avm
     module Sources
       module Runners
         class UpdateDependenciesRequirements
-          runner_with :help, :subcommands do
+          runner_with :help do
             bool_opt '-a', '--all'
             pos_arg :gem_name, repeat: true, optional: true
           end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/update.rb

@@ -14,10 +14,8 @@ module Avm
         end
 
         def bundle_update
-          infom 'Running "bundle update"...'
-          source.bundle('update').execute!
-          infom 'Running "bundle install"...'
-          source.bundle('install').execute!
+          infom 'Running "bundle update && bundle install"...'
+          source.bundle_update.execute!
         end
 
         protected

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/update_dependency_requirements.rb

@@ -35,9 +35,16 @@ module Avm
           ::Avm::EacRubyBase1::Rubygems::Gemspec.from_file(source.gemspec_path)
         end
 
+        def parent_bundle
+          return unless source.parent.if_present { |v| v.is_a?(::Avm::EacRubyBase1::Sources::Base) }
+
+          source.parent.bundle_update.execute!
+        end
+
         def update_code
           update_gemspec
           source.bundle.system!
+          parent_bundle
         end
 
         def update_gemspec

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.18.0'
+    VERSION = '0.19.0'
   end
 end

data/sub/avm-tools/avm-tools.gemspec

@@ -14,19 +14,19 @@ Gem::Specification.new do |s|
   s.bindir = 'exe'
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
-  s.add_dependency 'aranha-parsers', '~> 0.4'
-  s.add_dependency 'avm', '~> 0.34'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.8'
+  s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
+  s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.19'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
-  s.add_dependency 'avm-files', '~> 0.1'
-  s.add_dependency 'avm-git', '~> 0.3', '>= 0.3.1'
-  s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.3'
-  s.add_dependency 'curb', '~> 0.9.10'
+  s.add_dependency 'avm-files', '~> 0.3', '>= 0.3.2'
+  s.add_dependency 'avm-git', '~> 0.4'
+  s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'
+  s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
   s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.1'
-  s.add_dependency 'eac_ruby_base0', '~> 0.16', '>= 0.16.4'
+  s.add_dependency 'eac_ruby_base0', '~> 0.16', '>= 0.16.6'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.1'
-  s.add_dependency 'git', '~> 1.7'
-  s.add_dependency 'ruby-progressbar', '~> 1.10', '>= 1.10.1'
+  s.add_dependency 'git', '~> 1.11'
+  s.add_dependency 'ruby-progressbar', '~> 1.11'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-tools/lib/avm/tools/runner/instance.rb

@@ -22,7 +22,9 @@ module Avm
         private
 
         def instance_uncached
-          ::Avm::Registry.instances.detect(parsed.instance_id)
+          parsed.instance_id.if_present do |v|
+            ::Avm::Registry.instances.detect(v)
+          end
         end
       end
     end

data/sub/avm-tools/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.132.0'
+    VERSION = '0.132.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2022-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.35'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.35.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.35'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.35.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -146,14 +152,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +207,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.132'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.132.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -208,6 +217,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.132'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.132.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -465,6 +477,7 @@ files:
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/rake.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/rubygems.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/version_bump.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/bundle_update.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/bundler.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_local.rb