dry-config 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 676591550dec732ede12a3bb7b72452ab2ea6347
-  data.tar.gz: 9f140632b65169bafc5306c6f945cd846626be91
+  metadata.gz: 9c1737b29253538d7bf15cd0e02bc7f2d34c4b33
+  data.tar.gz: 051fd285d4b11930896fb44fe2c331bdc61630a2
 SHA512:
-  metadata.gz: 5fc431b635f0f9284b37366051ffa57a28073d2eb64a35ee7bc0278c317982240dd984ea3dd07d435489d1268c3529add547bf25ab195983db1468ce7a0c9c2f
-  data.tar.gz: 6100ea47ef1e198cfab7d024b09ad8f7b5d00f6ee1835313e4dbf48b9271b0078db15181e20b129fc633be14586ec5e3ae94cb6ce92cefc43d7258ac6d7afba3
+  metadata.gz: 237dec289c8886e1c80f7437bd9d03554f93706bb6c5576544a0fd4fdb9e0869c895e8f6d1355c34fdcf5bb1fac95fa7caee665055928284b70c10f108250c82
+  data.tar.gz: 0c0229fbbbc42e414959bd70433cdeeec726a3382ba0c5a4308102444718fc96a78d2af0464e5b7a614071dea87dc56bc2a2c61393e63e343658d9a05e46ce8d

data/dry-config.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
 
+  s.add_dependency 'deep_merge'
 end

data/lib/dry/config.rb

@@ -2,6 +2,7 @@ require 'dry/config/version'
 
 module Dry
   module Config
+    require 'deep_merge/rails_compat' # need to require an explicit rails compatibility https://github.com/danielsdeleo/deep_merge#using-deep_merge-in-rails
     require 'dry/config/deep_symbolizable'
     require 'dry/config/base'
   end

data/lib/dry/config/base.rb

@@ -58,7 +58,7 @@ module Dry
 
         filenames.each do |filename|
           # merge all top level settings with the defaults set in the #init
-          deep_merge!(@configuration, resolve_config(environment, filename))
+          @configuration.deeper_merge! resolve_config(environment, filename)
         end
       end
 
@@ -82,7 +82,7 @@ module Dry
           environment_settings = environment_settings[environment.to_sym]
 
           # finally overlay what was provided the settings from the specific environment
-          deep_merge!(config, environment_settings)
+          config.deeper_merge! environment_settings
         end
 
         config
@@ -179,25 +179,6 @@ module Dry
       def interpolate?
         @options[:interpolation]
       end
-
-      private
-
-      def deep_merge!(target, overrides)
-
-        raise 'target cannot be nil' if target.nil?
-        raise 'overrides cannot be nil' if overrides.nil?
-
-        merger = proc { |key, v1, v2|
-          if (Hash === v1 && Hash === v2)
-            v1.merge(v2, &merger)
-          elsif (Array === v1 && Array === v2)
-            v1.concat(v2)
-          else
-            v2
-          end
-        }
-        target.merge! overrides, &merger
-      end
     end
   end
 end

data/lib/dry/config/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Config
-    VERSION = '1.2.4'
+    VERSION = '1.2.5'
   end
 end

data/spec/dry/config/deep_merge_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'singleton'
+
+describe Dry::Config::Base do
+
+  class DockerRailsConfig < Dry::Config::Base
+    def initialize(options = {})
+      options = {
+          default_configuration: {
+              verbose: false
+
+          }
+      # ,
+      #     prune: [:development, :test, :parallel_tests, :staging, :production]
+      }.merge(options)
+
+      super(options)
+    end
+  end
+  
+  subject(:config) { DockerRailsConfig.new }
+  before(:each) {
+    config.clear
+  }
+
+  it 'should deep merge a subordinate array' do
+
+    config.load!(:development, config_file_path)
+
+    links = config[:'docker-compose'][:web][:links]
+    expect(links).to match_array %w(elasticsearch db)
+
+    # ensure no unnecessary environments make it into the resolved configuration
+    expect(config.production).to be_nil
+  end
+
+  private
+
+  def config_file_path
+    File.expand_path('../docker-rails.yml', __FILE__)
+  end
+end

data/spec/dry/config/docker-rails.yml

@@ -0,0 +1,72 @@
+verbose: true
+
+# local environments need elasticsearch, staging/production connects to existing running instance.
+elasticsearch: &elasticsearch
+  elasticsearch:
+    image: library/elasticsearch:1.7
+    ports:
+      - "9200:9200"
+  links:
+    - elasticsearch
+
+development:
+  docker-compose:
+    web:
+      <<: *elasticsearch
+
+      command: >
+        bash -c "
+        echo 'Bundling gems'
+        && bundle install --jobs 4 --retry 3
+
+        && echo 'Generating Spring binstubs'
+        && bundle exec spring binstub --all
+
+        && echo 'Clearing logs and tmp dirs'
+        && bundle exec rake log:clear tmp:clear
+
+        && echo 'Check and wait for database connection'
+        && bundle exec docker-rails-db-check
+
+        && echo 'DB rebuild'
+        && bundle exec rake db:rebuild
+
+        && echo "Starting app server"
+        && bundle exec rails s -p 3000
+
+        && echo 'Setup and start foreman'
+        && gem install foreman
+        && foreman start
+        "
+
+docker-compose:
+  web:
+    build: .
+    working_dir: /project/spec/dummy
+    ports:
+      - "3000:3000"
+
+    volumes:
+      - .:/project
+
+    links:
+      - db
+
+    volumes_from:
+      # Mount the gems data volume container for cached bundler gem files
+      - #{GEMS_VOLUME_NAME}
+
+    # https://docs.docker.com/v1.6/docker-compose/cli/#environment-variables
+    environment:
+      # Tell bundler where to get the files
+      - GEM_HOME=#{GEMS_VOLUME_PATH}
+
+  db:
+    # https://github.com/docker-library/docs/tree/master/mysql
+    image: library/mysql:5.7.6
+    ports:
+      - "3306:3306"
+
+    # https://github.com/docker-library/docs/tree/master/mysql#environment-variables
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-config
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Kevin Ross
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple base class for DRY environment based configurations.
 email:
 - kevin.ross@alienfast.com
@@ -75,9 +89,11 @@ files:
 - lib/dry/config/version.rb
 - spec/dry/config/acme.yml
 - spec/dry/config/base_spec.rb
+- spec/dry/config/deep_merge_spec.rb
 - spec/dry/config/deep_symbolizable_spec.rb
 - spec/dry/config/docker-compose-template-simple.yml
 - spec/dry/config/docker-compose-template.yml
+- spec/dry/config/docker-rails.yml
 - spec/dry/config/interpolation_spec.rb
 - spec/dry/config/white-label/acme.com.yml
 - spec/dry/config/white-label/base.yml
@@ -110,9 +126,11 @@ summary: Simple base class for DRY environment based configurations.
 test_files:
 - spec/dry/config/acme.yml
 - spec/dry/config/base_spec.rb
+- spec/dry/config/deep_merge_spec.rb
 - spec/dry/config/deep_symbolizable_spec.rb
 - spec/dry/config/docker-compose-template-simple.yml
 - spec/dry/config/docker-compose-template.yml
+- spec/dry/config/docker-rails.yml
 - spec/dry/config/interpolation_spec.rb
 - spec/dry/config/white-label/acme.com.yml
 - spec/dry/config/white-label/base.yml