avm-tools 0.75.0 → 0.78.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '061861b37a86551104e76e78c988fabd4e421dbdcaf223fd567e36aa725abf49'
-  data.tar.gz: e5b1a4bcd4cc716e9dfad2527143163a8e97528cabe7fa44ac01ed12a4fdbe6d
+  metadata.gz: 31676da0253c7ec8dc92aee2619723858f021faedb659e4f6128a7552eaad975
+  data.tar.gz: b6c14df8700750c9e0a39c9b8de6ee78e5864bdbf8ff2c21c7c59f029257437f
 SHA512:
-  metadata.gz: 83feb6ab0a6519f2319650eac3a15305fbc46d088a80d7521e14347fda3db9ea3503fe0c5a474d8899f9359f0807685ff7e4a33ccac0c610ac08406a33e137fa
-  data.tar.gz: cb4f4ff1b6f0b7dad60530111f60a20acbef410a9edb2e6c865cfd0589808e5847bf21afc9e954f33092ab8faa1cefd084905fc1206d54c18d117c8bd5efbaec
+  metadata.gz: 989f01a3eb81d88b99186f3471f7437cdd00d7f6d182a68cb2f1080461f08cbadb84bb30782e8bab731eecd75782cc7728d175920cb28f8544e31f88e435ef02
+  data.tar.gz: 2b51fd22a6aec3d7955f75c3f4d1c68fc5a60c2c8c2dbc13e25cdaff6396df1ba655e1ef5183ab3081e18f17b642a5cf832f7583e80997c6bfb121c90fd0c0a4

data/lib/avm/eac_rails_base1/runner/bundle.rb

@@ -8,7 +8,7 @@ require 'shellwords'
 module Avm
   module EacRailsBase1
     class Runner < ::Avm::EacWebappBase0::Runner
-      class Bundle < ::EacRubyUtils::Console::DocoptRunner
+      class Bundle
         runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle
         runner_definition do
           desc 'Runs "bundle ...".'
@@ -20,7 +20,7 @@ module Avm
         end
 
         def bundle_args
-          options.fetch('<bundle-args>').reject { |arg| arg == '--' }
+          parsed.bundle_args.reject { |arg| arg == '--' }
         end
       end
     end

data/lib/avm/eac_rails_base1/runner/code_runner.rb

@@ -7,7 +7,7 @@ require 'eac_ruby_utils/console/docopt_runner'
 module Avm
   module EacRailsBase1
     class Runner < ::Avm::EacWebappBase0::Runner
-      class CodeRunner < ::EacRubyUtils::Console::DocoptRunner
+      class CodeRunner
         runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle
         runner_definition do
           desc 'Runs a Ruby code with "rails runner".'
@@ -15,12 +15,12 @@ module Avm
         end
 
         def run
-          infov 'Environment', context(:instance).host_env
+          infov 'Environment', runner_context.call(:instance).host_env
           bundle_run
         end
 
         def bundle_args
-          %w[exec rails runner] + [options.fetch('<code>')]
+          %w[exec rails runner] + [parsed.code]
         end
       end
     end

data/lib/avm/eac_webapp_base0/deploy/build.rb

@@ -17,7 +17,7 @@ module Avm
           ::Avm::Files::Appender
             .new
             .variables_source_set(variables_source)
-            .append_directory(template.path)
+            .append_templatized_directory(template.path)
             .append_templatized_directories(appended_directories)
             .append_file_content(version_target_path, version)
             .write_appended_on(build_dir)

data/lib/avm/eac_webapp_base0/runner/deploy.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/instances/runner'
 require 'avm/path_string'
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_ruby_utils/console/speaker'

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/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/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/subrepo/clone.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'eac_git/local'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Git < ::EacRubyUtils::Console::DocoptRunner
+        class Subrepo < ::EacRubyUtils::Console::DocoptRunner
+          class Clone
+            runner_with :help do
+              desc 'Clone git-subrepo repositories.'
+              arg_opt '-b', '--branch', 'Branch.'
+              arg_opt '-d', '--parent-dir', 'Target path\'s parent directory.'
+              pos_arg :url
+              pos_arg :target_path, optional: true
+            end
+
+            def run
+              start_banner
+              clean
+              clone
+            end
+
+            private
+
+            def start_banner
+              infov 'URL', url
+              infov 'Subpath', target_path
+              infov 'Branch', branch
+            end
+
+            def clean
+              infom 'Cleaning...'
+              git.command('subrepo', 'clean', '--all', '--force').system!
+            end
+
+            def clone
+              infom 'Cloning...'
+              infov 'Clone arguments', clone_args
+              git.command(*clone_args).system!
+            end
+
+            delegate :branch, :url, to: :parsed
+
+            def git_uncached
+              ::EacGit::Local.new('.')
+            end
+
+            def clone_args
+              ['subrepo'] + branch.if_present([]) { |v| ['--branch', v] } +
+                if ::File.exist?(target_path)
+                  ['init', target_path, '--remote', url]
+                else
+                  ['clone', url, target_path, '--message', clone_message, '--force']
+                end
+            end
+
+            def clone_message
+              "Subrepo \"#{target_path}\" (#{url})."
+            end
+
+            def repos_name_from_url
+              %r{/([^/]+)\z}.if_match(url, false) { |m| m[1].gsub(/\.git\z/, '') }
+            end
+
+            def target_path
+              parsed.target_path || target_path_from_parent_dir ||
+                fatal_error('No target path specified')
+            end
+
+            def target_path_from_parent_dir
+              return nil unless parsed.parent_dir && repos_name_from_url
+
+              ::File.join(parsed.parent_dir, repos_name_from_url)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.75.0'
+    VERSION = '0.78.0'
   end
 end

data/template/avm/eac_redmine_base0/deploy/config/install.sh.template

@@ -12,3 +12,15 @@ fi
 export address_host='%%WEB.AUTHORITY%%'
 export address_path='%%WEB.PATH%%'
 export git_repositories_hierarchical_organisation=false
+
+# Mail settings
+export smtp_server='%%MAILER.SMTP.ADDRESS%%'
+export smtp_port='%%MAILER.SMTP.PORT%%'
+export smtp_domain='%%MAILER.SMTP.DOMAIN%%'
+export smtp_tls='%%MAILER_SMTP_TLS%%'
+export smtp_enable_starttls_auto='%%MAILER_SMTP_STARTTLS_AUTO%%'
+export smtp_openssl_verify_mode='%%MAILER_SMTP_OPENSSL_VERIFY_MODE%%'
+export smtp_authentication='%%MAILER.SMTP.AUTHENTICATION%%'
+export smtp_username='%%MAILER.SMTP.USERNAME%%'
+export smtp_password='%%MAILER.SMTP.PASSWORD%%'
+export mail_from='%%MAILER.FROM%%'

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,57 +8,66 @@ require 'eac_ruby_utils/core_ext'
 module EacCli
   class Definition
     require_sub __FILE__
+
+    MAIN_ALTERNATIVE_KEY = :main
+    SUBCOMMAND_NAME_ARG = 'subcommand'
+    SUBCOMMAND_ARGS_ARG = 'subcommand_args'
+
     attr_accessor :description
-    attr_accessor :options_argument
 
     def initialize
       self.description = '-- NO DESCRIPTION SET --'
-      self.options_argument = true
+      alternatives_set[MAIN_ALTERNATIVE_KEY] = main_alternative
     end
 
     def alt(&block)
-      r = ::EacCli::Definition.new
+      r = ::EacCli::Definition::Alternative.new
       r.instance_eval(&block)
-      alternatives << r
+      alternatives_set[new_alternative_key] = r
       r
     end
 
     def alternatives
-      @alternatives ||= []
-    end
-
-    def arg_opt(short, long, description, option_options = {})
-      options << ::EacCli::Definition::ArgumentOption.new(
-        short, long, description, option_options
-      )
+      alternatives_set.values
     end
 
-    def bool_opt(short, long, description, option_options = {})
-      options << ::EacCli::Definition::BooleanOption.new(short, long, description, option_options)
+    def alternative(key)
+      alternatives_set.fetch(key)
     end
 
     def desc(description)
       self.description = description
     end
 
+    def help_formatter
+      @help_formatter ||= ::EacCli::Definition::HelpFormatter.new(self)
+    end
+
+    def main_alternative
+      @main_alternative ||= begin
+        r = ::EacCli::Definition::Alternative.new
+        r.options_argument(true)
+        r
+      end
+    end
+
     def options_arg(options_argument)
       self.options_argument = options_argument
     end
 
-    def options
-      @options ||= []
+    def options_argument
+      main_alternative.options_argument?
     end
 
-    def pos_arg(name, arg_options = {})
-      positional << ::EacCli::Definition::PositionalArgument.new(name, arg_options)
+    def options_argument=(enable)
+      main_alternative.options_argument(enable)
     end
 
-    def positional
-      @positional ||= []
-    end
+    delegate :arg_opt, :bool_opt, :options, :pos_arg,
+             :positional, :subcommands, to: :main_alternative
 
-    def subcommands
-      positional << ::EacCli::Definition::PositionalArgument.new('subcommand', subcommand: true)
+    def subcommands?
+      alternatives.any?(&:subcommands?)
     end
 
     def options_first(enable = true)
@@ -68,5 +77,23 @@ module EacCli
     def options_first?
       @options_first ? true : false
     end
+
+    private
+
+    def alternatives_set
+      @alternatives_set ||= ::ActiveSupport::HashWithIndifferentAccess.new
+    end
+
+    def new_alternative_key
+      @last_key ||= 0
+      loop do
+        @last_key += 1
+        break @last_key unless alternatives_set.key?(@last_key)
+      end
+    end
+
+    def pos_set
+      @pos_set ||= []
+    end
   end
 end