avm-tools 0.67.0 → 0.69.3

data/lib/avm/stereotypes/eac_wordpress_base0/instance.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 require 'avm/instances/entry_keys'
-require 'avm/stereotypes/eac_webapp_base0/instance'
+require 'avm/eac_webapp_base0/instance'
 
 module Avm
   module Stereotypes
     module EacWordpressBase0
-      class Instance < ::Avm::Stereotypes::EacWebappBase0::Instance
+      class Instance < ::Avm::EacWebappBase0::Instance
         FILES_UNITS = { uploads: 'wp-content/uploads', themes: 'wp-content/themes' }.freeze
 
         def database_unit

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

@@ -2,7 +2,7 @@
 
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_ruby_utils/simple_cache'
-require 'avm/stereotypes/eac_rails_base0/instance'
+require 'avm/eac_rails_base0/instance'
 require 'eac_ruby_utils/require_sub'
 ::EacRubyUtils.require_sub(__FILE__)
 
@@ -26,7 +26,7 @@ module Avm
         private
 
         def instance_uncached
-          ::Avm::Stereotypes::EacRailsBase0::Instance.by_id(options['<instance_id>'])
+          ::Avm::EacRailsBase0::Instance.by_id(options['<instance_id>'])
         end
       end
     end

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

@@ -1,37 +1,14 @@
 # frozen_string_literal: true
 
+require 'avm/eac_webapp_base0/runner/apache_host'
 require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
-require 'avm/stereotypes/eac_rails_base0/apache_host'
+require 'avm/eac_rails_base0/apache_host'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class ApacheHost < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::Console::Speaker
-
-          DOC = <<~DOCOPT
-            Deploy for EacRailsBase0 instance.
-
-            Usage:
-              __PROGRAM__ [options]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                       Show this screen.
-          DOCOPT
-
-          def run
-            result = ::Avm::Stereotypes::EacRailsBase0::ApacheHost.new(
-              context(:instance)
-            ).run
-            if result.error?
-              fatal_error result.to_s
-            else
-              infov 'Result', result.label
-            end
-          end
+        class ApacheHost < ::Avm::EacWebappBase0::Runner::ApacheHost
         end
       end
     end

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_webapp_base0/runner/data'
+require 'avm/eac_webapp_base0/runner/data'
 require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Data < ::Avm::Stereotypes::EacWebappBase0::Runner::Data
+        class Data < ::Avm::EacWebappBase0::Runner::Data
         end
       end
     end

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_rails_base0/deploy'
-require 'avm/stereotypes/eac_webapp_base0/runner/deploy'
+require 'avm/eac_rails_base0/deploy'
+require 'avm/eac_webapp_base0/runner/deploy'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Deploy < ::Avm::Stereotypes::EacWebappBase0::Runner::Deploy
+        class Deploy < ::Avm::EacWebappBase0::Runner::Deploy
         end
       end
     end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_webapp_base0/runner/data'
+require 'avm/eac_webapp_base0/runner/data'
 require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_webapp_base0/runner/data/dump'
+require 'avm/eac_webapp_base0/runner/data/dump'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacRedmineBase0 < ::EacRubyUtils::Console::DocoptRunner
         class Data < ::EacRubyUtils::Console::DocoptRunner
-          class Dump < ::Avm::Stereotypes::EacWebappBase0::Runner::Data::Dump
+          class Dump < ::Avm::EacWebappBase0::Runner::Data::Dump
           end
         end
       end

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require 'avm/eac_redmine_base0/deploy'
-require 'avm/stereotypes/eac_webapp_base0/runner/deploy'
+require 'avm/eac_webapp_base0/runner/deploy'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacRedmineBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Deploy < ::Avm::Stereotypes::EacWebappBase0::Runner::Deploy
+        class Deploy < ::Avm::EacWebappBase0::Runner::Deploy
         end
       end
     end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/rails/runners/runner'
 require 'eac_cli/default_runner'
 
 module Avm

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

@@ -1,37 +1,15 @@
 # frozen_string_literal: true
 
+require 'avm/eac_webapp_base0/runner/apache_host'
+require 'eac_cli/default_runner'
 require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
 require 'avm/stereotypes/eac_wordpress_base0/apache_host'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacWordpressBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class ApacheHost < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::Console::Speaker
-
-          DOC = <<~DOCOPT
-            Configure Apache virtual host for EacWordpressBase0 instance.
-
-            Usage:
-              __PROGRAM__ [options]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                       Show this screen.
-          DOCOPT
-
-          def run
-            result = ::Avm::Stereotypes::EacWordpressBase0::ApacheHost.new(
-              context(:instance)
-            ).run
-            if result.error?
-              fatal_error result.to_s
-            else
-              infov 'Result', result.label
-            end
-          end
+        class ApacheHost < ::Avm::EacWebappBase0::Runner::ApacheHost
         end
       end
     end

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_webapp_base0/runner/data'
+require 'avm/eac_webapp_base0/runner/data'
 require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacWordpressBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Data < ::Avm::Stereotypes::EacWebappBase0::Runner::Data
+        class Data < ::Avm::EacWebappBase0::Runner::Data
         end
       end
     end

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_webapp_base0/runner/deploy'
+require 'avm/eac_webapp_base0/runner/deploy'
 require 'avm/stereotypes/eac_wordpress_base0/deploy'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacWordpressBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Deploy < ::Avm::Stereotypes::EacWebappBase0::Runner::Deploy
+        class Deploy < ::Avm::EacWebappBase0::Runner::Deploy
         end
       end
     end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.67.0'
+    VERSION = '0.69.3'
   end
 end

data/lib/eac_launcher/git/sub_warp_base.rb

@@ -12,7 +12,7 @@ module EacLauncher
         r = find_parent_instance(instance.parent)
         return r if r
 
-        ::EacLauncher::Instances::Errors::Base.new('Git parent not found')
+        ::Avm::Launcher::Errors::Base.new('Git parent not found')
       end
 
       def find_parent_instance(current)

data/lib/eac_launcher/publish/base.rb

@@ -35,7 +35,7 @@ module EacLauncher
 
       def check_with_rescue
         internal_check
-      rescue ::EacLauncher::Instances::Errors::Base => e
+      rescue ::Avm::Launcher::Errors::Base => e
         ::EacLauncher::Publish::CheckResult.blocked("Error: #{e}")
       rescue ::EacLauncher::Git::Error => e
         ::EacLauncher::Publish::CheckResult.blocked("Git error: #{e}")

data/template/avm/self/docker_image/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.4
+FROM ruby:2.5
 RUN gem install avm-tools
 
 RUN apt-get update && apt-get -y --no-install-recommends install \

data/vendor/eac_cli/Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec

data/vendor/eac_cli/eac_cli.gemspec

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'eac_cli/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'eac_cli'
+  s.version     = ::EacCli::VERSION
+  s.authors     = ['Esquilo Azul Company']
+  s.summary     = 'Utilities to build CLI applications with Ruby.'
+
+  s.files = Dir['{lib}/**/*', 'Gemfile']
+
+  s.add_dependency 'eac_ruby_utils', '~> 0.45'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.2'
+end

data/vendor/eac_cli/lib/eac_cli.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  require_sub __FILE__
+end

data/vendor/eac_cli/lib/eac_cli/core_ext.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_cli/patches'

data/vendor/eac_cli/lib/eac_cli/default_runner.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'eac_cli/runner_with/help'
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  module DefaultRunner
+    common_concern do
+      include ::EacCli::RunnerWith::Help
+      enable_console_speaker
+      enable_simple_cache
+    end
+  end
+end

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

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'eac_cli/definition/argument_option'
+require 'eac_cli/definition/boolean_option'
+require 'eac_cli/definition/positional_argument'
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  class Definition
+    require_sub __FILE__
+    attr_accessor :description
+    attr_accessor :options_argument
+
+    def initialize
+      self.description = '-- NO DESCRIPTION SET --'
+      self.options_argument = true
+    end
+
+    def alt(&block)
+      r = ::EacCli::Definition.new
+      r.instance_eval(&block)
+      alternatives << 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
+      )
+    end
+
+    def bool_opt(short, long, description, option_options = {})
+      options << ::EacCli::Definition::BooleanOption.new(short, long, description, option_options)
+    end
+
+    def desc(description)
+      self.description = description
+    end
+
+    def options_arg(options_argument)
+      self.options_argument = options_argument
+    end
+
+    def options
+      @options ||= []
+    end
+
+    def pos_arg(name, arg_options = {})
+      positional << ::EacCli::Definition::PositionalArgument.new(name, arg_options)
+    end
+
+    def positional
+      @positional ||= []
+    end
+
+    def subcommands
+      positional << ::EacCli::Definition::PositionalArgument.new('subcommand', subcommand: true)
+    end
+
+    def options_first(enable = true)
+      @options_first = enable
+    end
+
+    def options_first?
+      @options_first ? true : false
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_cli/definition/base_option'
+
+module EacCli
+  class Definition
+    class ArgumentOption < ::EacCli::Definition::BaseOption
+      def argument?
+        true
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  class Definition
+    class BaseOption
+      attr_reader :short, :long, :description, :options
+
+      def initialize(short, long, description, options = {})
+        @short = short
+        @long = long
+        @description = description
+        @options = options.with_indifferent_access
+      end
+
+      def identifier
+        long.to_s.variableize.to_sym
+      end
+
+      def show_on_usage?
+        options[:usage]
+      end
+    end
+  end
+end