dry-system 0.7.3 → 0.8.0

data/lib/dry/system/settings/file_loader.rb

@@ -0,0 +1,28 @@
+require "dry/system/settings/file_parser"
+
+module Dry
+  module System
+    module Settings
+      class FileLoader
+        def call(root, env)
+          files(root, env).reduce({}) do |hash, file|
+            hash.merge(parser.(file))
+          end
+        end
+
+        private
+
+        def parser
+          @parser ||= FileParser.new
+        end
+
+        def files(root, env)
+          [
+            root.join(".env"),
+            root.join(".env.#{env}")
+          ].compact
+        end
+      end
+    end
+  end
+end

data/lib/dry/system/settings/file_parser.rb

@@ -0,0 +1,49 @@
+module Dry
+  module System
+    module Settings
+      class FileParser
+        # Regex extracted from dotenv gem
+        # https://github.com/bkeepers/dotenv/blob/master/lib/dotenv/parser.rb#L14
+        LINE = %r(
+          \A
+          \s*
+          (?:export\s+)?    # optional export
+          ([\w\.]+)         # key
+          (?:\s*=\s*|:\s+?) # separator
+          (                 # optional value begin
+            '(?:\'|[^'])*'  #   single quoted value
+            |               #   or
+            "(?:\"|[^"])*"  #   double quoted value
+            |               #   or
+            [^#\n]+         #   unquoted value
+          )?                # value end
+          \s*
+          (?:\#.*)?         # optional comment
+          \z
+        )x
+
+        def call(file)
+          File.readlines(file).each_with_object({}) do |line, hash|
+            parse_line(line, hash)
+          end
+        rescue Errno::ENOENT
+          {}
+        end
+
+        private
+
+        def parse_line(line, hash)
+          if (match = line.match(LINE))
+            key, value = match.captures
+            hash[key] = parse_value(value || "")
+          end
+          hash
+        end
+
+        def parse_value(value)
+          value.strip.sub(/\A(['"])(.*)\1\z/, '\2')
+        end
+      end
+    end
+  end
+end

data/lib/dry/system/system_components/settings.rb

@@ -0,0 +1,9 @@
+Dry::System.register_component(:settings, provider: :system) do
+  init do
+    require 'dry/system/settings'
+  end
+
+  start do
+    register(:settings, settings.load(target.root, target.config.env))
+  end
+end

data/lib/dry/system/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module System
-    VERSION = '0.7.3'.freeze
+    VERSION = '0.8.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-system
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inflecto
@@ -114,6 +114,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: dry-struct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -163,36 +177,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- ".yardopts"
 - CHANGELOG.md
-- CONTRIBUTING.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- dry-system.gemspec
-- examples/custom_configuration_auto_register/Gemfile
-- examples/custom_configuration_auto_register/lib/entities/user.rb
-- examples/custom_configuration_auto_register/lib/user_repo.rb
-- examples/custom_configuration_auto_register/run.rb
-- examples/custom_configuration_auto_register/system/boot/persistence.rb
-- examples/custom_configuration_auto_register/system/container.rb
-- examples/custom_configuration_auto_register/system/import.rb
-- examples/standalone/Gemfile
-- examples/standalone/lib/user_repo.rb
-- examples/standalone/run.rb
-- examples/standalone/system/boot/persistence.rb
-- examples/standalone/system/container.rb
-- examples/standalone/system/import.rb
 - lib/dry-system.rb
 - lib/dry/system.rb
 - lib/dry/system/auto_registrar.rb
 - lib/dry/system/auto_registrar/configuration.rb
 - lib/dry/system/booter.rb
+- lib/dry/system/booter/component_registry.rb
 - lib/dry/system/component.rb
+- lib/dry/system/components.rb
+- lib/dry/system/components/bootable.rb
+- lib/dry/system/components/config.rb
 - lib/dry/system/constants.rb
 - lib/dry/system/container.rb
 - lib/dry/system/errors.rb
@@ -201,68 +198,14 @@ files:
 - lib/dry/system/loader.rb
 - lib/dry/system/magic_comments_parser.rb
 - lib/dry/system/manual_registrar.rb
+- lib/dry/system/provider.rb
+- lib/dry/system/provider_registry.rb
+- lib/dry/system/settings.rb
+- lib/dry/system/settings/file_loader.rb
+- lib/dry/system/settings/file_parser.rb
 - lib/dry/system/stubs.rb
+- lib/dry/system/system_components/settings.rb
 - lib/dry/system/version.rb
-- spec/fixtures/components/bar.rb
-- spec/fixtures/components/bar/baz.rb
-- spec/fixtures/components/foo.rb
-- spec/fixtures/components/no_register.rb
-- spec/fixtures/import_test/config/application.yml
-- spec/fixtures/import_test/lib/test/bar.rb
-- spec/fixtures/import_test/lib/test/foo.rb
-- spec/fixtures/import_test/system/boot/bar.rb
-- spec/fixtures/lazytest/config/application.yml
-- spec/fixtures/lazytest/lib/test/dep.rb
-- spec/fixtures/lazytest/lib/test/foo.rb
-- spec/fixtures/lazytest/lib/test/models.rb
-- spec/fixtures/lazytest/lib/test/models/book.rb
-- spec/fixtures/lazytest/lib/test/models/user.rb
-- spec/fixtures/lazytest/system/boot/bar.rb
-- spec/fixtures/magic_comments/comments.rb
-- spec/fixtures/manual_registration/container/foo.rb
-- spec/fixtures/manual_registration/lib/test/foo.rb
-- spec/fixtures/multiple_namespaced_components/multiple/level/baz.rb
-- spec/fixtures/multiple_namespaced_components/multiple/level/foz.rb
-- spec/fixtures/namespaced_components/namespaced/bar.rb
-- spec/fixtures/namespaced_components/namespaced/foo.rb
-- spec/fixtures/other/config/boot/bar.rb
-- spec/fixtures/other/config/boot/hell.rb
-- spec/fixtures/other/lib/test/dep.rb
-- spec/fixtures/other/lib/test/foo.rb
-- spec/fixtures/other/lib/test/models.rb
-- spec/fixtures/other/lib/test/models/book.rb
-- spec/fixtures/other/lib/test/models/user.rb
-- spec/fixtures/stubbing/lib/test/car.rb
-- spec/fixtures/stubbing/system/boot/db.rb
-- spec/fixtures/test/config/application.yml
-- spec/fixtures/test/config/subapp.yml
-- spec/fixtures/test/lib/test/dep.rb
-- spec/fixtures/test/lib/test/foo.rb
-- spec/fixtures/test/lib/test/models.rb
-- spec/fixtures/test/lib/test/models/book.rb
-- spec/fixtures/test/lib/test/models/user.rb
-- spec/fixtures/test/lib/test/singleton_dep.rb
-- spec/fixtures/test/log/.gitkeep
-- spec/fixtures/test/system/boot/bar.rb
-- spec/fixtures/test/system/boot/client.rb
-- spec/fixtures/test/system/boot/db.rb
-- spec/fixtures/test/system/boot/hell.rb
-- spec/fixtures/test/system/boot/logger.rb
-- spec/fixtures/umbrella/system/boot/db.rb
-- spec/integration/boot_spec.rb
-- spec/integration/container/lazy_loading/manual_registration_spec.rb
-- spec/integration/import_spec.rb
-- spec/spec_helper.rb
-- spec/unit/auto_registrar/configuration_spec.rb
-- spec/unit/component_spec.rb
-- spec/unit/container/auto_register_spec.rb
-- spec/unit/container/config_spec.rb
-- spec/unit/container/finalize_spec.rb
-- spec/unit/container/import_spec.rb
-- spec/unit/container/injector_spec.rb
-- spec/unit/container_spec.rb
-- spec/unit/loader_spec.rb
-- spec/unit/magic_comments_parser_spec.rb
 homepage: http://dry-rb.org/gems/dry-system
 licenses:
 - MIT
@@ -287,64 +230,4 @@ rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Organize your code into reusable components
-test_files:
-- spec/fixtures/components/bar.rb
-- spec/fixtures/components/bar/baz.rb
-- spec/fixtures/components/foo.rb
-- spec/fixtures/components/no_register.rb
-- spec/fixtures/import_test/config/application.yml
-- spec/fixtures/import_test/lib/test/bar.rb
-- spec/fixtures/import_test/lib/test/foo.rb
-- spec/fixtures/import_test/system/boot/bar.rb
-- spec/fixtures/lazytest/config/application.yml
-- spec/fixtures/lazytest/lib/test/dep.rb
-- spec/fixtures/lazytest/lib/test/foo.rb
-- spec/fixtures/lazytest/lib/test/models.rb
-- spec/fixtures/lazytest/lib/test/models/book.rb
-- spec/fixtures/lazytest/lib/test/models/user.rb
-- spec/fixtures/lazytest/system/boot/bar.rb
-- spec/fixtures/magic_comments/comments.rb
-- spec/fixtures/manual_registration/container/foo.rb
-- spec/fixtures/manual_registration/lib/test/foo.rb
-- spec/fixtures/multiple_namespaced_components/multiple/level/baz.rb
-- spec/fixtures/multiple_namespaced_components/multiple/level/foz.rb
-- spec/fixtures/namespaced_components/namespaced/bar.rb
-- spec/fixtures/namespaced_components/namespaced/foo.rb
-- spec/fixtures/other/config/boot/bar.rb
-- spec/fixtures/other/config/boot/hell.rb
-- spec/fixtures/other/lib/test/dep.rb
-- spec/fixtures/other/lib/test/foo.rb
-- spec/fixtures/other/lib/test/models.rb
-- spec/fixtures/other/lib/test/models/book.rb
-- spec/fixtures/other/lib/test/models/user.rb
-- spec/fixtures/stubbing/lib/test/car.rb
-- spec/fixtures/stubbing/system/boot/db.rb
-- spec/fixtures/test/config/application.yml
-- spec/fixtures/test/config/subapp.yml
-- spec/fixtures/test/lib/test/dep.rb
-- spec/fixtures/test/lib/test/foo.rb
-- spec/fixtures/test/lib/test/models.rb
-- spec/fixtures/test/lib/test/models/book.rb
-- spec/fixtures/test/lib/test/models/user.rb
-- spec/fixtures/test/lib/test/singleton_dep.rb
-- spec/fixtures/test/log/.gitkeep
-- spec/fixtures/test/system/boot/bar.rb
-- spec/fixtures/test/system/boot/client.rb
-- spec/fixtures/test/system/boot/db.rb
-- spec/fixtures/test/system/boot/hell.rb
-- spec/fixtures/test/system/boot/logger.rb
-- spec/fixtures/umbrella/system/boot/db.rb
-- spec/integration/boot_spec.rb
-- spec/integration/container/lazy_loading/manual_registration_spec.rb
-- spec/integration/import_spec.rb
-- spec/spec_helper.rb
-- spec/unit/auto_registrar/configuration_spec.rb
-- spec/unit/component_spec.rb
-- spec/unit/container/auto_register_spec.rb
-- spec/unit/container/config_spec.rb
-- spec/unit/container/finalize_spec.rb
-- spec/unit/container/import_spec.rb
-- spec/unit/container/injector_spec.rb
-- spec/unit/container_spec.rb
-- spec/unit/loader_spec.rb
-- spec/unit/magic_comments_parser_spec.rb
+test_files: []

data/.gitignore

@@ -1,39 +0,0 @@
-*.gem
-*.rbc
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/test/tmp/
-/test/version_tmp/
-/tmp/
-
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
-
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-
-## Environment normalisation:
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
-Gemfile.lock
-
-## Specific to RubyMine
-.idea

data/.rspec

@@ -1,3 +0,0 @@
---color
---require ./spec/spec_helper
---order random

data/.travis.yml

@@ -1,22 +0,0 @@
-language: ruby
-sudo: false
-cache: bundler
-bundler_args: --without tools
-script:
-  - bundle exec rake spec
-after_success:
-  - '[ -d coverage ] && bundle exec codeclimate-test-reporter'
-rvm:
-  - 2.1
-  - 2.2
-  - 2.3.1
-  - 2.4.1
-  - jruby-9.1.5.0
-notifications:
-  email: false
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/19098b4253a72c9796db
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false

data/.yardopts

@@ -1,5 +0,0 @@
---no-private
---hide-void-return
-
---markup-provider=redcarpet
---markup=markdown

data/CONTRIBUTING.md

@@ -1,29 +0,0 @@
-# Issue Guidelines
-
-## Reporting bugs
-
-If you found a bug, report an issue and describe what's the expected behavior versus what actually happens. If the bug causes a crash, attach a full backtrace. If possible, a reproduction script showing the problem is highly appreciated.
-
-## Reporting feature requests
-
-Report a feature request **only after discussing it first on [discuss.dry-rb.org](https://discuss.dry-rb.org)** where it was accepted. Please provide a concise description of the feature, don't link to a discussion thread, and instead summarize what was discussed.
-
-## Reporting questions, support requests, ideas, concerns etc.
-
-**PLEASE DON'T** - use [discuss.dry-rb.org](http://discuss.dry-rb.org) instead.
-
-# Pull Request Guidelines
-
-A Pull Request will only be accepted if it addresses a specific issue that was reported previously, or fixes typos, mistakes in documentation etc.
-
-Other requirements:
-
-1) Do not open a pull request if you can't provide tests along with it. If you have problems writing tests, ask for help in the related issue.
-2) Follow the style conventions of the surrounding code. In most cases, this is standard ruby style.
-3) Add API documentation if it's a new feature
-4) Update API documentation if it changes an existing feature
-5) Bonus points for sending a PR to [github.com/dry-rb/dry-rb.org](github.com/dry-rb/dry-rb.org) which updates user documentation and guides
-
-# Asking for help
-
-If these guidelines aren't helpful, and you're stuck, please post a message on [discuss.dry-rb.org](https://discuss.dry-rb.org).

data/Gemfile

@@ -1,9 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-gem 'codeclimate-test-reporter', platforms: :mri
-
-group :tools do
-  gem 'byebug', platforms: :mri
-end

data/Rakefile

@@ -1,12 +0,0 @@
-#!/usr/bin/env rake
-require 'bundler/gem_tasks'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-task default: :spec
-
-desc 'Run all specs in spec directory'
-RSpec::Core::RakeTask.new(:spec)