avm-tools 0.67.0 → 0.68.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 916ea6c3a654cc81c07739fffab5013f51cf9e83a7cf8b1163abef48c6fa7ea8
-  data.tar.gz: 7393ff7addec4974fccb0b95b1b6bc5e625e05decc8e695696a1511f4d40c472
+  metadata.gz: 804e613bfa303949fb0ed952f999d5815b6de62aea34e9c03c0e87ecf65f35b4
+  data.tar.gz: a86f89745be17ae8bc039beb9d0e28680481e30069975c809a9083e42ef17589
 SHA512:
-  metadata.gz: 70c1fa8e342208bfd2af99796da13e6cad4d86bb1e28f15b92212c5255fbb5de56dbd88a70ac89c84106a82dac44c1429c3bbf1524932034ef797bc690e4c7b3
-  data.tar.gz: 2b20f95259f5603547d3484d5771babb52eeaa43be785b0afe16460ac0bac584d8143ec70df2f53e6e567fdd99ad19498375a78eccb7f876c7ad445b44496f83
+  metadata.gz: fcd4890d0c29dc11ddd5c1cbce9c5d767900e5e9be10d763afcb91fd73cfdd715c0f6ae217c64fc82f5e87128dbad619500e2ee3a33c4500a29c49739b5a93dc
+  data.tar.gz: 89a8e507755008a2f7a18c0ee84ed2572588aff5ab12e0e9d5ec7e897a7c397f4cc6e1d2e7d83595d46fd3b835fcd3104dbb5cfebb38ae837113f25091169a85

data/lib/avm/local_projects/instance.rb

@@ -54,7 +54,7 @@ module Avm
 
       def source_stereotypes_mixins
         stereotypes.each do |s|
-          s.local_project_mixin_module.if_present { |v| extend(v) }
+          s.local_project_mixin_module.if_present { |v| singleton_class.include(v) }
         end
       end
     end

data/lib/avm/projects/stereotypes/git_subrepo/warp.rb

@@ -32,7 +32,7 @@ module Avm
             return if parent_git_warped.rev_parse(subrepo_parent_hash) &&
                       parent_git_warped.descendant?('HEAD', subrepo_parent_hash)
 
-            raise EacLauncher::Instances::Errors::Base,
+            raise Avm::Launcher::Errors::Base,
                   "Subrepo parent hash \"#{subrepo_parent_hash}\"" \
                   " not found in \"#{parent_git_warped}\""
           end
@@ -42,7 +42,7 @@ module Avm
             h = data['Pull Parent']
             return h if h.present?
 
-            raise EacLauncher::Instances::Errors::Base, "Subrepo parent hash is blank: #{data}"
+            raise Avm::Launcher::Errors::Base, "Subrepo parent hash is blank: #{data}"
           end
 
           def init_aux

data/lib/avm/projects/stereotypes/rails_application.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 require 'avm/projects/stereotype'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Projects
     module Stereotypes
       class RailsApplication
+        require_sub __FILE__
         include Avm::Projects::Stereotype
 
         class << self

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'avm/projects/stereotypes/ruby_gem/local_project_mixin'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Projects
+    module Stereotypes
+      class RailsApplication
+        module LocalProjectMixin
+          common_concern do
+            include ::Avm::Projects::Stereotypes::RubyGem::LocalProjectMixin
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/projects/stereotypes/ruby_gem/update'
+
+module Avm
+  module Projects
+    module Stereotypes
+      class RailsApplication
+        class Update < ::Avm::Projects::Stereotypes::RubyGem::Update
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.67.0'
+    VERSION = '0.68.0'
   end
 end

data/lib/eac_launcher/git/sub_warp_base.rb

@@ -12,7 +12,7 @@ module EacLauncher
         r = find_parent_instance(instance.parent)
         return r if r
 
-        ::EacLauncher::Instances::Errors::Base.new('Git parent not found')
+        ::Avm::Launcher::Errors::Base.new('Git parent not found')
       end
 
       def find_parent_instance(current)

data/lib/eac_launcher/publish/base.rb

@@ -35,7 +35,7 @@ module EacLauncher
 
       def check_with_rescue
         internal_check
-      rescue ::EacLauncher::Instances::Errors::Base => e
+      rescue ::Avm::Launcher::Errors::Base => e
         ::EacLauncher::Publish::CheckResult.blocked("Error: #{e}")
       rescue ::EacLauncher::Git::Error => e
         ::EacLauncher::Publish::CheckResult.blocked("Git error: #{e}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.67.0
+  version: 0.68.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -397,6 +397,8 @@ files:
 - lib/avm/projects/stereotypes/git_subtree/publish.rb
 - lib/avm/projects/stereotypes/git_subtree/warp.rb
 - lib/avm/projects/stereotypes/rails_application.rb
+- lib/avm/projects/stereotypes/rails_application/local_project_mixin.rb
+- lib/avm/projects/stereotypes/rails_application/update.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