avm-tools 0.104.0 → 0.105.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4585c23cae62880e31d062cc01fbef21cd4736371756e717eaef78ddf16291bc
-  data.tar.gz: 7f45edf7e390d0ca3fbaf0de62ce51820090d9fc1fe5e692b9e6c0a6624efb3a
+  metadata.gz: 3fe2686915966fcba0a1a718e139ea1e4ba92ee4c8f26ddb99abbe550e490061
+  data.tar.gz: a6a2010d4a8cf1a3647641669e967268a09a93ef993625a19407aae1d7ec9ecc
 SHA512:
-  metadata.gz: 1fa3e825fae8f70e9defcb19e44252ecd10872cf250fe043dfb8a6e40a5ccd12f6ce159f94afe602ad23a435e2e8ed84381d165f6498cb85ecfb6cdd3efe9033
-  data.tar.gz: 426f5496fe6e1701dc078f02ccd038d932a09fc362da23a89c9ce1e883ba0a515e1562031d0faaf0c817717a4fc92899af8820484297e0b183f860df33036f8d
+  metadata.gz: 21e08baec23bb4811d5ee4db550dd2b15909f26e02d40ca610f86e651194dcc6ccf19b91d82f9c0fa5b2cfe3c17a8ee8c37459a2e433d831e9a26f2748475e47
+  data.tar.gz: f150f90534d39728ec14e9ada47b2a0e13522b47218984447832075ee3876c20dad0cddf5bc11ee7c899eb06e49c7b6845354fb631c06affc439b5b72bfe0e23

data/lib/avm/launcher/context/instance_collector.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Launcher
+    class Context
+      class InstanceCollector
+        common_constructor :context
+
+        def add_all
+          instances_set.merge(context.instances)
+          self
+        end
+
+        def add_path(path)
+          instances_set.merge(instances_on_path(path))
+          self
+        end
+
+        def add_pending
+          instances_set.merge(context.pending_instances)
+          self
+        end
+
+        def instances
+          instances_set.sort
+        end
+
+        private
+
+        def instance_match?(instance, instance_name)
+          ::File.fnmatch?(instance_name, instance.name)
+        end
+
+        def instances_on_path(path)
+          context.instances.select { |instance| instance_match?(instance, path) }
+        end
+
+        def instances_set
+          @instances_set ||= ::Set.new
+        end
+      end
+    end
+  end
+end

data/lib/avm/launcher/instances/runner_helper.rb

@@ -1,31 +1,33 @@
 # frozen_string_literal: true
 
+require 'avm/launcher/context'
 require 'avm/tools/core_ext'
+require 'avm/launcher/context/instance_collector'
 
 module Avm
   module Launcher
     module Instances
-      class RunnerHelper
-        def context
-          @context ||= ::Avm::Launcher::Context.current
-        end
+      module RunnerHelper
+        common_concern do
+          runner_definition do
+            bool_opt '--all', 'Select all instances.'
+            bool_opt '--pending', 'Select pending instances.'
+            bool_opt '--recache', 'Rewrite instances cache.'
+          end
 
-        def find_instances(instance_name)
-          context.instances.select { |instance| instance_match?(instance, instance_name) }
+          set_callback :run, :before, :setup_cache
         end
 
-        def instance_match?(instance, instance_name)
-          ::File.fnmatch?(instance_name, instance.name)
+        def context
+          @context ||= ::Avm::Launcher::Context.current
         end
 
         def instances
-          if parsed.all?
-            context.instances
-          elsif parsed.pending?
-            context.pending_instances
-          else
-            parsed.instance_path.flat_map { |p| find_instances(p) }
-          end
+          collector = ::Avm::Launcher::Context::InstanceCollector.new(context)
+          collector.add_all if parsed.all?
+          collector.add_pending if parsed.pending?
+          parsed.instance_path.flat_map { |p| collector.add_path(p) }
+          collector.instances
         end
 
         def instance_stereotypes(instance)
@@ -35,6 +37,10 @@ module Avm
         def instance_label(instance)
           "#{instance.name} [#{instance_stereotypes(instance)}]"
         end
+
+        def setup_cache
+          ::Avm::Launcher::Context.current.recache = parsed.recache?
+        end
       end
     end
   end

data/lib/avm/launcher/paths/logical.rb

@@ -7,6 +7,7 @@ module Avm
   module Launcher
     module Paths
       class Logical
+        include ::Comparable
         include ::EacRubyUtils::SimpleCache
 
         class << self
@@ -25,6 +26,10 @@ module Avm
           @logical = logical
         end
 
+        def <=>(other)
+          [logical, real] <=> [other.logical, other.real]
+        end
+
         def to_s
           logical
         end

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

@@ -6,16 +6,14 @@ module Avm
   module Tools
     class Runner
       class Launcher
-        class Instances < ::Avm::Launcher::Instances::RunnerHelper
-          runner_with :help do
+        class Instances
+          runner_with :help, ::Avm::Launcher::Instances::RunnerHelper do
             desc 'Mostra informações sobre instâncias.'
-            bool_opt '--recache', 'Rewrite instances cache.'
-            bool_opt '--all', 'Get all instances.'
+            bool_opt '-e', '--extra', 'Show instances\' extra data.'
             pos_arg :instance_path, repeat: true, optional: true
           end
 
           def run
-            ::Avm::Launcher::Context.current.recache = parsed.recache?
             instances.each { |i| show_instance(i) }
           end
 
@@ -23,6 +21,10 @@ module Avm
 
           def show_instance(instance)
             puts instance_label(instance)
+            show_instance_extra(instance) if parsed.extra?
+          end
+
+          def show_instance_extra(instance)
             infov('  * Parent', (instance.parent ? instance_label(instance.parent) : '-'))
             infov('  * Git current revision', instance.options.git_current_revision)
             infov('  * Git publish remote', instance.options.git_publish_remote)

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

@@ -7,15 +7,13 @@ module Avm
   module Tools
     class Runner
       class Launcher
-        class Projects < ::Avm::Launcher::Instances::RunnerHelper
-          runner_with :help do
+        class Projects
+          runner_with :help, ::Avm::Launcher::Instances::RunnerHelper do
             desc 'Shows available projects.'
-            bool_opt '--recache', 'Rewrite instances cache.'
             bool_opt '-i', '--instances', 'Show instances.'
           end
 
           def run
-            ::Avm::Launcher::Context.current.recache = parsed.recache?
             ::Avm::Launcher::Context.current.projects.each do |p|
               show_project(p)
             end

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

@@ -6,21 +6,17 @@ module Avm
   module Tools
     class Runner
       class Launcher
-        class Publish < ::Avm::Launcher::Instances::RunnerHelper
-          runner_with :help do
+        class Publish
+          runner_with :help, ::Avm::Launcher::Instances::RunnerHelper 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
-            ::Avm::Launcher::Context.current.recache = parsed.recache?
             build_publish_options
             instances.each do |i|
               next unless i.options.publishable?

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.104.0'
+    VERSION = '0.105.0'
   end
 end

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/vendor/avm/spec/lib/avm/git/commit/diff_tree_line_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'aranha/parsers/spec/source_target_fixtures_example'
 require 'avm/git/commit/diff_tree_line'
 
 RSpec.describe ::Avm::Git::Commit::DiffTreeLine, git: true do

data/vendor/avm/spec/rubocop_spec.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-::EacRubyGemSupport::Rspec.default.describe_rubocop
+::EacRubyUtils::Rspec.default_setup.describe_rubocop

data/vendor/avm/spec/spec_helper.rb

@@ -1,19 +1,4 @@
 # frozen_string_literal: true
 
-RSpec.configure do |config|
-  config.expect_with :rspec do |expectations|
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-
-  config.mock_with :rspec do |mocks|
-    mocks.verify_partial_doubles = true
-  end
-
-  config.shared_context_metadata_behavior = :apply_to_host_groups
-
-  require 'eac_ruby_gem_support/rspec'
-  ::EacRubyGemSupport::Rspec.setup(::File.expand_path('..', __dir__))
-end
-
-require 'eac_git/rspec'
-::EacGit::Rspec.configure
+require 'eac_ruby_utils/rspec/default_setup'
+::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Apps
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
   end
 end

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

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-::EacRubyGemSupport::Rspec.default.describe_rubocop
+::EacRubyUtils::Rspec.default_setup.describe_rubocop

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

@@ -1,103 +1,4 @@
 # frozen_string_literal: true
 
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause
-# this file to always be loaded, without a need to explicitly require it in any
-# files.
-#
-# Given that it is always loaded, you are encouraged to keep this file as
-# light-weight as possible. Requiring heavyweight dependencies from this file
-# will add to the boot time of your test suite on EVERY test run, even for an
-# individual file that may not need all of that loaded. Instead, consider making
-# a separate helper file that requires the additional dependencies and performs
-# the additional setup, and require it from the spec files that actually need
-# it.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-RSpec.configure do |config|
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
-  config.expect_with :rspec do |expectations|
-    # This option will default to `true` in RSpec 4. It makes the `description`
-    # and `failure_message` of custom matchers include text for helper methods
-    # defined using `chain`, e.g.:
-    #     be_bigger_than(2).and_smaller_than(4).description
-    #     # => "be bigger than 2 and smaller than 4"
-    # ...rather than:
-    #     # => "be bigger than 2"
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
-  config.mock_with :rspec do |mocks|
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended, and will default to
-    # `true` in RSpec 4.
-    mocks.verify_partial_doubles = true
-  end
-
-  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
-  # have no way to turn it off -- the option exists only for backwards
-  # compatibility in RSpec 3). It causes shared context metadata to be
-  # inherited by the metadata hash of host groups and examples, rather than
-  # triggering implicit auto-inclusion in groups with matching metadata.
-  config.shared_context_metadata_behavior = :apply_to_host_groups
-
-  # The settings below are suggested to provide a good initial experience
-  # with RSpec, but feel free to customize to your heart's content.
-  #   # This allows you to limit a spec run to individual examples or groups
-  #   # you care about by tagging them with `:focus` metadata. When nothing
-  #   # is tagged with `:focus`, all examples get run. RSpec also provides
-  #   # aliases for `it`, `describe`, and `context` that include `:focus`
-  #   # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
-  #   config.filter_run_when_matching :focus
-  #
-  #   # Allows RSpec to persist some state between runs in order to support
-  #   # the `--only-failures` and `--next-failure` CLI options. We recommend
-  #   # you configure your source control system to ignore this file.
-  #   config.example_status_persistence_file_path = "spec/examples.txt"
-  #
-  #   # Limits the available syntax to the non-monkey patched syntax that is
-  #   # recommended. For more details, see:
-  #   #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
-  #   #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
-  #   config.disable_monkey_patching!
-  #
-  #   # This setting enables warnings. It's recommended, but in some cases may
-  #   # be too noisy due to issues in dependencies.
-  #   config.warnings = true
-  #
-  #   # Many RSpec users commonly either run the entire suite or an individual
-  #   # file, and it's useful to allow more verbose output when running an
-  #   # individual spec file.
-  #   if config.files_to_run.one?
-  #     # Use the documentation formatter for detailed output,
-  #     # unless a formatter has already been configured
-  #     # (e.g. via a command-line flag).
-  #     config.default_formatter = "doc"
-  #   end
-  #
-  #   # Print the 10 slowest examples and example groups at the
-  #   # end of the spec run, to help surface which specs are running
-  #   # particularly slow.
-  #   config.profile_examples = 10
-  #
-  #   # Run specs in random order to surface order dependencies. If you find an
-  #   # order dependency and want to debug it, you can fix the order by providing
-  #   # the seed, which is printed after each run.
-  #   #     --seed 1234
-  #   config.order = :random
-  #
-  #   # Seed global randomization in this process using the `--seed` CLI option.
-  #   # Setting this allows you to use `--seed` to deterministically reproduce
-  #   # 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
+require 'eac_ruby_utils/rspec/default_setup'
+::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacAsciidoctorBase0
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

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

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-::EacRubyGemSupport::Rspec.default.describe_rubocop
+::EacRubyUtils::Rspec.default_setup.describe_rubocop

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

@@ -1,102 +1,4 @@
 # frozen_string_literal: true
 
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause
-# this file to always be loaded, without a need to explicitly require it in any
-# files.
-#
-# Given that it is always loaded, you are encouraged to keep this file as
-# light-weight as possible. Requiring heavyweight dependencies from this file
-# will add to the boot time of your test suite on EVERY test run, even for an
-# individual file that may not need all of that loaded. Instead, consider making
-# a separate helper file that requires the additional dependencies and performs
-# the additional setup, and require it from the spec files that actually need
-# it.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-RSpec.configure do |config|
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
-  config.expect_with :rspec do |expectations|
-    # This option will default to `true` in RSpec 4. It makes the `description`
-    # and `failure_message` of custom matchers include text for helper methods
-    # defined using `chain`, e.g.:
-    #     be_bigger_than(2).and_smaller_than(4).description
-    #     # => "be bigger than 2 and smaller than 4"
-    # ...rather than:
-    #     # => "be bigger than 2"
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
-  config.mock_with :rspec do |mocks|
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended, and will default to
-    # `true` in RSpec 4.
-    mocks.verify_partial_doubles = true
-  end
-
-  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
-  # have no way to turn it off -- the option exists only for backwards
-  # compatibility in RSpec 3). It causes shared context metadata to be
-  # inherited by the metadata hash of host groups and examples, rather than
-  # triggering implicit auto-inclusion in groups with matching metadata.
-  config.shared_context_metadata_behavior = :apply_to_host_groups
-
-  # The settings below are suggested to provide a good initial experience
-  # with RSpec, but feel free to customize to your heart's content.
-  #   # This allows you to limit a spec run to individual examples or groups
-  #   # you care about by tagging them with `:focus` metadata. When nothing
-  #   # is tagged with `:focus`, all examples get run. RSpec also provides
-  #   # aliases for `it`, `describe`, and `context` that include `:focus`
-  #   # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
-  #   config.filter_run_when_matching :focus
-  #
-  #   # Allows RSpec to persist some state between runs in order to support
-  #   # the `--only-failures` and `--next-failure` CLI options. We recommend
-  #   # you configure your source control system to ignore this file.
-  #   config.example_status_persistence_file_path = "spec/examples.txt"
-  #
-  #   # Limits the available syntax to the non-monkey patched syntax that is
-  #   # recommended. For more details, see:
-  #   #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
-  #   #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
-  #   config.disable_monkey_patching!
-  #
-  #   # This setting enables warnings. It's recommended, but in some cases may
-  #   # be too noisy due to issues in dependencies.
-  #   config.warnings = true
-  #
-  #   # Many RSpec users commonly either run the entire suite or an individual
-  #   # file, and it's useful to allow more verbose output when running an
-  #   # individual spec file.
-  #   if config.files_to_run.one?
-  #     # Use the documentation formatter for detailed output,
-  #     # unless a formatter has already been configured
-  #     # (e.g. via a command-line flag).
-  #     config.default_formatter = "doc"
-  #   end
-  #
-  #   # Print the 10 slowest examples and example groups at the
-  #   # end of the spec run, to help surface which specs are running
-  #   # particularly slow.
-  #   config.profile_examples = 10
-  #
-  #   # Run specs in random order to surface order dependencies. If you find an
-  #   # order dependency and want to debug it, you can fix the order by providing
-  #   # the seed, which is printed after each run.
-  #   #     --seed 1234
-  #   config.order = :random
-  #
-  #   # Seed global randomization in this process using the `--seed` CLI option.
-  #   # Setting this allows you to use `--seed` to deterministically reproduce
-  #   # 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
+require 'eac_ruby_utils/rspec/default_setup'
+::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))