tiller 0.6.2 → 0.6.3

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
2
  SHA1:
3
- metadata.gz: 226f7774206435ec5cfa4e785b2a7400a65571c4
4
- data.tar.gz: a80f2572702cde9f298831b956e33ac873905219
3
+ metadata.gz: ac9f2fbbd550645d81ee50bb29ab95cce4b47409
4
+ data.tar.gz: d62decc948523c1b0bdec60c57e006928944198b
5
5
  SHA512:
6
- metadata.gz: 2a7add80a4a3d5ffd317ff45bb3a778097f5de902210655d01ef03f982d07e12c44de647cdbd460b642cfca4e366e0a03c37eb1a63bb4eab43cf781727b4fe26
7
- data.tar.gz: e05a6e6ba7a14a255a22ff3ab16e1d6a88d0f3266b9b6cf3bb3113ab98002be50292ba611437df0b1c66ec8b27c63d509ffe139da82c3fa238b16e386824da47
6
+ metadata.gz: 88fd3ca312ddb733e7a7a0461fefe7e8d7b78aa6c0b3a8930002f810665380a7bdf4bb3d95b897019d09f9669fc500f4987a90c15c310736c8969f7bdec362af
7
+ data.tar.gz: a1d28910dbcee918323aba31cbc26afb8f0d288c849fb74861cf3153a140fd24bbf563544bcb18c3a175a5a02b49674d1824fe227511f9234c4137a617cc11f3
data/bin/tiller CHANGED
@@ -8,7 +8,7 @@
8
8
  #
9
9
  # Mark Dastmalchi-Round <github@markround.com>
10
10
 
11
- VERSION = '0.6.2'
11
+ VERSION = '0.6.3'
12
12
 
13
13
  require 'erb'
14
14
  require 'ostruct'
@@ -27,7 +27,7 @@ class DefaultsDataSource < Tiller::DataSource
27
27
  if File.directory? defaults_dir
28
28
  Dir.glob(File.join(defaults_dir,'*.yaml')).each do |d|
29
29
  yaml = YAML.load(open(d))
30
- @defaults_hash.deep_merge!() if yaml != false
30
+ @defaults_hash.deep_merge!(yaml) if yaml != false
31
31
  end
32
32
  end
33
33
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tiller
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.2
4
+ version: 0.6.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mark Dastmalchi-Round
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-07-20 00:00:00.000000000 Z
11
+ date: 2015-07-23 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: A tool to create configuration files from a variety of sources, particularly
14
14
  useful for Docker containers. See https://github.com/markround/tiller for examples