Adding support for an external catalog version

This allows you to specify a command used to determine
the catalog version.  Also added an integration test
to verify the version cascades.

Signed-off-by: Luke Kanies <luke@madstop.com>

4 files changed, 52 insertions, 0 deletions

diff --git a/spec/integration/defaults.rb b/spec/integration/defaults.rb
index 72b5127e5..b2e5a829c 100755
--- a/spec/integration/defaults.rb
+++ b/spec/integration/defaults.rb
@@ -153,4 +153,8 @@ describe "Puppet defaults" do
             Puppet.settings[:storeconfigs].should be_true
         end
     end
+
+    it "should have a setting for determining the configuration version and should default to an empty string" do
+        Puppet.settings[:config_version].should == ""
+    end
 end
diff --git a/spec/integration/parser/compiler.rb b/spec/integration/parser/compiler.rb
new file mode 100755
index 000000000..27666400b
--- /dev/null
+++ b/spec/integration/parser/compiler.rb
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Puppet::Parser::Compiler do
+    before :each do
+        @node = Puppet::Node.new "testnode"
+
+        @scope_resource = stub 'scope_resource', :builtin? => true, :finish => nil, :ref => 'Class[main]'
+        @scope = stub 'scope', :resource => @scope_resource, :source => mock("source")
+    end
+
+    after do
+        Puppet.settings.clear
+    end
+
+    it "should be able to determine the configuration version from a local version control repository" do
+        # This should always work, because we should always be
+        # in the puppet repo when we run this.
+        version = %x{git rev-parse HEAD}.chomp
+
+        Puppet.settings[:config_version] = 'git rev-parse HEAD'
+
+        @parser = Puppet::Parser::Parser.new :environment => "development"
+        @compiler = Puppet::Parser::Compiler.new(@node, @parser)
+
+        @compiler.catalog.version.should == version
+    end
+end
diff --git a/spec/unit/parser/compiler.rb b/spec/unit/parser/compiler.rb
index 9b9428296..0cc6e8a17 100755
--- a/spec/unit/parser/compiler.rb
+++ b/spec/unit/parser/compiler.rb
@@ -82,6 +82,10 @@ describe Puppet::Parser::Compiler do
             @parser.expects(:nodes?).returns true
             @compiler.ast_nodes?.should be_true
         end
+
+        it "should copy the parser version to the catalog" do
+            @compiler.catalog.version.should == @parser.version
+        end
     end
 
     describe "when managing scopes" do
diff --git a/spec/unit/parser/parser.rb b/spec/unit/parser/parser.rb
index 3fd1b2d57..bd12f7155 100755
--- a/spec/unit/parser/parser.rb
+++ b/spec/unit/parser/parser.rb
@@ -313,4 +313,19 @@ describe Puppet::Parser do
         end
     end
 
+    describe "when determining the configuration version" do
+        it "should default to the current time" do
+            time = Time.now
+
+            Time.stubs(:now).returns time
+            @parser.version.should == time.to_i
+        end
+
+        it "should use the output of the config_version setting if one is provided" do
+            Puppet.settings.stubs(:[]).with(:config_version).returns("/my/foo")
+
+            @parser.expects(:`).with("/my/foo").returns "output\n"
+            @parser.version.should == "output"
+        end
+    end
  end