avm-tools 0.63.0 → 0.66.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 855b0d8610e334378c5f061444ae6c414739fa383b9d09d64229ef8014feba53
-  data.tar.gz: '09008022bebd8de5a6c3104406c7b5f415f94b1c0f2d84700e92a2b29d4fa530'
+  metadata.gz: 5fadfbad4ae6f17cae7e5137761710e454d858b08f56b0f666956d7f84c9787b
+  data.tar.gz: 30bceb50691d6c31bd34980c0985f4a689d16075f01ffba2495441d67913e312
 SHA512:
-  metadata.gz: c4f2e3cb91702b6b93963c1478c38498c0774617538b75a8401ce96b00b505156aeb5d6554c595d5837c678a6f245b86352a57f86056c6599a40f5fbefae3cd7
-  data.tar.gz: a577468f0221af04fb6fc08a5f6ada465dc9e64228b4be577ac0b6cbdaed4cd995108ca0f88f713226cadacf4152b1243b18986f3d9212d20742b75a84e651ff
+  metadata.gz: 5c88f25a0c0a7ae293d3c7b40f8708cfcdbfe92ace54a85c0b028751b75a044aa0c9ad437d16b3d47e0895bee0338119c6ea18cbf1328124dab7189f28852353
+  data.tar.gz: eab8e705b2d927f0d196117592a5273ce01f3f55e67e2074691500e44164eed3df86e50e69ece788f77c01fc4b06f39f3aeb670f389ab992c7d539ebc1206eca

data/lib/avm/data/package/dump.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/files/rotate'
 require 'eac_ruby_utils/core_ext'
 require 'minitar'
 

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

@@ -80,6 +80,7 @@ module Avm
 
         def publish?(stereotype)
           return false unless stereotype.publish_class
+          return false unless options.stereotype_publishable?(stereotype)
 
           filter = ::EacLauncher::Context.current.publish_options[:stereotype]
           filter.blank? ? true : filter == stereotype.name.demodulize

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Launcher
+    module Instances
+      class Settings
+        DEFAULT_CURRENT_REVISION = 'origin/master'
+        DEFAULT_PUBLISH_REMOTE = 'publish'
+        PUBLISHABLE_KEY = :publishable
+
+        common_constructor :data do
+          self.data = (data.is_a?(Hash) ? data : {}).with_indifferent_access
+        end
+
+        def git_current_revision
+          data[__method__] || DEFAULT_CURRENT_REVISION
+        end
+
+        def git_publish_remote
+          data[__method__] || DEFAULT_PUBLISH_REMOTE
+        end
+
+        def publishable?
+          !!publishable_value
+        end
+
+        def stereotype_publishable?(stereotype)
+          return publishable? unless publishable_value.is_a?(::Hash)
+
+          parse_publishable_value(publishable_value[stereotype.stereotype_name], true)
+        end
+
+        private
+
+        def publishable_value
+          parse_publishable_value(data[PUBLISHABLE_KEY], false)
+        end
+
+        def parse_publishable_value(value, hash_to_true)
+          return value.with_indifferent_access if !hash_to_true && value.is_a?(::Hash)
+          return true if value.nil? || value == true
+          return false if value == false
+
+          !!value
+        end
+      end
+    end
+  end
+end

data/lib/avm/local_projects/instance.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/instances/configuration'
 require 'eac_launcher/paths/real'
 require 'eac_ruby_utils/core_ext'
 require 'avm/projects/stereotypes'
@@ -13,6 +14,8 @@ module Avm
         source_stereotypes_mixins
       end
 
+      delegate :to_s, to: :path
+
       # Backward compatibility with [EacLauncher::Paths::Logical].
       # @return [EacLauncher::Paths::Real].
       def real
@@ -21,6 +24,11 @@ module Avm
 
       private
 
+      # @return [Avm::Instances::Configuration]
+      def configuration_uncached
+        ::Avm::Instances::Configuration.find_in_path(path)
+      end
+
       def stereotypes_uncached
         ::Avm::Projects::Stereotypes.list.select { |s| s.match?(self) }
       end

data/lib/avm/patches/object/template.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+require 'avm/self'
 require 'eac_ruby_utils/patches/object/template'
 
-::EacRubyUtils::Templates::Searcher.default.included_paths << ::File.expand_path(
-  ('../' * 4) + 'template', __dir__
-)
+::EacRubyUtils::Templates::Searcher.default.included_paths <<
+  ::Avm::Self.root.join('template').to_path

data/lib/avm/projects/stereotype.rb

@@ -47,14 +47,14 @@ module Avm
         private
 
         def sub_constant(constant_name, is_a)
+          return nil unless const_defined?(constant_name)
+
           constant = const_get(constant_name)
           unless is_a.if_present(true) { |v| constant.is_a?(v) }
             raise("#{constant} is not a #{is_a}")
           end
 
           constant
-        rescue NameError
-          nil
         end
       end
     end

data/lib/avm/self.rb

@@ -10,12 +10,16 @@ module Avm
 
     class << self
       def application
-        @application ||= ::EacRubyBase0::Application.new(::File.expand_path('../..', __dir__))
+        @application ||= ::EacRubyBase0::Application.new(root.to_path)
       end
 
       def instance
         @instance ||= ::Avm::Self::Instance.by_id('avm-tools_self')
       end
+
+      def root
+        ::Pathname.new('../..').expand_path(__dir__)
+      end
     end
   end
 end

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

@@ -17,6 +17,11 @@ module Avm
           subcommands
         end
 
+        def instance_banner
+          infov 'Instance', instance
+          infov 'Stereotypes', instance.stereotypes.map(&:label).join(', ')
+        end
+
         private
 
         def instance_uncached

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'avm/patches/eac_ruby_gems_utils/gem'
+require 'eac_cli/default_runner'
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+        class Ruby < ::EacRubyUtils::Console::DocoptRunner
+          require_sub __FILE__
+          include ::EacCli::DefaultRunner
+
+          runner_definition do
+            desc 'Ruby utitilies for local projects.'
+            subcommands
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/local_project/ruby/bundler.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_cli/default_runner'
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+        class Ruby < ::EacRubyUtils::Console::DocoptRunner
+          class Bundler < ::EacRubyUtils::Console::DocoptRunner
+            require_sub __FILE__
+            include ::EacCli::DefaultRunner
+
+            runner_definition do
+              desc 'Ruby\'s bundler utitilies for local projects.'
+              subcommands
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/local_project/ruby/bundler/gemfile_lock.rb

@@ -0,0 +1,138 @@
+# frozen_string_literal: true
+
+require 'eac_cli/default_runner'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+        class Ruby < ::EacRubyUtils::Console::DocoptRunner
+          class Bundler < ::EacRubyUtils::Console::DocoptRunner
+            class GemfileLock < ::EacRubyUtils::Console::DocoptRunner
+              include ::EacCli::DefaultRunner
+
+              runner_definition do
+                desc 'Manipulage a "Gemfile.lock" file.'
+                bool_opt '-c', '--continue', 'Continue Git rebase/cherry-pick.'
+                bool_opt '-i', '--install', 'Run "bundle install".'
+                bool_opt '-u', '--update', 'Run "bundle update".'
+                bool_opt '-r', '--recursive', 'Run until Git rebase/cherry-pick is finished.'
+                bool_opt '-a', '--all', 'Same as "-ciru".'
+              end
+
+              def run
+                loop do
+                  git_reset_checkout
+                  bundle_update
+                  bundle_install
+                  git_continue
+                  break if complete?
+                end
+              end
+
+              private
+
+              def complete?
+                !option_or_all?('--recursive') || !conflict?
+              end
+
+              def rebasing?
+                instance.git_repo.root_path.join('.git', 'rebase-merge').exist?
+              end
+
+              def git_reset_checkout
+                return unless check_capability(__method__, :git_repo, nil)
+
+                infom 'Reseting...'
+                instance.git_repo.command('reset', gemfile_lock).system!
+                infom 'Checkouting...'
+                instance.git_repo.command('checkout', '--', gemfile_lock).system!
+              end
+
+              def bundle_install
+                return unless check_capability(__method__, :ruby_gem, '--install')
+
+                infom '"bundle install"...'
+                bundle_run('install')
+              end
+
+              def bundle_update
+                return unless check_capability(__method__, :ruby_gem, '--update')
+
+                infom '"bundle update"...'
+                bundle_run('update')
+              end
+
+              def git_continue
+                return unless check_capability(__method__, :git_repo, '--continue')
+
+                infom "Adding \"#{gemfile_lock}\"..."
+                instance.git_repo.command('add', gemfile_lock).execute!
+                if rebase_conflict?
+                  git_continue_run('rebase')
+                elsif cherry_conflict?
+                  git_continue_run('cherry-pick')
+                else
+                  raise 'Unknown how to continue'
+                end
+              end
+
+              def git_continue_run(command)
+                infom "\"#{command}\" --continue..."
+                cmd = instance.git_repo.command(command, '--continue').envvar('GIT_EDITOR', 'true')
+                return unless !cmd.system && !conflict?
+
+                fatal_error "\"#{cmd}\" failed and there is no conflict"
+              end
+
+              def gemfile_lock
+                'Gemfile.lock'
+              end
+
+              def git_uncached
+                ::EacGit::Local.new(git_path)
+              end
+
+              def bundle_run(*args)
+                instance.ruby_gem.bundle(*args).system!
+              end
+
+              def git_path
+                '.'
+              end
+
+              def conflict?
+                rebase_conflict? || cherry_conflict?
+              end
+
+              def rebase_conflict?
+                instance.git_repo.root_path.join('.git', 'REBASE_HEAD').exist?
+              end
+
+              def cherry_conflict?
+                instance.git_repo.root_path.join('.git', 'CHERRY_PICK_HEAD').exist?
+              end
+
+              def option_or_all?(option)
+                options.fetch(option) || options.fetch('--all')
+              end
+
+              def instance
+                context(:instance)
+              end
+
+              def check_capability(caller, capability, option)
+                return false unless option.blank? || option_or_all?(option)
+                return true if instance.respond_to?(capability)
+
+                warn "Cannot run #{caller}: instance has no capability \"#{capability}\""
+                false
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/local_project/test.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+        class Test < ::EacRubyUtils::Console::DocoptRunner
+          include ::EacCli::DefaultRunner
+
+          runner_definition do
+            desc 'Test local project.'
+          end
+
+          def run
+            context(:instance_banner)
+            infov 'Test command', test_command
+            if test_command.present?
+              test_command.system!
+            else
+              fatal_error 'No test command found'
+            end
+          end
+
+          def test_command
+            context(:instance).configuration.if_present(&:any_test_command)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.63.0'
+    VERSION = '0.66.0'
   end
 end

data/lib/eac_launcher/context/settings.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
+require 'avm/launcher/instances/settings'
 require 'eac_ruby_utils/simple_cache'
 require 'yaml'
-require 'eac_launcher/instances/settings'
 
 module EacLauncher
   class Context
@@ -18,7 +18,7 @@ module EacLauncher
       end
 
       def instance_settings(instance)
-        ::EacLauncher::Instances::Settings.new(value(['Instances', instance.name]))
+        ::Avm::Launcher::Instances::Settings.new(value(['Instances', instance.name]))
       end
 
       private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.63.0
+  version: 0.66.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -373,6 +373,7 @@ files:
 - lib/avm/launcher/errors/non_project.rb
 - lib/avm/launcher/instances/base.rb
 - lib/avm/launcher/instances/base/cache.rb
+- lib/avm/launcher/instances/settings.rb
 - lib/avm/local_projects.rb
 - lib/avm/local_projects/instance.rb
 - lib/avm/local_projects/jobs/update.rb
@@ -488,6 +489,10 @@ files:
 - lib/avm/tools/runner/launcher/publish.rb
 - lib/avm/tools/runner/local_project.rb
 - lib/avm/tools/runner/local_project/info.rb
+- lib/avm/tools/runner/local_project/ruby.rb
+- lib/avm/tools/runner/local_project/ruby/bundler.rb
+- lib/avm/tools/runner/local_project/ruby/bundler/gemfile_lock.rb
+- lib/avm/tools/runner/local_project/test.rb
 - lib/avm/tools/runner/local_project/update.rb
 - lib/avm/tools/runner/ruby.rb
 - lib/avm/tools/runner/ruby/gems.rb
@@ -516,7 +521,6 @@ files:
 - lib/eac_launcher/instances.rb
 - lib/eac_launcher/instances/error.rb
 - lib/eac_launcher/instances/runner_helper.rb
-- lib/eac_launcher/instances/settings.rb
 - lib/eac_launcher/paths.rb
 - lib/eac_launcher/paths/logical.rb
 - lib/eac_launcher/paths/real.rb

data/lib/eac_launcher/instances/settings.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module EacLauncher
-  module Instances
-    class Settings
-      def initialize(data)
-        @data = ActiveSupport::HashWithIndifferentAccess.new(data.is_a?(Hash) ? data : {})
-      end
-
-      def git_current_revision
-        @data[__method__] || 'origin/master'
-      end
-
-      def git_publish_remote
-        @data[__method__] || 'publish'
-      end
-
-      def publishable?
-        @data.key?(:publishable) ? @data[:publishable] : true
-      end
-    end
-  end
-end