avm-tools 0.74.0 → 0.74.1

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

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

data/lib/avm/postgresql/instance.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'avm/postgresql/instance/data_unit'
+
+module Avm
+  module Postgresql
+    class Instance
+      def initialize(env, connection_params)
+        @env = env
+        @connection_params = connection_params.with_indifferent_access
+      end
+
+      def data_unit
+        ::Avm::Postgresql::Instance::DataUnit.new(self)
+      end
+
+      def dump_command
+        env.command('pg_dump', '--no-privileges', '--clean', '--no-owner', *common_command_args)
+           .envvar('PGPASSWORD', password)
+      end
+
+      def dump_gzip_command
+        dump_command.append(['@ESC_|', 'gzip', '-9', '-c'])
+      end
+
+      def psql_command
+        env.command("@ESC_PGPASSWORD=#{password}", 'psql', *common_command_args)
+      end
+
+      def psql_command_command(sql)
+        psql_command.append(['--quiet', '--tuples-only', '--command', sql])
+      end
+
+      private
+
+      attr_reader :env, :connection_params
+
+      def common_command_args
+        ['--host', host, '--username', user, '--port', port, name]
+      end
+
+      def host
+        connection_params[:host] || '127.0.0.1'
+      end
+
+      def port
+        connection_params[:port] || '5432'
+      end
+
+      def user
+        connection_params.fetch(:user)
+      end
+
+      def password
+        connection_params.fetch(:password)
+      end
+
+      def name
+        connection_params.fetch(:name)
+      end
+    end
+  end
+end

data/lib/avm/postgresql/instance/data_unit.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'avm/data/instance/unit'
+
+module Avm
+  module Postgresql
+    class Instance
+      class DataUnit < ::Avm::Data::Instance::Unit
+        EXTENSION = '.pgdump.gz'
+
+        before_load :clear_database
+
+        def dump_command
+          instance.dump_gzip_command
+        end
+
+        def load_command
+          instance.psql_command.prepend(['gzip', '-d', '@ESC_|'])
+        end
+
+        private
+
+        def clear_database
+          info 'Clearing database (Dropping all tables)...'
+          run_sql(drop_all_tables_sql).if_present { |v| run_sql(v) }
+        end
+
+        def drop_all_tables_sql
+          "select 'drop table \"' || tablename || '\" cascade;' from pg_tables " \
+            "where schemaname = 'public';"
+        end
+
+        def run_sql(sql)
+          instance.psql_command_command(sql).execute!
+        end
+      end
+    end
+  end
+end

data/lib/avm/postgresql/instance_with.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'avm/instances/entry_keys'
+require 'avm/postgresql/instance'
+
+module Avm
+  module Postgresql
+    module InstanceWith
+      def pg
+        @pg ||= ::Avm::Postgresql::Instance.new(
+          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
+  end
+end

data/lib/avm/tools/runner.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
 require 'avm/self'
 require 'avm/tools/version'
 require 'eac_ruby_base0/runner'
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       include ::EacRubyBase0::Runner
+      require_sub __FILE__
 
       runner_definition do
         desc 'Tools for AVM.'

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

@@ -1,28 +1,15 @@
 # frozen_string_literal: true
 
-require 'eac_cli/core_ext'
+require 'avm/eac_rails_base0'
+require 'avm/eac_rails_base1/runner'
 require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/simple_cache'
-require 'avm/eac_rails_base0/instance'
-::EacRubyUtils.require_sub(__FILE__)
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
-        runner_with
-
-        runner_definition do
-          desc 'Utilities for EacRailsBase0 instances.'
-          pos_arg :instance_id
-          subcommands
-        end
-
-        private
-
-        def instance_uncached
-          ::Avm::EacRailsBase0::Instance.by_id(options['<instance_id>'])
-        end
+      class EacRailsBase0 < ::Avm::EacRailsBase1::Runner
+        require_sub __FILE__
       end
     end
   end

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

@@ -8,7 +8,7 @@ require 'avm/eac_rails_base0/apache_path'
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
+      class EacRailsBase0 < ::Avm::EacRailsBase1::Runner
         class ApachePath < ::EacRubyUtils::Console::DocoptRunner
           runner_with
 

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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avm/rails/runners/bundle'
+require 'avm/eac_rails_base1/runner/bundle'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Bundle < ::Avm::Rails::Runners::Bundle
+      class EacRailsBase0 < ::Avm::EacRailsBase1::Runner
+        class Bundle < ::Avm::EacRailsBase1::Runner::Bundle
         end
       end
     end

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

@@ -8,31 +8,25 @@ require 'shellwords'
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
+      class EacRailsBase0 < ::Avm::EacRailsBase1::Runner
         class RailsServer
-          runner_with
-
+          DEFAULT_RAILS_ENVIRONMENT = 'development'
+          runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle
           runner_definition do
             desc 'Run the embbeded Rails web server.'
-            arg_opt '-e', '--environment', 'Specifies the environment to run this server under' \
-              ' (development/test/production).'
           end
 
           def run
+            infov 'Environment', rails_environment
             infov 'Bundle args', ::Shellwords.join(bundle_args)
-            infov 'Result', command.system
+            infov 'Result', bundle_command.system
           end
 
           protected
 
           def bundle_args
             ['exec', 'rails', 'server', '--port',
-             runner_context.call(:instance).read_entry(::Avm::Instances::EntryKeys::WEB_PORT)] +
-              parsed.environment.if_present([]) { |v| ['--environment', v] }
-          end
-
-          def command
-            runner_context.call(:instance).bundle(*bundle_args).chdir_root
+             runner_context.call(:instance).read_entry(::Avm::Instances::EntryKeys::WEB_PORT)]
           end
         end
       end

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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avm/rails/runners/runner'
+require 'avm/eac_rails_base1/runner/code_runner'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Runner < ::Avm::Rails::Runners::Runner
+      class EacRailsBase0 < ::Avm::EacRailsBase1::Runner
+        class Runner < ::Avm::EacRailsBase1::Runner::CodeRunner
         end
       end
     end

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

@@ -1,33 +1,15 @@
 # frozen_string_literal: true
 
+require 'avm/eac_rails_base1/runner'
+require 'avm/eac_redmine_base0'
 require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/simple_cache'
-require 'avm/eac_redmine_base0/instance'
-require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class EacRedmineBase0 < ::EacRubyUtils::Console::DocoptRunner
-        include ::EacRubyUtils::SimpleCache
-
-        DOC = <<~DOCOPT
-          Utilities for EacRedmineBase0 instances.
-
-          Usage:
-            __PROGRAM__ [options] <instance_id> __SUBCOMMANDS__
-            __PROGRAM__ -h | --help
-
-          Options:
-            -h --help             Show this screen.
-        DOCOPT
-
-        private
-
-        def instance_uncached
-          ::Avm::EacRedmineBase0::Instance.by_id(options['<instance_id>'])
-        end
+      class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
+        require_sub __FILE__
       end
     end
   end

data/lib/avm/tools/runner/eac_redmine_base0/core_update.rb

@@ -8,7 +8,7 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class EacRedmineBase0 < ::EacRubyUtils::Console::DocoptRunner
+      class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
         class CoreUpdate < ::EacRubyUtils::Console::DocoptRunner
           include ::EacCli::DefaultRunner
 

data/lib/avm/tools/runner/eac_redmine_base0/docker.rb

@@ -5,7 +5,7 @@ require 'avm/docker/runner'
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class EacRedmineBase0 < ::EacRubyUtils::Console::DocoptRunner
+      class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
         class Docker < ::Avm::Docker::Runner
         end
       end

data/lib/avm/tools/runner/eac_redmine_base0/project_rename.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/rails/runners/runner'
+require 'avm/eac_rails_base1/runner/code_runner'
 require 'eac_cli/default_runner'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class EacRedmineBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class ProjectRename < ::Avm::Rails::Runners::Runner
+      class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
+        class ProjectRename < ::Avm::EacRailsBase1::Runner::CodeRunner
           include ::EacCli::DefaultRunner
 
           runner_definition do

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

@@ -1,34 +1,15 @@
 # frozen_string_literal: true
 
+require 'avm/eac_webapp_base0/runner'
+require 'avm/eac_wordpress_base0'
 require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/simple_cache'
-require 'avm/stereotypes/eac_wordpress_base0/instance'
-require 'avm/tools/runner/eac_wordpress_base0/apache_host'
-require 'avm/tools/runner/eac_wordpress_base0/data'
-require 'avm/tools/runner/eac_wordpress_base0/deploy'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class EacWordpressBase0 < ::EacRubyUtils::Console::DocoptRunner
-        include ::EacRubyUtils::SimpleCache
-
-        DOC = <<~DOCOPT
-          Utilities for EacWordpressBase0 instances.
-
-          Usage:
-            __PROGRAM__ [options] <instance_id> __SUBCOMMANDS__
-            __PROGRAM__ -h | --help
-
-          Options:
-            -h --help             Show this screen.
-        DOCOPT
-
-        private
-
-        def instance_uncached
-          ::Avm::Stereotypes::EacWordpressBase0::Instance.by_id(options['<instance_id>'])
-        end
+      class EacWordpressBase0 < ::Avm::EacWebappBase0::Runner
+        require_sub __FILE__
       end
     end
   end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.74.0'
+    VERSION = '0.74.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.74.0
+  version: 0.74.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-25 00:00:00.000000000 Z
+date: 2020-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -295,11 +295,18 @@ files:
 - lib/avm/eac_rails_base0/apache_path.rb
 - lib/avm/eac_rails_base0/deploy.rb
 - lib/avm/eac_rails_base0/instance.rb
+- lib/avm/eac_rails_base1.rb
+- lib/avm/eac_rails_base1/instance.rb
+- lib/avm/eac_rails_base1/runner.rb
+- lib/avm/eac_rails_base1/runner/bundle.rb
+- lib/avm/eac_rails_base1/runner/code_runner.rb
+- lib/avm/eac_rails_base1/runner_with/bundle.rb
 - lib/avm/eac_redmine_base0.rb
 - lib/avm/eac_redmine_base0/core_update.rb
 - lib/avm/eac_redmine_base0/data_unit.rb
 - lib/avm/eac_redmine_base0/deploy.rb
 - lib/avm/eac_redmine_base0/instance.rb
+- lib/avm/eac_ubuntu_base0.rb
 - lib/avm/eac_ubuntu_base0/apache.rb
 - lib/avm/eac_ubuntu_base0/apache/resource.rb
 - lib/avm/eac_ubuntu_base0/docker_image.rb
@@ -311,11 +318,16 @@ files:
 - lib/avm/eac_webapp_base0/deploy/git_info.rb
 - lib/avm/eac_webapp_base0/deploy/version.rb
 - lib/avm/eac_webapp_base0/instance.rb
+- lib/avm/eac_webapp_base0/runner.rb
 - lib/avm/eac_webapp_base0/runner/apache_host.rb
 - lib/avm/eac_webapp_base0/runner/data.rb
 - lib/avm/eac_webapp_base0/runner/data/dump.rb
 - lib/avm/eac_webapp_base0/runner/data/load.rb
 - lib/avm/eac_webapp_base0/runner/deploy.rb
+- lib/avm/eac_wordpress_base0.rb
+- lib/avm/eac_wordpress_base0/apache_host.rb
+- lib/avm/eac_wordpress_base0/deploy.rb
+- lib/avm/eac_wordpress_base0/instance.rb
 - lib/avm/eac_writings_base0.rb
 - lib/avm/eac_writings_base0/commons.rb
 - lib/avm/eac_writings_base0/file_build.rb
@@ -400,6 +412,7 @@ files:
 - lib/avm/instances/entries.rb
 - lib/avm/instances/entry.rb
 - lib/avm/instances/entry_keys.rb
+- lib/avm/instances/runner.rb
 - lib/avm/launcher/context/instance_manager.rb
 - lib/avm/launcher/context/instance_manager/cached_instance.rb
 - lib/avm/launcher/context/instance_manager/cached_instances.rb
@@ -416,6 +429,10 @@ files:
 - lib/avm/patches/object/i18n.rb
 - lib/avm/patches/object/template.rb
 - lib/avm/path_string.rb
+- lib/avm/postgresql.rb
+- lib/avm/postgresql/instance.rb
+- lib/avm/postgresql/instance/data_unit.rb
+- lib/avm/postgresql/instance_with.rb
 - lib/avm/projects.rb
 - lib/avm/projects/stereotype.rb
 - lib/avm/projects/stereotypes.rb
@@ -439,10 +456,6 @@ files:
 - lib/avm/projects/stereotypes/ruby_gem/update.rb
 - lib/avm/projects/stereotypes/ruby_gem/version_bump.rb
 - lib/avm/rails.rb
-- lib/avm/rails/instance.rb
-- lib/avm/rails/runners.rb
-- lib/avm/rails/runners/bundle.rb
-- lib/avm/rails/runners/runner.rb
 - lib/avm/result.rb
 - lib/avm/ruby.rb
 - lib/avm/ruby/gems.rb
@@ -457,39 +470,19 @@ files:
 - lib/avm/self/instance/entry_keys.rb
 - lib/avm/self/root.rb
 - lib/avm/stereotypes.rb
-- lib/avm/stereotypes/eac_ubuntu_base0.rb
-- lib/avm/stereotypes/eac_wordpress_base0/apache_host.rb
-- lib/avm/stereotypes/eac_wordpress_base0/deploy.rb
-- lib/avm/stereotypes/eac_wordpress_base0/instance.rb
-- lib/avm/stereotypes/postgresql.rb
-- 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/sync.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/apache_path.rb
 - lib/avm/tools/runner/eac_rails_base0/bundle.rb
-- lib/avm/tools/runner/eac_rails_base0/data.rb
-- lib/avm/tools/runner/eac_rails_base0/deploy.rb
 - lib/avm/tools/runner/eac_rails_base0/rails_server.rb
 - lib/avm/tools/runner/eac_rails_base0/runner.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/core_update.rb
-- lib/avm/tools/runner/eac_redmine_base0/data.rb
-- lib/avm/tools/runner/eac_redmine_base0/data/dump.rb
-- lib/avm/tools/runner/eac_redmine_base0/deploy.rb
 - lib/avm/tools/runner/eac_redmine_base0/docker.rb
 - lib/avm/tools/runner/eac_redmine_base0/project_rename.rb
-- lib/avm/tools/runner/eac_redmine_base0/runner.rb
 - 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/deploy.rb
 - lib/avm/tools/runner/files.rb
 - lib/avm/tools/runner/files/format.rb
 - lib/avm/tools/runner/files/rotate.rb