eac_tools 0.36.0 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae4239b30a17da4a1f143e5aeddcf1b845a6234b2b95049d44a18c7fe7d8c041
-  data.tar.gz: 394046628010ad6317a184017d7749895373a58ffdf03413bd8f899c77c9b70f
+  metadata.gz: c51afc6cc47066279aecae0a111a60358d765c6cb42bd50b028aa1d01972e051
+  data.tar.gz: 370f9cf00a71393edc5345948f95dc96e438cf00ea3672b6c2f23e7f8d5da285
 SHA512:
-  metadata.gz: a950c92642fa1ed6ef188d2d4383356b5857d917a4be35ef504cab08a1f10d9dff64dcfc0d65b29c0665b52ca0be36d5d773796045209445c896c5a8c521cc6a
-  data.tar.gz: 74983a5dab48ace1f6c06638e421aed086c32b9c9579e1585289c6a97aad8db4ab76423881a7700a319ea1c877671c5749f232962dc1f8791739dd014fcb5db0
+  metadata.gz: f8114f6308cee0ee687085eb7b2e87419bb55876e9bc4cad9ddee448b6d5e325ac162196ca06eb48af92b72b391b106cb6ee4bce51a5260e28f1e6a611349a8d
+  data.tar.gz: 738c6a8e0a54ead97d5af98a37fb48c95d9befda1743b4de35e50e894868396c9bee734cbf41e56d7421dd84eff60064a1d7fc2ea57c44650d6c9347aaaaf957

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,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.36.0)
-      avm (~> 0.47)
+    eac_tools (0.37.0)
+      avm (~> 0.49)
       avm-eac_asciidoctor_base0 (~> 0.7, >= 0.7.1)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_latex_base0 (~> 0.2, >= 0.2.1)
@@ -11,10 +11,10 @@ PATH
       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_ruby_base1 (~> 0.24)
       avm-eac_webapp_base0 (~> 0.9, >= 0.9.2)
       avm-eac_wordpress_base0 (~> 0.2, >= 0.2.1)
-      avm-tools (~> 0.140)
+      avm-tools (~> 0.142)
       eac_ruby_utils (~> 0.104)
 
 PATH
@@ -87,8 +87,8 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.22.0)
-      avm (~> 0.45)
+    avm-eac_ruby_base1 (0.24.0)
+      avm (~> 0.49)
       avm-eac_generic_base0 (~> 0.5)
       eac_ruby_utils (~> 0.104)
 
@@ -123,22 +123,23 @@ PATH
 PATH
   remote: sub/avm-git
   specs:
-    avm-git (0.5.0)
-      avm (~> 0.46)
+    avm-git (0.7.0)
+      avm (~> 0.49)
       avm-files (~> 0.4, >= 0.4.1)
       eac_git (~> 0.12, >= 0.12.3)
       eac_ruby_utils (~> 0.104)
+      git (~> 1.12)
 
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.140.0)
+    avm-tools (0.142.0)
       aranha-parsers (~> 0.14, >= 0.14.3)
-      avm (~> 0.46)
-      avm-eac_ruby_base1 (~> 0.22)
+      avm (~> 0.49)
+      avm-eac_ruby_base1 (~> 0.24)
       avm-eac_ubuntu_base0 (~> 0.3)
       avm-files (~> 0.4, >= 0.4.1)
-      avm-git (~> 0.5)
+      avm-git (~> 0.7)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
       eac_git (~> 0.12, >= 0.12.3)
@@ -150,7 +151,7 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.47.0)
+    avm (0.49.0)
       eac_cli (~> 0.28)
       eac_config (~> 0.11, >= 0.11.1)
       eac_docker (~> 0.5)

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.36.0'
+  VERSION = '0.37.0'
 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/publish/base.rb

@@ -35,8 +35,6 @@ module Avm
           internal_check
         rescue ::Avm::Launcher::Errors::Base => e
           ::Avm::Launcher::Publish::CheckResult.blocked("Error: #{e}")
-        rescue ::Avm::Launcher::Git::Error => e
-          ::Avm::Launcher::Publish::CheckResult.blocked("Git error: #{e}")
         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_stereotypes.rb

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

data/sub/avm/lib/avm/registry/launcher_stereotypes.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'avm/registry/with_path'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Registry
+    class LauncherStereotypes < ::Avm::Registry::WithPath
+    end
+  end
+end

data/sub/avm/lib/avm/registry.rb

@@ -7,8 +7,8 @@ module Avm
   module Registry
     require_sub __FILE__
     enable_listable
-    lists.add_symbol :category, :application_stereotypes, :instances, :runners, :scms,
-                     :source_generators, :sources
+    lists.add_symbol :category, :application_stereotypes, :instances, :launcher_stereotypes,
+                     :runners, :scms, :source_generators, :sources
 
     class << self
       enable_simple_cache

data/sub/avm/lib/avm/rspec/setup.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/rspec/source_generator'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -9,6 +10,7 @@ module Avm
 
       def self.extended(obj)
         obj.setup_examples
+        obj.rspec_config.include(::Avm::Rspec::SourceGenerator)
       end
 
       def setup_examples

data/sub/avm/lib/avm/rspec/source_generator.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Rspec
+    module SourceGenerator
+      # @return [Avm::Sources::Base]
+      def avm_source(stereotype_name, target_path = nil)
+        target_path ||= temp_dir.join('generated_app')
+        ::Avm::Registry.source_generators.detect(stereotype_name, target_path).perform
+        ::Avm::Registry.sources.detect(target_path)
+      end
+    end
+  end
+end

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

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

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.49'
   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-tools/lib/avm/projects/stereotypes/ruby_gem → avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher_stereotypes/base}/local_project_mixin.rb

@@ -5,9 +5,9 @@ require 'avm/version_number'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Projects
-    module Stereotypes
-      class RubyGem
+  module EacRubyBase1
+    module LauncherStereotypes
+      class Base
         module LocalProjectMixin
           # @return [Avm::EacRubyBase1::Sources::Base]
           def ruby_gem

data/sub/{avm-tools/lib/avm/projects/stereotypes/ruby_gem → avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher_stereotypes/base}/publish.rb

@@ -7,12 +7,12 @@ require 'rubygems'
 require 'eac_cli/speaker'
 require 'avm/launcher/publish/base'
 require 'avm/launcher/publish/check_result'
-require 'avm/launcher/ruby/gem'
+require 'avm/eac_ruby_base1/launcher/gem'
 
 module Avm
-  module Projects
-    module Stereotypes
-      class RubyGem
+  module EacRubyBase1
+    module LauncherStereotypes
+      class Base
         class Publish < ::Avm::Launcher::Publish::Base
           include ::EacRubyUtils::SimpleCache
           enable_speaker
@@ -67,11 +67,11 @@ module Avm
           end
 
           def gem_spec_uncached
-            ::Avm::Projects::Stereotypes::RubyGem.load_gemspec(gemspec)
+            ::Avm::EacRubyBase1::LauncherStereotypes::Base.load_gemspec(gemspec)
           end
 
           def gem_build_uncached
-            ::Avm::Launcher::Ruby::Gem::Build.new(source)
+            ::Avm::EacRubyBase1::Launcher::Gem::Build.new(source)
           end
 
           def publish

data/sub/{avm-tools/lib/avm/projects/stereotypes/ruby_gem.rb → avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher_stereotypes/base.rb}

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require 'avm/projects/stereotype'
-require 'avm/launcher/ruby/gem/specification'
+require 'avm/launcher/stereotype'
+require 'avm/eac_ruby_base1/launcher/gem/specification'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Projects
-    module Stereotypes
-      class RubyGem
+  module EacRubyBase1
+    module LauncherStereotypes
+      class Base
         require_sub __FILE__
-        include Avm::Projects::Stereotype
+        include ::Avm::Launcher::Stereotype
 
         class << self
           def match?(path)
@@ -21,7 +21,7 @@ module Avm
           end
 
           def load_gemspec(gemspec_file)
-            ::Avm::Launcher::Ruby::Gem::Specification.new(gemspec_file)
+            ::Avm::EacRubyBase1::Launcher::Gem::Specification.new(gemspec_file)
           end
         end
       end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module LauncherStereotypes
+      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.24.0'
   end
 end

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/sources/base_spec.rb

@@ -1,7 +1,16 @@
 # frozen_string_literal: true
 
 require 'avm/eac_ruby_base1/sources/base'
+require 'avm/version_number'
 
 ::RSpec.describe ::Avm::EacRubyBase1::Sources::Base do
+  let(:instance) { avm_source('EacRubyBase1') }
+
   include_examples 'in_avm_registry', 'sources'
+
+  it { expect(instance).to be_a(described_class) }
+
+  it do
+    expect(instance.version).to eq(::Avm::VersionNumber.new('0.0.0'))
+  end
 end

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

@@ -2,3 +2,7 @@
 
 require 'eac_ruby_utils/rspec/default_setup'
 ::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))
+
+require 'eac_ruby_utils/speaker'
+require 'eac_ruby_utils/rspec/stub_speaker'
+::EacRubyUtils::Speaker.context.push(::EacRubyUtils::Rspec::StubSpeaker.new)

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

@@ -12,10 +12,11 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.46'
+  s.add_dependency 'avm', '~> 0.49'
   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'
+  s.add_dependency 'git', '~> 1.12'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.5'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'

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,9 +1,11 @@
 # frozen_string_literal: true
 
+require 'avm/launcher/errors/base'
+
 module Avm
-  module Launcher
-    module Git
-      class Error < StandardError
+  module Git
+    module Launcher
+      class Error < ::Avm::Launcher::Errors::Base
         def initialize(git_instance, message)
           super("#{message} (Repository: #{git_instance})")
         end

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