avm-tools 0.30.0 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cfe97a7d0fe91a8c981753c6a1f54613eca1224a291b21f79fc40d599706dcb
-  data.tar.gz: 24af1b76d95b1f49502a676c2530cae9796848b601e97c66f2c2c2ad799ca30f
+  metadata.gz: b16ebdd42a72fca522a1d9ee15607fd367205816b0120fae9335a4161c648d78
+  data.tar.gz: 97fa9f4fc23ca7a8f8f948e5bbbce607236995ffffc7c8c18e2c929371d24cef
 SHA512:
-  metadata.gz: c703058938922ecb22415179574396eff2d2ab775d7a9b9d46293e27f9510ee7701eb2c72184d777e5e5b8b2a4620b3622bf86c0af6c7ea09158762458f1b660
-  data.tar.gz: a42d70070a33d8452e02aac392864a62aae5d30c159ba93eb10bf0c24d5691ba9607a4994ea3b00ce45c8734ac257fe7d48605cf178e40e2f3c8619f8b9b04ce
+  metadata.gz: c2de01964e826aa3abd422adb772360d526b0b547ffa68c5bc16ce56e901d6272be6b4ed6c7a10f3a1dbe0af93c2f0b7dbb6379c66501aa144a11634f3dbccd9
+  data.tar.gz: 62ae835eb68eb1b780c8c801393fa1345cfd8c053ad79f2c8fe401fc8817226b08d330f1f1b7a66675560736781f19403ad79ebcd2dfcd811f6cbc9c10b52874

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'avm/instances/entry_keys'
+
 module Avm
   module Instances
     class Base
@@ -15,7 +17,8 @@ module Avm
           DEFAULT_SYSTEM = 'postgresql'
 
           def auto_database_name
-            inherited_entry_value(:'database.id', 'database.name') || id
+            inherited_entry_value(::Avm::Instances::EntryKeys::DATABASE_ID,
+                                  ::Avm::Instances::EntryKeys::DATABASE_NAME) || id
           end
 
           def auto_database_hostname
@@ -41,12 +44,13 @@ module Avm
           private
 
           def database_auto_common(suffix)
-            inherited_entry_value('database.id', "database.#{suffix}") ||
-              inherited_entry_value(:host_id, "database.#{suffix}")
+            database_key = ::Avm::Instances::EntryKeys.const_get("database_#{suffix}".upcase)
+            inherited_entry_value(::Avm::Instances::EntryKeys::DATABASE_ID, database_key) ||
+              inherited_entry_value(:host_id, database_key)
           end
 
           def database_port_by_system
-            read_entry_optional('database.system').if_present do |v|
+            read_entry_optional(::Avm::Instances::EntryKeys::DATABASE_SYSTEM).if_present do |v|
               DEFAULT_PORTS.fetch(v)
             end
           end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'addressable'
+require 'avm/instances/entry_keys'
 
 module Avm
   module Instances
@@ -34,7 +35,7 @@ module Avm
           private
 
           def web_url_as_uri
-            read_entry_optional('web.url').if_present do |v|
+            read_entry_optional(::Avm::Instances::EntryKeys::WEB_URL).if_present do |v|
               yield(::Addressable::URI.parse(v))
             end
           end

data/lib/avm/instances/entry_keys.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Avm
+  module Instances
+    module EntryKeys
+      {
+        database: %w[id hostname name password port system username],
+        web: %w[authority hostname path port scheme url userinfo]
+      }.each do |prefix, suffixes|
+        suffixes.each do |suffix|
+          key = "#{prefix}.#{suffix}"
+          const_set(key.gsub('.', '_').upcase, key)
+        end
+      end
+    end
+  end
+end

data/lib/avm/stereotypes/eac_webapp_base0/runner/data.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/require_sub'
+
+module Avm
+  module Stereotypes
+    module EacWebappBase0
+      module Runner
+        class Data < ::EacRubyUtils::Console::DocoptRunner
+          ::EacRubyUtils.require_sub(__FILE__)
+
+          DOC = <<~DOCOPT
+            Data utilities for EacRailsBase0 instances.
+
+            Usage:
+              __PROGRAM__ __SUBCOMMANDS__
+              __PROGRAM__ -h | --help
+
+            Options:
+              -h --help             Show this screen.
+          DOCOPT
+        end
+      end
+    end
+  end
+end

data/lib/avm/stereotypes/eac_webapp_base0/runner/data/dump.rb

@@ -9,7 +9,7 @@ module Avm
   module Stereotypes
     module EacWebappBase0
       module Runner
-        module Data
+        class Data < ::EacRubyUtils::Console::DocoptRunner
           class Dump < ::EacRubyUtils::Console::DocoptRunner
             include ::EacRubyUtils::SimpleCache
             include ::EacRubyUtils::Console::Speaker

data/lib/avm/{tools/runner/eac_wordpress_base0 → stereotypes/eac_webapp_base0/runner}/data/load.rb

@@ -5,9 +5,9 @@ require 'eac_ruby_utils/console/speaker'
 require 'eac_ruby_utils/simple_cache'
 
 module Avm
-  module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class EacWordpressBase0 < ::EacRubyUtils::Console::DocoptRunner
+  module Stereotypes
+    module EacWebappBase0
+      module Runner
         class Data < ::EacRubyUtils::Console::DocoptRunner
           class Load < ::EacRubyUtils::Console::DocoptRunner
             include ::EacRubyUtils::SimpleCache
@@ -41,7 +41,7 @@ module Avm
             end
 
             def source_instance_dump_path
-              ::Avm::Stereotypes::EacWordpressBase0::Instance.by_id(
+              context(:instance).class.by_id(
                 options.fetch('--source-instance')
               ).data_dump
             end
@@ -49,7 +49,6 @@ module Avm
             def load_dump
               info "Loading dump \"#{dump_path}\"..."
               package_load.run
-              #::EacRubyUtils::Envs.local.command('cat', dump_path).pipe(load_command).execute!
             end
 
             def dump_instance_method

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/instances/entry_keys'
 require 'avm/stereotypes/eac_webapp_base0/instance'
 
 module Avm
@@ -9,12 +10,12 @@ module Avm
         FILES_UNITS = { uploads: 'wp-content/uploads', themes: 'wp-content/themes' }.freeze
 
         def database_unit
-          self_instance = self
+          web_url = read_entry(::Avm::Instances::EntryKeys::WEB_URL)
           super.after_load do
             info 'Fixing web addresses...'
             run_sql(<<~SQL)
               update wp_options
-              set option_value = '#{self_instance.read_entry('url')}'
+              set option_value = '#{web_url}'
               where option_name in ('siteurl', 'home')
             SQL
           end

data/lib/avm/stereotypes/postgresql/instance_with.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/instances/entry_keys'
 require 'avm/stereotypes/postgresql/instance'
 
 module Avm
@@ -8,8 +9,9 @@ module Avm
       module InstanceWith
         def pg
           @pg ||= ::Avm::Stereotypes::Postgresql::Instance.new(
-            host_env, user: read_entry('database.user'), password: read_entry('database.password'),
-                      name: read_entry('database.name')
+            host_env, user: read_entry(::Avm::Instances::EntryKeys::DATABASE_USERNAME),
+                      password: read_entry(::Avm::Instances::EntryKeys::DATABASE_PASSWORD),
+                      name: read_entry(::Avm::Instances::EntryKeys::DATABASE_NAME)
           )
         end
       end

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

@@ -1,25 +1,13 @@
 # frozen_string_literal: true
 
+require 'avm/stereotypes/eac_webapp_base0/runner/data'
 require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/require_sub'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Data < ::EacRubyUtils::Console::DocoptRunner
-          ::EacRubyUtils.require_sub(__FILE__)
-
-          DOC = <<~DOCOPT
-            Data utilities for EacRailsBase0 instances.
-
-            Usage:
-              __PROGRAM__ __SUBCOMMANDS__
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help             Show this screen.
-          DOCOPT
+        class Data < ::Avm::Stereotypes::EacWebappBase0::Runner::Data
         end
       end
     end

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

@@ -1,24 +1,13 @@
 # frozen_string_literal: true
 
+require 'avm/stereotypes/eac_webapp_base0/runner/data'
 require 'eac_ruby_utils/console/docopt_runner'
-require 'avm/tools/runner/eac_wordpress_base0/data/dump'
-require 'avm/tools/runner/eac_wordpress_base0/data/load'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacWordpressBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Data < ::EacRubyUtils::Console::DocoptRunner
-          DOC = <<~DOCOPT
-            Data utilities for EacWordpressBase0 instances.
-
-            Usage:
-              __PROGRAM__ __SUBCOMMANDS__
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help             Show this screen.
-          DOCOPT
+        class Data < ::Avm::Stereotypes::EacWebappBase0::Runner::Data
         end
       end
     end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.30.0'
+    VERSION = '0.31.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.31.0
 platform: ruby
 authors:
 - Esquilo Azul Company
@@ -220,6 +220,7 @@ files:
 - lib/avm/instances/base/dockerizable.rb
 - lib/avm/instances/entries.rb
 - lib/avm/instances/entries/entry_reader.rb
+- lib/avm/instances/entry_keys.rb
 - lib/avm/patches.rb
 - lib/avm/patches/eac_launcher_git_base.rb
 - lib/avm/patches/object/template.rb
@@ -247,7 +248,9 @@ files:
 - lib/avm/stereotypes/eac_webapp_base0/deploy/_appended_directories.rb
 - lib/avm/stereotypes/eac_webapp_base0/deploy/file_unit.rb
 - lib/avm/stereotypes/eac_webapp_base0/instance.rb
+- lib/avm/stereotypes/eac_webapp_base0/runner/data.rb
 - lib/avm/stereotypes/eac_webapp_base0/runner/data/dump.rb
+- lib/avm/stereotypes/eac_webapp_base0/runner/data/load.rb
 - lib/avm/stereotypes/eac_webapp_base0/runner/deploy.rb
 - lib/avm/stereotypes/eac_wordpress_base0/apache_host.rb
 - lib/avm/stereotypes/eac_wordpress_base0/deploy.rb
@@ -263,7 +266,6 @@ files:
 - lib/avm/tools/runner/eac_rails_base0.rb
 - lib/avm/tools/runner/eac_rails_base0/apache_host.rb
 - lib/avm/tools/runner/eac_rails_base0/data.rb
-- lib/avm/tools/runner/eac_rails_base0/data/dump.rb
 - lib/avm/tools/runner/eac_rails_base0/deploy.rb
 - lib/avm/tools/runner/eac_redmine_base0.rb
 - lib/avm/tools/runner/eac_redmine_base0/bundle.rb
@@ -272,8 +274,6 @@ files:
 - lib/avm/tools/runner/eac_wordpress_base0.rb
 - lib/avm/tools/runner/eac_wordpress_base0/apache_host.rb
 - lib/avm/tools/runner/eac_wordpress_base0/data.rb
-- lib/avm/tools/runner/eac_wordpress_base0/data/dump.rb
-- lib/avm/tools/runner/eac_wordpress_base0/data/load.rb
 - lib/avm/tools/runner/eac_wordpress_base0/deploy.rb
 - lib/avm/tools/runner/files.rb
 - lib/avm/tools/runner/files/rotate.rb

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

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

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

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