dry-system 0.26.0 → 0.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3817891e298713d98e37ad2f3fae19f0d63e2aaa0ed7fa43a084f4530a8c97b5
-  data.tar.gz: d438cfec3270bd3abff042fa8a1b145517548300d79159a62be6b82e8f8d8df6
+  metadata.gz: 457ba079fa65d7b60e5d6808fd2c62fda357dd81eb4d207c3e69694f26440ea0
+  data.tar.gz: 6da71e4c7ec328fefba00c89e51f0af3817c91d0f615d1b9bc0b5468177f9504
 SHA512:
-  metadata.gz: d7a26bf48ab9318e359780ce83f0d2cd3ea541a2546dcc88c8fa0637d801b513bff9b1d8b64ce9c28e7307343ddea66d03f299ae4f1909c775ac1e478e7648af
-  data.tar.gz: 5bc0286acd96dfaca17099c1a29d14417ba547cf4cb286a5f3951aa38bb9527d3ed2a966b959e658222a645f91a39caa094cdd2c63a4c2209f603b575a017792
+  metadata.gz: 49403c32c5c9aa8a7e705fe892c49d94092dc8a901e452f0b7760cab52643dbe7438e255fa8150ee12e75aec10cb694d08a7479ecc365d87664b09ccc33cc252
+  data.tar.gz: 8028d23914be1b5cf8c4d943591f1d8025f150836db11142ceec79401248cdf5cbf64ec6857bdee0b6d3e16f7624a583c51f7ef3eeca90ddbd734d73cc7e9f3e

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 0.27.1 2022-10-15
+
+
+### Fixed
+
+- Tweak for zeitwerk loader (@flash-gordon)
+
+
+[Compare v0.27.0...v0.27.1](https://github.com/dry-rb/dry-system/compare/v0.27.0...v0.27.1)
+
+## 0.27.0 2022-10-15
+
+
+### Changed
+
+- Use zeitwerk for auto-loading dry-system (@flash-gordon + @solnic)
+
+[Compare v0.26.0...v0.27.0](https://github.com/dry-rb/dry-system/compare/v0.26.0...v0.27.0)
+
 ## 0.26.0 2022-10-08
 
 

data/dry-system.gemspec

@@ -29,10 +29,11 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.7.0"
 
   # to update dependencies edit project.yml
+  spec.add_runtime_dependency "zeitwerk", "~> 2.6"
   spec.add_runtime_dependency "dry-auto_inject", ">= 0.4.0"
   spec.add_runtime_dependency "dry-configurable", "~> 0.16", ">= 0.16.0"
   spec.add_runtime_dependency "dry-container", "~> 0.10", ">= 0.10.0"
-  spec.add_runtime_dependency "dry-core", "~> 0.5", ">= 0.5"
+  spec.add_runtime_dependency "dry-core", "~> 0.9", ">= 0.9.0"
   spec.add_runtime_dependency "dry-inflector", "~> 0.1", ">= 0.1.2"
 
   spec.add_development_dependency "bundler"

data/lib/dry/system/auto_registrar.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "dry/system/constants"
-require_relative "component"
 
 module Dry
   module System

data/lib/dry/system/component.rb

@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
+require "pathname"
 require "dry/inflector"
-require "dry/system/loader"
 require "dry/system/errors"
 require "dry/system/constants"
-require "pathname"
-require_relative "identifier"
 
 module Dry
   module System

data/lib/dry/system/component_dir.rb

@@ -2,9 +2,6 @@
 
 require "pathname"
 require "dry/system/constants"
-require_relative "constants"
-require_relative "identifier"
-require_relative "magic_comments_parser"
 
 module Dry
   module System

data/lib/dry/system/components.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-
 Dry::Core::Deprecations.announce(
   "require \"dry/system/components\"",
   "Use `require \"dry/system/provider_sources\"` instead",

data/lib/dry/system/config/component_dir.rb

@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/configurable"
-require "dry/core/deprecations"
 require "dry/system/constants"
-require "dry/system/loader"
-require_relative "namespaces"
 
 module Dry
   module System

data/lib/dry/system/config/component_dirs.rb

@@ -2,7 +2,6 @@
 
 require "dry/system/constants"
 require "dry/system/errors"
-require_relative "component_dir"
 
 module Dry
   module System

data/lib/dry/system/config/namespace.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
 require "dry/system/constants"
 
 module Dry

data/lib/dry/system/config/namespaces.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-require "dry/core/equalizer"
 require "dry/system/errors"
-require_relative "namespace"
 
 module Dry
   module System

data/lib/dry/system/constants.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/constants"
-
 module Dry
   module System
     include Dry::Core::Constants

data/lib/dry/system/container.rb

@@ -5,25 +5,8 @@ require "pathname"
 require "dry/configurable"
 require "dry/auto_inject"
 require "dry/container"
-require "dry/core/deprecations"
 require "dry/inflector"
 
-require "dry/system/auto_registrar"
-require "dry/system/component"
-require "dry/system/constants"
-require "dry/system/errors"
-require "dry/system/identifier"
-require "dry/system/importer"
-require "dry/system/indirect_component"
-require "dry/system/manifest_registrar"
-require "dry/system/plugins"
-require "dry/system/provider_registrar"
-require "dry/system/provider"
-require "dry/system/provider/source"
-
-require_relative "component_dir"
-require_relative "config/component_dirs"
-
 module Dry
   module System
     # Abstract container class to inherit from

data/lib/dry/system/errors.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-
 module Dry
   module System
     extend Dry::Core::Deprecations["dry-system"]

data/lib/dry/system/identifier.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-require_relative "constants"
+require "dry/system/constants"
 
 module Dry
   module System

data/lib/dry/system/importer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "dry/container"
-require_relative "constants"
+require "dry/system/constants"
 
 module Dry
   module System

data/lib/dry/system/indirect_component.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-
 module Dry
   module System
     # An indirect component is a component that cannot be directly from a source file

data/lib/dry/system/loader/autoloading.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../loader"
-
 module Dry
   module System
     class Loader

data/lib/dry/system/plugins/plugin.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Dry
+  module System
+    module Plugins
+      # @api private
+      class Plugin
+        attr_reader :name
+
+        attr_reader :mod
+
+        attr_reader :block
+
+        # @api private
+        def initialize(name, mod, &block)
+          @name = name
+          @mod = mod
+          @block = block
+        end
+
+        # @api private
+        def apply_to(system, **options)
+          system.extend(stateful? ? mod.new(**options) : mod)
+          system.instance_eval(&block) if block
+          system
+        end
+
+        # @api private
+        def load_dependencies(dependencies = mod_dependencies, gem = nil)
+          Array(dependencies).each do |dependency|
+            if dependency.is_a?(Array) || dependency.is_a?(Hash)
+              dependency.each { |value| load_dependencies(*Array(value).reverse) }
+            elsif !Plugins.loaded_dependencies.include?(dependency.to_s)
+              load_dependency(dependency, gem)
+            end
+          end
+        end
+
+        # @api private
+        def load_dependency(dependency, gem)
+          Kernel.require dependency
+          Plugins.loaded_dependencies << dependency.to_s
+        rescue LoadError => e
+          raise PluginDependencyMissing.new(name, e.message, gem)
+        end
+
+        # @api private
+        def stateful?
+          mod < Module
+        end
+
+        # @api private
+        def mod_dependencies
+          return EMPTY_ARRAY unless mod.respond_to?(:dependencies)
+
+          mod.dependencies.is_a?(Array) ? mod.dependencies : [mod.dependencies]
+        end
+      end
+    end
+  end
+end

data/lib/dry/system/plugins.rb

@@ -1,64 +1,8 @@
 # frozen_string_literal: true
 
-require "dry/system/constants"
-
 module Dry
   module System
     module Plugins
-      # @api private
-      class Plugin
-        attr_reader :name
-
-        attr_reader :mod
-
-        attr_reader :block
-
-        # @api private
-        def initialize(name, mod, &block)
-          @name = name
-          @mod = mod
-          @block = block
-        end
-
-        # @api private
-        def apply_to(system, **options)
-          system.extend(stateful? ? mod.new(**options) : mod)
-          system.instance_eval(&block) if block
-          system
-        end
-
-        # @api private
-        def load_dependencies(dependencies = mod_dependencies, gem = nil)
-          Array(dependencies).each do |dependency|
-            if dependency.is_a?(Array) || dependency.is_a?(Hash)
-              dependency.each { |value| load_dependencies(*Array(value).reverse) }
-            elsif !Plugins.loaded_dependencies.include?(dependency.to_s)
-              load_dependency(dependency, gem)
-            end
-          end
-        end
-
-        # @api private
-        def load_dependency(dependency, gem)
-          Kernel.require dependency
-          Plugins.loaded_dependencies << dependency.to_s
-        rescue LoadError => e
-          raise PluginDependencyMissing.new(name, e.message, gem)
-        end
-
-        # @api private
-        def stateful?
-          mod < Module
-        end
-
-        # @api private
-        def mod_dependencies
-          return EMPTY_ARRAY unless mod.respond_to?(:dependencies)
-
-          mod.dependencies.is_a?(Array) ? mod.dependencies : [mod.dependencies]
-        end
-      end
-
       # Register a plugin
       #
       # @param [Symbol] name The name of a plugin
@@ -93,7 +37,7 @@ module Dry
       def use(name, **options)
         return self if enabled_plugins.include?(name)
 
-        raise PluginNotFoundError, name unless (plugin = Plugins.registry[name])
+        raise PluginNotFoundError, name unless (plugin = Dry::System::Plugins.registry[name])
 
         plugin.load_dependencies
         plugin.apply_to(self, **options)

data/lib/dry/system/provider/source.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/configurable"
-require "dry/core/class_attributes"
-require "dry/core/deprecations"
 require_relative "source_dsl"
 
 module Dry

data/lib/dry/system/provider/source_dsl.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-
 module Dry
   module System
     class Provider

data/lib/dry/system/provider.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-require_relative "constants"
-require_relative "provider/source"
+require "dry/system/constants"
 
 module Dry
   module System

data/lib/dry/system/provider_registrar.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-require "dry/system"
 require "pathname"
-require_relative "errors"
-require_relative "constants"
-require_relative "provider"
+
+require "dry/system/errors"
+require "dry/system/constants"
 
 module Dry
   module System

data/lib/dry/system/provider_source_registry.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-require_relative "constants"
-require_relative "provider/source"
+require "dry/system/constants"
 
 module Dry
   module System

data/lib/dry/system/provider_sources/settings/config.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/configurable"
-require "dry/core/deprecations"
-require_relative "loader"
-
 module Dry
   module System
     module ProviderSources

data/lib/dry/system/provider_sources/settings/loader.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/configurable"
-require "dry/core/deprecations"
-
 module Dry
   module System
     module ProviderSources

data/lib/dry/system/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module System
-    VERSION = "0.26.0"
+    VERSION = "0.27.1"
   end
 end

data/lib/dry/system.rb

@@ -1,10 +1,25 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-require_relative "system/provider_source_registry"
+require "zeitwerk"
+require "dry/core"
 
 module Dry
   module System
+    # @api private
+    def self.loader
+      @loader ||= Zeitwerk::Loader.new.tap do |loader|
+        root = File.expand_path("..", __dir__)
+        loader.tag = "dry-system"
+        loader.inflector = Zeitwerk::GemInflector.new("#{root}/dry-system.rb")
+        loader.push_dir(root)
+        loader.ignore(
+          "#{root}/dry-system.rb",
+          "#{root}/dry/system/{components,constants,errors,stubs,version}.rb"
+        )
+        loader.inflector.inflect("source_dsl" => "SourceDSL")
+      end
+    end
+
     # Registers the provider sources in the files under the given path
     #
     # @api public
@@ -58,5 +73,7 @@ module Dry
     def self.provider_sources
       @provider_sources ||= ProviderSourceRegistry.new
     end
+
+    loader.setup
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dry-system
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.1
 platform: ruby
 authors:
 - Piotr Solnica
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-08 00:00:00.000000000 Z
+date: 2022-10-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: dry-auto_inject
   requirement: !ruby/object:Gem::Requirement
@@ -70,20 +84,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
@@ -186,6 +200,7 @@ files:
 - lib/dry/system/plugins/monitoring.rb
 - lib/dry/system/plugins/monitoring/proxy.rb
 - lib/dry/system/plugins/notifications.rb
+- lib/dry/system/plugins/plugin.rb
 - lib/dry/system/plugins/zeitwerk.rb
 - lib/dry/system/plugins/zeitwerk/compat_inflector.rb
 - lib/dry/system/provider.rb
@@ -207,7 +222,7 @@ metadata:
   changelog_uri: https://github.com/dry-rb/dry-system/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-system
   bug_tracker_uri: https://github.com/dry-rb/dry-system/issues
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -222,8 +237,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Organize your code into reusable components
 test_files: []