avm-tools 0.28.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9056924dbceab142648a79e5da4b931c3391e2138fdf10196e0b0b7f79a529f
-  data.tar.gz: b09f24e9e27940bfc314a9e4d236470ff6d0c0fd2e4d5b42f80b78f37848cf0b
+  metadata.gz: 0cfe97a7d0fe91a8c981753c6a1f54613eca1224a291b21f79fc40d599706dcb
+  data.tar.gz: 24af1b76d95b1f49502a676c2530cae9796848b601e97c66f2c2c2ad799ca30f
 SHA512:
-  metadata.gz: 52a94ce93193368d76c1985d691672470699a54febfa7f957f0c48c1c0983bbc78e7b5d985c144a0678a9320577215f3be5a68a401678c708def8ba2f2dd3ccd
-  data.tar.gz: 644e16d5d4bfc5d74b0410cad8ad382ceabb0cae1a9822dd1b9650fa9c711deab8060fd3566176e82b4baaf669a49c1473d2ab4859d7756c24f3fe8ce4cb7327
+  metadata.gz: c703058938922ecb22415179574396eff2d2ab775d7a9b9d46293e27f9510ee7701eb2c72184d777e5e5b8b2a4620b3622bf86c0af6c7ea09158762458f1b660
+  data.tar.gz: a42d70070a33d8452e02aac392864a62aae5d30c159ba93eb10bf0c24d5691ba9607a4994ea3b00ce45c8734ac257fe7d48605cf178e40e2f3c8619f8b9b04ce

data/lib/avm/data/package/dump.rb

@@ -11,6 +11,7 @@ module Avm
         enable_listable
 
         DEFAULT_EXPIRE_TIME = 1.days
+        DEFAULT_FILE_EXTENSION = '.tar'
 
         attr_reader :package, :data_file_path, :existing
 

data/lib/avm/docker/registry.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/self/instance'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -7,7 +8,9 @@ module Avm
     class Registry
       class << self
         def default
-          @default ||= new(::Avm.configs.read_entry('self.docker.registry.name'))
+          @default ||= new(::Avm::Self.instance.read_entry(
+                             ::Avm::Self::Instance::EntryKeys::DOCKER_REGISTRY_NAME
+                           ))
         end
       end
 

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

@@ -10,7 +10,7 @@ module Avm
         extend ::ActiveSupport::Concern
 
         included do
-          %w[Access Admin Database Filesystem Ruby Source System Web].each do |class_name|
+          %w[Access Admin Data Database Filesystem Ruby Source System Web].each do |class_name|
             include const_get(class_name)
           end
         end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'avm/data/package/dump'
+require 'avm/self/instance'
+
+module Avm
+  module Instances
+    class Base
+      module AutoValues
+        module Data
+          def auto_data_default_dump_path
+            ::Avm::Self
+              .instance
+              .read_entry_optional(::Avm::Self::Instance::EntryKeys::DATA_DEFAULT_PATH)
+              .if_present do |v|
+              ::File.join(
+                v,
+                "#{id}#{::Avm::Data::Instance::Package::Dump::DEFAULT_FILE_EXTENSION}"
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/self/instance.rb

@@ -2,6 +2,7 @@
 
 require 'avm/instances/base'
 require 'avm/self/docker_image'
+require 'avm/self/instance/entry_keys'
 require 'avm/stereotypes/eac_ubuntu_base0/docker_image'
 
 module Avm

data/lib/avm/self/instance/entry_keys.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Avm
+  module Self
+    class Instance < ::Avm::Instances::Base
+      module EntryKeys
+        DATA_DEFAULT_PATH = 'data.default_path'
+        DOCKER_REGISTRY_NAME = 'docker.registry.name'
+      end
+    end
+  end
+end

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

@@ -1,23 +1,15 @@
 # frozen_string_literal: true
 
 require 'avm/stereotypes/eac_webapp_base0/instance'
+require 'avm/stereotypes/rails/instance'
 
 module Avm
   module Stereotypes
     module EacRailsBase0
       class Instance < ::Avm::Stereotypes::EacWebappBase0::Instance
-        FILES_UNITS = { uploads: 'public/uploads' }.freeze
-
-        def bundle(*args)
-          host_env.command('bundle', *args)
-                  .envvar('BUNDLE_GEMFILE', ::File.join(read_entry('fs_path'), 'Gemfile'))
-                  .envvar('RAILS_ENV', 'production')
-                  .chdir(read_entry('fs_path'))
-        end
+        include ::Avm::Stereotypes::Rails::Instance
 
-        def rake(*args)
-          bundle('exec', 'rake', *args)
-        end
+        FILES_UNITS = { uploads: 'public/uploads' }.freeze
       end
     end
   end

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

@@ -2,11 +2,14 @@
 
 require 'avm/stereotypes/eac_ubuntu_base0/docker_image'
 require 'avm/stereotypes/eac_webapp_base0/instance'
+require 'avm/stereotypes/rails/instance'
 
 module Avm
   module Stereotypes
     module EacRedmineBase0
       class Instance < ::Avm::Stereotypes::EacWebappBase0::Instance
+        include ::Avm::Stereotypes::Rails::Instance
+
         FILES_UNITS = { files: 'files' }.freeze
 
         def docker_image_class

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

@@ -12,8 +12,6 @@ module Avm
       class Instance < ::Avm::Instances::Base
         include ::Avm::Stereotypes::Postgresql::InstanceWith
 
-        FILES_UNITS = { uploads: 'wp-content/uploads', themes: 'wp-content/themes' }.freeze
-
         def stereotype_name
           self.class.name.desconstantize.demodulize
         end
@@ -44,7 +42,7 @@ module Avm
         private
 
         def files_units
-          FILES_UNITS.map do |data_key, fs_path_subpath|
+          self.class.const_get('FILES_UNITS').map do |data_key, fs_path_subpath|
             [data_key, ::Avm::Data::Instance::FilesUnit.new(self, fs_path_subpath)]
           end.to_h
         end

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

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/numeric/time'
+require 'eac_ruby_utils/console/speaker'
+require 'eac_ruby_utils/simple_cache'
+require 'avm/data/package/dump'
+
+module Avm
+  module Stereotypes
+    module EacWebappBase0
+      module Runner
+        module Data
+          class Dump < ::EacRubyUtils::Console::DocoptRunner
+            include ::EacRubyUtils::SimpleCache
+            include ::EacRubyUtils::Console::Speaker
+
+            DUMP_EXPIRE_TIME = 1.days
+            DEFAULT_DUMP_PATH_ENTRY_SUFFIX = 'data.default_dump_path'
+            NO_DUMP_MESSAGE = 'Dump "%s" already exist and rewrite options was no setted nor ' \
+              'dump was expired.'
+
+            DOC = <<~DOCUMENT
+              Dump utility for EacRailsBase instance.
+
+                  Usage:
+                  __PROGRAM__ [options]
+
+                Options:
+                  -h --help               Show this screen.
+                  --rewrite               Forces dump overwrite.
+                  --dump-path=<dump_path> Set DUMP_PATH variable.
+            DOCUMENT
+
+            def run
+              infov 'Instance to dump', "#{context(:instance)} (#{context(:instance).class})"
+              if package_dump.runnable?
+                package_dump.run
+              else
+                warn(package_dump.cannot_run_reason)
+              end
+              success("Dump path: \"#{dump_path}\"")
+              dump_path
+            end
+
+            private
+
+            def package_dump_uncached
+              context(:instance).data_package.dump(dump_path, existing: package_dump_existing)
+            end
+
+            def dump_path
+              options.fetch('--dump-path') || default_dump_path
+            end
+
+            def default_dump_path
+              context(:instance).read_entry(DEFAULT_DUMP_PATH_ENTRY_SUFFIX)
+            end
+
+            def package_dump_existing
+              if options.fetch('--rewrite')
+                ::Avm::Data::Package::Dump::EXISTING_ROTATE
+              else
+                ::Avm::Data::Package::Dump::EXISTING_ROTATE_EXPIRED
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/stereotypes/rails.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+
+module Avm
+  module Stereotypes
+    module Rails
+      ::EacRubyUtils.require_sub(__FILE__)
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Avm
+  module Stereotypes
+    module Rails
+      module Instance
+        def bundle(*args)
+          host_env.command('bundle', *args)
+                  .envvar('BUNDLE_GEMFILE', ::File.join(read_entry('fs_path'), 'Gemfile'))
+                  .envvar('RAILS_ENV', 'production')
+                  .chdir(read_entry('fs_path'))
+        end
+
+        def rake(*args)
+          bundle('exec', 'rake', *args)
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/eac_rails_base0/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 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
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# 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_redmine_base0/bundle.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'avm/stereotypes/eac_redmine_base0/deploy'
+require 'avm/stereotypes/eac_webapp_base0/runner/deploy'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class EacRedmineBase0 < ::EacRubyUtils::Console::DocoptRunner
+        class Bundle < ::EacRubyUtils::Console::DocoptRunner
+          enable_console_speaker
+
+          DOC = <<~DOCOPT
+            Runs "bundle ...".
+
+            Usage:
+              __PROGRAM__ [<bundle-args>...]
+              __PROGRAM__ -h | --help
+
+            Options:
+              -h --help                 Show this screen.
+          DOCOPT
+
+          def run
+            infov 'Bundle arguments', ::Shellwords.join(bundle_args)
+            context(:instance).bundle(*bundle_args).system!
+          end
+
+          def bundle_args
+            options.fetch('<bundle-args>').reject { |arg| arg == '--' }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,67 +1,14 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/numeric/time'
-require 'eac_ruby_utils/console/speaker'
-require 'eac_ruby_utils/simple_cache'
-require 'avm/data/package/dump'
+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 < ::EacRubyUtils::Console::DocoptRunner
-            include ::EacRubyUtils::SimpleCache
-            include ::EacRubyUtils::Console::Speaker
-
-            DUMP_EXPIRE_TIME = 1.days
-            DEFAULT_DUMP_PATH_ENTRY_SUFFIX = 'data.default_dump_path'
-            NO_DUMP_MESSAGE = 'Dump "%s" already exist and rewrite options was no setted nor ' \
-              'dump was expired.'
-
-            DOC = <<~DOCUMENT
-              Dump utility for EacRailsBase instance.
-
-                  Usage:
-                  __PROGRAM__ [options]
-
-                Options:
-                  -h --help               Show this screen.
-                  --rewrite               Forces dump overwrite.
-                  --dump-path=<dump_path> Set DUMP_PATH variable.
-            DOCUMENT
-
-            def run
-              if package_dump.runnable?
-                package_dump.run
-              else
-                warn(package_dump.cannot_run_reason)
-              end
-              success("Dump path: \"#{dump_path}\"")
-              dump_path
-            end
-
-            private
-
-            def package_dump_uncached
-              context(:instance).data_package.dump(dump_path, existing: package_dump_existing)
-            end
-
-            def dump_path
-              options.fetch('--dump-path') || default_dump_path
-            end
-
-            def default_dump_path
-              context(:instance).read_entry(DEFAULT_DUMP_PATH_ENTRY_SUFFIX)
-            end
-
-            def package_dump_existing
-              if options.fetch('--rewrite')
-                ::Avm::Data::Package::Dump::EXISTING_ROTATE
-              else
-                ::Avm::Data::Package::Dump::EXISTING_ROTATE_EXPIRED
-              end
-            end
+          class Dump < ::Avm::Stereotypes::EacWebappBase0::Runner::Data::Dump
           end
         end
       end

data/lib/avm/tools/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-23 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -210,6 +210,7 @@ files:
 - lib/avm/instances/base/auto_values.rb
 - lib/avm/instances/base/auto_values/access.rb
 - lib/avm/instances/base/auto_values/admin.rb
+- lib/avm/instances/base/auto_values/data.rb
 - lib/avm/instances/base/auto_values/database.rb
 - lib/avm/instances/base/auto_values/filesystem.rb
 - lib/avm/instances/base/auto_values/ruby.rb
@@ -227,6 +228,7 @@ files:
 - lib/avm/self.rb
 - lib/avm/self/docker_image.rb
 - lib/avm/self/instance.rb
+- lib/avm/self/instance/entry_keys.rb
 - lib/avm/stereotypes.rb
 - lib/avm/stereotypes/eac_rails_base0.rb
 - lib/avm/stereotypes/eac_rails_base0/apache_host.rb
@@ -245,6 +247,7 @@ 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/dump.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
@@ -253,12 +256,17 @@ files:
 - lib/avm/stereotypes/postgresql/instance.rb
 - lib/avm/stereotypes/postgresql/instance/data_unit.rb
 - lib/avm/stereotypes/postgresql/instance_with.rb
+- lib/avm/stereotypes/rails.rb
+- lib/avm/stereotypes/rails/instance.rb
 - lib/avm/tools.rb
 - lib/avm/tools/runner.rb
 - 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
 - lib/avm/tools/runner/eac_redmine_base0/deploy.rb
 - lib/avm/tools/runner/eac_redmine_base0/docker.rb
 - lib/avm/tools/runner/eac_wordpress_base0.rb