itamae 1.0.10 → 1.0.11

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bf80dc0d09edfc8284cab903ab066deae70f24f7
4
- data.tar.gz: 3603e62c980190ab27b5b44d776f975315ff6707
3
+ metadata.gz: f33cda78b5bc4a3243b5c405f71d0301d23b4b8d
4
+ data.tar.gz: 0a046c03cb563adbf210849fbe27ae9b5437a32b
5
5
  SHA512:
6
- metadata.gz: ee73911856bdf0999914850ffb578c3eaec682417a7572f38f23f17e45f978d32dd10c5eb0af48e1aee0cb676489d56acdca6cfecd107a5bac90c55b9c412096
7
- data.tar.gz: 47dd8eac7815c35c685b78e2063332d7ebdf1a517b77b66e28c97ba6f7cd3a550d5dee9e49d88d08dff5ec8fd494e87766bb1b1708589235d71db4709dcf3a1e
6
+ metadata.gz: 57375980d2adff19751e17441d4a38418426d916a59bc4ed2fbe01e39a7580a24c1d61960f36a8360b696fd99d76062b789d9302e67206117c557541da7c5bad
7
+ data.tar.gz: 7c2f78e973463799b3de2e35001a4f9d97ca272e493a6a47b3a4c0c7f052c499d085749e0175612c2ae0b3da696f049a1bbd4e0127adcf95358cd2bc3b290bff
data/lib/itamae/node.rb CHANGED
@@ -11,6 +11,18 @@ module Itamae
11
11
  def reverse_merge!(other_hash)
12
12
  self.replace(reverse_merge(other_hash))
13
13
  end
14
+
15
+ def [](key)
16
+ val = super(key)
17
+ if val.nil?
18
+ begin
19
+ val = host_inventory[key]
20
+ rescue NotImplementedError
21
+ val = nil
22
+ end
23
+ end
24
+ val
25
+ end
14
26
  end
15
27
  end
16
28
 
@@ -1 +1 @@
1
- 1.0.10
1
+ 1.0.11
@@ -26,8 +26,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
26
26
 
27
27
  provider.ssh_key_name = ENV['WERCKER'] ? 'vagrant/wercker/itamae' : 'Vagrant'
28
28
  provider.token = ENV['DIGITALOCEAN_TOKEN']
29
- provider.image = '14.04 x64' # ubuntu
30
- provider.region = 'nyc2'
29
+ provider.image = 'ubuntu-14-04-x64' # ubuntu
30
+ provider.region = 'nyc3'
31
31
  provider.size = '512mb'
32
32
  end
33
33
  end
@@ -33,6 +33,7 @@ describe file('/tmp/template') do
33
33
  it { should be_file }
34
34
  its(:content) { should match(/Hello/) }
35
35
  its(:content) { should match(/Good bye/) }
36
+ its(:content) { should match(/^total memory: \d+kB$/) }
36
37
  end
37
38
 
38
39
  describe file('/tmp/file') do
@@ -1,2 +1,4 @@
1
1
  <%= node['greeting'] %>
2
2
  <%= @goodbye %>
3
+
4
+ total memory: <%= node['memory']['total'] %>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: itamae
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.10
4
+ version: 1.0.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ryota Arai
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-11-22 00:00:00.000000000 Z
11
+ date: 2014-12-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor