avm-tools 0.74.0 → 0.76.1

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,23 +1,20 @@
 # frozen_string_literal: true
 
-require 'avm/rails/runners/runner'
-require 'eac_cli/default_runner'
+require 'eac_cli/core_ext'
+require 'avm/eac_rails_base1/runner/code_runner'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class EacRedmineBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class ProjectRename < ::Avm::Rails::Runners::Runner
-          include ::EacCli::DefaultRunner
-
-          runner_definition do
+      class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
+        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_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/runner/{eac_rails_base0/data.rb → eac_writings_base0.rb}

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'avm/eac_webapp_base0/runner/data'
+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 EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Data < ::Avm::EacWebappBase0::Runner::Data
-        end
+      class EacWritingsBase0 < ::Avm::EacWebappBase0::Runner
+        require_sub __FILE__
       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

data/lib/avm/tools/version.rb

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

data/template/avm/eac_writings_base0/deploy/index.html.template

@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <title>%%title%%</title>
+  </head>
+  <body>
+    <h1>%%title%%</h1>
+    <a href="%%pdf_path%%">PDF</a>
+  </body>
+</html>

data/vendor/eac_cli/eac_cli.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*', 'Gemfile']
 
-  s.add_dependency 'eac_ruby_utils', '~> 0.45'
+  s.add_dependency 'eac_ruby_utils', '~> 0.50'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.2'
 end

data/vendor/eac_cli/lib/eac_cli/definition.rb

@@ -8,6 +8,10 @@ require 'eac_ruby_utils/core_ext'
 module EacCli
   class Definition
     require_sub __FILE__
+
+    SUBCOMMAND_NAME_ARG = 'subcommand'
+    SUBCOMMAND_ARGS_ARG = 'subcommand_args'
+
     attr_accessor :description
     attr_accessor :options_argument
 
@@ -41,6 +45,10 @@ module EacCli
       self.description = description
     end
 
+    def help_formatter
+      @help_formatter ||= ::EacCli::Definition::HelpFormatter.new(self)
+    end
+
     def options_arg(options_argument)
       self.options_argument = options_argument
     end
@@ -50,15 +58,33 @@ module EacCli
     end
 
     def pos_arg(name, arg_options = {})
-      positional << ::EacCli::Definition::PositionalArgument.new(name, arg_options)
+      new_pos_arg = ::EacCli::Definition::PositionalArgument.new(name, arg_options)
+      raise 'Positional arguments are blocked' if positional_arguments_blocked?(new_pos_arg)
+
+      pos_set << new_pos_arg
     end
 
     def positional
-      @positional ||= []
+      pos_set.to_a
+    end
+
+    def positional_arguments_blocked?(new_pos_arg)
+      last = pos_set.last
+      return false unless last
+      return true if last.repeat?
+      return true if last.optional? && new_pos_arg.required?
+
+      false
     end
 
     def subcommands
-      positional << ::EacCli::Definition::PositionalArgument.new('subcommand', subcommand: true)
+      pos_arg(SUBCOMMAND_NAME_ARG, subcommand: true)
+      pos_set << ::EacCli::Definition::PositionalArgument.new(SUBCOMMAND_ARGS_ARG,
+                                                              optional: true, repeat: true)
+    end
+
+    def subcommands?
+      pos_set.any?(&:subcommand?)
     end
 
     def options_first(enable = true)
@@ -68,5 +94,11 @@ module EacCli
     def options_first?
       @options_first ? true : false
     end
+
+    private
+
+    def pos_set
+      @pos_set ||= []
+    end
   end
 end

data/vendor/eac_cli/lib/eac_cli/definition/base_option.rb

@@ -5,19 +5,35 @@ require 'eac_ruby_utils/core_ext'
 module EacCli
   class Definition
     class BaseOption
+      DEFAULT_REQUIRED = false
+
+      enable_listable
+      lists.add_symbol :option, :optional, :usage, :required
       attr_reader :short, :long, :description, :options
 
       def initialize(short, long, description, options = {})
         @short = short
         @long = long
         @description = description
-        @options = options.with_indifferent_access
+        @options = options.symbolize_keys
+        @options.assert_valid_keys(::EacCli::Definition::BaseOption.lists.option.values)
       end
 
       def identifier
         long.to_s.variableize.to_sym
       end
 
+      def required?
+        return true if options.key?(:required) && options.fetch(:required)
+        return false if options.key?(:optional) && options.fetch(:optional)
+
+        DEFAULT_REQUIRED
+      end
+
+      def to_s
+        "#{self.class.name.demodulize}[#{identifier}]"
+      end
+
       def show_on_usage?
         options[:usage]
       end

data/vendor/eac_cli/lib/eac_cli/definition/help_formatter.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  class Definition
+    class HelpFormatter
+      SEP = ' '
+      IDENT = SEP * 2
+      OPTION_DESC_SEP = IDENT * 2
+
+      class << self
+        def option_long(option)
+          b = option.long
+          b += '=VALUE' if option.argument?
+          b
+        end
+
+        def option_short(option)
+          b = option.short
+          b += 'VALUE' if option.argument?
+          b
+        end
+      end
+
+      common_constructor :definition
+
+      def positional_argument(positional)
+        if positional.subcommand?
+          ::EacRubyUtils::Console::DocoptRunner::SUBCOMMANDS_MACRO
+        else
+          r = "<#{positional.name}>"
+          r += '...' if positional.repeat?
+          r = "[#{r}]" if positional.optional?
+          r
+        end
+      end
+
+      def section(header, include_header = true)
+        b = include_header ? "#{header.humanize}:\n" : ''
+        b += send("self_#{header}") + "\n"
+        # TO-DO: implement alternatives
+        b
+      end
+
+      def self_options
+        definition.options.map { |option| IDENT + option_definition(option) }.join("\n")
+      end
+
+      def self_usage
+        IDENT + self_usage_arguments.join(SEP)
+      end
+
+      def self_usage_arguments
+        [::EacRubyUtils::Console::DocoptRunner::PROGRAM_MACRO] +
+          definition.options_argument.if_present([]) { |_v| ['[options]'] } +
+          self_usage_arguments_options +
+          self_usage_arguments_positional
+      end
+
+      def self_usage_arguments_options
+        definition.options.select(&:show_on_usage?).map do |option|
+          self.class.option_long(option)
+        end
+      end
+
+      def self_usage_arguments_positional
+        definition.positional.map { |p| positional_argument(p) }
+      end
+
+      def to_banner
+        "#{definition.description}\n\n#{section('usage')}"
+      end
+    end
+  end
+end