avm-tools 0.53.0 → 0.56.0

data/lib/avm/stereotypes/eac_webapp_base0/deploy/appended_directories.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/path_string'
+
+module Avm
+  module Stereotypes
+    module EacWebappBase0
+      class Deploy
+        module AppendedDirectories
+          APPENDED_DIRECTORIES_ENTRY_KEY = 'deploy.appended_directories'
+
+          def appended_directories
+            appended_directories_from_instance_entry + appended_directories_from_options
+          end
+
+          def appended_directories_from_instance_entry
+            ::Avm::PathString.paths(instance.read_entry_optional(APPENDED_DIRECTORIES_ENTRY_KEY))
+          end
+
+          def appended_directories_from_options
+            options[:appended_directories] || []
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/stereotypes/eac_webapp_base0/deploy/file_unit.rb

@@ -4,7 +4,7 @@ module Avm
   module Stereotypes
     module EacWebappBase0
       class Deploy
-        class FilesUnit < ::SimpleDelegator
+        class FileUnit < ::SimpleDelegator
           attr_reader :data_key, :fs_path_subpath
 
           def initialize(deploy, data_key, fs_path_subpath)

data/lib/avm/stereotypes/eac_webapp_base0/deploy/git_info.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Avm
+  module Stereotypes
+    module EacWebappBase0
+      class Deploy
+        module GitInfo
+          def commit_sha1_uncached
+            git_fetch
+            r = git.rev_parse(git_reference_found)
+            return r if r
+
+            raise ::Avm::Result::Error, "No commit SHA1 found for \"#{git_reference_found}\""
+          end
+
+          def git_reference
+            options[:reference] || DEFAULT_REFERENCE
+          end
+
+          def git_reference_found_uncached
+            %w[git_reference instance_branch master_branch].map { |b| send(b) }.find(&:present?) ||
+              raise(
+                ::Avm::Result::Error,
+                'No git reference found (Searched for option, instance and master)'
+              )
+          end
+
+          def git_remote_hashs_uncached
+            git.remote_hashs(git_remote_name)
+          end
+
+          def git_remote_name
+            ::Avm::Git::DEFAULT_REMOTE_NAME
+          end
+
+          def instance_branch
+            remote_branch(instance.id)
+          end
+
+          def remote_branch(name)
+            git_remote_hashs.key?("refs/heads/#{name}") ? "#{git_remote_name}/#{name}" : nil
+          end
+
+          def master_branch
+            remote_branch('master')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/stereotypes/eac_webapp_base0/deploy/version.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Avm
+  module Stereotypes
+    module EacWebappBase0
+      class Deploy
+        module Version
+          VERSION_TARGET_PATH = 'VERSION'
+
+          def version
+            ([::Time.now, commit_sha1] + version_git_refs).join('|')
+          end
+
+          def version_git_refs
+            git_remote_hashs.select { |_name, sha1| sha1 == commit_sha1 }.keys
+                            .map { |ref| ref.gsub(%r{\Arefs/}, '') }.reject { |ref| ref == 'HEAD' }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner.rb

@@ -1,39 +1,23 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
 require 'eac_ruby_utils/require_sub'
 ::EacRubyUtils.require_sub(__FILE__)
+require 'avm/self'
 require 'avm/tools/version'
+require 'eac_ruby_base0/runner'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
-      include ::EacRubyUtils::Console::Speaker
+      include ::EacRubyBase0::Runner
 
-      DOC = <<~DOCOPT
-        Tools for AVM.
-
-        Usage:
-          __PROGRAM__ [options] __SUBCOMMANDS__
-          __PROGRAM__ --version
-          __PROGRAM__ -h | --help
-
-        Options:
-          -h --help             Show this screen.
-          -V --version          Show version.
-          -q --quiet            Quiet mode.
-      DOCOPT
+      runner_definition do
+        desc 'Tools for AVM.'
+      end
 
-      def run
-        on_speaker_node do |node|
-          node.stderr = ::StringIO.new if options.fetch('--quiet')
-          if options.fetch('--version')
-            out(::Avm::Tools::VERSION + "\n")
-          else
-            run_with_subcommand
-          end
-        end
+      def application
+        ::Avm::Self.application
       end
     end
   end

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

@@ -16,13 +16,17 @@ module Avm
               desc 'Check status of subrepos.'
               bool_opt '-a', '--all', 'Select all subrepos.'
               bool_opt '-f', '--fix-parent', 'Fix parent SHA1.'
+              bool_opt '-n', '--no-error', 'Do not exit with error if check fails.'
               bool_opt '-r', '--remote', 'Check subrepos remote.'
               pos_arg :subrepos, repeat: true, optional: true
             end
 
             def run
               subrepo_checks.show_result
-              fatal_error 'Failed' if subrepo_checks.result.error?
+              return if options.fetch('--no-error')
+              return unless subrepo_checks.result.error?
+
+              fatal_error 'Failed'
             end
 
             private

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.53.0'
+    VERSION = '0.56.0'
   end
 end

data/lib/eac_launcher.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-GIT_SUBREPO_LIB = ::File.join(::File.dirname(__dir__), 'vendor', 'git-subrepo', 'lib')
-ENV['PATH'] = "#{GIT_SUBREPO_LIB}#{::File::PATH_SEPARATOR}#{ENV['PATH']}"
-
 module EacLauncher
   require 'eac_launcher/context'
   require 'eac_launcher/paths'

data/lib/eac_launcher/git/base/underlying.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_git/executables'
 require 'eac_ruby_utils/envs'
 require 'git'
 require 'eac_launcher/paths/real'
@@ -9,23 +10,24 @@ module EacLauncher
     class Base < ::EacLauncher::Paths::Real
       module Underlying
         def command(*args)
-          args, _options = build_args(args)
-          ::EacRubyUtils::Envs.local.command(*args)
+          args, options = build_args(args)
+          r = ::EacGit::Executables.git.command(*args)
+          (options[:exit_outputs] || {}).each do |status_code, result|
+            r = r.status_result(status_code, result)
+          end
+          r
         end
 
         def execute(*args)
-          args, options = build_args(args)
-          ::EacRubyUtils::Envs.local.command(*args).execute(options)
+          command(*args).execute
         end
 
         def execute!(*args)
-          args, options = build_args(args)
-          ::EacRubyUtils::Envs.local.command(*args).execute!(options)
+          command(*args).execute!
         end
 
         def system!(*args)
-          args, options = build_args(args)
-          ::EacRubyUtils::Envs.local.command(*args).system!(options)
+          command(*args).system!
         end
 
         def init
@@ -42,7 +44,7 @@ module EacLauncher
             args.pop
           end
           args = args.first if args.first.is_a?(Array)
-          [['git', '-C', self, '--no-pager'] + args, options]
+          [['-C', self, '--no-pager'] + args, options]
         end
 
         def git_uncached

data/vendor/{gems/eac_git → eac_git}/eac_git.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.authors     = ['Put here the authors']
   s.summary     = 'Put here de description.'
 
-  s.files = Dir['{lib}/**/*']
+  s.files = Dir['{lib,vendor}/**/*']
 
   s.add_dependency 'eac_ruby_utils', '~> 0.37'
   s.add_dependency 'parseconfig', '~> 1.0', '>= 1.0.8'

data/vendor/eac_git/lib/eac_git/executables.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/envs'
+
+module EacGit
+  module Executables
+    class << self
+      include ::EacRubyUtils::SimpleCache
+
+      def env
+        ::EacRubyUtils::Envs.local
+      end
+
+      private
+
+      def git_uncached
+        r = env.executable('git', '--version')
+        r.extend(GitCommandExtensions)
+        r
+      end
+
+      module GitCommandExtensions
+        def command(*args)
+          super(*args).envvar('PATH', path_with_git_subrepo)
+        end
+
+        def gem_root
+          '../..'.to_pathname.expand_path(__dir__)
+        end
+
+        def git_subrepo_root
+          gem_root.join('vendor', 'git-subrepo')
+        end
+
+        def path_with_git_subrepo
+          ([git_subrepo_root.join('lib').to_path] +
+              ENV['PATH'].if_present('').split(::File::PATH_SEPARATOR))
+            .join(::File::PATH_SEPARATOR)
+        end
+      end
+    end
+  end
+end

data/vendor/eac_git/lib/eac_git/rspec.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/rspec/conditional'
+require 'eac_git/executables'
+
+module EacGit
+  module Rspec
+    class << self
+      def configure
+        ::EacRubyUtils::Rspec::Conditional.default.add(:git) do
+          ::EacGit::Executables.git.validate
+        end
+        RSpec.configure { |config| ::EacRubyUtils::Rspec::Conditional.default.configure(config) }
+      end
+    end
+  end
+end

data/vendor/eac_git/lib/eac_git/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module EacGit
+  VERSION = '0.2.0'
+end

data/vendor/eac_git/spec/lib/eac_git/executables_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_git/executables'
+
+RSpec.describe(::EacGit::Executables, git: true) do
+  it 'output version' do
+    expect(described_class.git.command('--version').execute!).to be_present
+  end
+
+  it 'subrepo output version' do
+    expect(described_class.git.command('subrepo', '--version').execute!).to be_present
+  end
+end

data/vendor/eac_git/spec/spec_helper.rb

@@ -0,0 +1,103 @@
+# 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
+end
+
+require 'eac_git/rspec'
+::EacGit::Rspec.configure