avm 0.49.0 → 0.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45c9b97e84c6bc931f5c39f0b4504f2ff0bb54777eefec60a11ca75f0f78d7ac
-  data.tar.gz: 8056ef32f78b0dd4e0dd3befb96b76215e427dee54439150bddc8ca55b6f79f9
+  metadata.gz: c7d526aa03c069d29d98545ce6d90ff1336592ad1c74a432c88430feb4cc71a6
+  data.tar.gz: f1b4f72746cd60c762df317eb415a91810de688bf58bc24d1ab261f085974b52
 SHA512:
-  metadata.gz: 645d93964df7e611a16976cebaad4a49cffb661b0e44b3d499a3c09f92c3ddf2376de919ee864759e2cd0fb1d63b942a934ce47a1c524bcd62c6e10400858fa1
-  data.tar.gz: 47dd65cb91878b663412a94e47da514d31b39bcb37f87d20796abaffe4877537885207ef2d291f78d511bbe9389333de66be73de053ae484aabfff314e566cde
+  metadata.gz: db1371c99c4d393a1b47cb09275a9fb6c9acb094706119b2db2a83131e87b75a85210b097e76dd053f35b892680713e493b2a2277767b66b0885e5c0434f713a
+  data.tar.gz: c2f242bddf30a01e4db4f4aaaffa7878863df455a04023d928ab611951cd2a73b4343cea0bcb312c44db96b98488a4337894f90cf23aba6972f28bf4ab571ee9

data/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/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/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/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/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/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/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/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/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/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/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.49.0
+  version: 0.51.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2022-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -64,34 +64,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.104'
+        version: '0.105'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.104'
+        version: '0.105'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +174,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.1
+- !ruby/object:Gem::Dependency
+  name: avm-eac_ruby_base1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.24'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.24'
+- !ruby/object:Gem::Dependency
+  name: avm-git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -243,6 +265,8 @@ files:
 - lib/avm/entries/keys_constants_set.rb
 - lib/avm/entries/uri_builder.rb
 - lib/avm/executables.rb
+- lib/avm/file_formats.rb
+- lib/avm/file_formats/base.rb
 - lib/avm/instances.rb
 - lib/avm/instances/base.rb
 - lib/avm/instances/base/auto_values.rb
@@ -289,6 +313,7 @@ files:
 - lib/avm/registry/application_stereotypes.rb
 - lib/avm/registry/application_stereotypes/build_available.rb
 - lib/avm/registry/application_stereotypes/stereotype_builder.rb
+- lib/avm/registry/file_formats.rb
 - lib/avm/registry/from_gems.rb
 - lib/avm/registry/instances.rb
 - lib/avm/registry/launcher_stereotypes.rb
@@ -301,6 +326,7 @@ files:
 - lib/avm/result.rb
 - lib/avm/rspec.rb
 - lib/avm/rspec/setup.rb
+- lib/avm/rspec/setup/launcher.rb
 - lib/avm/rspec/shared_examples/entries_values.rb
 - lib/avm/rspec/shared_examples/in_avm_registry.rb
 - lib/avm/rspec/shared_examples/not_in_avm_registry.rb