bocuse 0.1.2.2 → 0.2.0

data/bin/bocuse

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

data/lib/bocuse/context_delegation.rb

@@ -0,0 +1,14 @@
+module Bocuse
+  module ContextDelegation
+    # Method delegation to the context of this context. Every method not 
+    # defined here may be defined there instead. 
+    #
+    def respond_to?(sym)
+      super || @context.respond_to?(sym)
+    end
+    def method_missing(sym, *args, &block)
+      return @context.send(sym, *args, &block) if @context.respond_to?(sym)
+      super
+    end
+  end
+end

data/lib/bocuse/file.rb

@@ -1,4 +1,6 @@
 
+require 'bocuse/node_context'
+
 # Represents a bocuse File. 
 #
 # This is usually a file that contains one or more of the
@@ -11,12 +13,9 @@
 class Bocuse::File
   attr_reader :path
 
-  # When inside a construct that has a configuration associated, this will 
-  # return that configuration instance.
-  attr_reader :current_configuration
-
-  def initialize(path, context)
+  def initialize(path, project, context)
     @path = path
+    @project = project
     @context = context
   end
     
@@ -36,37 +35,22 @@ class Bocuse::File
   # The files read by #evaluate will trigger these methods.
   #
   def node name
-    unit = Bocuse::Unit.new(Proc.new, @context)
+    node_context = Bocuse::NodeContext.new(name, @context)
+    configuration = Bocuse::Configuration.new
 
-    configuration_block do |configuration|
-      unit.call(configuration)
-      @context.register_node name, configuration
-    end
+    unit = Bocuse::Unit.new(Proc.new, @project, node_context)
+    unit.call(configuration)
+
+    @project.register_node name, configuration
+    
+    return configuration
   end
   def template
     # 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, @context)
-    @context.register_template path, unit
+    unit = Bocuse::Unit.new(Proc.new, @project, @context)
+    @project.register_template path, unit
     unit
   end
-private
-  def configuration_block
-    # NOTE since thread-safety is not an issue here (who would use threads
-    # to define configuration?), we can use a simple file-global state to
-    # keep track of which configuration is in progress. We use the begin-end
-    # construct to make sure that configurations are not used beyond the end
-    # of the node block. 
-
-    configuration = @current_configuration = Bocuse::Configuration.new
-  
-    begin
-      yield configuration
-    ensure
-      @current_configuration = nil
-    end
-  
-    configuration
-  end
 end

data/lib/bocuse/node_context.rb

@@ -0,0 +1,19 @@
+require 'bocuse/context_delegation'
+
+module Bocuse
+  # A context for a node. This wraps the project level context and provides 
+  # node specific context functions. 
+  #
+  class NodeContext
+    include ContextDelegation
+    
+    def initialize(node_name, context)
+      @context = context
+      @node_name = node_name
+    end
+    
+    def bocuse
+      @context.bocuse.merge(node_name: @node_name)
+    end
+  end
+end

data/lib/bocuse/project.rb

@@ -1,5 +1,7 @@
 require 'pathname'
 
+require 'bocuse/project_context'
+
 module Bocuse
   # A bocuse project comes in two flavours: simple and co-located with chef.
   # The simple project is a directory with the subdirectories 
@@ -53,7 +55,8 @@ module Bocuse
       path = Pathname.new(path)
       path = base_path.join(path) unless path.absolute?
       
-      Bocuse::File.new(path, self)
+      ctx = ProjectContext.new
+      Bocuse::File.new(path, self, ctx)
     end
     
     # Evaluates a file given by path. 
@@ -92,7 +95,7 @@ module Bocuse
     #   foo               -> templates/foo.rb
     #   /templates/bar    -> /usr/templates/bar.rb
     #
-    def template name
+    def lookup_template name
       unless @templates.has_key?(name.to_sym)
         file_name = name.to_s
         file_name += '.rb' unless file_name.end_with?('.rb')

data/lib/bocuse/project_context.rb

@@ -0,0 +1,14 @@
+require 'bocuse/context_delegation'
+
+module Bocuse
+  # Project wide evaluation context. 
+  #
+  class ProjectContext
+    def initialize
+    end
+    
+    def bocuse
+      {}
+    end
+  end
+end

data/lib/bocuse/unit.rb

@@ -5,9 +5,10 @@ module Bocuse
     # Returns the current configuration, but only during a call to this unit. 
     attr_reader :current_configuration
     
-    def initialize(block, context)
+    def initialize(block, project, context)
       @block = block
       @context = context
+      @project = project
     end
     
     def call(configuration)
@@ -37,9 +38,17 @@ module Bocuse
     # Note: This could be pushed to the configuration.
     #
     def include_template identifier
-      template_block = @context.template identifier
+      template_block = @project.lookup_template identifier
 
       template_block.call(current_configuration)
     end
+    
+    # Exposes some of bocuses internal variables to the node that is currently
+    # compiled. This allows using node name (, etc...) for formulating clever
+    # node configurations.
+    #
+    def bocuse
+      @context.bocuse
+    end
   end
 end

data/spec/integration/complex_spec.rb

@@ -41,7 +41,7 @@ describe 'complex example with templates' do
           :address => "1.1.1.1"
         },
         :empty => true,
-        :recipes => ["nginx", "git", "app::install", "app::deploy"]
+        :recipes => ["app::install", "app::deploy"]
       }
     end
   end

data/spec/integration/environment_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe "bocuse environment" do
+  let(:project) { Bocuse::Project.new(fixture('environment')) }
+    
+  it "exports node_name" do
+    project.nodes['A'].to_h[:name].should == 'A'
+    project.nodes['B'].to_h[:name].should == 'B'
+  end
+end

data/spec/integration/templates_spec.rb

@@ -8,7 +8,7 @@ describe 'Templates' do
   describe 'loading' do
     it 'works' do
       config = Bocuse::Configuration.new
-      project.template(:users).call(config)
+      project.lookup_template(:users).call(config)
       
       config.to_h.should == {
         :user => "root",

data/spec/lib/bocuse/file_spec.rb

@@ -4,10 +4,11 @@ require 'bocuse/file'
 
 describe Bocuse::File do
   let(:context) { flexmock('context') }
-  let(:file) { described_class.new('path', context) }
+  let(:project) { flexmock('project') }
+  let(:file) { described_class.new('path', project, context) }
   
   before(:each) { 
-    context.
+    project.
       should_receive(
         :register_node, :register_template).by_default 
   }
@@ -26,7 +27,7 @@ describe Bocuse::File do
       configuration.to_h.should == { :something => :value, :something_else => { :key => "value" } }
     end
     it "registers the node in the context" do
-      context.should_receive(:register_node).
+      project.should_receive(:register_node).
         with('name', Bocuse::Configuration).once
         
       file.node('name') { }

data/spec/lib/bocuse/project_spec.rb

@@ -36,7 +36,7 @@ describe Bocuse::Project do
       project.register_template template, :configuration }
       
     it "returns the template" do
-      project.template('foo/bar').should == :configuration
+      project.lookup_template('foo/bar').should == :configuration
     end 
   end
 end

data/spec/lib/bocuse/unit_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+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) }
+  end
+  
+  describe "#bocuse environment hash" do
+    it "contains the current node name" do
+      configuration = {}
+      unit(configuration) do |cfg|
+        cfg[:node_name] = bocuse[:node_name]
+      end
+      
+      configuration[:node_name].should == 'test.of.bocuse'
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bocuse
 version: !ruby/object:Gem::Version
-  version: 0.1.2.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2012-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -140,19 +140,24 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/bocuse/configuration.rb
+- lib/bocuse/context_delegation.rb
 - lib/bocuse/file.rb
+- lib/bocuse/node_context.rb
 - lib/bocuse/project.rb
+- lib/bocuse/project_context.rb
 - lib/bocuse/unit.rb
 - lib/bocuse/value.rb
 - lib/bocuse.rb
 - spec/integration/cli_spec.rb
 - spec/integration/complex_spec.rb
+- spec/integration/environment_spec.rb
 - spec/integration/helpers_spec.rb
 - spec/integration/node_finding_spec.rb
 - spec/integration/templates_spec.rb
 - spec/lib/bocuse/configuration_spec.rb
 - spec/lib/bocuse/file_spec.rb
 - spec/lib/bocuse/project_spec.rb
+- spec/lib/bocuse/unit_spec.rb
 - spec/lib/bocuse/value_spec.rb
 - bin/bocuse
 homepage: http://github.com/mobino/bocuse
@@ -182,11 +187,12 @@ summary: A front-end language to chef-solo.
 test_files:
 - spec/integration/cli_spec.rb
 - spec/integration/complex_spec.rb
+- spec/integration/environment_spec.rb
 - spec/integration/helpers_spec.rb
 - spec/integration/node_finding_spec.rb
 - spec/integration/templates_spec.rb
 - spec/lib/bocuse/configuration_spec.rb
 - spec/lib/bocuse/file_spec.rb
 - spec/lib/bocuse/project_spec.rb
+- spec/lib/bocuse/unit_spec.rb
 - spec/lib/bocuse/value_spec.rb
-has_rdoc: