configa 0.0.3 → 0.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. data/lib/configa/version.rb +1 -1
  2. data/lib/configa.rb +2 -2
  3. data/spec/base.yml +3 -1
  4. data/spec/configa/configa_spec.rb +1 -0
  5. metadata +1 -1
data/lib/configa/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Configa
2
- VERSION = "0.0.3"
2
+ VERSION = "0.0.4"
3
3
  end
data/lib/configa.rb CHANGED
@@ -42,9 +42,9 @@ module Configa
42
42
  def merge_yamls
43
43
  ymls = @yamls.dup
44
44
  base = ymls.delete(@base_env)
45
- yaml = base
45
+ yaml = base.dup
46
46
  ymls.each do |env, data|
47
- yaml[env] = data
47
+ yaml[env] = base.merge data
48
48
  end
49
49
  yaml = merge_yaml(yaml)
50
50
  yaml
data/spec/base.yml CHANGED
@@ -6,4 +6,6 @@ mysql:
6
6
 
7
7
  tarantool:
8
8
  host: localhost
9
- port: 13013
9
+ port: 13013
10
+
11
+ storage: "tmp"
data/spec/configa/configa_spec.rb CHANGED
@@ -26,6 +26,7 @@ describe Configa do
26
26
  dev = configa.development
27
27
  dev["mysql"]["adapter"].must_equal mysql.adapter
28
28
  dev.mysql.database.must_equal "mysql_dev"
29
+ configa.development.storage.must_equal configa.storage
29
30
  end
30
31
 
31
32
  it "should raise an error" do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: configa
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.3
4
+ version: 0.0.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors: