avm-tools 0.94.0 → 0.96.0

data/lib/avm/tools/runner/{local_project → app_src}/test.rb

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Tools
     class Runner
-      class LocalProject
+      class AppSrc
         class Test < ::EacRubyUtils::Console::DocoptRunner
           include ::EacCli::DefaultRunner
 

data/lib/avm/tools/runner/{local_project → app_src}/update.rb

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Tools
     class Runner
-      class LocalProject
+      class AppSrc
         class Update < ::EacRubyUtils::Console::DocoptRunner
           include ::EacCli::DefaultRunner
 

data/lib/avm/tools/runner/{local_project → app_src}/version_bump.rb

@@ -6,7 +6,7 @@ require 'eac_cli/core_ext'
 module Avm
   module Tools
     class Runner
-      class LocalProject
+      class AppSrc
         class VersionBump
           runner_with :help do
             desc 'Bump version of a local project.'

data/lib/avm/tools/runner/git/subrepo/fix.rb

@@ -30,7 +30,7 @@ module Avm
               local_repos.dirty_files.each do |file|
                 infov '  * Ammending', file.path
                 ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file.path,
-                                              ::Avm::Git::FileAutoFixup::OPTION_UNIQUE => true).run
+                                              [::Avm::Git::AutoCommit::Rules::Unique.new]).run
               end
             end
 

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

@@ -1,16 +1,13 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/core_ext'
+require 'avm/core_ext'
 
 module Avm
   module Tools
     class Runner
-      class Launcher < ::EacRubyUtils::Console::DocoptRunner
+      class Launcher
         require_sub __FILE__
-        include ::EacCli::DefaultRunner
-
-        runner_definition do
+        runner_with :help, :subcommands do
           desc 'Utilities to deploy applications and libraries.'
           subcommands
         end

data/lib/avm/tools/runner/launcher/instances.rb

@@ -1,28 +1,21 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/instances/runner_helper'
+require 'avm/launcher/instances/runner_helper'
 
 module Avm
   module Tools
     class Runner
-      class Launcher < ::EacRubyUtils::Console::DocoptRunner
-        class Instances < ::EacLauncher::Instances::RunnerHelper
-          DOC = <<~DOCOPT
-            Mostra informações sobre instâncias.
-
-            Usage:
-              __PROGRAM__ [options] [<instance_path>...]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help             Show this screen.
-              --all            Get all instances.
-              --recache        Rewrite instances cache.
-
-          DOCOPT
+      class Launcher
+        class Instances < ::Avm::Launcher::Instances::RunnerHelper
+          runner_with :help do
+            desc 'Mostra informações sobre instâncias.'
+            bool_opt '--recache', 'Rewrite instances cache.'
+            bool_opt '--all', 'Get all instances.'
+            pos_arg :instance_path, repeat: true, optional: true
+          end
 
           def run
-            ::EacLauncher::Context.current.recache = options['--recache']
+            ::EacLauncher::Context.current.recache = parsed.recache?
             instances.each { |i| show_instance(i) }
           end
 
@@ -34,10 +27,6 @@ module Avm
             infov('  * Git current revision', instance.options.git_current_revision)
             infov('  * Git publish remote', instance.options.git_publish_remote)
           end
-
-          def instance_path
-            options['<instance_path>']
-          end
         end
       end
     end

data/lib/avm/tools/runner/launcher/projects.rb

@@ -1,29 +1,21 @@
 # frozen_string_literal: true
 
 require 'eac_launcher/context'
-require 'eac_launcher/instances/runner_helper'
+require 'avm/launcher/instances/runner_helper'
 
 module Avm
   module Tools
     class Runner
-      class Launcher < ::EacRubyUtils::Console::DocoptRunner
-        class Projects < ::EacLauncher::Instances::RunnerHelper
-          DOC = <<~DOCOPT
-            Shows available projects.
-
-            Usage:
-              __PROGRAM__ [options]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help        Show this screen.
-              -i --instances   Show instances.
-              --recache        Rewrite instances cache.
-
-          DOCOPT
+      class Launcher
+        class Projects < ::Avm::Launcher::Instances::RunnerHelper
+          runner_with :help do
+            desc 'Shows available projects.'
+            bool_opt '--recache', 'Rewrite instances cache.'
+            bool_opt '-i', '--instances', 'Show instances.'
+          end
 
           def run
-            ::EacLauncher::Context.current.recache = options['--recache']
+            ::EacLauncher::Context.current.recache = parsed.recache?
             ::EacLauncher::Context.current.projects.each do |p|
               show_project(p)
             end
@@ -33,7 +25,7 @@ module Avm
 
           def show_project(project)
             puts project_label(project)
-            return unless options['--instances']
+            return unless parsed.instances?
 
             project.instances.each do |i|
               puts "  * #{instance_label(i)}"

data/lib/avm/tools/runner/launcher/publish.rb

@@ -1,33 +1,26 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/instances/runner_helper'
+require 'avm/launcher/instances/runner_helper'
 
 module Avm
   module Tools
     class Runner
-      class Launcher < ::EacRubyUtils::Console::DocoptRunner
-        class Publish < ::EacLauncher::Instances::RunnerHelper
-          DOC = <<~DOCOPT
-            Publica projetos ou instâncias.
-
-            Usage:
-              __PROGRAM__ [options] [<instance_path>...]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help             Show this screen.
-              --new                 Publish projects not published before.
-              -s --stereotype=<st>  Publish only for stereotype <stereotype>.
-              --all            Publish all instances.
-              -d --dry-run          "Dry run" publishing.
-              --pending             Publish only pending.
-              --recache             Rewrite instances cache.
-              --run                 Confirm publishing.
-
-          DOCOPT
+      class Launcher
+        class Publish < ::Avm::Launcher::Instances::RunnerHelper
+          runner_with :help do
+            desc 'Publica projetos ou instâncias.'
+            bool_opt '--all', 'Get all instances.'
+            bool_opt '-d', '--dry-run', '"Dry run" publishing.'
+            bool_opt '--new', 'Publish projects not published before.'
+            bool_opt '--pending', 'Publish only pending.'
+            bool_opt '--recache', 'Rewrite instances cache.'
+            bool_opt '--run', 'Confirm publishing.'
+            arg_opt '-s', '--stereotype', 'Publish only for stereotype <stereotype>.'
+            pos_arg :instance_path, repeat: true, optional: true
+          end
 
           def run
-            ::EacLauncher::Context.current.recache = options['--recache']
+            ::EacLauncher::Context.current.recache = parsed.run?
             build_publish_options
             instances.each do |i|
               next unless i.options.publishable?
@@ -39,7 +32,7 @@ module Avm
           private
 
           def dry_run?
-            options.fetch('--dry-run')
+            parsed.dry_run?
           end
 
           def instance_method
@@ -51,12 +44,11 @@ module Avm
           end
 
           def publish_options
-            { new: options.fetch('--new'), stereotype: options.fetch('--stereotype'),
-              confirm: run? }
+            { new: parsed.new?, stereotype: parsed.stereotype?, confirm: run? }
           end
 
           def run?
-            options.fetch('--run') && !dry_run?
+            parsed.run? && !dry_run?
           end
         end
       end

data/lib/avm/tools/runner/ruby/rubocop.rb

@@ -1,43 +1,27 @@
 # frozen_string_literal: true
 
+require 'avm/core_ext'
 require 'avm/ruby/rubocop'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
     class Runner
       class Ruby
-        class Rubocop < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::Console::Speaker
-          include ::EacRubyUtils::SimpleCache
-
-          DOC = <<~DOCOPT
-            Runs Rubocop (https://rubygems.org/gems/rubocop).
-
-            Usage:
-              __PROGRAM__ [options] [<rubocop-args>...]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help               Show this screen.
-              -C=<path>               Caminho para executar o Rubocop [default: .].
-          DOCOPT
+        class Rubocop
+          runner_with :help do
+            desc 'Runs Rubocop (https://rubygems.org/gems/rubocop).'
+            arg_opt '-C', 'Caminho para executar o Rubocop [default: .].'
+            pos_arg :rubocop_args, repeat: true, optional: true
+          end
 
           def run
-            ::Avm::Ruby::Rubocop.new(path, rubocop_args).run
+            ::Avm::Ruby::Rubocop.new(path, parsed.rubocop_args).run
           end
 
           private
 
           def path
-            ::Pathname.new(options.fetch('-C')).expand_path
-          end
-
-          def rubocop_args
-            r = options.fetch('<rubocop-args>')
-            r.shift if r.first == '--'
-            r
+            ::Pathname.new(parsed.c || '.').expand_path
           end
         end
       end

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

@@ -1,25 +1,17 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/require_sub'
+require 'avm/core_ext'
 require 'avm/self'
 
 module Avm
   module Tools
     class Runner
-      class Self < ::EacRubyUtils::Console::DocoptRunner
-        ::EacRubyUtils.require_sub(__FILE__)
-
-        DOC = <<~DOCOPT
-          Utilities for self avm-tools.
-
-          Usage:
-            __PROGRAM__ [options] __SUBCOMMANDS__
-            __PROGRAM__ -h | --help
-
-          Options:
-            -h --help             Show this screen.
-        DOCOPT
+      class Self
+        require_sub __FILE__
+        runner_with :help, :subcommands do
+          desc 'Utilities for self avm-tools.'
+          subcommands
+        end
 
         def instance
           ::Avm::Self.instance

data/lib/avm/tools/runner/self/docker.rb

@@ -5,7 +5,7 @@ require 'avm/docker/runner'
 module Avm
   module Tools
     class Runner
-      class Self < ::EacRubyUtils::Console::DocoptRunner
+      class Self
         class Docker < ::Avm::Docker::Runner
         end
       end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.94.0'
+    VERSION = '0.96.0'
   end
 end

data/lib/eac_launcher/instances.rb

@@ -2,5 +2,5 @@
 
 require 'avm/launcher/errors/base'
 require 'avm/launcher/instances/base'
-require 'eac_launcher/instances/runner_helper'
+require 'avm/launcher/instances/runner_helper'
 require 'eac_launcher/instances/settings'

data/template/avm/ruby/gems/generator/static/spec/rubocop_spec.rb

@@ -1,7 +1,3 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_gem_support/spec/examples/rubocop_check'
-
-RSpec.describe ::RuboCop, slow: true do
-  include_examples 'rubocop_check', ::File.expand_path('..', __dir__)
-end
+::EacRubyGemSupport::Rspec.default.describe_rubocop

data/template/avm/ruby/gems/generator/static/spec/spec_helper.rb

@@ -97,4 +97,6 @@ RSpec.configure do |config|
   #   # test failures related to randomization by passing the same `--seed` value
   #   # as the one that triggered the failure.
   #   Kernel.srand config.seed
+  require 'eac_ruby_gem_support/rspec'
+  ::EacRubyGemSupport::Rspec.setup(::File.expand_path('..', __dir__))
 end

data/vendor/avm-apps/avm-apps.gemspec

@@ -14,5 +14,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'eac_ruby_utils', '~> 0.58', '>= 0.58.1'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.2'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/vendor/avm-apps/lib/avm/apps/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Apps
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/vendor/avm-apps/spec/rubocop_spec.rb

@@ -1,7 +1,3 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_gem_support/spec/examples/rubocop_check'
-
-RSpec.describe ::RuboCop, slow: true do
-  include_examples 'rubocop_check', ::File.expand_path('..', __dir__)
-end
+::EacRubyGemSupport::Rspec.default.describe_rubocop

data/vendor/avm-apps/spec/spec_helper.rb

@@ -97,4 +97,7 @@ RSpec.configure do |config|
   #   # test failures related to randomization by passing the same `--seed` value
   #   # as the one that triggered the failure.
   #   Kernel.srand config.seed
+
+  require 'eac_ruby_gem_support/rspec'
+  ::EacRubyGemSupport::Rspec.setup(::File.expand_path('..', __dir__), config)
 end

data/vendor/eac_cli/eac_cli.gemspec

@@ -14,5 +14,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'eac_ruby_utils', '~> 0.55'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.2'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

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

@@ -2,3 +2,5 @@
 
 require 'eac_ruby_utils/core_ext'
 require 'eac_cli/patches'
+
+::EacCli::RunnerWithSet.default.add_namespace(::EacCli::RunnerWith)

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

@@ -28,7 +28,11 @@ module EacCli
       end
 
       def identifier
-        long.to_s.variableize.to_sym
+        [long, short].each do |v|
+          v.to_s.if_present { |vv| return vv.variableize.to_sym }
+        end
+
+        raise 'No short or long option to build identifier'
       end
 
       def repeat?

data/vendor/eac_cli/lib/eac_cli/docopt/doc_builder.rb

@@ -36,7 +36,9 @@ module EacCli
       end
 
       def option_definition(option)
-        self.class.option_usage_full(option) + OPTION_DESC_SEP + option.description
+        self.class.option_usage_full(option) + option.description.if_present('') do |v|
+          OPTION_DESC_SEP + v
+        end
       end
 
       def section(header, include_header = true)

data/vendor/eac_cli/lib/eac_cli/parser/alternative/short_options.rb

@@ -14,7 +14,9 @@ module EacCli
         end
 
         def find_short_option(char)
-          alternative.options.find { |option| short_without_prefix(option.short) == char }
+          alternative.options.find do |option|
+            short_without_prefix(option.short).if_present(false) { |v| v == char }
+          end
         end
 
         def short_option_collect_argv_value
@@ -37,7 +39,7 @@ module EacCli
         end
 
         def short_without_prefix(short)
-          short.gsub(/\A#{::Regexp.quote(SHORT_OPTION_PREFIX)}/, '')
+          short.to_s.gsub(/\A#{::Regexp.quote(SHORT_OPTION_PREFIX)}/, '')
         end
       end
     end