avm-tools 0.74.0 → 0.74.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4460b770d82c88ec42b81c1fa27af44d87957e92dcb46c32721a72ce64f3dc7
-  data.tar.gz: 4f79e81ef512e596af26e0fd18c13582518778233042ee05a1d846f6afd405a6
+  metadata.gz: 86b1ee08028ac161c73a2069542d961e11585fd4eee8673307cb5f3912e0c215
+  data.tar.gz: 438fccaf469c7843762e381a853514ff60fb466bc202e628188eb8a512982129
 SHA512:
-  metadata.gz: c2520c8c2b7a9805ddd0a856b1ed8c9ec019d71abd6023bdb69bc4e5ab27ba7c3cfc4e7eb3b02c9051b9dca97e2196e51455843344d305fce1a466ba89bce7d7
-  data.tar.gz: 707b05197a270bd6442994390347713770505105ad1aeb32e6220f96571e184c78dd4ded315d9a993cbe45d0bd28a3e6b09dc708bd3fa39af291fb0df5f6b94f
+  metadata.gz: adfbd30ba8bac66dbb87a165d1839a1163b0679f582e326ae888fc6f773d9eeaa67d8b7047d9a0f2ec16cf98dd815ddccf2097c2003743a9fee5b7a49e67a769
+  data.tar.gz: deca6800842fd5dcebc5748ea4b4fa0909ff3e6bb7c927c5506d01b6f14af7588d2527f0c8c6636c11783b866dadbb65d8c59715198648eac7a9964ae2fec4a4

data/lib/avm/eac_rails_base0/instance.rb

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
-require 'avm/eac_webapp_base0/instance'
-require 'avm/rails/instance'
+require 'avm/eac_rails_base1/instance'
 
 module Avm
   module EacRailsBase0
-    class Instance < ::Avm::EacWebappBase0::Instance
-      include ::Avm::Rails::Instance
-
+    class Instance < ::Avm::EacRailsBase1::Instance
       FILES_UNITS = { uploads: 'public/uploads' }.freeze
     end
   end

data/lib/avm/{rails/runners.rb → eac_rails_base1.rb}

@@ -3,9 +3,7 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Rails
-    module Runners
-      require_sub __FILE__
-    end
+  module EacRailsBase1
+    require_sub __FILE__
   end
 end

data/lib/avm/{rails → eac_rails_base1}/instance.rb

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
+require 'avm/eac_webapp_base0/instance'
+require 'eac_ruby_gems_utils/gem'
+
 module Avm
-  module Rails
-    module Instance
+  module EacRailsBase1
+    class Instance < ::Avm::EacWebappBase0::Instance
+      DEFAULT_RAILS_ENVIRONMENT = 'production'
+
       def bundle(*args)
-        the_gem.bundle(*args).chdir_root.envvar('RAILS_ENV', 'production')
+        the_gem.bundle(*args).chdir_root.envvar('RAILS_ENV', DEFAULT_RAILS_ENVIRONMENT)
       end
 
       def rake(*args)

data/lib/avm/eac_rails_base1/runner.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/runner'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    class Runner < ::Avm::EacWebappBase0::Runner
+      require_sub __FILE__
+    end
+  end
+end

data/lib/avm/eac_rails_base1/runner/bundle.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/runner_with/bundle'
+require 'eac_cli/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+require 'shellwords'
+
+module Avm
+  module EacRailsBase1
+    class Runner < ::Avm::EacWebappBase0::Runner
+      class Bundle < ::EacRubyUtils::Console::DocoptRunner
+        runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle
+        runner_definition do
+          desc 'Runs "bundle ...".'
+          pos_arg :'bundle-args', repeat: true, optional: true
+        end
+
+        def run
+          bundle_run
+        end
+
+        def bundle_args
+          options.fetch('<bundle-args>').reject { |arg| arg == '--' }
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_rails_base1/runner/code_runner.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/runner_with/bundle'
+require 'eac_cli/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module EacRailsBase1
+    class Runner < ::Avm::EacWebappBase0::Runner
+      class CodeRunner < ::EacRubyUtils::Console::DocoptRunner
+        runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle
+        runner_definition do
+          desc 'Runs a Ruby code with "rails runner".'
+          pos_arg :code
+        end
+
+        def run
+          infov 'Environment', context(:instance).host_env
+          bundle_run
+        end
+
+        def bundle_args
+          %w[exec rails runner] + [options.fetch('<code>')]
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_rails_base1/runner_with/bundle.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/instance'
+require 'eac_cli/runner'
+
+module Avm
+  module EacRailsBase1
+    module RunnerWith
+      module Bundle
+        DEFAULT_RAILS_ENVIRONMENT_CONSTANT = 'DEFAULT_RAILS_ENVIRONMENT'
+
+        common_concern do
+          include ::EacCli::Runner
+
+          runner_definition do
+            arg_opt '-e', '--environment', 'Specifies the environment for the runner to operate' \
+              ' (test/development/production). Default: "development".'
+          end
+        end
+
+        module ClassMethods
+          def default_rails_environment
+            const_get(DEFAULT_RAILS_ENVIRONMENT_CONSTANT)
+          rescue ::NameError
+            ::Avm::EacRailsBase1::Instance::DEFAULT_RAILS_ENVIRONMENT
+          end
+        end
+
+        def bundle_command
+          rails_instance.bundle(*bundle_args).envvar('RAILS_ENV', rails_environment)
+        end
+
+        def bundle_run
+          infov 'Bundle arguments', ::Shellwords.join(bundle_args)
+          infov 'Rails environment', rails_environment
+          bundle_command.system!
+        end
+
+        def default_rails_environment
+          self.class.default_rails_environment
+        end
+
+        def rails_instance
+          if respond_to?(:runner_context)
+            runner_context.call(:instance)
+          else
+            context(:instance)
+          end
+        end
+
+        def rails_environment
+          parsed.environment.presence || default_rails_environment
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/instance.rb

@@ -3,13 +3,11 @@
 require 'avm/eac_redmine_base0/data_unit'
 require 'avm/eac_ubuntu_base0/docker_image'
 require 'avm/eac_webapp_base0/instance'
-require 'avm/rails/instance'
+require 'avm/eac_rails_base1/instance'
 
 module Avm
   module EacRedmineBase0
-    class Instance < ::Avm::EacWebappBase0::Instance
-      include ::Avm::Rails::Instance
-
+    class Instance < ::Avm::EacRailsBase1::Instance
       FILES_UNITS = { files: 'files' }.freeze
 
       def docker_image_class

data/lib/avm/{stereotypes/eac_ubuntu_base0.rb → eac_ubuntu_base0.rb}

@@ -4,8 +4,6 @@ require 'eac_ruby_utils/require_sub'
 ::EacRubyUtils.require_sub(__FILE__)
 
 module Avm
-  module Stereotypes
-    module EacUbuntuBase0
-    end
+  module EacUbuntuBase0
   end
 end

data/lib/avm/eac_webapp_base0/instance.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/instances/base'
-require 'avm/stereotypes/postgresql/instance_with'
+require 'avm/postgresql/instance_with'
 require 'avm/data/instance/files_unit'
 require 'avm/data/instance/package'
 require 'avm/eac_webapp_base0/deploy/file_unit'
@@ -9,7 +9,7 @@ require 'avm/eac_webapp_base0/deploy/file_unit'
 module Avm
   module EacWebappBase0
     class Instance < ::Avm::Instances::Base
-      include ::Avm::Stereotypes::Postgresql::InstanceWith
+      include ::Avm::Postgresql::InstanceWith
 
       def stereotype_name
         self.class.name.desconstantize.demodulize

data/lib/avm/eac_webapp_base0/runner.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'avm/instances/runner'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    class Runner < ::Avm::Instances::Runner
+      require_sub __FILE__
+    end
+  end
+end

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

@@ -5,13 +5,12 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module EacWebappBase0
-    module Runner
+    class Runner < ::Avm::Instances::Runner
       class ApacheHost < ::EacRubyUtils::Console::DocoptRunner
         include ::EacCli::DefaultRunner
 
-        stereotype_name = name.deconstantize.demodulize
         runner_definition do
-          desc "Configure Apache virtual host for #{stereotype_name} instance."
+          desc 'Configure Apache virtual host for instance.'
           bool_opt '-c', '--certbot', 'Install certbot.'
         end
 

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

@@ -5,7 +5,7 @@ require 'eac_ruby_utils/require_sub'
 
 module Avm
   module EacWebappBase0
-    module Runner
+    class Runner < ::Avm::Instances::Runner
       class Data < ::EacRubyUtils::Console::DocoptRunner
         ::EacRubyUtils.require_sub(__FILE__)
 

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

@@ -7,7 +7,7 @@ require 'avm/data/package/dump'
 
 module Avm
   module EacWebappBase0
-    module Runner
+    class Runner < ::Avm::Instances::Runner
       class Data < ::EacRubyUtils::Console::DocoptRunner
         class Dump < ::EacRubyUtils::Console::DocoptRunner
           include ::EacRubyUtils::SimpleCache

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

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/simple_cache'
 
 module Avm
   module EacWebappBase0
-    module Runner
+    class Runner < ::Avm::Instances::Runner
       class Data < ::EacRubyUtils::Console::DocoptRunner
         class Load < ::EacRubyUtils::Console::DocoptRunner
           include ::EacRubyUtils::SimpleCache

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

@@ -6,12 +6,12 @@ require 'eac_ruby_utils/console/speaker'
 
 module Avm
   module EacWebappBase0
-    module Runner
+    class Runner < ::Avm::Instances::Runner
       class Deploy < ::EacRubyUtils::Console::DocoptRunner
         include ::EacRubyUtils::Console::Speaker
 
         DOC = <<~DOCOPT
-          Deploy for %%STEREOTYPE_NAME%% instance.
+          Deploy for instance.
 
           Usage:
             __PROGRAM__ [options]
@@ -22,22 +22,9 @@ module Avm
             -r --reference=<git-reference>  Git reference to deploy.
             -a --append-dirs=<append-dirs>  Append directories to deploy (List separated by ":").
         DOCOPT
-        def initialize(settings = {})
-          super settings.merge(doc: DOC.gsub('%%STEREOTYPE_NAME%%', stereotype_name))
-        end
 
         def deploy_class
-          stereotype_module.const_get('Deploy')
-        end
-
-        def stereotype_module
-          ::Avm::Stereotypes.const_get(stereotype_name)
-        rescue ::NameError
-          ::Avm.const_get(stereotype_name)
-        end
-
-        def stereotype_name
-          self.class.name.deconstantize.demodulize
+          context(:stereotype_module).const_get('Deploy')
         end
 
         def run

data/lib/avm/eac_wordpress_base0.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWordpressBase0
+    require_sub __FILE__
+  end
+end

data/lib/avm/eac_wordpress_base0/apache_host.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/apache_host'
+
+module Avm
+  module EacWordpressBase0
+    class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
+      def document_root
+        instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+      end
+
+      def extra_content
+        "AssignUserID #{system_user} #{system_group}"
+      end
+
+      def system_user
+        instance.read_entry('system.username')
+      end
+
+      def system_group
+        instance.read_entry('system.groupname')
+      end
+    end
+  end
+end

data/lib/avm/eac_wordpress_base0/deploy.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/deploy'
+
+module Avm
+  module EacWordpressBase0
+    class Deploy < ::Avm::EacWebappBase0::Deploy
+    end
+  end
+end

data/lib/avm/eac_wordpress_base0/instance.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'avm/instances/entry_keys'
+require 'avm/eac_webapp_base0/instance'
+
+module Avm
+  module EacWordpressBase0
+    class Instance < ::Avm::EacWebappBase0::Instance
+      FILES_UNITS = { uploads: 'wp-content/uploads', themes: 'wp-content/themes' }.freeze
+
+      def database_unit
+        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 = '#{web_url}'
+            where option_name in ('siteurl', 'home')
+          SQL
+        end
+      end
+    end
+  end
+end

data/lib/avm/instances/runner.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module Instances
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class << self
+        def instance_class
+          ::Avm.const_get(stereotype_name).const_get('Instance')
+        end
+
+        def stereotype_module
+          ::Avm.const_get(stereotype_name)
+        end
+
+        def stereotype_name
+          name.demodulize
+        end
+      end
+
+      runner_with
+      description = "Utilities for #{stereotype_name} instances."
+      runner_definition do
+        desc description
+        pos_arg 'instance-id'
+        subcommands
+      end
+
+      delegate :instance_class, :stereotype_module, :stereotype_name, to: :class
+
+      private
+
+      def instance_uncached
+        self.class.instance_class.by_id(options.fetch('<instance-id>'))
+      end
+    end
+  end
+end