avm-tools 0.59.0 → 0.60.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08d973e58416ce742fea0b91630ad75c85c48838f302019cdbd4362594704cb8'
-  data.tar.gz: 6984410c1a7cf6e36f846fa6c388abca39b6b5f9eb8aec359b9bf069cd2d74a8
+  metadata.gz: 3a03f7f27fdfdd821203ba28f951ca16404a91b886453f9839e855dcf78627ef
+  data.tar.gz: 8f02cc5b2e5454e4e5253be317e73c94d8f007538b3464281f9a84c1bd83768f
 SHA512:
-  metadata.gz: 2d019bdb2a01a137afa8a5e01aeb35b9d29214e185eddad3ab926215bbf0267ca1aa21f57927fea98482f381e09fa52e6ba6497da618bcdcc6f522d7672afa5a
-  data.tar.gz: 17f2e21690f779b7c67405e4397343b13083b8cf8984a8b521031f5f65f8998a0f44062099425e6acb6c9d1a33771a21dd487678afe2929a384f3a6c5a89bfc1
+  metadata.gz: dd7d158d5b73aea3e54c715b2a13ec15fa3bc5fd6f87b3252f70ae9b0fd8dce36fb3a6b9c1d043f0b2365087848627595aaf7041142bf27f18d60a3f1ac4e0a9
+  data.tar.gz: a8300831601639f79484dcd81934900c4be5003e85ed4e5a6345bb0c19ea5f4b3149556633238bd63fff97c933df7535622bfe588021c06e0567a064ccaca7e2

data/lib/avm/local_projects/instance.rb

@@ -5,11 +5,12 @@ require 'eac_ruby_utils/core_ext'
 require 'avm/projects/stereotypes'
 
 module Avm
-  module LocalProject
+  module LocalProjects
     class Instance
       enable_simple_cache
       common_constructor :path do
         self.path = path.to_pathname
+        source_stereotypes_mixins
       end
 
       # Backward compatibility with [EacLauncher::Paths::Logical].
@@ -23,6 +24,12 @@ module Avm
       def stereotypes_uncached
         ::Avm::Projects::Stereotypes.list.select { |s| s.match?(self) }
       end
+
+      def source_stereotypes_mixins
+        stereotypes.each do |s|
+          s.local_project_mixin_module.if_present { |v| extend(v) }
+        end
+      end
     end
   end
 end

data/lib/avm/local_projects/jobs/update.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module LocalProjects
+    module Jobs
+      class Update
+        enable_console_speaker
+        common_constructor :instance
+
+        def run
+          instance.stereotypes.each { |stereotype| run_stereotype(stereotype) }
+        end
+
+        private
+
+        def run_stereotype(stereotype)
+          if stereotype.update_class.present?
+            puts stereotype.label + ': update class found. Running...'
+            stereotype.update_class.new(instance).run
+          else
+            puts stereotype.label + ': update class not found'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/projects/stereotype.rb

@@ -30,22 +30,29 @@ module Avm
         end
 
         def stereotype_name
-          name.gsub(/^.*::/, '')
+          name.demodulize
         end
 
-        def publish_class
-          sub_class('Publish')
-        end
-
-        def warp_class
-          sub_class('Warp')
+        {
+          local_project_mixin: ::Module,
+          publish: ::Class,
+          update: ::Class,
+          warp: ::Class
+        }.each do |name, is_a|
+          define_method "#{name}_#{is_a.name.underscore}" do
+            sub_constant(name.to_s.camelcase, is_a)
+          end
         end
 
         private
 
-        def sub_class(sub_class_name)
-          klass = const_get(sub_class_name)
-          klass.is_a?(Class) ? klass : nil
+        def sub_constant(constant_name, is_a)
+          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

data/lib/avm/projects/stereotypes/git/local_project_mixin.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_git/local'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Projects
+    module Stereotypes
+      class Git
+        module LocalProjectMixin
+          # @return [EacGit::Local]
+          def git_repo
+            @git_repo ||= ::EacGit::Local.new(path)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/projects/stereotypes/ruby_gem/local_project_mixin.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_gems_utils/gem'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Projects
+    module Stereotypes
+      class RubyGem
+        module LocalProjectMixin
+          # @return [EacRubyGemsUtils::Gem]
+          def ruby_gem
+            @ruby_gem ||= ::EacRubyGemsUtils::Gem.new(path)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/projects/stereotypes/ruby_gem/update.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Projects
+    module Stereotypes
+      class RubyGem
+        class Update
+          enable_console_speaker
+          common_constructor :instance
+
+          def run
+            gemfile_lock_checkout
+            bundle_update
+            gemfile_lock_commit
+          end
+
+          private
+
+          def bundle_update
+            infom 'Running "bundle update"...'
+            instance.ruby_gem.bundle('update').execute!
+            infom 'Running "bundle install"...'
+            instance.ruby_gem.bundle('install').execute!
+          end
+
+          def gemfile_lock_checkout
+            return unless instance.respond_to?(:git_repo)
+
+            infom 'Checkouting Gemfile.lock...'
+            instance.git_repo.command('checkout', '--',
+                                      instance.ruby_gem.gemfile_lock_path.to_path).execute!
+          end
+
+          def gemfile_lock_commit
+            return unless instance.respond_to?(:git_repo)
+
+            if gemfile_lock_changed?
+              infom 'Commiting Gemfile.lock...'
+              instance.git_repo.command('commit', '-m', gemfile_lock_commit_message, '--',
+                                        instance.ruby_gem.gemfile_lock_path).execute!
+            else
+              infom 'Gemfile.lock did not change'
+            end
+          end
+
+          def gemfile_lock_commit_message
+            'Todas as gems: atualiza.'
+          end
+
+          def gemfile_lock_changed?
+            instance.git_repo.dirty_file?(instance.ruby_gem.gemfile_lock_path)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -20,7 +20,7 @@ module Avm
         private
 
         def instance_uncached
-          ::Avm::LocalProject::Instance.new(instance_path)
+          ::Avm::LocalProjects::Instance.new(instance_path)
         end
 
         def instance_path_uncached

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'avm/local_projects/jobs/update'
+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 Update < ::EacRubyUtils::Console::DocoptRunner
+          include ::EacCli::DefaultRunner
+
+          runner_definition do
+            desc 'Update local project.'
+          end
+
+          def run
+            infov 'Path', context(:instance).path
+            ::Avm::LocalProjects::Jobs::Update.new(context(:instance)).run
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.59.0'
+    VERSION = '0.60.0'
   end
 end

data/lib/eac_launcher/context/instance_manager.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_launcher/publish/check_result'
 require('yaml')
 
 module EacLauncher

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

@@ -6,24 +6,15 @@ module EacLauncher
   module Git
     class Base < ::EacLauncher::Paths::Real
       module DirtyFiles
-        def dirty?
-          dirty_files.any?
-        end
+        delegate :dirty, to: :eac_git
 
         def dirty_files
-          execute!('status', '--porcelain', '--untracked-files').each_line.map do |line|
-            parse_status_line(line.gsub(/\n\z/, ''))
+          eac_git.dirty_files.map do |df|
+            ::OpenStruct.new(
+              df.to_h.merge(path: df.path.to_path, absolute_path: df.absolute_path.to_path)
+            )
           end
         end
-
-        private
-
-        def parse_status_line(line)
-          m = /\A(.)(.)\s(.+)\z/.match(line)
-          ::Kernel.raise "Status pattern does not match \"#{line}\"" unless m
-          ::OpenStruct.new(index: m[1], worktree: m[2], path: m[3],
-                           absolute_path: ::File.expand_path(m[3], self))
-        end
       end
     end
   end

data/vendor/eac_git/lib/eac_git/local.rb

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/core_ext'
 module EacGit
   # A Git repository in local filesystem.
   class Local
-    require_sub __FILE__
+    require_sub __FILE__, include_modules: true
 
     common_constructor :root_path do
       self.root_path = root_path.to_pathname

data/vendor/eac_git/lib/eac_git/local/dirty_files.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'ostruct'
+
+module EacGit
+  class Local
+    module DirtyFiles
+      STATUS_LINE_PATTERN = /\A(.)(.)\s(.+)\z/.freeze
+
+      def dirty?
+        dirty_files.any?
+      end
+
+      def dirty_file?(path)
+        absolute_path = path.to_pathname.expand_path(root_path)
+        dirty_files.any? do |df|
+          df.absolute_path == absolute_path
+        end
+      end
+
+      def dirty_files
+        command('status', '--porcelain', '--untracked-files').execute!.each_line.map do |line|
+          parse_status_line(line.gsub(/\n\z/, ''))
+        end
+      end
+
+      private
+
+      def parse_status_line(line)
+        STATUS_LINE_PATTERN.if_match(line) do |m|
+          ::OpenStruct.new(index: m[1], worktree: m[2], path: m[3].to_pathname,
+                           absolute_path: m[3].to_pathname.expand_path(root_path))
+        end
+      end
+    end
+  end
+end

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

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

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_class_methods.rb

@@ -3,7 +3,7 @@
 module EacRubyUtils
   module Console
     class DocoptRunner
-      DOCOPT_ERROR_EXIT_CODE = 0x22220000
+      DOCOPT_ERROR_EXIT_CODE = 0xC0
 
       class << self
         def run(options = {})

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/ssh_env/identity_file.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/concern'
+require 'eac_ruby_utils/envs/ssh_env/dasho_options'
 require 'eac_ruby_utils/listable'
 require 'eac_ruby_utils/patches/object/if_present'
 
@@ -11,6 +12,7 @@ module EacRubyUtils
         extend ::ActiveSupport::Concern
 
         included do
+          include ::EacRubyUtils::Envs::SshEnv::DashoOptions
           add_nodasho_option('IdentityFile')
         end
 

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/ssh_env/quiet.rb

@@ -2,6 +2,7 @@
 
 require 'active_support/concern'
 require 'eac_ruby_utils/boolean'
+require 'eac_ruby_utils/envs/ssh_env/dasho_options'
 
 module EacRubyUtils
   module Envs
@@ -10,6 +11,7 @@ module EacRubyUtils
         extend ::ActiveSupport::Concern
 
         included do
+          include ::EacRubyUtils::Envs::SshEnv::DashoOptions
           add_nodasho_option('Quiet')
         end
 

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/ssh_env/terminal.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/concern'
+require 'eac_ruby_utils/envs/ssh_env/dasho_options'
 require 'eac_ruby_utils/listable'
 require 'eac_ruby_utils/patches/object/if_present'
 
@@ -11,6 +12,7 @@ module EacRubyUtils
         extend ::ActiveSupport::Concern
 
         included do
+          include ::EacRubyUtils::Envs::SshEnv::DashoOptions
           add_nodasho_option('Terminal')
           include ::EacRubyUtils::Listable
           lists.add_string :terminal_option, :auto, :disable, :enable, :force

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/listable/list.rb

@@ -33,6 +33,11 @@ module EacRubyUtils
         find_list_by_method(name) || super
       end
 
+      def hash_keys_validate!(hash, error_class = ::StandardError)
+        hash.keys.each { |key| value_validate!(key, error_class) }
+        hash
+      end
+
       def i18n_key
         "eac_ruby_utils.listable.#{class_i18n_key}.#{item}"
       end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/require_sub.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/inflector'
+require 'eac_ruby_utils/listable'
 
 module EacRubyUtils
   class << self
@@ -10,15 +11,14 @@ module EacRubyUtils
   end
 
   class RequireSub
-    BASE_OPTION_KEY = :base
-    INCLUDE_MODULES_OPTION_KEY = :include_modules
-    REQUIRE_DEPENDENCY_OPTION_KEY = :require_dependency
+    include ::EacRubyUtils::Listable
+    lists.add_symbol :option, :base, :include_modules, :require_dependency
 
     attr_reader :file, :options
 
     def initialize(file, options = {})
       @file = file
-      @options = options
+      @options = self.class.lists.option.hash_keys_validate!(options)
     end
 
     def apply
@@ -29,7 +29,7 @@ module EacRubyUtils
     private
 
     def active_support_require(path)
-      return false unless options[REQUIRE_DEPENDENCY_OPTION_KEY]
+      return false unless options[OPTION_REQUIRE_DEPENDENCY]
 
       ::Kernel.require_dependency(path)
       true
@@ -46,7 +46,7 @@ module EacRubyUtils
     end
 
     def include_modules
-      return unless options[INCLUDE_MODULES_OPTION_KEY]
+      return unless options[OPTION_INCLUDE_MODULES]
 
       base.constants.each do |constant_name|
         constant = base.const_get(constant_name)
@@ -57,11 +57,11 @@ module EacRubyUtils
     end
 
     def base
-      options[BASE_OPTION_KEY] || raise('Option :base not setted')
+      options[OPTION_BASE] || raise('Option :base not setted')
     end
 
     def base?
-      options[BASE_OPTION_KEY] ? true : false
+      options[OPTION_BASE] ? true : false
     end
 
     def kernel_require(path)

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.42.0'
+  VERSION = '0.43.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.59.0
+  version: 0.60.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-25 00:00:00.000000000 Z
+date: 2020-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -360,6 +360,7 @@ files:
 - lib/avm/instances/entry_keys.rb
 - lib/avm/local_projects.rb
 - lib/avm/local_projects/instance.rb
+- lib/avm/local_projects/jobs/update.rb
 - lib/avm/patches.rb
 - lib/avm/patches/object/template.rb
 - lib/avm/path_string.rb
@@ -367,6 +368,7 @@ files:
 - lib/avm/projects/stereotype.rb
 - lib/avm/projects/stereotypes.rb
 - lib/avm/projects/stereotypes/git.rb
+- lib/avm/projects/stereotypes/git/local_project_mixin.rb
 - lib/avm/projects/stereotypes/git/publish.rb
 - lib/avm/projects/stereotypes/git/warp.rb
 - lib/avm/projects/stereotypes/git_subrepo.rb
@@ -378,7 +380,9 @@ files:
 - lib/avm/projects/stereotypes/rails_application.rb
 - lib/avm/projects/stereotypes/redmine_plugin.rb
 - lib/avm/projects/stereotypes/ruby_gem.rb
+- lib/avm/projects/stereotypes/ruby_gem/local_project_mixin.rb
 - lib/avm/projects/stereotypes/ruby_gem/publish.rb
+- lib/avm/projects/stereotypes/ruby_gem/update.rb
 - lib/avm/rails.rb
 - lib/avm/rails/runners.rb
 - lib/avm/rails/runners/bundle.rb
@@ -468,6 +472,7 @@ 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/update.rb
 - lib/avm/tools/runner/ruby.rb
 - lib/avm/tools/runner/ruby/gems.rb
 - lib/avm/tools/runner/ruby/gems/generate.rb
@@ -552,6 +557,7 @@ files:
 - vendor/eac_git/lib/eac_git.rb
 - vendor/eac_git/lib/eac_git/executables.rb
 - vendor/eac_git/lib/eac_git/local.rb
+- vendor/eac_git/lib/eac_git/local/dirty_files.rb
 - vendor/eac_git/lib/eac_git/local/subrepo.rb
 - vendor/eac_git/lib/eac_git/local/subrepo/config.rb
 - vendor/eac_git/lib/eac_git/remote.rb