eac_tools 0.45.0 → 0.45.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 964b726ccd6fbbfe8a4ef55261f839acde321207e1234066f18d889a90faa7e9
-  data.tar.gz: aa665607427b10b5ce0f87b8c1880259ebc45744b752f440abd7e5c8f2d61da8
+  metadata.gz: d5895138920c46d129b675b1e7f264baae15f265aaceac01b77ec06c519b0b92
+  data.tar.gz: 4c1abea1083c04b96cacac8e9cf12b5bb3a688ac22bccdcf400c23b50eed7dc0
 SHA512:
-  metadata.gz: 729da0dbe20389bf2503beab62c9d72ac4dfbd3c8adfd6eebfc92cff9cc9e4d33d15079b23cf71a37c34e6e9f027d7a9b385653ff5cdbb8d1d1be5defcfe6d23
-  data.tar.gz: da1901c9536653a7c30bfe8e110a485fc19fc68046455d09f1bdb7c3ce367faa085901a81ede3a85dd319b9416d426f8362da0dc956980d33658032003935d19
+  metadata.gz: be4d60eb73a687e391c59ef23d7c0ff8845c49a6c6f5cd80f70019339f07673a8ce9597a7c8b4c79ff4e8dbb978702229eee24a13bc077268f1cf6bcb91eb316
+  data.tar.gz: 8728eae853dc90dace706b001f144caf36885871c208f8a4f9786bc730939aff3cbf2d9838ac2fe0b4738827489a9d463c1c23c9d2b1c212e11ccaf504fcc93c

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.45.0)
-      avm (~> 0.56)
+    eac_tools (0.45.2)
+      avm (~> 0.56, >= 0.56.1)
       avm-eac_asciidoctor_base0 (~> 0.12)
       avm-eac_generic_base0 (~> 0.8)
       avm-eac_latex_base0 (~> 0.3)
       avm-eac_php_base0 (~> 0.3)
       avm-eac_rails_base0 (~> 0.8, >= 0.8.1)
       avm-eac_rails_base1 (~> 0.7)
-      avm-eac_redmine_base0 (~> 0.16)
+      avm-eac_redmine_base0 (~> 0.16, >= 0.16.1)
       avm-eac_redmine_plugin_base0 (~> 0.3)
       avm-eac_ruby_base1 (~> 0.27, >= 0.27.1)
       avm-eac_webapp_base0 (~> 0.12, >= 0.12.2)
       avm-eac_wordpress_base0 (~> 0.2, >= 0.2.1)
-      avm-tools (~> 0.142, >= 0.142.5)
+      avm-tools (~> 0.142, >= 0.142.6)
       eac_ruby_utils (~> 0.107, >= 0.107.1)
 
 PATH
@@ -88,15 +88,15 @@ PATH
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.16.0)
-      avm (~> 0.44)
-      avm-eac_generic_base0 (~> 0.5)
-      avm-eac_rails_base1 (~> 0.6)
+    avm-eac_redmine_base0 (0.16.1)
+      avm (~> 0.56, >= 0.56.1)
+      avm-eac_generic_base0 (~> 0.8)
+      avm-eac_rails_base1 (~> 0.7)
       avm-eac_ubuntu_base0 (~> 0.3)
       curb (~> 0.9, >= 0.9.11)
-      eac_fs (~> 0.12, >= 0.12.3)
+      eac_fs (~> 0.15)
       eac_rest (~> 0.6, >= 0.6.1)
-      eac_ruby_utils (~> 0.104)
+      eac_ruby_utils (~> 0.107, >= 0.107.1)
 
 PATH
   remote: sub/avm-eac_redmine_plugin_base0
@@ -155,7 +155,7 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.142.5)
+    avm-tools (0.142.6)
       aranha-parsers (~> 0.14, >= 0.14.4)
       avm (~> 0.56)
       avm-eac_ruby_base1 (~> 0.27, >= 0.27.1)
@@ -164,8 +164,8 @@ PATH
       avm-git (~> 0.10)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
-      eac_git (~> 0.13)
-      eac_ruby_base0 (~> 0.17)
+      eac_git (~> 0.14)
+      eac_ruby_base0 (~> 0.17, >= 0.17.1)
       eac_templates (~> 0.3, >= 0.3.2)
       git (~> 1.12)
       ruby-progressbar (~> 1.11)
@@ -173,13 +173,13 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.56.0)
+    avm (0.56.1)
       aranha-parsers (~> 0.14, >= 0.14.4)
-      eac_cli (~> 0.29)
+      eac_cli (~> 0.30)
       eac_config (~> 0.12)
       eac_docker (~> 0.5)
       eac_fs (~> 0.15)
-      eac_git (~> 0.13)
+      eac_git (~> 0.14)
       eac_ruby_utils (~> 0.107, >= 0.107.1)
       eac_templates (~> 0.3, >= 0.3.2)
       filesize (~> 0.2)
@@ -189,10 +189,10 @@ PATH
 PATH
   remote: sub/eac_cli
   specs:
-    eac_cli (0.29.0)
+    eac_cli (0.30.0)
       colorize (~> 0.8, >= 0.8.1)
       eac_config (~> 0.12)
-      eac_ruby_utils (~> 0.107)
+      eac_ruby_utils (~> 0.107, >= 0.107.1)
 
 PATH
   remote: sub/eac_config
@@ -219,18 +219,18 @@ PATH
 PATH
   remote: sub/eac_git
   specs:
-    eac_git (0.13.0)
-      eac_ruby_utils (~> 0.105)
+    eac_git (0.14.0)
+      eac_ruby_utils (~> 0.107)
       parseconfig (~> 1.1, >= 1.1.2)
 
 PATH
   remote: sub/eac_ruby_base0
   specs:
-    eac_ruby_base0 (0.17.0)
-      avm-eac_ruby_base1 (~> 0.21)
-      eac_cli (~> 0.28)
-      eac_fs (~> 0.12, >= 0.12.3)
-      eac_ruby_utils (~> 0.103)
+    eac_ruby_base0 (0.17.1)
+      avm-eac_ruby_base1 (~> 0.27, >= 0.27.1)
+      eac_cli (~> 0.30)
+      eac_fs (~> 0.15)
+      eac_ruby_utils (~> 0.107, >= 0.107.1)
 
 PATH
   remote: sub/eac_ruby_utils

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -13,11 +13,11 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.4'
-  s.add_dependency 'eac_cli', '~> 0.29'
+  s.add_dependency 'eac_cli', '~> 0.30'
   s.add_dependency 'eac_config', '~> 0.12'
   s.add_dependency 'eac_docker', '~> 0.5'
   s.add_dependency 'eac_fs', '~> 0.15'
-  s.add_dependency 'eac_git', '~> 0.13'
+  s.add_dependency 'eac_git', '~> 0.14'
   s.add_dependency 'eac_ruby_utils', '~> 0.107', '>= 0.107.1'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
   s.add_dependency 'filesize', '~> 0.2'

data/sub/avm/lib/avm/entries/uri_builder.rb

@@ -46,8 +46,10 @@ module Avm
         field_get(translate_field(avm_field))
       end
 
+      # @return [String, nil]
       def field_get(name)
-        data[name.to_sym].if_present(&:to_s)
+        v = data[name.to_sym]
+        v.nil? ? nil : v.to_s
       end
 
       def field_set(field, value)

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

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

data/sub/avm/spec/lib/avm/instances/base_spec.rb

@@ -22,7 +22,9 @@ RSpec.describe ::Avm::Instances::Base do
       ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME => 'myhost.com',
       ::Avm::Instances::EntryKeys::INSTALL_USERNAME => 'myuser',
       ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME => 'myuser',
-      ::Avm::Instances::EntryKeys::INSTALL_URL => 'ssh://otheruser@otherhost.com'
+      ::Avm::Instances::EntryKeys::INSTALL_URL => 'ssh://otheruser@otherhost.com',
+      ::Avm::Instances::EntryKeys::WEB_URL => 'https://app0.net',
+      ::Avm::Instances::EntryKeys::WEB_PATH => ''
     },
     'app_2' => {
       ::Avm::Instances::EntryKeys::DATABASE_HOSTNAME => '127.0.0.1',

data/sub/avm/spec/lib/avm/instances/base_spec_files/config.yml

@@ -2,6 +2,8 @@
 app_0:
   install:
     id: app_1
+  web:
+    url: https://app0.net
 app_1:
   install:
     id: app_2

data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -12,14 +12,14 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.44'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.6'
+  s.add_dependency 'avm', '~> 0.56', '>= 0.56.1'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.8'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.7'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
-  s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.3'
+  s.add_dependency 'eac_fs', '~> 0.15'
   s.add_dependency 'eac_rest', '~> 0.6', '>= 0.6.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.104'
+  s.add_dependency 'eac_ruby_utils', '~> 0.107', '>= 0.107.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.16.0'
+    VERSION = '0.16.1'
   end
 end

data/sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/deploy/config/install.sh.template

@@ -22,8 +22,8 @@ export address_path='%%WEB.PATH%%'
 
 # Git
 export git_repositories_hierarchical_organisation=false
-export gitolite_user='%%GIT.USERNAME%%'
-export gitolite_user_home="/var/lib/${gitolite_user}"
+export gitolite_user='%%GITOLITE.USERNAME%%'
+export gitolite_user_home='%%GITOLITE.PATH%%'
 export redmine_git_hosting_ssh_key_name=redmine_git_hosting_id
 
 # Mail settings

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

@@ -22,8 +22,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'avm-git', '~> 0.10'
   s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
-  s.add_dependency 'eac_git', '~> 0.13'
-  s.add_dependency 'eac_ruby_base0', '~> 0.17'
+  s.add_dependency 'eac_git', '~> 0.14'
+  s.add_dependency 'eac_ruby_base0', '~> 0.17', '>= 0.17.1'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
   s.add_dependency 'git', '~> 1.12'
   s.add_dependency 'ruby-progressbar', '~> 1.11'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.142.5'
+    VERSION = '0.142.6'
   end
 end

data/sub/eac_cli/eac_cli.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'colorize', '~> 0.8', '>= 0.8.1'
   s.add_dependency 'eac_config', '~> 0.12'
-  s.add_dependency 'eac_ruby_utils', '~> 0.107'
+  s.add_dependency 'eac_ruby_utils', '~> 0.107', '>= 0.107.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_cli/lib/eac_cli/config/entry/options.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
+require 'eac_config/node_entry'
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
   class Config < ::SimpleDelegator
-    class Entry
+    class Entry < ::EacConfig::NodeEntry
       class Options
         enable_simple_cache
         enable_listable

data/sub/eac_cli/lib/eac_cli/config/entry/undefined.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
+require 'eac_cli/speaker/input_requested'
+require 'eac_config/entry/not_found_error'
+require 'eac_config/node_entry'
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
   class Config < ::SimpleDelegator
-    class Entry
+    class Entry < ::EacConfig::NodeEntry
       module Undefined
         private
 
@@ -19,6 +22,8 @@ module EacCli
 
         def undefined_value_no_loop
           input("Value for entry \"#{path}\"", options.request_input_options)
+        rescue ::EacCli::Speaker::InputRequested
+          raise ::EacConfig::Entry::NotFoundError, self
         end
       end
     end

data/sub/eac_cli/lib/eac_cli/config/entry.rb

@@ -2,21 +2,26 @@
 
 require 'eac_cli/speaker'
 require 'eac_config/entry_path'
+require 'eac_config/node_entry'
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
   class Config < ::SimpleDelegator
-    class Entry
+    class Entry < ::EacConfig::NodeEntry
       require_sub __FILE__, include_modules: true
       enable_listable
       enable_simple_cache
       enable_speaker
 
-      common_constructor :config, :path, :options do
-        self.path = ::EacConfig::EntryPath.assert(path)
+      common_constructor :root_node, :path, :options, super_args: -> { [root_node, path] } do
         self.options = ::EacCli::Config::Entry::Options.new(options)
       end
 
+      # @return [EacCli::Config]
+      def config
+        root_node
+      end
+
       def value
         value!
       end

data/sub/eac_cli/lib/eac_cli/runner/class_runner.rb

@@ -18,33 +18,19 @@ module EacCli
       end
 
       def run
-        on_asserted_speaker do
-          r = create
-          begin
-            r.run_run
-          rescue ::EacCli::Parser::Error => e
-            run_parser_error(r, e)
-          end
-          r
+        r = create
+        begin
+          r.run_run
+        rescue ::EacCli::Parser::Error => e
+          run_parser_error(r, e)
         end
+        r
       end
 
       def run_parser_error(runner_instance, error)
         $stderr.write("#{runner_instance.program_name}: #{error}\n")
         ::Kernel.exit(PARSER_ERROR_EXIT_CODE)
       end
-
-      private
-
-      def on_asserted_speaker
-        if ::EacRubyUtils::Speaker.context.optional_current
-          yield
-        else
-          ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new) do
-            yield
-          end
-        end
-      end
     end
   end
 end

data/sub/eac_cli/lib/eac_cli/speaker/input_blocked.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'eac_cli/speaker/input_requested'
+
+module EacCli
+  class Speaker
+    class InputBlocked
+      %w[gets noecho].each do |method|
+        define_method(method) do
+          raise ::EacCli::Speaker::InputRequested,
+                "Method (\"#{method}\") was requested, but input is blocked"
+        end
+      end
+    end
+  end
+end

data/sub/eac_cli/lib/eac_cli/speaker/input_requested.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module EacCli
+  class Speaker
+    class InputRequested < ::RuntimeError
+    end
+  end
+end

data/sub/eac_cli/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.29.0'
+  VERSION = '0.30.0'
 end

data/sub/eac_git/eac_git.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,vendor}/**/*']
 
-  s.add_dependency 'eac_ruby_utils', '~> 0.105'
+  s.add_dependency 'eac_ruby_utils', '~> 0.107'
   s.add_dependency 'parseconfig', '~> 1.1', '>= 1.1.2'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.2'

data/sub/eac_git/lib/eac_git/local/remote.rb

@@ -33,6 +33,11 @@ module EacGit
           .execute!(exit_outputs: { NO_SUCH_REMOTE_CODE => nil })
           .if_present(nil, &:strip)
       end
+
+      # @return [String]
+      def url=(new_url)
+        local.command('remote', 'set-url', name, new_url).execute!
+      end
     end
   end
 end

data/sub/eac_git/lib/eac_git/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacGit
-  VERSION = '0.13.0'
+  VERSION = '0.14.0'
 end

data/sub/eac_ruby_base0/eac_ruby_base0.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.21'
-  s.add_dependency 'eac_cli', '~> 0.28'
-  s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.3'
-  s.add_dependency 'eac_ruby_utils', '~> 0.103'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.27', '>= 0.27.1'
+  s.add_dependency 'eac_cli', '~> 0.30'
+  s.add_dependency 'eac_fs', '~> 0.15'
+  s.add_dependency 'eac_ruby_utils', '~> 0.107', '>= 0.107.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_ruby_base0/lib/eac_ruby_base0/runner.rb

@@ -2,6 +2,7 @@
 
 require 'eac_cli/core_ext'
 require 'eac_cli/speaker'
+require 'eac_cli/speaker/input_blocked'
 require 'eac_config/node'
 require 'eac_fs/contexts'
 require 'eac_ruby_utils/speaker'
@@ -51,16 +52,6 @@ module EacRubyBase0
       out("#{application_version}\n")
     end
 
-    class FailIfRequestInput
-      enable_speaker
-
-      %w[gets noecho].each do |method|
-        define_method(method) do
-          raise "Input method requested (\"#{method}\") and option --no-input is set"
-        end
-      end
-    end
-
     private
 
     # @return [Array<EacRubyUtils::Struct>]
@@ -78,7 +69,7 @@ module EacRubyBase0
     def build_speaker
       options = {}
       options[:err_out] = ::StringIO.new if parsed.quiet?
-      options[:in_in] = FailIfRequestInput.new if parsed.no_input?
+      options[:in_in] = ::EacCli::Speaker::InputBlocked.new if parsed.no_input?
       ::EacCli::Speaker.new(options)
     end
 

data/sub/eac_ruby_base0/lib/eac_ruby_base0/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyBase0
-  VERSION = '0.17.0'
+  VERSION = '0.17.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.45.0
+  version: 0.45.2
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-09 00:00:00.000000000 Z
+date: 2022-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.56'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.56.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.56'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.56.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +127,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -128,6 +137,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_plugin_base0
   requirement: !ruby/object:Gem::Requirement
@@ -211,7 +223,7 @@ dependencies:
         version: '0.142'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.142.5
+        version: 0.142.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -221,7 +233,7 @@ dependencies:
         version: '0.142'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.142.5
+        version: 0.142.6
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -1186,6 +1198,8 @@ files:
 - sub/eac_cli/lib/eac_cli/runner_with_set.rb
 - sub/eac_cli/lib/eac_cli/speaker.rb
 - sub/eac_cli/lib/eac_cli/speaker/constants.rb
+- sub/eac_cli/lib/eac_cli/speaker/input_blocked.rb
+- sub/eac_cli/lib/eac_cli/speaker/input_requested.rb
 - sub/eac_cli/lib/eac_cli/speaker/list.rb
 - sub/eac_cli/lib/eac_cli/speaker/options.rb
 - sub/eac_cli/lib/eac_cli/version.rb