eac_tools 0.91.0 → 0.92.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc14ff03ab2ecbfab4ead24c9c5b2416687036476ef605551f247bdd5887d5b4
-  data.tar.gz: 4869c99525745694048006def029c93bc31caba4c6025b1567e97f20e11492ae
+  metadata.gz: 70c9ddd945d2a7f477ed9f2c4afbb75b7f9a4e0dc9662231c346343d42c38a43
+  data.tar.gz: 17a6a935aa8fabf2cfcfa40d9654ca58bb4b994bf393b433c414874e6b66de53
 SHA512:
-  metadata.gz: aee6a697defa7069768e3fb6ca5d1922474bcbe39804456d4d1844fb705714e25d45a5e5c5a03cde481379e1c481798adbca18c3223fda8d0404189bd6affa55
-  data.tar.gz: 7c021c5d28157c2dd352ae6d7ea11603778c99f780dbf65c0e125e042b054738ab2f7f2b13254dbedca57d146b3a45e4bd71079a75b2c3b0816d135d3be0c217
+  metadata.gz: 2fe6d762d07cfe594f0547b6f517ea3230929fad6cf40b225fd1232c96aa499c69befa8039776e7fbaf0add18ffbacca607d0586ba9e76c21ead8f771148e1b3
+  data.tar.gz: 7258008fe1d0a328c10e124aaddb8e82f9110a561723a3d77f3025a0ab68f98f3e67a8a70f4e2c7690ec0195b40550e0b7a181468d4a084ecef36066a93bebe4

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.91.0)
-      avm (~> 0.92)
+    eac_tools (0.92.0)
+      avm (~> 0.93)
       avm-eac_asciidoctor_base0 (~> 0.23)
       avm-eac_generic_base0 (~> 0.13)
       avm-eac_github_base0 (~> 0.3)
@@ -16,47 +16,18 @@ PATH
       avm-eac_redmine_base0 (~> 0.22, >= 0.22.3)
       avm-eac_redmine_plugin_base0 (~> 0.4, >= 0.4.1)
       avm-eac_ruby_base0 (~> 0.1)
-      avm-eac_ruby_base1 (~> 0.34)
+      avm-eac_ruby_base1 (~> 0.34, >= 0.34.1)
       avm-eac_webapp_base0 (~> 0.19)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.2)
       avm-git (~> 0.17)
       avm-tools (~> 0.161)
       eac_ruby_utils (~> 0.122)
 
-PATH
-  remote: sub/avm-eac_redmine_base0
-  specs:
-    avm-eac_redmine_base0 (0.22.3)
-      avm (~> 0.92)
-      avm-eac_generic_base0 (~> 0.13)
-      avm-eac_rails_base1 (~> 0.10)
-      avm-eac_ubuntu_base0 (~> 0.5, >= 0.5.1)
-      curb (~> 0.9, >= 0.9.11)
-      eac_fs (~> 0.17)
-      eac_rest (~> 0.12)
-      eac_ruby_utils (~> 0.122)
-
-PATH
-  remote: sub/avm-eac_ruby_base0
-  specs:
-    avm-eac_ruby_base0 (0.1.0)
-      avm-eac_ruby_base1 (~> 0.34)
-      eac_ruby_utils (~> 0.122)
-
-PATH
-  remote: sub/avm-eac_ruby_base1
-  specs:
-    avm-eac_ruby_base1 (0.34.0)
-      avm (~> 0.92)
-      avm-eac_generic_base0 (~> 0.13)
-      eac_envs-http (~> 0.5, >= 0.5.1)
-      eac_ruby_utils (~> 0.122)
-
 PATH
   remote: sub/avm
   specs:
-    avm (0.92.0)
-      eac_cli (~> 0.41)
+    avm (0.93.0)
+      eac_cli (~> 0.42)
       eac_config (~> 0.14, >= 0.14.2)
       eac_docker (~> 0.7)
       eac_fs (~> 0.17)
@@ -65,24 +36,17 @@ PATH
       minitar (~> 0.9)
       ruby-progressbar (~> 1.13)
 
-PATH
-  remote: sub/eac_templates
-  specs:
-    eac_templates (0.7.0)
-      eac_config (~> 0.14, >= 0.14.2)
-      eac_ruby_utils (~> 0.122)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.7)
+    activesupport (6.1.7.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     asciidoctor (2.0.23)
     ast (2.4.2)
     avm-eac_asciidoctor_base0 (0.23.0)
@@ -124,9 +88,26 @@ GEM
       avm-eac_ruby_base1 (~> 0.33)
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.2)
       eac_ruby_utils (~> 0.119, >= 0.119.2)
+    avm-eac_redmine_base0 (0.22.3)
+      avm (~> 0.92)
+      avm-eac_generic_base0 (~> 0.13)
+      avm-eac_rails_base1 (~> 0.10)
+      avm-eac_ubuntu_base0 (~> 0.5, >= 0.5.1)
+      curb (~> 0.9, >= 0.9.11)
+      eac_fs (~> 0.17)
+      eac_rest (~> 0.12)
+      eac_ruby_utils (~> 0.122)
     avm-eac_redmine_plugin_base0 (0.4.1)
       avm-eac_ruby_base1 (~> 0.33, >= 0.33.1)
       eac_ruby_utils (~> 0.121)
+    avm-eac_ruby_base0 (0.1.0)
+      avm-eac_ruby_base1 (~> 0.34)
+      eac_ruby_utils (~> 0.122)
+    avm-eac_ruby_base1 (0.34.1)
+      avm (~> 0.92)
+      avm-eac_generic_base0 (~> 0.13)
+      eac_envs-http (~> 0.5, >= 0.5.1)
+      eac_ruby_utils (~> 0.122)
     avm-eac_ubuntu_base0 (0.5.1)
       avm (~> 0.86, >= 0.86.2)
       eac_ruby_utils (~> 0.121)
@@ -162,15 +143,15 @@ GEM
     base64 (0.2.0)
     clipboard (1.4.1)
     colorize (0.8.1)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.3)
     content-type (0.0.2)
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.1)
-    eac_cli (0.41.0)
+    eac_cli (0.42.0)
       colorize (~> 0.8, >= 0.8.1)
       eac_config (~> 0.14, >= 0.14.2)
-      eac_ruby_utils (~> 0.121)
+      eac_ruby_utils (~> 0.122)
       tty-table (~> 0.12)
     eac_config (0.14.2)
       addressable (~> 2.8, >= 2.8.6)
@@ -214,6 +195,9 @@ GEM
       bundler
       filesize (~> 0.2)
       net-ssh (~> 4.2)
+    eac_templates (0.7.0)
+      eac_config (~> 0.14, >= 0.14.2)
+      eac_ruby_utils (~> 0.122)
     faraday (2.8.1)
       base64
       faraday-net_http (>= 2.0, < 3.1)
@@ -238,26 +222,26 @@ GEM
     json (2.7.2)
     language_server-protocol (3.17.0.3)
     minitar (0.9)
-    minitest (5.23.1)
+    minitest (5.24.1)
     multipart-post (2.4.1)
     net-ssh (4.2.0)
     os (1.1.4)
-    parallel (1.24.0)
+    parallel (1.25.1)
     parseconfig (1.1.2)
-    parser (3.3.1.0)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    public_suffix (5.0.5)
+    public_suffix (5.1.1)
     racc (1.8.0)
-    rack (3.0.11)
+    rack (3.1.6)
     rainbow (3.1.1)
     rchardet (1.8.0)
     regexp_parser (2.9.2)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.1)
+      strscan
     rouge (3.30.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -265,14 +249,14 @@ GEM
       rspec-mocks (~> 3.13.0)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.64.0)
+    rubocop (1.64.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -285,22 +269,22 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
+    rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
-    rubocop-rails (2.25.0)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
+    rubocop-rails (2.25.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.29.2)
+    rubocop-rspec (2.31.0)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
       rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.3)
-      rubocop (~> 1.40)
+    rubocop-rspec_rails (2.29.1)
+      rubocop (~> 1.61)
     ruby-filemagic (0.7.3)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
@@ -320,7 +304,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     unicode_utils (1.4.0)
-    zeitwerk (2.6.15)
+    zeitwerk (2.6.16)
     zlib (2.1.1)
 
 PLATFORMS
@@ -328,11 +312,7 @@ PLATFORMS
 
 DEPENDENCIES
   avm!
-  avm-eac_redmine_base0!
-  avm-eac_ruby_base0!
-  avm-eac_ruby_base1!
   eac_ruby_gem_support (~> 0.10)
-  eac_templates!
   eac_tools!
 
 BUNDLED WITH

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib,locale,template}/**/*']
   s.required_ruby_version = '>= 2.7'
 
-  s.add_dependency 'eac_cli', '~> 0.41'
+  s.add_dependency 'eac_cli', '~> 0.42'
   s.add_dependency 'eac_config', '~> 0.14', '>= 0.14.2'
   s.add_dependency 'eac_docker', '~> 0.7'
   s.add_dependency 'eac_fs', '~> 0.17'

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

@@ -22,6 +22,11 @@ module Avm
         context_entry.found?
       end
 
+      # @return [Boolean]
+      def found?
+        context_found?
+      end
+
       def full_path
         (parent.path_prefix + suffix_as_array).join('.')
       end

data/sub/avm/lib/avm/instances/base/auto_values/data.rb

@@ -18,6 +18,11 @@ module Avm
               )
             end
           end
+
+          # @return [Boolean]
+          def auto_data_allow_loading
+            local? || !production?
+          end
         end
       end
     end

data/sub/avm/lib/avm/instances/base/auto_values/source.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
+require 'avm/applications/base/local_instance'
+
 module Avm
   module Instances
     class Base
       module AutoValues
         module Source
           def auto_source_instance_id
-            "#{application.id}_dev"
+            [application.id, ::Avm::Applications::Base::LocalInstance::LOCAL_INSTANCE_SUFFIX]
+              .join('_')
           end
         end
       end

data/sub/avm/lib/avm/instances/base/production.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'addressable'
+require 'avm/instances/entry_keys'
+
+module Avm
+  module Instances
+    class Base
+      module Production
+        DEFAULT_PRODUCTION = true
+        PRODUCTION_KEY = 'production'
+
+        # @return [Boolean]
+        def default_production?
+          DEFAULT_PRODUCTION
+        end
+
+        # @return [Boolean]
+        def production?
+          if production_entry.found?
+            production_entry.value.to_bool
+          else
+            default_production?
+          end
+        end
+
+        # @return [Avm::Entries::Entry]
+        def production_entry
+          entry(PRODUCTION_KEY)
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/instances/ids'
+require 'avm/applications/base/local_instance'
 require 'avm/with/application_stereotype'
 require 'avm/with/extra_subcommands'
 require 'eac_ruby_utils/require_sub'
@@ -61,6 +62,11 @@ module Avm
         end
       end
 
+      # @return [Boolean]
+      def local?
+        suffix == ::Avm::Applications::Base::LocalInstance::LOCAL_INSTANCE_SUFFIX
+      end
+
       private
 
       def source_instance_uncached

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Avm
+  module Instances
+    module Data
+      class LoadingDeniedError < ::RuntimeError
+      end
+    end
+  end
+end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/data/unit_with_commands'
+require 'avm/instances/data/loading_denied_error'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -9,6 +10,14 @@ module Avm
       class Unit < ::Avm::Data::UnitWithCommands
         common_constructor :instance
 
+        # @return [void]
+        # @raise Avm::Instances::Data::Unit
+        def check_load_permission!
+          return if instance.data_allow_loading
+
+          raise ::Avm::Instances::Data::LoadingDeniedError, "Instance: #{instance}"
+        end
+
         # @return [Pathname]
         def data_default_dump_path
           instance.data_default_dump_path.to_pathname.basename_sub('.*') do |b|
@@ -22,6 +31,7 @@ module Avm
         end
 
         def load(...)
+          check_load_permission!
           instance.on_disabled_processes { super }
         end
       end

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

@@ -28,7 +28,7 @@ module Avm
       {
         '' => %w[name source_instance_id],
         admin: URI_FIELDS + %w[api_key],
-        data: %w[default_dump_path],
+        data: %w[allow_loading default_dump_path],
         database: URI_FIELDS + %w[id limit name system timeout extra],
         docker: %w[registry],
         install: URI_FIELDS + %w[id data_path email groupname],

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

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