ettin 1.1.3 → 1.1.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 0fce81d67e0d2aca6ca2c62a169ef8725c06b028
4
- data.tar.gz: 49da37aeaa16188ffb672e3b3231883e1af3a11d
2
+ SHA256:
3
+ metadata.gz: f1d5b845bc35999f778c7063021b7586e8ecf7fde1699b338c01dec0d8a07d54
4
+ data.tar.gz: cfca43af7d34410b5946b3faf4025573db9c14d7f0536cc9228eaaddb29c7fa0
5
5
  SHA512:
6
- metadata.gz: 6491a8b5851949c6ead0f36b2d75b34e5dcd1744cb2a901e37f62ab5ac36b4108800f59c81d6270549c9c8acec89d402df4aac25caaebc9129f1a1469f01637b
7
- data.tar.gz: b2a93de70da048a1144dc12b12ca3956f364d8df8fed439b09f28429afc50c5c9079fb9888e6a84428d04050148f7db648166346f3b2c01865d9bd6b7895a8a3
6
+ metadata.gz: df87f1e0e70aeb5edb4d89d4f4816f46fc41f2f1d4445a4f168cb7dd82b5f90fb30887818192c05cebcdf8a2e7555cbe09a00ca285b8c59cc1c99d81891537e5
7
+ data.tar.gz: e5931b2496e436f5e9b90cee272054b03618a3f9060b39ae149f96d2829c21300666ca6ce932f954744273813493bb6c99edafed1fc696d5adf17d5581735936
@@ -1,6 +1,7 @@
1
1
  sudo: false
2
2
  language: ruby
3
3
  rvm:
4
+ - 2.5
4
5
  - 2.4
5
6
  - 2.3
6
7
 
data/README.md CHANGED
@@ -90,15 +90,20 @@ The name of the environment is not special, so you can easily create more.
90
90
 
91
91
  config/settings.yml
92
92
  config/settings/#{environment}.yml
93
- config/environments/#{environment}.yml
94
93
 
95
94
  config/settings.local.yml
96
95
  config/settings/#{environment}.local.yml
97
- config/environments/#{environment}.local.yml
98
96
 
99
97
  Environment-specific settings take precedence over common, and the .local
100
98
  files take precedence over those. The local files are intendended to be gitignored.
101
99
 
100
+ Ettin will also read from the following files commonly placed by other config gems.
101
+ However, inclusion of these files is redundant, and can be confusing. Their inclusion
102
+ is not recommended.
103
+
104
+ config/environments/#{environment}.yml
105
+ config/environments/#{environment}.local.yml
106
+
102
107
  ## Using the Settings
103
108
 
104
109
  ### Access
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Ettin
4
- VERSION = "1.1.3"
4
+ VERSION = "1.1.4"
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ettin
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.3
4
+ version: 1.1.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Bryan Hockey
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-03-29 00:00:00.000000000 Z
11
+ date: 2018-04-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: deep_merge
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
145
145
  version: '0'
146
146
  requirements: []
147
147
  rubyforge_project:
148
- rubygems_version: 2.6.13
148
+ rubygems_version: 2.7.6
149
149
  signing_key:
150
150
  specification_version: 4
151
151
  summary: The best way to add settings in any ruby project.