avm-tools 0.74.1 → 0.77.0

data/lib/avm/files/appendable/tar_output_command.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/envs'
+require 'avm/files/appendable/resource_base'
+
+module Avm
+  module Files
+    module Appendable
+      class TarOutputCommand < ::Avm::Files::Appendable::ResourceBase
+        attr_reader :command
+
+        def initialize(appender, command)
+          super(appender)
+          @command = command
+        end
+
+        def write_on(target_dir)
+          command.pipe(
+            ::EacRubyUtils::Envs.local.command('tar', '-xf', '-', '-C', target_dir)
+          ).execute!
+        end
+      end
+    end
+  end
+end

data/lib/avm/files/appendable/templatized_directory.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/files/appendable/resource_base'
+
+module Avm
+  module Files
+    module Appendable
+      class TemplatizedDirectory < ::Avm::Files::Appendable::ResourceBase
+        attr_reader :source_path
+
+        def initialize(appender, source_path)
+          super(appender)
+          @source_path = source_path
+        end
+
+        def write_on(target_dir)
+          raise 'Variables source not set' if appender.variables_source.blank?
+
+          ::EacRubyUtils::Templates::Directory.new(source_path).apply(
+            appender.variables_source,
+            target_dir
+          )
+        end
+      end
+    end
+  end
+end

data/lib/avm/files/appender.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'avm/files/appendable'
+
+module Avm
+  module Files
+    class Appender
+      include ::Avm::Files::Appendable
+    end
+  end
+end

data/lib/avm/files/deploy.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'addressable'
+require 'avm/files/appendable'
+require 'avm/patches/object/template'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Files
+    class Deploy
+      include ::Avm::Files::Appendable
+      enable_simple_cache
+
+      attr_reader :build_dir, :target_env, :target_path
+
+      common_constructor :target_env, :target_path
+
+      def run
+        on_build_dir do
+          copy_content_to_build_dir
+          mkdir_target
+          clear_content
+          send_untar_package
+          set_target_permission
+        end
+      end
+
+      private
+
+      def on_build_dir
+        @build_dir = ::Dir.mktmpdir
+        yield
+      ensure
+        ::FileUtils.rm_rf(@build_dir)
+      end
+
+      def copy_content_to_build_dir
+        write_appended_on(build_dir)
+      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 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/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/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'

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

@@ -1,23 +1,20 @@
 # frozen_string_literal: true
 
+require 'eac_cli/core_ext'
 require 'avm/eac_rails_base1/runner/code_runner'
-require 'eac_cli/default_runner'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
-        class ProjectRename < ::Avm::EacRailsBase1::Runner::CodeRunner
-          include ::EacCli::DefaultRunner
-
-          runner_definition do
+        class ProjectRename
+          runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle do
             pos_arg :from
             pos_arg :to
           end
 
           def run
-            start_banner
-            command.system!
+            bundle_run
           end
 
           def start_banner
@@ -25,16 +22,10 @@ module Avm
             infov 'To', to
           end
 
-          def from
-            options.fetch('<from>')
-          end
-
-          def to
-            options.fetch('<to>')
-          end
+          delegate :from, :to, to: :parsed
 
-          def command
-            context(:instance).bundle('exec', 'rails', 'runner', code)
+          def bundle_args
+            %w[exec rails runner] + [code]
           end
 
           def code

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/runner'
+require 'avm/eac_writings_base0'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class EacWritingsBase0 < ::Avm::EacWebappBase0::Runner
+        require_sub __FILE__
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/files/format.rb

@@ -32,8 +32,9 @@ module Avm
           end
 
           def formatter_options
-            { apply: options.fetch('--apply'), recursive: !options.fetch('--no-recursive'),
-              verbose: options.fetch('--verbose') }
+            { ::Avm::Files::Formatter::OPTION_APPLY => options.fetch('--apply'),
+              ::Avm::Files::Formatter::OPTION_RECURSIVE => !options.fetch('--no-recursive'),
+              ::Avm::Files::Formatter::OPTION_VERBOSE => options.fetch('--verbose') }
           end
 
           def git

data/lib/avm/tools/runner/git/auto_commit.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/git/auto_commit_path'
+require 'avm/files/formatter'
 require 'eac_cli/default_runner'
 
 module Avm
@@ -13,12 +14,14 @@ module Avm
           runner_definition do
             desc 'Commit with message based in content commited.'
             bool_opt '-d', '--dirty', 'Select dirty files.'
+            bool_opt '-f', '--format', 'Format files before commit.'
             pos_arg 'paths', repeat: true, optional: true
           end
 
           def run
             clear_stage
             banner
+            format_files
             run_paths
           end
 
@@ -39,6 +42,14 @@ module Avm
             context(:git).dirty_files.map { |d| context(:git).root_path.join / d.path }
           end
 
+          def format_files
+            return unless options.fetch('--format')
+
+            infom 'Formating files...'
+            ::Avm::Files::Formatter.new(paths.map(&:path),
+                                        ::Avm::Files::Formatter::OPTION_APPLY => true).run
+          end
+
           def paths_uncached
             (options.fetch('<paths>')
               .map { |p| p.to_pathname.expand_path } + dirty_paths)

data/lib/avm/tools/runner/git/deploy.rb

@@ -88,7 +88,7 @@ module Avm
           def deploy
             ::Avm::Git::Commit.new(git, reference_sha1)
                               .deploy_to_url(target_url)
-                              .append_directories(appended_directories)
+                              .append_templatized_directories(appended_directories)
                               .variables_source_set(variables_source)
                               .run
           end