bocuse 0.2.0 → 0.2.1

data/bin/bocuse

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby -W0
 # Encoding: UTF-8
 
+$VERBOSE=nil
+
 require 'thor'
 
 $:.unshift File.expand_path '../../lib', __FILE__

data/lib/bocuse/file.rb

@@ -38,8 +38,8 @@ class Bocuse::File
     node_context = Bocuse::NodeContext.new(name, @context)
     configuration = Bocuse::Configuration.new
 
-    unit = Bocuse::Unit.new(Proc.new, @project, node_context)
-    unit.call(configuration)
+    unit = Bocuse::Unit.new(Proc.new, @project)
+    unit.call(configuration, node_context)
 
     @project.register_node name, configuration
     
@@ -49,7 +49,7 @@ class Bocuse::File
     # Delay template evaluation until someone tries to call include_template.
     # At that time, we'll have a configuration object to have the template
     # manipulate. 
-    unit = Bocuse::Unit.new(Proc.new, @project, @context)
+    unit = Bocuse::Unit.new(Proc.new, @project)
     @project.register_template path, unit
     unit
   end

data/lib/bocuse/project_context.rb

@@ -1,6 +1,12 @@
+
+require 'hashie/mash'
+
 require 'bocuse/context_delegation'
 
 module Bocuse
+  class ContextHash < Hashie::Mash
+  end
+  
   # Project wide evaluation context. 
   #
   class ProjectContext
@@ -8,7 +14,7 @@ module Bocuse
     end
     
     def bocuse
-      {}
+      ContextHash.new
     end
   end
 end

data/lib/bocuse/unit.rb

@@ -2,29 +2,27 @@ module Bocuse
   # A configuration unit. 
   #
   class Bocuse::Unit
-    # Returns the current configuration, but only during a call to this unit. 
-    attr_reader :current_configuration
-    
-    def initialize(block, project, context)
+    def initialize(block, project)
       @block = block
-      @context = context
       @project = project
     end
     
-    def call(configuration)
-      @current_configuration = configuration
+    def call(configuration, context)
+      @configuration = configuration
+      @context = context
       
       # Fill in the config hash argument if the block cares at all.
       instance_exec(configuration, &@block)
     ensure 
-      @current_configuration = nil
+      @configuration = nil
+      @context = nil
     end
     
     # Cook adds to the toplevel recipes of this file's configuration.
     #
     def cook recipe, &block
-      current_configuration.recipes << recipe
-      current_configuration.send(recipe, &block)
+      @configuration.recipes << recipe
+      @configuration.send(recipe, &block)
     end
     
     # Make the given module a helper module for this node. 
@@ -40,7 +38,7 @@ module Bocuse
     def include_template identifier
       template_block = @project.lookup_template identifier
 
-      template_block.call(current_configuration)
+      template_block.call(@configuration, @context)
     end
     
     # Exposes some of bocuses internal variables to the node that is currently

data/spec/integration/environment_spec.rb

@@ -7,4 +7,8 @@ describe "bocuse environment" do
     project.nodes['A'].to_h[:name].should == 'A'
     project.nodes['B'].to_h[:name].should == 'B'
   end
+  it "exports node_name to templates" do
+    project.nodes['A'].to_h[:t_name].should == 'A'
+    project.nodes['B'].to_h[:t_name].should == 'B'
+  end 
 end

data/spec/lib/bocuse/file_spec.rb

@@ -44,7 +44,7 @@ describe Bocuse::File do
       end
       
       config = Bocuse::Configuration.new
-      template.call config
+      template.call config, context
       
       config.to_h.should == { :something => :value, :something_else => { :key => "value" } }
     end

data/spec/lib/bocuse/unit_spec.rb

@@ -4,8 +4,8 @@ describe Bocuse::Unit do
   let(:context) { flexmock('context', bocuse: {node_name: 'test.of.bocuse'}) }
   let(:project) { flexmock('project') }
   def unit(configuration)
-    described_class.new(Proc.new, project, context).
-      tap { |unit| unit.call(configuration) }
+    described_class.new(Proc.new, project).
+      tap { |unit| unit.call(configuration, context) }
   end
   
   describe "#bocuse environment hash" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bocuse
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -30,7 +30,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -46,7 +46,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: flexmock
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -62,7 +62,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: flexmock
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: growl
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -125,6 +141,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.1.2
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 description: ! "    bocuse teaches chef-solo a few tricks. A strict front-end to chef-solo,
   \n    it reads a configuration syntax that is under source control and \n    generates
   JSON for chef-solo.\n\n    This library puts the full power of Ruby at your fingertips
@@ -196,3 +228,4 @@ test_files:
 - spec/lib/bocuse/project_spec.rb
 - spec/lib/bocuse/unit_spec.rb
 - spec/lib/bocuse/value_spec.rb
+has_rdoc: