puppet 2.7.25 → 2.7.26

data/ext/packaging/spec/lib/packaging/tar_spec.rb

@@ -0,0 +1,122 @@
+# -*- ruby -*-
+require 'spec_helper'
+
+describe "tar.rb" do
+  let(:project) { "packaging" }
+  let(:version) { "1.2.3" }
+  let(:files)   { [ "a", "b", "c" ] }
+  let(:templates) do
+    [
+      "ext/redhat/spec.erb",
+      { "source" => "ext/debian/control.erb", "target" => "ext/debian/not-a-control-file" },
+      "ext/debian/changelog.erb",
+      "ext/packaging/thing.erb"
+    ]
+  end
+  let(:expanded_templates) do
+    [
+      "#{PROJECT_ROOT}/ext/redhat/spec.erb",
+      { "source" => "ext/debian/control.erb", "target" => "ext/debian/not-a-control-file" },
+      "#{PROJECT_ROOT}/ext/debian/changelog.erb"
+    ]
+  end
+
+  describe "#expand_templates" do
+    it "should be invoked when Pkg::Config.templates is set" do
+      Pkg::Config.config_from_hash(
+        {
+          :templates      => templates,
+          :project        => project,
+          :version        => version,
+          :files          => files,
+          :project_root   => PROJECT_ROOT,
+          :packaging_root => "ext/packaging"
+        })
+
+      Pkg::Tar.any_instance.should_receive(:expand_templates)
+      Pkg::Tar.new
+    end
+
+    it "packaging templates should be filtered and paths should be expanded" do
+      Pkg::Config.config_from_hash(
+        {
+          :templates      => templates,
+          :project        => project,
+          :version        => version,
+          :files          => files,
+          :project_root   => PROJECT_ROOT,
+          :packaging_root => "ext/packaging"
+        })
+
+      templates.each do |temp|
+        if temp.is_a?(String)
+          Dir.stub(:glob).with(File.join(PROJECT_ROOT, temp)).and_return(File.join(PROJECT_ROOT, temp))
+        end
+      end
+
+      tar = Pkg::Tar.new
+      tar.templates = templates
+      tar.expand_templates
+      tar.templates.should eq expanded_templates
+    end
+  end
+
+  describe "#template" do
+    it "should handle hashes and strings correctly" do
+      Pkg::Config.config_from_hash(
+        {
+          :templates      => expanded_templates,
+          :project        => project,
+          :version        => version,
+          :files          => files,
+          :project_root   => PROJECT_ROOT,
+          :packaging_root => "ext/packaging"
+        })
+
+      # Set up correct stubs and expectations
+      expanded_templates.each do |temp|
+        if temp.is_a?(String)
+          full_path_temp = File.join(PROJECT_ROOT, temp)
+          target = full_path_temp.sub(File.extname(full_path_temp), "")
+        elsif temp.is_a?(Hash)
+          full_path_temp = File.join(PROJECT_ROOT, temp["source"])
+          target = File.join(PROJECT_ROOT, temp["target"])
+        end
+
+        Dir.stub(:glob).with(full_path_temp).and_return(full_path_temp)
+        File.stub(:exist?).with(full_path_temp).and_return(true)
+        Pkg::Util::File.should_receive(:erb_file).with(full_path_temp, target, true, :binding => an_instance_of(Binding))
+      end
+
+      Pkg::Tar.new.template
+    end
+
+    it "should raise an error if the template source can't be found" do
+     Pkg::Config.config_from_hash(
+        {
+          :templates      => expanded_templates,
+          :project        => project,
+          :version        => version,
+          :files          => files,
+          :project_root   => PROJECT_ROOT,
+          :packaging_root => "ext/packaging"
+        })
+
+      # Set up correct stubs and expectations
+      expanded_templates.each do |temp|
+        if temp.is_a?(String)
+          full_path_temp = File.join(PROJECT_ROOT, temp)
+          target = full_path_temp.sub(File.extname(full_path_temp), "")
+        elsif temp.is_a?(Hash)
+          full_path_temp = File.join(PROJECT_ROOT, temp["source"])
+          target = File.join(PROJECT_ROOT, temp["target"])
+        end
+
+        Dir.stub(:glob).with(full_path_temp).and_return(full_path_temp)
+        File.stub(:exist?).with(full_path_temp).and_return(false)
+      end
+
+      expect { Pkg::Tar.new.template }.to raise_error RuntimeError
+    end
+  end
+end

data/ext/packaging/spec/lib/packaging/util/file_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe "Pkg::Util::File" do
+  let(:source)  { "/tmp/placething.tar.gz" }
+  let(:target)  { "/tmp" }
+  let(:options) { "--thing-for-tar" }
+  let(:tar)     { "/usr/bin/tar" }
+
+  describe "#untar_into" do
+    before :each do
+      Pkg::Util::Tool.stub(:find_tool).with('tar', :required => true) { tar }
+    end
+
+    it "raises an exception if the source doesn't exist" do
+      Pkg::Util::File.should_receive(:file_exists?).with(source, {:required => true}).and_raise(RuntimeError)
+      Pkg::Util::File.should_not_receive(:ex)
+      expect { Pkg::Util::File.untar_into(source) }.to raise_error(RuntimeError)
+    end
+
+    it "unpacks the tarball to the current directory if no target is passed" do
+      Pkg::Util::File.should_receive(:file_exists?).with(source, {:required => true}) { true }
+      Pkg::Util::File.should_receive(:ex).with("#{tar}   -xf #{source}")
+      Pkg::Util::File.untar_into(source)
+    end
+
+    it "unpacks the tarball to the current directory with options if no target is passed" do
+      Pkg::Util::File.should_receive(:file_exists?).with(source, {:required => true}) { true }
+      Pkg::Util::File.should_receive(:ex).with("#{tar} #{options}  -xf #{source}")
+      Pkg::Util::File.untar_into(source, nil, options)
+    end
+
+    it "unpacks the tarball into the target" do
+      File.stub(:exist?).with(source) { true }
+      Pkg::Util::File.should_receive(:file_exists?).with(source, {:required => true}) { true }
+      Pkg::Util::File.should_receive(:file_writable?).with(target) { true }
+      Pkg::Util::File.should_receive(:ex).with("#{tar}  -C #{target} -xf #{source}")
+      Pkg::Util::File.untar_into(source, target)
+    end
+
+    it "unpacks the tarball into the target with options passed" do
+      File.stub(:exist?).with(source) { true }
+      Pkg::Util::File.should_receive(:file_exists?).with(source, {:required => true}) { true }
+      Pkg::Util::File.should_receive(:file_writable?).with(target) { true }
+      Pkg::Util::File.should_receive(:ex).with("#{tar} #{options} -C #{target} -xf #{source}")
+      Pkg::Util::File.untar_into(source, target, options)
+    end
+  end
+end

data/ext/packaging/spec/lib/packaging/util/jira_spec.rb

@@ -0,0 +1,50 @@
+# -*- ruby -*-
+require 'spec_helper'
+require 'packaging/util/jira'
+
+describe Pkg::Util::Jira do
+  it "should build an expected set of client options" do
+    options = described_class.jira_client_options("user", "password", "http://devnull.tld")
+    expect(options[:username]).to eq("user")
+    expect(options[:password]).to eq("password")
+    expect(options[:site]).to eq("http://devnull.tld")
+  end
+
+  it "should extract a project name from the project list" do
+    Project = Struct.new(:key, :name)
+    projects = [Project.new("PUP", "PUP"), Project.new("FOO", "BAR")]
+
+    expect(described_class.jira_project_name(projects, "PUP")).to eq("PUP")
+    expect(described_class.jira_project_name(projects, "FOO")).to eq("BAR")
+  end
+
+  it "should build a parent ticket's fields" do
+    fields = described_class.jira_issue_fields("summary",
+                                               "desc",
+                                               "PUP",
+                                               nil,
+                                               "ivy")
+
+    expect(fields['summary']).to eq("summary")
+    expect(fields['description']).to eq("desc")
+    expect(fields['project']['key']).to eq("PUP")
+    expect(fields['issuetype']['name']).to eq("Task")
+    expect(fields['assignee']['name']).to eq("ivy")
+    expect(fields['parent']).to eq(nil)
+  end
+
+  it "should build a subtask ticket's fields" do
+    fields = described_class.jira_issue_fields("sub summary",
+                                               "sub desc",
+                                               "PUP",
+                                               42,
+                                               "bean")
+
+    expect(fields['summary']).to eq("sub summary")
+    expect(fields['description']).to eq("sub desc")
+    expect(fields['project']['key']).to eq("PUP")
+    expect(fields['issuetype']['name']).to eq("Sub-task")
+    expect(fields['assignee']['name']).to eq("bean")
+    expect(fields['parent']['id']).to eq(42)
+  end
+end

data/ext/packaging/spec/lib/packaging/util/net_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe "Pkg::Util::Net" do
+  let(:target)     { "/tmp/placething" }
+  let(:target_uri) { "http://google.com" }
+  let(:content)    { "stuff" }
+
+  describe "#fetch_uri" do
+    context "given a target directory" do
+      it "does nothing if the directory isn't writable" do
+        File.stub(:writable?).with(File.dirname(target)) { false }
+        File.should_receive(:open).never
+        Pkg::Util::Net.fetch_uri(target_uri, target)
+      end
+
+      it "writes the content of the uri to a file if directory is writable" do
+        File.should_receive(:writable?).once.with(File.dirname(target)) { true }
+        File.should_receive(:open).once.with(target, 'w')
+        Pkg::Util::Net.fetch_uri(target_uri, target)
+      end
+    end
+  end
+end

data/ext/packaging/spec/lib/packaging/util/rake_utils_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+describe "Pkg::Util::RakeUtils" do
+  let(:foo_defined?) { Rake::Task.task_defined?(:foo) }
+  let(:bar_defined?) { Rake::Task.task_defined?(:bar) }
+  let(:define_foo)   { body = proc{}; Rake::Task.define_task(:foo, &body) }
+  let(:define_bar)   { body = proc{}; Rake::Task.define_task(:bar, &body) }
+
+  before(:each) do
+    if foo_defined?
+      Rake::Task[:foo].clear_prerequisites
+    end
+  end
+
+  describe "#task_defined?" do
+    context "given a Rake::Task task name" do
+      it "should return true if the task exists" do
+        Rake::Task.stub(:task_defined?).with(:foo) {true}
+        expect(Pkg::Util::RakeUtils.task_defined?(:foo)).to be_true
+      end
+      it "should return false if the task does not exist" do
+        Rake::Task.stub(:task_defined?).with(:foo) {false}
+        expect(Pkg::Util::RakeUtils.task_defined?(:foo)).to be_false
+      end
+    end
+  end
+
+  describe "#get_task" do
+    it "should return a task object for a named task" do
+      foo = nil
+      if !foo_defined?
+        foo = define_foo
+      else
+        foo = Rake::Task[:foo]
+      end
+      task = Pkg::Util::RakeUtils.get_task(:foo)
+      expect(task).to be_a(Rake::Task)
+      expect(task).to be(foo)
+    end
+  end
+
+  describe "#add_dependency" do
+    it "should add a dependency to a given rake task" do
+      foo = nil
+      bar = nil
+      if !foo_defined?
+        foo = define_foo
+      else
+        foo = Rake::Task[:foo]
+      end
+      if !bar_defined?
+        bar = define_bar
+      else
+        bar = Rake::Task[:bar]
+      end
+      Pkg::Util::RakeUtils.add_dependency(foo, bar)
+      expect(Rake::Task["foo"].prerequisites).to include(bar)
+    end
+  end
+
+  describe "#evaluate_pre_tasks" do
+    context "Given a data file with :pre_tasks defined" do
+      it "should, for each k=>v pair, add v as a dependency to k" do
+        Pkg::Config.config_from_yaml(File.join(FIXTURES, 'util', 'pre_tasks.yaml'))
+        expect(Pkg::Util::RakeUtils).to receive(:add_dependency)
+        Pkg::Util::RakeUtils.evaluate_pre_tasks
+      end
+    end
+  end
+end

data/ext/packaging/spec/lib/packaging/util/version_spec.rb

@@ -0,0 +1,67 @@
+# -*- ruby -*-
+require 'spec_helper'
+
+describe "Pkg::Util::Version" do
+  context "#versionbump" do
+    let(:version_file) { "thing.txt" }
+    let(:version) { "1.2.3" }
+    let(:orig_contents) { "abcd\nVERSION = @DEVELOPMENT_VERSION@\n" }
+    let(:updated_contents) { "abcd\nVERSION = #{version}\n" }
+
+    it "should update the version file contents accordingly" do
+      Pkg::Config.config_from_hash({:project => "foo", :version_file => version_file})
+      IO.stub(:read).with(version_file).and_return(orig_contents)
+      Pkg::Config.stub(:version).and_return(version)
+      version_file_to_write = double('file')
+      File.should_receive(:open).with(version_file, 'w').and_yield(version_file_to_write)
+      version_file_to_write.should_receive(:write).with(updated_contents)
+      Pkg::Util::Version.versionbump
+    end
+  end
+
+  context "#is_less_than_one?" do
+    context "with a version that starts with '0'" do
+      it "should return true" do
+        Pkg::Util::Version.stub(:get_dash_version).and_return("0.0.1")
+        Pkg::Util::Version.is_less_than_one?.should be(true)
+      end
+    end
+
+    context "with a version that starts with '1' or greater" do
+      it "should return false" do
+        Pkg::Util::Version.stub(:get_dash_version).and_return("1.0.0")
+        Pkg::Util::Version.is_less_than_one?.should be(false)
+      end
+    end
+  end
+
+  context "#is_final?" do
+
+    context "with version_strategy 'rc_final'" do
+      it "should use 'is_rc?' and return the opposite" do
+        Pkg::Util::Version.stub(:is_rc?).and_return(false)
+        Pkg::Config.stub(:version_strategy).and_return("rc_final")
+        Pkg::Util::Version.should_receive(:is_rc?)
+        Pkg::Util::Version.is_final?.should be(true)
+      end
+    end
+
+    context "with version_strategy 'odd_even'" do
+      it "should use 'is_odd?' and return the opposite" do
+        Pkg::Util::Version.stub(:is_odd?).and_return(false)
+        Pkg::Config.stub(:version_strategy).and_return("odd_even")
+        Pkg::Util::Version.should_receive(:is_odd?)
+        Pkg::Util::Version.is_final?.should be(true)
+      end
+    end
+
+    context "with version_strategy 'zero_based'" do
+      it "should use 'is_less_than_one?' and return the opposite" do
+        Pkg::Util::Version.stub(:is_less_than_one?).and_return(false)
+        Pkg::Config.stub(:version_strategy).and_return("zero_based")
+        Pkg::Util::Version.should_receive(:is_less_than_one?)
+        Pkg::Util::Version.is_final?.should be(true)
+      end
+    end
+  end
+end

data/ext/packaging/spec/lib/packaging_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+#   We load packaging.rb once, in spec_helper, to avoid reloading the library
+#   and issuing warnings about already defined constants.
+describe "Pkg" do
+  it "should require the utilities module, Pkg::Util" do
+    Pkg::Util.should_not be_nil
+  end
+
+  it  "should require the configuration module, Pkg::Config" do
+    Pkg::Config.should_not be_nil
+  end
+
+  it  "should require the tar library, Pkg::Tar" do
+    Pkg::Tar.should_not be_nil
+  end
+
+end
+

data/ext/packaging/spec/spec_helper.rb

@@ -4,9 +4,19 @@ require 'pathname'
 require 'rake'
 
 SPECDIR = Pathname(__FILE__).dirname
+PROJECT_ROOT = File.expand_path(File.join(Pathname(__FILE__).dirname, ".."))
+FIXTURES = File.join(SPECDIR, 'fixtures')
+
+require File.join(SPECDIR, '..', 'lib', 'packaging.rb')
 
 def load_task(name)
   return false if (@loaded ||= {})[name]
   load File.join(SPECDIR, '..', 'tasks', name)
   @loaded[name] = true
 end
+
+def reset_env(keys)
+  keys.each do |key|
+    ENV[key] = nil
+  end
+end

data/ext/packaging/spec/tasks/00_utils_spec.rb

@@ -1,118 +1,248 @@
 # -*- ruby -*-
 require 'spec_helper'
-load_task '00_utils.rake'
-load_task 'build.rake'
+load_task('00_utils.rake')
 
 describe "00_utils" do
   TestVersions = {
-    '0.7.0'                       => {
-      :git_describe_version       => %w{0.7.0},
-      :get_dash_version           => '0.7.0',
-      :get_ips_version            => '0.7.0,3.14159-0',
-      :get_dot_version            => '0.7.0',
-      :get_debversion             => '0.7.0-1puppetlabs1',
-      :get_rpmversion             => '0.7.0',
-      :get_rpmrelease             => '1',
-      :is_rc?                     => false,
-      :is_odd?                    => true,
+    '0.3.2-20140507.175526-5'       => {
+      :ref_type                     => "tag",
+      :method_map                   => {
+        :git_describe_version       => %w{0.3.2 20140507.175526 5},
+        :get_dash_version           => '0.3.2-20140507.175526-5',
+        :get_dot_version            => '0.3.2.20140507.175526.5',
+        :get_debversion             => '0.3.2.20140507.175526.5-1puppetlabs1',
+        :get_rpmversion             => '0.3.2.20140507.175526.5',
+        :get_rpmrelease             => '1',
+        :is_rc?                     => false,
+        :is_odd?                    => true,
+        :is_less_than_one?          => true,
+      },
     },
-    '0.8.0rc10'                   => {
-      :git_describe_version       => %w{0.8.0rc10},
-      :get_dash_version           => '0.8.0rc10',
-      :get_ips_version            => '0.8.0rc10,3.14159-0',
-      :get_dot_version            => '0.8.0rc10',
-      :get_debversion             => '0.8.0-0.1rc10puppetlabs1',
-      :get_rpmversion             => '0.8.0',
-      :get_rpmrelease             => '0.1rc10',
-      :is_rc?                     => true,
-      :is_odd?                    => false,
+    '0.7.0'                         => {
+      :ref_type                     => "tag",
+      :method_map                   => {
+        :git_describe_version       => %w{0.7.0},
+        :get_dash_version           => '0.7.0',
+        :get_ips_version            => '0.7.0,3.14159-0',
+        :get_dot_version            => '0.7.0',
+        :get_debversion             => '0.7.0-1puppetlabs1',
+        :get_rpmversion             => '0.7.0',
+        :get_rpmrelease             => '1',
+        :is_rc?                     => false,
+        :is_odd?                    => true,
+        :is_less_than_one?          => true,
+      },
     },
-    '0.7.0-rc1'                   => {
-      :git_describe_version       => %w{0.7.0 rc1},
-      :get_dash_version           => '0.7.0-rc1',
-      :get_ips_version            => '0.7.0,3.14159-0',
-      :get_dot_version            => '0.7.0.rc1',
-      :get_debversion             => '0.7.0-0.1rc1puppetlabs1',
-      :get_rpmversion             => '0.7.0',
-      :get_rpmrelease             => '0.1rc1',
-      :is_rc?                     => true,
-      :is_odd?                    => true,
+    '0.8.0rc10'                     => {
+      :ref_type                     => "tag",
+      :method_map                   => {
+        :git_describe_version       => %w{0.8.0rc10},
+        :get_dash_version           => '0.8.0rc10',
+        :get_ips_version            => '0.8.0rc10,3.14159-0',
+        :get_dot_version            => '0.8.0rc10',
+        :get_debversion             => '0.8.0-0.1rc10puppetlabs1',
+        :get_rpmversion             => '0.8.0',
+        :get_rpmrelease             => '0.1rc10',
+        :is_rc?                     => true,
+        :is_odd?                    => false,
+        :is_less_than_one?          => true,
+      },
     },
-    '0.4.0-rc1-63-ge391f55'       => {
-      :git_describe_version       => %w{0.4.0 rc1 63},
-      :get_dash_version           => '0.4.0-rc1-63',
-      :get_ips_version            => '0.4.0,3.14159-63',
-      :get_dot_version            => '0.4.0.rc1.63',
-      :get_debversion             => '0.4.0-0.1rc1.63puppetlabs1',
-      :get_rpmversion             => '0.4.0',
-      :get_rpmrelease             => '0.1rc1.63',
-      :is_rc?                     => true,
-      :is_odd?                    => false,
+    '0.7.0-rc1'                     => {
+      :ref_type                     => "tag",
+      :method_map                   => {
+        :git_describe_version       => %w{0.7.0 rc1},
+        :get_dash_version           => '0.7.0-rc1',
+        :get_ips_version            => '0.7.0,3.14159-0',
+        :get_dot_version            => '0.7.0.rc1',
+        :get_debversion             => '0.7.0-0.1rc1puppetlabs1',
+        :get_rpmversion             => '0.7.0',
+        :get_rpmrelease             => '0.1rc1',
+        :is_rc?                     => true,
+        :is_odd?                    => true,
+        :is_less_than_one?          => true,
+      },
     },
-    '0.6.0-rc1-63-ge391f55-dirty' => {
-      :git_describe_version       => %w{0.6.0 rc1 63 dirty},
-      :get_dash_version           => '0.6.0-rc1-63-dirty',
-      :get_ips_version            => '0.6.0,3.14159-63-dirty',
-      :get_dot_version            => '0.6.0.rc1.63.dirty',
-      :get_debversion             => '0.6.0-0.1rc1.63dirtypuppetlabs1',
-      :get_rpmversion             => '0.6.0',
-      :get_rpmrelease             => '0.1rc1.63dirty',
-      :is_rc?                     => true,
-      :is_odd?                    => false,
-
+    '0.4.0-rc1-63-ge391f55'         => {
+      :ref_type                     => "commit",
+      :method_map                   => {
+        :git_describe_version       => %w{0.4.0 rc1 63},
+        :get_dash_version           => '0.4.0-rc1-63',
+        :get_ips_version            => '0.4.0,3.14159-63',
+        :get_dot_version            => '0.4.0.rc1.63',
+        :get_debversion             => '0.4.0-0.1rc1.63puppetlabs1',
+        :get_rpmversion             => '0.4.0',
+        :get_rpmrelease             => '0.1rc1.63',
+        :is_rc?                     => true,
+        :is_odd?                    => false,
+        :is_less_than_one?          => true,
+      },
     },
-    '0.7.0-63-ge391f55'           => {
-      :git_describe_version       => %w{0.7.0 63},
-      :get_dash_version           => '0.7.0-63',
-      :get_ips_version            => '0.7.0,3.14159-63',
-      :get_dot_version            => '0.7.0.63',
-      :get_debversion             => '0.7.0.63-1puppetlabs1',
-      :get_rpmversion             => '0.7.0.63',
-      :get_rpmrelease             => '1',
-      :is_rc?                     => false,
-      :is_odd?                    => true,
-
+    '0.6.0-rc1-63-ge391f55-dirty'   => {
+      :ref_type                     => "commit",
+      :method_map                   => {
+        :git_describe_version       => %w{0.6.0 rc1 63 dirty},
+        :get_dash_version           => '0.6.0-rc1-63-dirty',
+        :get_ips_version            => '0.6.0,3.14159-63-dirty',
+        :get_dot_version            => '0.6.0.rc1.63.dirty',
+        :get_debversion             => '0.6.0-0.1rc1.63dirtypuppetlabs1',
+        :get_rpmversion             => '0.6.0',
+        :get_rpmrelease             => '0.1rc1.63dirty',
+        :is_rc?                     => true,
+        :is_odd?                    => false,
+        :is_less_than_one?          => true,
+      },
+    },
+    '0.7.0-63-ge391f55'             => {
+      :ref_type                     => "commit",
+      :method_map                   => {
+        :git_describe_version       => %w{0.7.0 63},
+        :get_dash_version           => '0.7.0-63',
+        :get_ips_version            => '0.7.0,3.14159-63',
+        :get_dot_version            => '0.7.0.63',
+        :get_debversion             => '0.7.0.63-1puppetlabs1',
+        :get_rpmversion             => '0.7.0.63',
+        :get_rpmrelease             => '1',
+        :is_rc?                     => false,
+        :is_odd?                    => true,
+        :is_less_than_one?          => true,
+      },
+    },
+    '0.7.0-63-ge391f55-dirty'       => {
+      :ref_type                     => "commit",
+      :method_map                   => {
+        :git_describe_version       => %w{0.7.0 63 dirty},
+        :get_dash_version           => '0.7.0-63-dirty',
+        :get_ips_version            => '0.7.0,3.14159-63-dirty',
+        :get_dot_version            => '0.7.0.63.dirty',
+        :get_debversion             => '0.7.0.63.dirty-1puppetlabs1',
+        :get_rpmversion             => '0.7.0.63.dirty',
+        :get_rpmrelease             => '1',
+        :is_rc?                     => false,
+        :is_odd?                    => true,
+        :is_less_than_one?          => true,
+      },
+    },
+    '1.7.0'                         => {
+      :ref_type                     => "tag",
+      :method_map                   => {
+        :is_less_than_one?          => false,
+      },
+    },
+    '1.8.0rc10'                   => {
+      :ref_type                     => "tag",
+      :method_map                   => {
+        :is_less_than_one?          => false,
+      },
+    },
+    '1.7.0-rc1'                   => {
+      :ref_type                     => "tag",
+      :method_map                   => {
+        :is_less_than_one?          => false,
+      },
     },
-    '0.7.0-63-ge391f55-dirty'     => {
-      :git_describe_version       => %w{0.7.0 63 dirty},
-      :get_dash_version           => '0.7.0-63-dirty',
-      :get_ips_version            => '0.7.0,3.14159-63-dirty',
-      :get_dot_version            => '0.7.0.63.dirty',
-      :get_debversion             => '0.7.0.63.dirty-1puppetlabs1',
-      :get_rpmversion             => '0.7.0.63.dirty',
-      :get_rpmrelease             => '1',
-      :is_rc?                     => false,
-      :is_odd?                    => true,
+    '1.4.0-rc1-63-ge391f55'       => {
+      :ref_type                     => "commit",
+      :method_map                   => {
+        :is_less_than_one?          => false,
+      },
+    },
+    '1.6.0-rc1-63-ge391f55-dirty' => {
+      :ref_type                     => "commit",
+      :method_map                   => {
+        :is_less_than_one?          => false,
+      },
+    },
+    '1.7.0-63-ge391f55'           => {
+      :ref_type                     => "commit",
+      :method_map                   => {
+        :is_less_than_one?          => false,
+      },
+    },
+    '1.7.0-63-ge391f55-dirty'     => {
+      :ref_type                     => "commit",
+      :method_map                   => {
+        :is_less_than_one?          => false,
+      },
     },
   }
 
-  before :all do
-    @build = Build::BuildInstance.new
-  end
-
   TestVersions.keys.sort.each do |input|
+    before :each do
+      Pkg::Config.project_root = File.expand_path(File.dirname(__FILE__))
+    end
+
     describe "Versioning based on #{input}" do
-      results = TestVersions[input]
+      results = TestVersions[input][:method_map]
+      let(:ref_type) { TestVersions[input][:ref_type] }
       results.keys.sort_by(&:to_s).each do |method|
-        it "using #{method} #{input.inspect} becomes #{results[method].inspect}" do
+        it "using Pkg::Util::Version.#{method} #{input.inspect} becomes #{results[method].inspect}" do
           # We have to call the `stub!` alias because we are trying to stub on
           # `self`, and in the scope of an rspec block that is overridden to
           # return a new double, not to stub a method!
-          @build.release = "1"
+          Pkg::Config.release = "1"
+          Pkg::Util::Version.should_receive(:git_ref_type).and_return(ref_type)
 
           if method.to_s.include?("deb")
-            self.should_receive(:run_git_describe_internal).and_return(input)
-            @build.packager = "puppetlabs"
+            Pkg::Util::Version.should_receive(:run_git_describe_internal).and_return(input)
+            Pkg::Config.packager = "puppetlabs"
           elsif method.to_s.include?("rpm")
-            self.should_receive(:run_git_describe_internal).and_return(input)
+            Pkg::Util::Version.should_receive(:run_git_describe_internal).and_return(input)
           else
-            self.stub!(:uname_r) { "3.14159" }
-            self.stub!(:is_git_repo) { true }
-            self.should_receive(:run_git_describe_internal).and_return(input)
+            Pkg::Util::Version.stub(:uname_r) { "3.14159" }
+            Pkg::Util::Version.stub(:is_git_repo) { true }
+            Pkg::Util::Version.should_receive(:run_git_describe_internal).and_return(input)
           end
-          self.send(method).should == results[method]
+          Pkg::Util::Version.send(method).should == results[method]
         end
       end
     end
   end
+
+  describe "#set_cow_envs" do
+    before(:each) do
+      reset_env(["DIST", "ARCH", "PE_VER", "BUILDMIRROR"])
+      Pkg::Config.deb_build_mirrors = nil
+      Pkg::Config.build_pe = nil
+      Pkg::Config.pe_version = nil
+    end
+
+    after(:all) do
+      reset_env(["DIST", "ARCH", "PE_VER", "BUILDMIRROR"])
+      Pkg::Config.deb_build_mirrors = nil
+      Pkg::Config.build_pe = nil
+      Pkg::Config.pe_version = nil
+    end
+
+    it "should always set DIST and ARCH correctly" do
+      self.send(:set_cow_envs, "base-wheezy-i386.cow")
+      ENV["DIST"].should eq("wheezy")
+      ENV["ARCH"].should eq("i386")
+      ENV["PE_VER"].should be_nil
+      ENV["BUILDMIRROR"].should be_nil
+    end
+
+    it "should set BUILDMIRROR if Pkg::Config.deb_build_mirrors is set" do
+      Pkg::Config.deb_build_mirrors = ["deb http://pl-build-tools.delivery.puppetlabs.net/debian __DIST__ main", "deb http://debian.is.awesome/wait no it is not"]
+      self.send(:set_cow_envs, "base-wheezy-i386.cow")
+      ENV["DIST"].should eq("wheezy")
+      ENV["ARCH"].should eq("i386")
+      ENV["PE_VER"].should be_nil
+      ENV["BUILDMIRROR"].should eq("deb http://pl-build-tools.delivery.puppetlabs.net/debian wheezy main | deb http://debian.is.awesome/wait no it is not")
+    end
+
+    it "should set PE_VER if Pkg::Config.build_pe is truthy" do
+      Pkg::Config.build_pe = true
+      Pkg::Config.pe_version = "3.2"
+      self.send(:set_cow_envs, "base-wheezy-i386.cow")
+      ENV["DIST"].should eq("wheezy")
+      ENV["ARCH"].should eq("i386")
+      ENV["PE_VER"].should eq("3.2")
+      ENV["BUILDMIRROR"].should be_nil
+    end
+
+    it "should fail on a badly formatted cow" do
+      expect { self.send(:set_cow_envs, "wheezy-i386") }.to raise_error(RuntimeError)
+    end
+  end
 end