avm-tools 0.74.0 → 0.76.1

data/lib/avm/files/formatter.rb

@@ -10,7 +10,11 @@ module Avm
       require_sub __FILE__
       enable_simple_cache
       enable_console_speaker
-      common_constructor :source_paths, :options
+      enable_listable
+      lists.add_symbol :option, :apply, :recursive, :verbose
+      common_constructor :source_paths, :options, default: [{}] do
+        options.assert_valid_keys(self.class.lists.option.values)
+      end
 
       FORMATS = %w[ruby php html python xml json generic_plain].freeze
 
@@ -27,7 +31,7 @@ module Avm
         infom "Applying #{@formats_files.count} format(s)... "
         @formats_files.each do |format, files|
           infom "Applying format #{format.name} (Files matched: #{files.count})..."
-          next unless options.fetch(:apply)
+          next unless options[OPTION_APPLY]
 
           @result += format.apply(files)
         end
@@ -35,7 +39,7 @@ module Avm
 
       def traverser_check_file(file)
         format = find_format(file)
-        infov file, format ? format.class : '-' if options.fetch(:verbose)
+        infov file, format ? format.class : '-' if options[OPTION_VERBOSE]
         return unless format
 
         @formats_files[format] ||= []
@@ -79,7 +83,7 @@ module Avm
       end
 
       def traverser_recursive
-        options.fetch(:recursive)
+        options[OPTION_RECURSIVE]
       end
     end
   end

data/lib/avm/git/auto_commit_path.rb

@@ -5,6 +5,7 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Git
     class AutoCommitPath
+      require_sub __FILE__, include_modules: true
       enable_console_speaker
       common_constructor :git, :path do
         self.path = path.to_pathname
@@ -31,10 +32,7 @@ module Avm
       end
 
       def class_name
-        CLASS_NAME_PATTERNS.each do |pattern|
-          pattern.if_match(relative_path.to_path, false) { |m| return m[1].camelize }
-        end
-        raise "No pattern matched \"#{relative_path}\""
+        ruby_class_name || relative_path.to_path
       end
 
       def commit_message

data/lib/avm/git/auto_commit_path/ruby.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    class AutoCommitPath
+      module Ruby
+        RUBY_CLASS_NAME_PATTERNS = [%r{lib/((?!.*/lib/).+)\.rb\z}, %r{app/[^/]+/(.+)\.rb\z}].freeze
+
+        def ruby_class_name
+          RUBY_CLASS_NAME_PATTERNS.each do |pattern|
+            pattern.if_match(relative_path.to_path, false) { |m| return m[1].camelize }
+          end
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/commit/deploy.rb

@@ -2,90 +2,37 @@
 
 require 'addressable'
 require 'eac_ruby_utils/core_ext'
+require 'avm/files/appendable'
+require 'avm/files/deploy'
 require 'avm/patches/object/template'
 
 module Avm
   module Git
     class Commit
       class Deploy
-        require_sub __FILE__, include_modules: true
+        include ::Avm::Files::Appendable
         enable_simple_cache
 
-        attr_reader :build_dir, :commit, :target_env, :target_path, :variables_source
+        attr_reader :build_dir, :commit, :target_env, :target_path
 
         def initialize(commit, target_env, target_path)
           @commit = commit
           @target_env = target_env
           @target_path = target_path
-          @variables_source = nil
-        end
-
-        def variables_source_set(source)
-          @variables_source = source
-          self
         end
 
         def run
-          on_build_dir do
-            copy_git_content
-            copy_appended_content
-            mkdir_target
-            clear_content
-            send_untar_package
-            set_target_permission
-          end
+          fd = ::Avm::Files::Deploy.new(target_env, target_path)
+          fd.append_tar_output_command(git_archive_command)
+          fd.appended.push(*appended)
+          fd.run
         end
 
         private
 
-        def on_build_dir
-          @build_dir = ::Dir.mktmpdir
-          yield
-        ensure
-          ::FileUtils.rm_rf(@build_dir)
-        end
-
-        def copy_git_content
-          git_archive_command.pipe(untar_git_archive_command).execute!
-        end
-
-        def mkdir_target
-          target_env.command('mkdir', '-p', target_path).execute!
-        end
-
-        def clear_content
-          target_env.command(
-            'find', target_path, '-mindepth', '1', '-maxdepth', '1', '-exec', 'rm', '-rf', '{}', ';'
-          ).execute!
-        end
-
-        def send_untar_package
-          tar_build_command.pipe(untar_build_command).execute!
-        end
-
-        def set_target_permission
-          target_env.command('chmod', '755', target_path).execute!
-        end
-
         def git_archive_command
           commit.git.command('archive', '--format=tar', commit.sha1)
         end
-
-        def untar_git_archive_command
-          source_env.command('tar', '-xf', '-', '-C', build_dir)
-        end
-
-        def tar_build_command
-          source_env.command('tar', '-czO', '-C', build_dir, '.')
-        end
-
-        def untar_build_command
-          target_env.command('tar', '-xzf', '-', '-C', target_path)
-        end
-
-        def source_env
-          ::EacRubyUtils::Envs.local
-        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

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/rails_server.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/eac_rails_base1/runner_with/bundle'
 require 'avm/instances/entry_keys'
 require 'eac_cli/core_ext'
 require 'eac_ruby_utils/console/docopt_runner'
@@ -8,31 +9,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