gusteau 0.4.2 → 0.4.3

data/lib/gusteau/bureau.rb

@@ -1,11 +1,12 @@
+require 'gusteau/erb'
 require 'etc'
-require 'erb'
-require 'yaml'
 require 'json'
 require 'fileutils'
 
 module Gusteau
   class Bureau
+    include Gusteau::ERB
+
     def initialize(name)
       template_path = File.expand_path('../../../template', __FILE__)
 
@@ -17,7 +18,7 @@ module Gusteau
       FileUtils.cp_r(template_path, name)
 
       File.open(File.join(name, 'nodes', 'example.yml'), 'w+') do |f|
-        read_erb(File.join(template_path, 'nodes', 'example.yml.erb')).tap do |node|
+        read_erb_yaml(File.join(template_path, 'nodes', 'example.yml.erb')).tap do |node|
           f.write node
           f.close
         end
@@ -43,15 +44,5 @@ module Gusteau
         system 'librarian-chef install'
       end
     end
-
-    private
-
-    def read_erb(path)
-      ERB.new(File.read(path)).result binding
-    end
-
-    def read_erb_json(path)
-      JSON::parse(read_erb path)
-    end
   end
 end

data/lib/gusteau/erb.rb

@@ -0,0 +1,19 @@
+require 'erb'
+require 'yaml'
+require 'json'
+
+module Gusteau
+  module ERB
+    def read_erb(path)
+      ::ERB.new(File.read(path)).result binding
+    end
+
+    def read_erb_yaml(path)
+      YAML::load(read_erb path)
+    end
+
+    def read_erb_json(path)
+      JSON::parse(read_erb path)
+    end
+  end
+end

data/lib/gusteau/node.rb

@@ -1,18 +1,19 @@
-require 'yaml'
-require 'json'
-
 require 'gusteau/server'
 require 'gusteau/chef'
+require 'gusteau/erb'
 
 module Gusteau
   class Node
+    include Gusteau::ERB
+
     attr_reader :server
 
     def initialize(path)
       raise "Node YAML file #{path} not found" unless path && File.exists?(path)
 
       @name   = File.basename(path).gsub('.yml','')
-      @config = YAML::load_file path
+      @config = read_erb_yaml(path)
+
       @dna_path = '/tmp/dna.json'
 
       @server = Server.new(@config['server'])

data/lib/gusteau/version.rb

@@ -1,3 +1,3 @@
 module Gusteau
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/lib/gusteau/node_spec.rb

@@ -19,6 +19,10 @@ describe Gusteau::Node do
       File.exists?(dna[:path]).must_equal true
     end
 
+    it "should support ERB" do
+      json['environment'].must_equal "production"
+    end
+
     context "recipes not specified" do
       it "should contain a full run_list" do
         json['run_list'].must_equal ["role[redhat]", "recipe[rvm]", "recipe[ntp]", "recipe[rails::apps]"]

data/spec/nodes/production.yml

@@ -1,4 +1,5 @@
 json:
+  environment: <%= "pro" + "duction" %>
   apps:
     enabled:
       - profile

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gusteau
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-13 00:00:00.000000000 Z
+date: 2013-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optitron
@@ -152,6 +152,7 @@ files:
 - lib/gusteau/bureau.rb
 - lib/gusteau/chef.rb
 - lib/gusteau/compressed_tar_stream.rb
+- lib/gusteau/erb.rb
 - lib/gusteau/log.rb
 - lib/gusteau/node.rb
 - lib/gusteau/server.rb