eac_tools 0.37.0 → 0.37.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c51afc6cc47066279aecae0a111a60358d765c6cb42bd50b028aa1d01972e051
-  data.tar.gz: 370f9cf00a71393edc5345948f95dc96e438cf00ea3672b6c2f23e7f8d5da285
+  metadata.gz: adddd8b71bf6e7fea8707749d003c2b70c48a9788a89203936cc2caf44577d21
+  data.tar.gz: 33e2a116d3f440f20a6dcdb1472d11ed1b62225c2d5c83e670d675cb707b3e22
 SHA512:
-  metadata.gz: f8114f6308cee0ee687085eb7b2e87419bb55876e9bc4cad9ddee448b6d5e325ac162196ca06eb48af92b72b391b106cb6ee4bce51a5260e28f1e6a611349a8d
-  data.tar.gz: 738c6a8e0a54ead97d5af98a37fb48c95d9befda1743b4de35e50e894868396c9bee734cbf41e56d7421dd84eff60064a1d7fc2ea57c44650d6c9347aaaaf957
+  metadata.gz: 81a7b7abf41d216ddcf599907100e128be48f1a45af08d16501ba842f6eb083f17c8dc8b35ee022b6708d840f6a3189e1604afbe816c0192d43a439cbe7819ee
+  data.tar.gz: 292a5afc0448b0010973a90a9ab8a7e92e932d1475368e2c11130bad74046c7961639f9a56d00b9a41b675b098b5850cdef351678aa880b8d611459c2dd22043

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.37.0)
-      avm (~> 0.49)
+    eac_tools (0.37.2)
+      avm (~> 0.51)
       avm-eac_asciidoctor_base0 (~> 0.7, >= 0.7.1)
-      avm-eac_generic_base0 (~> 0.5)
+      avm-eac_generic_base0 (~> 0.6)
       avm-eac_latex_base0 (~> 0.2, >= 0.2.1)
-      avm-eac_php_base0 (~> 0.1)
+      avm-eac_php_base0 (~> 0.2)
       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.24)
-      avm-eac_webapp_base0 (~> 0.9, >= 0.9.2)
+      avm-eac_ruby_base1 (~> 0.26)
+      avm-eac_webapp_base0 (~> 0.11)
       avm-eac_wordpress_base0 (~> 0.2, >= 0.2.1)
-      avm-tools (~> 0.142)
-      eac_ruby_utils (~> 0.104)
+      avm-tools (~> 0.142, >= 0.142.2)
+      eac_ruby_utils (~> 0.105)
 
 PATH
   remote: sub/avm-eac_asciidoctor_base0
@@ -30,9 +30,9 @@ PATH
 PATH
   remote: sub/avm-eac_generic_base0
   specs:
-    avm-eac_generic_base0 (0.5.0)
-      avm (~> 0.28)
-      eac_ruby_utils (~> 0.96)
+    avm-eac_generic_base0 (0.6.0)
+      avm (~> 0.51)
+      eac_ruby_utils (~> 0.105)
 
 PATH
   remote: sub/avm-eac_latex_base0
@@ -45,8 +45,16 @@ PATH
 PATH
   remote: sub/avm-eac_php_base0
   specs:
-    avm-eac_php_base0 (0.1.0)
-      eac_ruby_utils (~> 0.104)
+    avm-eac_php_base0 (0.2.0)
+      avm-eac_generic_base0 (~> 0.6)
+      eac_ruby_utils (~> 0.105)
+
+PATH
+  remote: sub/avm-eac_python_base0
+  specs:
+    avm-eac_python_base0 (0.1.0)
+      avm-eac_generic_base0 (~> 0.6)
+      eac_ruby_utils (~> 0.105)
 
 PATH
   remote: sub/avm-eac_rails_base0
@@ -87,20 +95,20 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.24.0)
-      avm (~> 0.49)
-      avm-eac_generic_base0 (~> 0.5)
-      eac_ruby_utils (~> 0.104)
+    avm-eac_ruby_base1 (0.26.0)
+      avm (~> 0.51)
+      avm-eac_generic_base0 (~> 0.6)
+      eac_ruby_utils (~> 0.105)
 
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.9.2)
-      avm (~> 0.46)
-      avm-eac_generic_base0 (~> 0.5)
+    avm-eac_webapp_base0 (0.11.0)
+      avm (~> 0.51)
+      avm-eac_generic_base0 (~> 0.6)
       avm-eac_postgresql_base0 (~> 0.2)
       avm-eac_ubuntu_base0 (~> 0.3)
-      eac_ruby_utils (~> 0.104)
+      eac_ruby_utils (~> 0.105)
 
 PATH
   remote: sub/avm-eac_wordpress_base0
@@ -113,36 +121,36 @@ PATH
 PATH
   remote: sub/avm-files
   specs:
-    avm-files (0.4.1)
-      avm (~> 0.43)
+    avm-files (0.5.0)
+      avm (~> 0.51)
       eac_cli (~> 0.28)
       eac_fs (~> 0.12, >= 0.12.3)
-      eac_ruby_utils (~> 0.103)
+      eac_ruby_utils (~> 0.105)
       eac_templates (~> 0.3, >= 0.3.2)
 
 PATH
   remote: sub/avm-git
   specs:
-    avm-git (0.7.0)
-      avm (~> 0.49)
+    avm-git (0.8.0)
+      avm (~> 0.50)
       avm-files (~> 0.4, >= 0.4.1)
-      eac_git (~> 0.12, >= 0.12.3)
-      eac_ruby_utils (~> 0.104)
+      eac_git (~> 0.13)
+      eac_ruby_utils (~> 0.105)
       git (~> 1.12)
 
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.142.0)
+    avm-tools (0.142.2)
       aranha-parsers (~> 0.14, >= 0.14.3)
-      avm (~> 0.49)
-      avm-eac_ruby_base1 (~> 0.24)
+      avm (~> 0.51)
+      avm-eac_ruby_base1 (~> 0.26)
       avm-eac_ubuntu_base0 (~> 0.3)
-      avm-files (~> 0.4, >= 0.4.1)
-      avm-git (~> 0.7)
+      avm-files (~> 0.5)
+      avm-git (~> 0.8)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
-      eac_git (~> 0.12, >= 0.12.3)
+      eac_git (~> 0.13)
       eac_ruby_base0 (~> 0.17)
       eac_templates (~> 0.3, >= 0.3.2)
       git (~> 1.12)
@@ -151,12 +159,12 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.49.0)
+    avm (0.51.0)
       eac_cli (~> 0.28)
       eac_config (~> 0.11, >= 0.11.1)
       eac_docker (~> 0.5)
-      eac_git (~> 0.12, >= 0.12.3)
-      eac_ruby_utils (~> 0.104)
+      eac_git (~> 0.13)
+      eac_ruby_utils (~> 0.105)
       eac_templates (~> 0.3, >= 0.3.2)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
@@ -195,8 +203,8 @@ PATH
 PATH
   remote: sub/eac_git
   specs:
-    eac_git (0.12.3)
-      eac_ruby_utils (~> 0.103)
+    eac_git (0.13.0)
+      eac_ruby_utils (~> 0.105)
       parseconfig (~> 1.1, >= 1.1.2)
 
 PATH
@@ -211,7 +219,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.104.0)
+    eac_ruby_utils (0.105.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.8, >= 2.8.1)
       bundler
@@ -238,7 +246,7 @@ GEM
       faraday_middleware (~> 1.2)
       nokogiri (~> 1.13, >= 1.13.8)
       ofx-parser (~> 1.1)
-    asciidoctor (2.0.17)
+    asciidoctor (2.0.18)
     ast (2.4.2)
     avm-eac_postgresql_base0 (0.2.0)
       avm (~> 0.12, >= 0.12.1)
@@ -306,7 +314,7 @@ GEM
     minitest (5.16.3)
     multipart-post (2.2.3)
     net-ssh (4.2.0)
-    nokogiri (1.13.8-x86_64-linux)
+    nokogiri (1.13.9-x86_64-linux)
       racc (~> 1.4)
     ofx-parser (1.1.0)
       hpricot (>= 0.6)
@@ -367,6 +375,7 @@ DEPENDENCIES
   avm-eac_generic_base0!
   avm-eac_latex_base0!
   avm-eac_php_base0!
+  avm-eac_python_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.37.0'
+  VERSION = '0.37.2'
 end

data/sub/avm/avm.gemspec

@@ -15,13 +15,15 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_cli', '~> 0.28'
   s.add_dependency 'eac_config', '~> 0.11', '>= 0.11.1'
   s.add_dependency 'eac_docker', '~> 0.5'
-  s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.3'
-  s.add_dependency 'eac_ruby_utils', '~> 0.104'
+  s.add_dependency 'eac_git', '~> 0.13'
+  s.add_dependency 'eac_ruby_utils', '~> 0.105'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'
   s.add_dependency 'minitar', '~> 0.9'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '~> 0.14.1'
+  s.add_development_dependency 'avm-eac_ruby_base1', '~> 0.24'
+  s.add_development_dependency 'avm-git', '~> 0.7'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm/lib/avm/file_formats/base.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'eac_fs/file_info'
+require 'ostruct'
+
+module Avm
+  module FileFormats
+    class Base
+      enable_abstract_methods
+
+      def apply(files)
+        old_content = Hash[files.map { |f| [f, File.read(f)] }]
+        ::Avm::Files::Formatter::Utf8Assert.assert_files(files) { internal_apply(files) }
+        files.map { |f| build_file_result(f, old_content[f]) }
+      end
+
+      def name
+        self.class.name.demodulize
+      end
+
+      def match?(file)
+        match_by_filename?(file) || match_by_type?(file)
+      end
+
+      def valid_basenames
+        constant_or_array('VALID_BASENAMES')
+      end
+
+      def valid_types
+        constant_or_array('VALID_TYPES')
+      end
+
+      private
+
+      def constant_or_array(name)
+        return [] unless self.class.const_defined?(name)
+
+        self.class.const_get(name)
+      end
+
+      def build_file_result(file, old_content)
+        ::OpenStruct.new(file: file, format: self.class,
+                         changed: (old_content != File.read(file)))
+      end
+
+      def match_by_filename?(file)
+        valid_basenames.any? do |valid_basename|
+          file.basename.fnmatch?(valid_basename)
+        end
+      end
+
+      def match_by_type?(file)
+        info = ::EacFs::FileInfo.new(file)
+        return unless info.content_type.type == 'text'
+
+        valid_types.include?(info.content_type.subtype)
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/file_formats.rb

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

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

@@ -8,7 +8,6 @@ require 'avm/launcher/context/instance_discovery'
 require 'avm/launcher/context/settings'
 require 'avm/launcher/paths/logical'
 require 'avm/launcher/project'
-require 'avm/tools/self'
 
 module Avm
   module Launcher
@@ -43,6 +42,10 @@ module Avm
         @recache = false
       end
 
+      def fs_object_id
+        root.real.variableize
+      end
+
       def instance(name)
         instances.find { |i| i.name == name }
       end
@@ -66,7 +69,7 @@ module Avm
       end
 
       def default_cache_root
-        ::Avm::Tools::Self.application.cache_dir.join('launcher')
+        fs_cache.path
       end
 
       def default_option(key)
@@ -78,7 +81,7 @@ module Avm
       end
 
       def default_settings_file
-        ::Avm::Tools::Self.application.config_dir.join('launcher.yaml')
+        ::File.join(::EacFs::Contexts.config.current.path, 'launcher.yaml')
       end
 
       def projects_uncached

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/projects/stereotypes'
 require 'avm/launcher/paths/real'
 require 'avm/launcher/stereotype'
 

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

@@ -7,11 +7,7 @@ module Avm
   module Launcher
     module Stereotype
       class << self
-        attr_reader :stereotypes
-
         def included(base)
-          @stereotypes ||= []
-          @stereotypes << base
           base.extend(ClassMethods)
         end
 
@@ -22,6 +18,10 @@ module Avm
         def nogit_stereotypes
           stereotypes - git_stereotypes
         end
+
+        def stereotypes
+          ::Avm::Registry.launcher_stereotypes.available
+        end
       end
 
       module ClassMethods

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'avm/registry/from_gems'
+
+module Avm
+  module Registry
+    class FileFormats < ::Avm::Registry::FromGems
+    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, :launcher_stereotypes,
-                     :runners, :scms, :source_generators, :sources
+    lists.add_symbol :category, :application_stereotypes, :file_formats, :instances,
+                     :launcher_stereotypes, :runners, :scms, :source_generators, :sources
 
     class << self
       enable_simple_cache

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'tmpdir'
+
+module Avm
+  module Rspec
+    module Setup
+      module Launcher
+        def temp_launcher_context(settings_file = nil)
+          settings_file ||= temp_file
+          ::Avm::Launcher::Context.current = ::Avm::Launcher::Context.new(
+            projects_root: ::Dir.mktmpdir, settings_file: settings_file, cache_root: ::Dir.mktmpdir
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -6,10 +6,12 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Rspec
     module Setup
+      require_sub __FILE__
       EXAMPLES = %w[entries_values in_avm_registry not_in_avm_registry].freeze
 
       def self.extended(obj)
         obj.setup_examples
+        obj.rspec_config.include(::Avm::Rspec::Setup::Launcher)
         obj.rspec_config.include(::Avm::Rspec::SourceGenerator)
       end
 

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

@@ -6,9 +6,9 @@ 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
+      def avm_source(stereotype_name, options = {})
+        target_path ||= options.delete(:target_path) || temp_dir.join('generated_app')
+        ::Avm::Registry.source_generators.detect(stereotype_name, target_path, options).perform
         ::Avm::Registry.sources.detect(target_path)
       end
     end

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

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

data/sub/avm-eac_generic_base0/avm-eac_generic_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale}/**/*']
 
-  s.add_dependency 'avm', '~> 0.28'
-  s.add_dependency 'eac_ruby_utils', '~> 0.96'
+  s.add_dependency 'avm', '~> 0.51'
+  s.add_dependency 'eac_ruby_utils', '~> 0.105'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats/base.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'avm/file_formats/base'
+
+module Avm
+  module EacGenericBase0
+    class FileFormats
+      class Base < ::Avm::FileFormats::Base
+        VALID_BASENAMES = %w[*.asm *.bat *.css.coffee *.java *.js *.rb *.s *.scss *.sql *.tex
+                             *.url *.yml *.yaml].freeze
+
+        VALID_TYPES = %w[plain x-shellscript].freeze
+
+        def internal_apply(files)
+          files.each { |file| file_apply(file) }
+        end
+
+        def file_apply(file)
+          file.write(string_apply(file.read))
+        end
+
+        def string_apply(string)
+          b = ''
+          string.each_line do |line|
+            b += "#{line.rstrip}\n"
+          end
+          "#{b.strip}\n".gsub(/\t/, '  ')
+        end
+      end
+    end
+  end
+end

data/sub/{avm-files/lib/avm/files/formatter/formats.rb → avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats.rb}

@@ -3,11 +3,9 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Files
-    class Formatter
-      module Formats
-        require_sub __FILE__
-      end
+  module EacGenericBase0
+    module FileFormats
+      require_sub __FILE__
     end
   end
 end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacGenericBase0
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

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

@@ -12,7 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'eac_ruby_utils', '~> 0.104'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.6'
+  s.add_dependency 'eac_ruby_utils', '~> 0.105'
 
   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/file_formats/base.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'avm/executables'
+require 'avm/eac_generic_base0/file_formats/base'
+
+module Avm
+  module EacPhpBase0
+    module FileFormats
+      class Base < ::Avm::EacGenericBase0::FileFormats::Base
+        VALID_BASENAMES = %w[*.php].freeze
+        VALID_TYPES = ['x-php'].freeze
+
+        def file_apply(file)
+          ::Avm::Executables.php_cs_fixer.command.append(['fix', file]).system!
+          super(file)
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacPhpBase0
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/sub/avm-eac_python_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_python_base0/avm-eac_python_base0.gemspec

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

data/sub/avm-eac_python_base0/lib/avm/eac_python_base0/file_formats/base.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'avm/executables'
+require 'avm/eac_generic_base0/file_formats/base'
+
+module Avm
+  module EacPythonBase0
+    module FileFormats
+      class Base < ::Avm::EacGenericBase0::FileFormats::Base
+        VALID_BASENAMES = %w[*.py].freeze
+        VALID_TYPES = ['x-python'].freeze
+
+        def internal_apply(files)
+          ::Avm::Executables.yapf.command.append(['--in-place', *files]).system!
+          super(files)
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_python_base0/lib/avm/eac_python_base0/file_formats.rb

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

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

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

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

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

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

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