eac_tools 0.35.0 → 0.36.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e7be8c10a31eca92c292ca5a2aff340237809512a2477c04b9212b9a246264d
-  data.tar.gz: 7de8fb83e7fbc7583c0577e5de1a561952b17d1b2768951e6706f645933966bb
+  metadata.gz: cbfe0ab59e6f9c5c8c7bbfa72dac3511b3c666ec50a219da0cb72b68bd6fd57e
+  data.tar.gz: 44c539a327ce1f33448e91091198bc4e932571e7fffc8780110f9fa21b2d6a2a
 SHA512:
-  metadata.gz: 71a2a76a1b55a74f18f7aa18db4b25c269c8ffff5e397669ff0d8782fe21db1269e2b571dbf1d7b2b0fa70a696e2cccbdf0921d57a329ff62a15de115d8d1bd4
-  data.tar.gz: f5a62fb8592908556546226ff6232eef6b8be3a7d72f87080dd2b31a38cfdb60c724069439037942549b72b319672ebd1af1e06bfb378d526f0a2014c1499318
+  metadata.gz: cdd20d0375d461660c5c92b11ac386b6c920fabec8abadeae17e08cc18f441a300c7f2d5cc1852f9c16fd9495b62ac25b83d34f789676a4fd89dc5f835a26e80
+  data.tar.gz: b07bd715ddbc48a80c8d1529d5972690f726d35a31ddfa2a42f50385fab31c294f814fe49dbf6dc5199ea51a88152f7dd8de09ad0b113ce908fffb268c8b1d73

data/Gemfile

@@ -5,5 +5,10 @@ source 'https://rubygems.org'
 gemspec
 
 ::Dir["#{::File.join(__dir__, 'sub')}/*"].each do |dir|
+  next unless ::File.exist?(::File.join(dir, "#{::File.basename(dir)}.gemspec"))
+
   gem ::File.basename(dir), path: dir, require: false
 end
+
+local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if ::File.exist?(local_gemfile)

data/Gemfile.lock

@@ -1,19 +1,20 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.35.0)
-      avm (~> 0.46)
+    eac_tools (0.36.1)
+      avm (~> 0.48)
       avm-eac_asciidoctor_base0 (~> 0.7, >= 0.7.1)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_latex_base0 (~> 0.2, >= 0.2.1)
+      avm-eac_php_base0 (~> 0.1)
       avm-eac_rails_base0 (~> 0.8, >= 0.8.1)
       avm-eac_rails_base1 (~> 0.7)
       avm-eac_redmine_base0 (~> 0.16)
       avm-eac_redmine_plugin_base0 (~> 0.3)
-      avm-eac_ruby_base1 (~> 0.22)
-      avm-eac_webapp_base0 (~> 0.9, >= 0.9.1)
+      avm-eac_ruby_base1 (~> 0.23)
+      avm-eac_webapp_base0 (~> 0.9, >= 0.9.2)
       avm-eac_wordpress_base0 (~> 0.2, >= 0.2.1)
-      avm-tools (~> 0.139)
+      avm-tools (~> 0.141)
       eac_ruby_utils (~> 0.104)
 
 PATH
@@ -41,6 +42,12 @@ PATH
       avm-eac_webapp_base0 (~> 0.9)
       eac_ruby_utils (~> 0.104)
 
+PATH
+  remote: sub/avm-eac_php_base0
+  specs:
+    avm-eac_php_base0 (0.1.0)
+      eac_ruby_utils (~> 0.104)
+
 PATH
   remote: sub/avm-eac_rails_base0
   specs:
@@ -80,15 +87,15 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.22.0)
-      avm (~> 0.45)
+    avm-eac_ruby_base1 (0.23.0)
+      avm (~> 0.48)
       avm-eac_generic_base0 (~> 0.5)
       eac_ruby_utils (~> 0.104)
 
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.9.1)
+    avm-eac_webapp_base0 (0.9.2)
       avm (~> 0.46)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_postgresql_base0 (~> 0.2)
@@ -116,8 +123,8 @@ PATH
 PATH
   remote: sub/avm-git
   specs:
-    avm-git (0.5.0)
-      avm (~> 0.46)
+    avm-git (0.6.0)
+      avm (~> 0.48)
       avm-files (~> 0.4, >= 0.4.1)
       eac_git (~> 0.12, >= 0.12.3)
       eac_ruby_utils (~> 0.104)
@@ -125,13 +132,13 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.139.0)
+    avm-tools (0.141.0)
       aranha-parsers (~> 0.14, >= 0.14.3)
-      avm (~> 0.46)
-      avm-eac_ruby_base1 (~> 0.22)
+      avm (~> 0.48)
+      avm-eac_ruby_base1 (~> 0.23)
       avm-eac_ubuntu_base0 (~> 0.3)
       avm-files (~> 0.4, >= 0.4.1)
-      avm-git (~> 0.5)
+      avm-git (~> 0.6)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
       eac_git (~> 0.12, >= 0.12.3)
@@ -143,7 +150,7 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.46.0)
+    avm (0.48.0)
       eac_cli (~> 0.28)
       eac_config (~> 0.11, >= 0.11.1)
       eac_docker (~> 0.5)
@@ -358,6 +365,7 @@ DEPENDENCIES
   avm-eac_asciidoctor_base0!
   avm-eac_generic_base0!
   avm-eac_latex_base0!
+  avm-eac_php_base0!
   avm-eac_rails_base0!
   avm-eac_rails_base1!
   avm-eac_redmine_base0!

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.35.0'
+  VERSION = '0.36.1'
 end

data/sub/avm/lib/avm/launcher/errors.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Launcher
+    module Errors
+      require_sub __FILE__
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Launcher
+    module Instances
+      require_sub __FILE__
+    end
+  end
+end

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

@@ -2,6 +2,7 @@
 
 require 'avm/projects/stereotypes'
 require 'avm/launcher/paths/real'
+require 'avm/launcher/stereotype'
 
 module Avm
   module Launcher
@@ -61,7 +62,7 @@ module Avm
         private
 
         def stereotypes_uncached
-          ::Avm::Projects::Stereotype.stereotypes.select { |s| s.match?(self) }
+          ::Avm::Launcher::Stereotype.stereotypes.select { |s| s.match?(self) }
         end
 
         def build_child(name)

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Launcher
+    module Paths
+      require_sub __FILE__
+    end
+  end
+end

data/sub/{avm-tools → avm}/lib/avm/launcher/project.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/core_ext'
+
 module Avm
   module Launcher
     class Project
-      attr_reader :name, :instances
-
-      def initialize(name, instances)
-        @name = name
-        @instances = instances.to_a
+      common_constructor :name, :instances do
+        self.instances = instances.to_a
       end
 
       def to_s

data/sub/avm/lib/avm/launcher/publish.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Launcher
+    module Paths
+      require_sub __FILE__
+    end
+  end
+end

data/sub/{avm-tools/lib/avm/projects → avm/lib/avm/launcher}/stereotype.rb

@@ -4,7 +4,7 @@ require 'active_support/core_ext/string/inflections'
 require 'colorized_string'
 
 module Avm
-  module Projects
+  module Launcher
     module Stereotype
       class << self
         attr_reader :stereotypes

data/sub/avm/lib/avm/launcher.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Launcher
+    require_sub __FILE__
+  end
+end

data/sub/avm/lib/avm/version.rb

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

data/sub/avm-eac_php_base0/Gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec
+
+local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if ::File.exist?(local_gemfile)

data/sub/avm-eac_php_base0/avm-eac_php_base0.gemspec

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'avm/eac_php_base0/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'avm-eac_php_base0'
+  s.version     = Avm::EacPhpBase0::VERSION
+  s.authors     = ['Eduardo H. Bogoni']
+  s.summary     = 'AVM stereotype for PHP applications.'
+
+  s.files = Dir['{lib,locale,template}/**/*']
+
+  s.add_dependency 'eac_ruby_utils', '~> 0.104'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
+end

data/sub/avm-eac_php_base0/lib/avm/eac_php_base0/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacPhpBase0
+    VERSION = '0.1.0'
+  end
+end

data/sub/avm-eac_php_base0/lib/avm/eac_php_base0.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacPhpBase0
+    require_sub __FILE__
+  end
+end

data/sub/avm-eac_php_base0/spec/rubocop_spec.rb

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

data/sub/avm-eac_php_base0/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/rspec/default_setup'
+::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.45'
+  s.add_dependency 'avm', '~> 0.48'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
   s.add_dependency 'eac_ruby_utils', '~> 0.104'
 

data/sub/{avm-tools/lib/avm/launcher/ruby → avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher}/gem/build.rb

@@ -3,11 +3,11 @@
 require 'tmpdir'
 require 'eac_cli/speaker'
 require 'eac_ruby_utils/envs'
-require 'avm/launcher/ruby/gem/specification'
+require 'avm/eac_ruby_base1/launcher/gem/specification'
 
 module Avm
-  module Launcher
-    module Ruby
+  module EacRubyBase1
+    module Launcher
       module Gem
         class Build
           enable_speaker
@@ -88,7 +88,7 @@ module Avm
           end
 
           def check_gem_version
-            spec = ::Avm::Launcher::Ruby::Gem::Specification.new(gemspec_file)
+            spec = ::Avm::EacRubyBase1::Launcher::Gem::Specification.new(gemspec_file)
             return if ::File.basename(output_file, '.gem') == spec.full_name
 
             raise("Builded gem is not the same version of gemspec (#{spec}, #{output_file})")

data/sub/{avm-tools/lib/avm/launcher/ruby → avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher}/gem/specification.rb

@@ -3,8 +3,8 @@
 require 'active_support/core_ext/object'
 
 module Avm
-  module Launcher
-    module Ruby
+  module EacRubyBase1
+    module Launcher
       module Gem
         class Specification
           class << self

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher/gem.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Launcher
+      module Gem
+        require_sub __FILE__
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Launcher
+      require_sub __FILE__
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.22.0'
+    VERSION = '0.23.0'
   end
 end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/git_info.rb

@@ -42,8 +42,9 @@ module Avm
             instance.source_instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
           end
 
+          # @return [EacGit::Local]
           def git_uncached
-            ::Avm::Launcher::Git::Base.new(git_repository_path)
+            instance.application.local_source.scm.git_repo
           end
 
           def instance_branch

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy.rb

@@ -5,7 +5,6 @@ require 'avm/entries/jobs/base'
 require 'avm/git'
 require 'eac_ruby_utils/core_ext'
 require 'eac_templates/core_ext'
-require 'avm/launcher/git/base'
 require 'net/http'
 
 module Avm

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.9.1'
+    VERSION = '0.9.2'
   end
 end

data/sub/avm-git/avm-git.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.46'
+  s.add_dependency 'avm', '~> 0.48'
   s.add_dependency 'avm-files', '~> 0.4', '>= 0.4.1'
   s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.3'
   s.add_dependency 'eac_ruby_utils', '~> 0.104'

data/sub/avm-git/lib/avm/git/issue/complete.rb

@@ -58,7 +58,7 @@ module Avm
         end
 
         def launcher_git_uncached
-          ::Avm::Launcher::Git::Base.new(dir)
+          ::Avm::Git::Launcher::Base.new(dir)
         end
       end
     end

data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/base/class_methods.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 module Avm
-  module Launcher
-    module Git
+  module Git
+    module Launcher
       class Base < ::Avm::Launcher::Paths::Real
         module ClassMethods
-          # @return [Avm::Launcher::Git::Base]
+          # @return [Avm::Git::Launcher::Base]
           def by_root(search_base_path)
             new(find_root(search_base_path).to_path)
           end

data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/base/dirty_files.rb

@@ -3,8 +3,8 @@
 require 'active_support/core_ext/object'
 
 module Avm
-  module Launcher
-    module Git
+  module Git
+    module Launcher
       class Base < ::Avm::Launcher::Paths::Real
         module DirtyFiles
           delegate :dirty?, to: :eac_git

data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/base/remotes.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'avm/launcher/git/remote'
+require 'avm/git/launcher/remote'
 
 module Avm
-  module Launcher
-    module Git
+  module Git
+    module Launcher
       class Base < ::Avm::Launcher::Paths::Real
         module Remotes
-          # @return [Avm::Launcher::Git::Remote]
+          # @return [Avm::Git::Launcher::Remote]
           def remote(name)
-            ::Avm::Launcher::Git::Remote.new(self, name)
+            ::Avm::Git::Launcher::Remote.new(self, name)
           end
 
           def remote_hashs(remote_name)

data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/base/subrepo.rb

@@ -3,8 +3,8 @@
 require 'active_support/core_ext/object'
 
 module Avm
-  module Launcher
-    module Git
+  module Git
+    module Launcher
       class Base < ::Avm::Launcher::Paths::Real
         module Subrepo
           def subrepo_status(subrepo_path)

data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/base/underlying.rb

@@ -6,8 +6,8 @@ require 'git'
 require 'avm/launcher/paths/real'
 
 module Avm
-  module Launcher
-    module Git
+  module Git
+    module Launcher
       class Base < ::Avm::Launcher::Paths::Real
         module Underlying
           def command(*args)

data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/base.rb

@@ -4,19 +4,19 @@ require 'eac_git/local'
 require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/envs'
 require 'avm/launcher/paths/real'
-require 'avm/launcher/git/error'
+require 'avm/git/launcher/error'
 
 module Avm
-  module Launcher
-    module Git
+  module Git
+    module Launcher
       class Base < ::Avm::Launcher::Paths::Real
         require_sub __FILE__
         enable_simple_cache
-        extend ::Avm::Launcher::Git::Base::ClassMethods
-        include ::Avm::Launcher::Git::Base::DirtyFiles
-        include ::Avm::Launcher::Git::Base::Remotes
-        include ::Avm::Launcher::Git::Base::Subrepo
-        include ::Avm::Launcher::Git::Base::Underlying
+        extend ::Avm::Git::Launcher::Base::ClassMethods
+        include ::Avm::Git::Launcher::Base::DirtyFiles
+        include ::Avm::Git::Launcher::Base::Remotes
+        include ::Avm::Git::Launcher::Base::Subrepo
+        include ::Avm::Git::Launcher::Base::Underlying
 
         attr_reader :eac_git
         delegate :descendant?, :merge_base, :rev_parse, to: :eac_git
@@ -78,7 +78,7 @@ module Avm
         end
 
         def raise(message)
-          ::Kernel.raise Avm::Launcher::Git::Error.new(self, message)
+          ::Kernel.raise Avm::Git::Launcher::Error.new(self, message)
         end
       end
     end

data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/error.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Avm
-  module Launcher
-    module Git
+  module Git
+    module Launcher
       class Error < StandardError
         def initialize(git_instance, message)
           super("#{message} (Repository: #{git_instance})")

data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/mirror_update.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
-require 'avm/launcher/git/base'
+require 'avm/git/launcher/base'
 
 module Avm
-  module Launcher
-    module Git
+  module Git
+    module Launcher
       class MirrorUpdate < ::Avm::Launcher::Paths::Real
         include ::EacRubyUtils::SimpleCache
 
         def initialize(target_path, source_path, source_rev)
           super(target_path)
-          @target_git = ::Avm::Launcher::Git::Base.new(self)
-          @source_git = ::Avm::Launcher::Git::Base.new(source_path)
+          @target_git = ::Avm::Git::Launcher::Base.new(self)
+          @source_git = ::Avm::Git::Launcher::Base.new(source_path)
           @source_rev = source_rev
           run
         end

data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/publish_base.rb

@@ -6,8 +6,8 @@ require 'avm/launcher/publish/base'
 require 'avm/launcher/publish/check_result'
 
 module Avm
-  module Launcher
-    module Git
+  module Git
+    module Launcher
       class PublishBase < ::Avm::Launcher::Publish::Base
         include ::EacRubyUtils::SimpleCache
         enable_speaker
@@ -92,7 +92,7 @@ module Avm
         end
 
         def sgit_uncached
-          ::Avm::Launcher::Git::Base.new(instance.warped)
+          ::Avm::Git::Launcher::Base.new(instance.warped)
         end
 
         def publish
@@ -117,7 +117,7 @@ module Avm
         end
 
         def remote_name
-          ::Avm::Launcher::Git::WarpBase::TARGET_REMOTE
+          ::Avm::Git::Launcher::WarpBase::TARGET_REMOTE
         end
       end
     end

data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/remote.rb

@@ -3,8 +3,8 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Launcher
-    module Git
+  module Git
+    module Launcher
       class Remote
         common_constructor :git, :name
 

data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/sub_warp_base.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/projects/stereotype'
 require 'avm/launcher/errors/base'
+require 'avm/launcher/stereotype'
 
 module Avm
-  module Launcher
-    module Git
+  module Git
+    module Launcher
       module SubWarpBase
         private
 
@@ -17,7 +17,7 @@ module Avm
         end
 
         def find_parent_instance(current)
-          if ::Avm::Projects::Stereotype.git_stereotypes.any? { |s| current.stereotype?(s) }
+          if ::Avm::Launcher::Stereotype.git_stereotypes.any? { |s| current.stereotype?(s) }
             return current
           end