toque 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 448b10e7713de07a35d214f3ed5693cebb4f94ac
-  data.tar.gz: e15016d9d28df39fc514d3c39409d3f1a2ef36e5
+  metadata.gz: abe45ec2e232621d391e863a00de26f9687c2efe
+  data.tar.gz: 20dcc17fcf3005f8f7ed944213ba5a2cb34abe9f
 SHA512:
-  metadata.gz: d7218962dbf656cc07ecf4b85187ba59711800234cb9c9f5d2a55b3990e2447ce4c008b9bbf5372c7de1c7f37fd980842de3e25370fa8535d369c708dda0a4f8
-  data.tar.gz: 12abda9ee2c118d09b04ba1e76e000e0a12f999aa4a80a6caaac287e688ff1e17237e4c0bc9dc22cde5591563b716b402a8e74089292a42d298a309a6d656802
+  metadata.gz: fec190cf7bea20de7c050792ff0f2897344e3d39b2818605ec28d16ee866cf88f321f586816e20c4f6758ba00437c235631fa5dba7dc6a07f6ced9d3362980e8
+  data.tar.gz: 0ba3906f360398bccc02ddd76902a9881204e50cd4ab5c5dabf42a23480c244ecb14aafcff0c69518d0bb892a8ffe095cf6ebd1b7a5fc9c9863a369adabec6a0

data/lib/toque/chef.rb

@@ -117,10 +117,19 @@ module Toque
               task :configuration do
                 pwd!
 
-                attrs = variables.dup
+                attrs = convert variables.dup
                 attrs[:run_list] = recipes
                 put MultiJson.dump(attrs), pwd("node.json"), :via => :scp
               end
+
+              def convert(hash)
+                hash.inject({}) do |h, e|
+                  key, value = *e
+                  h[key] = convert value if value.is_a?(Hash)
+                  h[key] = value.call    if value.is_a?(Proc)
+                  h
+                end
+              end
             end
 
             desc 'Run list of recipes from `:run_list` option.'

data/lib/toque/version.rb

@@ -1,7 +1,7 @@
 module Toque
   module VERSION
     MAJOR = 1
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
     STAGE = nil
 

data/spec/toque/chef_spec.rb

@@ -76,7 +76,7 @@ describe Toque::Chef, 'loaded into capistrano' do
     end
   end
 
-  describe '#upload_cookbooks' do
+  describe 'toque:chef:setup:cookbooks' do
     before do
       File.stub(:exists?).and_return false
       File.stub(:exists?).with('config/cookbooks').and_return true
@@ -101,6 +101,31 @@ describe Toque::Chef, 'loaded into capistrano' do
     end
   end
 
+  describe 'toque:chef:setup:script' do
+    it 'should upload chef solo script' do
+      @configuration.toque.chef.setup.script
+
+      expect(@configuration).to have_uploaded.to('/tmp/toque/node.rb')
+    end
+  end
+
+  describe 'toque:chef:setup:configuration' do
+    before do
+      @configuration.set :run_list, %w(recipe[awesomeium])
+      @configuration.set :postgres, :version => '9.2', password: -> { { postgresql: 'secret_in_proc' } }
+      @configuration.toque.chef.setup.configuration
+      @node = MultiJson.load @configuration.uploads.keys.first.read
+    end
+
+    it 'should upload node configuration' do
+      expect(@configuration).to have_uploaded.to('/tmp/toque/node.json')
+    end
+
+    it 'should have called option procs' do
+      expect(@node['postgres']['password']).to be == { 'postgresql' => 'secret_in_proc' }
+    end
+  end
+
   describe 'toque:chef:install' do
 
     it 'should install chef using omnibus installer' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toque
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jan Graichen