omnibus 3.0.0 → 3.1.0

data/spec/functional/packagers/mac_spec.rb

@@ -1,24 +1,7 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 require 'spec_helper'
 
 module Omnibus
-  describe Packager::MacDmg, :functional do
+  describe Packager::MacDmg, :functional, :mac_only do
     let(:name) { 'sample' }
     let(:version) { '12.4.0' }
 
@@ -64,8 +47,8 @@ module Omnibus
 
       # There is a tiny bit of hard-coding here, but I don't see a better
       # solution for generating the package name
-      pkg = "#{project.package_dir}/#{name}-#{version}-1.mac_os_x.10.9.2.pkg"
-      dmg = "#{project.package_dir}/#{name}-#{version}-1.mac_os_x.10.9.2.dmg"
+      pkg = "#{project.package_dir}/#{name}-#{version}-1.pkg"
+      dmg = "#{project.package_dir}/#{name}-#{version}-1.dmg"
 
       expect(File.exist?(pkg)).to be_true
       expect(File.exist?(dmg)).to be_true

data/spec/functional/packagers/windows_spec.rb

@@ -0,0 +1,69 @@
+#
+# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+
+module Omnibus
+  describe Packager::WindowsMsi, :functional, :windows_only do
+    let(:name) { 'sample' }
+    let(:version) { '12.4.0' }
+
+    let(:project) do
+      Project.new(<<-EOH, __FILE__)
+        name               '#{name}'
+        maintainer         'Chef'
+        homepage           'https://getchef.com'
+        build_version      '#{version}'
+        install_path       '#{tmp_path}\\opt\\#{name}'
+      EOH
+    end
+
+    let(:windows_packager) { Packager::WindowsMsi.new(project) }
+
+    before do
+      # Reset stale configuration
+      Omnibus.config.reset!
+
+      # Tell things to install into the cache directory
+      root = "#{tmp_path}/var/omnibus"
+      Omnibus.config.cache_dir "#{root}/cache"
+      Omnibus.config.install_path_cache_dir "#{root}/cache/install_path"
+      Omnibus.config.source_dir "#{root}/src"
+      Omnibus.config.build_dir "#{root}/build"
+      Omnibus.config.package_dir "#{root}/pkg"
+      Omnibus.config.package_tmp "#{root}/pkg-tmp"
+
+      # Point at our sample project fixture
+      Omnibus.config.project_root "#{fixtures_path}/sample"
+
+      # Create the target directory
+      FileUtils.mkdir_p(project.install_path)
+
+      # Create a file to be included in the MSI
+      FileUtils.touch(File.join(project.install_path, 'golden_file'))
+    end
+
+    it 'builds a pkg and a dmg' do
+      # Create the pkg resource
+      windows_packager.run!
+
+      # There is a tiny bit of hard-coding here, but I don't see a better
+      # solution for generating the package name
+      expect(File.exist?("#{project.package_dir}/#{name}-#{version}-1.windows.msi")).to be_true
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -17,6 +17,10 @@ module Omnibus
       File.join(SPEC_DATA, 'projects', "#{name}.rb")
     end
 
+    def complicated_path
+      File.join(SPEC_DATA, 'complicated')
+    end
+
     def fixtures_path
       File.expand_path('../fixtures', __FILE__)
     end
@@ -24,17 +28,88 @@ module Omnibus
     def tmp_path
       File.expand_path('../../tmp', __FILE__)
     end
+
+    #
+    # Stub the given environment key.
+    #
+    # @param [String] key
+    # @param [String] value
+    #
+    def stub_env(key, value)
+      unless @__env_already_stubbed__
+        ENV.stub(:[]).and_call_original
+        @__env_already_stubbed__ = true
+      end
+
+      ENV.stub(:[]).with(key).and_return(value.to_s)
+    end
+
+    #
+    # Stub Ohai with the given data.
+    #
+    # @param [Hash] data
+    #
+    def stub_ohai(data = {})
+      system = ::Ohai::System.new
+      system.data = Mash.new(data)
+
+      Ohai.stub(:ohai).and_return(system)
+    end
+
+    #
+    # Grab the result of the log command. Since Omnibus uses the block form of
+    # the logger, this method handles both types of logging.
+    #
+    # @example
+    #   output = capture_logging { some_command }
+    #   expect(output).to include('whatever')
+    #
+    def capture_logging
+      original = Omnibus.logger
+      Omnibus.logger = TestLogger.new
+      yield
+      Omnibus.logger.output
+    ensure
+      Omnibus.logger = original
+    end
+  end
+end
+
+module Omnibus
+  class TestLogger < Logger
+    def initialize(*)
+      super(StringIO.new)
+      @level = -1
+    end
+
+    def output
+      @logdev.dev.string
+    end
   end
 end
 
+def windows?
+  !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
+end
+
+def mac?
+  !!(RUBY_PLATFORM =~ /darwin/)
+end
+
 RSpec.configure do |config|
   config.include Omnibus::RSpec
   config.filter_run focus: true
   config.run_all_when_everything_filtered = true
   config.treat_symbols_as_metadata_keys_with_true_values = true
 
-  # Clear the tmp_path on each run
+  config.filter_run_excluding windows_only: true unless windows?
+  config.filter_run_excluding mac_only: true unless mac?
+
   config.before(:each) do
+    # Suppress logging
+    Omnibus.logger.level = :unknown
+
+    # Clear the tmp_path on each run
     FileUtils.rm_rf(tmp_path)
     FileUtils.mkdir_p(tmp_path)
   end
@@ -43,4 +118,7 @@ RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end
+
+  # Run specs in a random order
+  config.order = 'random'
 end

data/spec/unit/artifact_spec.rb

@@ -1,21 +1,3 @@
-#
-# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'omnibus/artifact'
 require 'spec_helper'
 
 describe Omnibus::Artifact do

data/spec/unit/build_version_dsl_spec.rb

@@ -0,0 +1,136 @@
+#
+# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+
+describe Omnibus::BuildVersionDSL do
+  let(:subject_with_version) { Omnibus::BuildVersionDSL.new(version_string) }
+  let(:subject_with_description) { Omnibus::BuildVersionDSL.new(&description) }
+
+  let(:version_string) { "1.0.0" }
+  let(:description) { nil }
+
+  let(:zoo_version) { double("BuildVersion", semver: "5.5.5", custom: "7.7.7") }
+  let(:zoo_software) { double("software", name: 'zoo', project_dir: '/etc/zoo', version: "6.6.6") }
+
+  describe "when given nil" do
+    it "should fail" do
+      expect { subject.build_version }.to raise_error
+    end
+  end
+
+  describe "when given a string" do
+    it "should set the version to the string" do
+      expect(subject_with_version.build_version).to eq("1.0.0")
+    end
+  end
+
+  describe "when given a :git source" do
+    describe "when given a software as source" do
+      let(:description) do
+        proc do
+          source(:git, from_dependency: 'zoo')
+        end
+      end
+
+      describe "before resolving version" do
+        it "should mention the version is not ready yet" do
+          expect(subject_with_description.explain).to match(/will be determined/)
+        end
+
+        it "should include the dependency name in the message" do
+          expect(subject_with_description.explain).to match(/zoo/)
+        end
+      end
+
+      describe "after resolving version" do
+        before do
+          Omnibus::BuildVersion.should_receive(:new).with("/etc/zoo").and_return(zoo_version)
+          subject_with_description.resolve(zoo_software)
+        end
+
+        it "should create the version with path from source with semver" do
+          expect(subject_with_description.explain).to eq("Build Version: 5.5.5")
+        end
+      end
+    end
+
+    describe "when not given a software as source" do
+      let(:description) do
+        proc { source(:git) }
+      end
+
+      it "should create the version with default path as semver" do
+        Omnibus::BuildVersion.should_receive(:new).with(no_args).and_return(zoo_version)
+        expect(subject_with_description.build_version).to eq("5.5.5")
+      end
+    end
+
+    describe "when given an output format" do
+      let(:description) do
+        proc do
+          source(:git)
+          output_format(:custom)
+        end
+      end
+
+      it "should output the version with given function" do
+        Omnibus::BuildVersion.should_receive(:new).with(no_args).and_return(zoo_version)
+        expect(subject_with_description.build_version).to eq("7.7.7")
+      end
+    end
+  end
+
+  describe "when given a :version source" do
+    describe "when given a software as source" do
+      let(:description) do
+        proc do
+          source(:version, from_dependency: 'zoo')
+        end
+      end
+
+      it "should create the version with version from source" do
+        subject_with_description.resolve(zoo_software)
+        expect(subject_with_description.build_version).to eq("6.6.6")
+      end
+    end
+
+    describe "when not given a software as source" do
+      let(:description) do
+        proc do
+          source(:version)
+        end
+      end
+
+      it "should fail" do
+        expect { subject_with_description.build_version }.to raise_error
+      end
+    end
+  end
+
+  describe "when given an unknown source" do
+    let(:description) do
+      proc do
+        source(:park)
+      end
+    end
+
+    it "should fail" do
+      expect { subject_with_description.build_version }.to raise_error
+    end
+  end
+end

data/spec/unit/build_version_spec.rb

@@ -1,258 +1,245 @@
-#
-# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'omnibus/build_version'
 require 'spec_helper'
 
-describe Omnibus::BuildVersion do
+module Omnibus
+  describe BuildVersion do
+    let(:git_describe) { '11.0.0-alpha1-207-g694b062' }
+    let(:valid_semver_regex) { /^\d+\.\d+\.\d+(\-[\dA-Za-z\-\.]+)?(\+[\dA-Za-z\-\.]+)?$/ }
+    let(:valid_git_describe_regex) { /^\d+\.\d+\.\d+(\-[A-Za-z0-9\-\.]+)?(\-\d+\-g[0-9a-f]+)?$/ }
 
-  let(:git_describe) { '11.0.0-alpha1-207-g694b062' }
-  let(:valid_semver_regex) { /^\d+\.\d+\.\d+(\-[\dA-Za-z\-\.]+)?(\+[\dA-Za-z\-\.]+)?$/ }
-  let(:valid_git_describe_regex) { /^\d+\.\d+\.\d+(\-[A-Za-z0-9\-\.]+)?(\-\d+\-g[0-9a-f]+)?$/ }
+    subject(:build_version) { described_class.new }
 
-  subject(:build_version) { Omnibus::BuildVersion.new }
+    before do
+      described_class.any_instance.stub(:shellout)
+        .and_return(double('ouput', stdout: git_describe, exitstatus: 0))
 
-  before :each do
-    ENV['BUILD_ID'] = nil
-    ENV['OMNIBUS_APPEND_TIMESTAMP'] = nil
-    Omnibus::BuildVersion.any_instance.stub(:shellout)
-      .and_return(double('ouput', stdout: git_describe, exitstatus: 0))
-  end
+      Omnibus.reset!
+    end
 
-  describe 'git describe parsing' do
+    describe 'git describe parsing' do
 
-    # we prefer our git tags to be SemVer compliant
+      # we prefer our git tags to be SemVer compliant
 
-    # release version
-    context '11.0.1' do
-      let(:git_describe) { '11.0.1' }
-      its(:version_tag) { should == '11.0.1' }
-      its(:prerelease_tag) { should be_nil }
-      its(:git_sha_tag) { should be_nil }
-      its(:commits_since_tag) { should == 0 }
-      its(:development_version?) { should be_true }
-      its(:prerelease_version?) { should be_false }
-    end
+      # release version
+      context '11.0.1' do
+        let(:git_describe) { '11.0.1' }
+        its(:version_tag) { should == '11.0.1' }
+        its(:prerelease_tag) { should be_nil }
+        its(:git_sha_tag) { should be_nil }
+        its(:commits_since_tag) { should == 0 }
+        its(:development_version?) { should be_true }
+        its(:prerelease_version?) { should be_false }
+      end
 
-    # SemVer compliant prerelease version
-    context '11.0.0-alpha.2' do
-      let(:git_describe) { '11.0.0-alpha.2' }
-      its(:version_tag) { should == '11.0.0' }
-      its(:prerelease_tag) { should == 'alpha.2' }
-      its(:git_sha_tag) { should be_nil }
-      its(:commits_since_tag) { should == 0 }
-      its(:development_version?) { should be_false }
-      its(:prerelease_version?) { should be_true }
-    end
+      # SemVer compliant prerelease version
+      context '11.0.0-alpha.2' do
+        let(:git_describe) { '11.0.0-alpha.2' }
+        its(:version_tag) { should == '11.0.0' }
+        its(:prerelease_tag) { should == 'alpha.2' }
+        its(:git_sha_tag) { should be_nil }
+        its(:commits_since_tag) { should == 0 }
+        its(:development_version?) { should be_false }
+        its(:prerelease_version?) { should be_true }
+      end
 
-    # full git describe string
-    context '11.0.0-alpha.3-59-gf55b180' do
-      let(:git_describe) { '11.0.0-alpha.3-59-gf55b180' }
-      its(:version_tag) { should == '11.0.0' }
-      its(:prerelease_tag) { should == 'alpha.3' }
-      its(:git_sha_tag) { should == 'f55b180' }
-      its(:commits_since_tag) { should == 59 }
-      its(:development_version?) { should be_false }
-      its(:prerelease_version?) { should be_true }
-    end
+      # full git describe string
+      context '11.0.0-alpha.3-59-gf55b180' do
+        let(:git_describe) { '11.0.0-alpha.3-59-gf55b180' }
+        its(:version_tag) { should == '11.0.0' }
+        its(:prerelease_tag) { should == 'alpha.3' }
+        its(:git_sha_tag) { should == 'f55b180' }
+        its(:commits_since_tag) { should == 59 }
+        its(:development_version?) { should be_false }
+        its(:prerelease_version?) { should be_true }
+      end
 
-    # Degenerate git tag formats
-
-    # RubyGems compliant git tag
-    context '10.16.0.rc.0' do
-      let(:git_describe) { '10.16.0.rc.0' }
-      its(:version_tag) { should == '10.16.0' }
-      its(:prerelease_tag) { should == 'rc.0' }
-      its(:git_sha_tag) { should be_nil }
-      its(:commits_since_tag) { should == 0 }
-      its(:development_version?) { should be_false }
-      its(:prerelease_version?) { should be_true }
-    end
+      # Degenerate git tag formats
+
+      # RubyGems compliant git tag
+      context '10.16.0.rc.0' do
+        let(:git_describe) { '10.16.0.rc.0' }
+        its(:version_tag) { should == '10.16.0' }
+        its(:prerelease_tag) { should == 'rc.0' }
+        its(:git_sha_tag) { should be_nil }
+        its(:commits_since_tag) { should == 0 }
+        its(:development_version?) { should be_false }
+        its(:prerelease_version?) { should be_true }
+      end
 
-    # dash seperated prerelease
-    context '11.0.0-alpha-2' do
-      let(:git_describe) { '11.0.0-alpha-2' }
-      its(:version_tag) { should == '11.0.0' }
-      its(:prerelease_tag) { should == 'alpha-2' }
-      its(:git_sha_tag) { should be_nil }
-      its(:commits_since_tag) { should == 0 }
-      its(:development_version?) { should be_false }
-      its(:prerelease_version?) { should be_true }
-    end
+      # dash seperated prerelease
+      context '11.0.0-alpha-2' do
+        let(:git_describe) { '11.0.0-alpha-2' }
+        its(:version_tag) { should == '11.0.0' }
+        its(:prerelease_tag) { should == 'alpha-2' }
+        its(:git_sha_tag) { should be_nil }
+        its(:commits_since_tag) { should == 0 }
+        its(:development_version?) { should be_false }
+        its(:prerelease_version?) { should be_true }
+      end
 
-    # dash seperated prerelease full git describe string
-    context '11.0.0-alpha-2-59-gf55b180' do
-      let(:git_describe) { '11.0.0-alpha-2-59-gf55b180' }
-      its(:version_tag) { should == '11.0.0' }
-      its(:prerelease_tag) { should == 'alpha-2' }
-      its(:git_sha_tag) { should == 'f55b180' }
-      its(:commits_since_tag) { should == 59 }
-      its(:development_version?) { should be_false }
-      its(:prerelease_version?) { should be_true }
-    end
+      # dash seperated prerelease full git describe string
+      context '11.0.0-alpha-2-59-gf55b180' do
+        let(:git_describe) { '11.0.0-alpha-2-59-gf55b180' }
+        its(:version_tag) { should == '11.0.0' }
+        its(:prerelease_tag) { should == 'alpha-2' }
+        its(:git_sha_tag) { should == 'f55b180' }
+        its(:commits_since_tag) { should == 59 }
+        its(:development_version?) { should be_false }
+        its(:prerelease_version?) { should be_true }
+      end
 
-    # WTF git tag
-    context '11.0.0-alpha2' do
-      let(:git_describe) { '11.0.0-alpha2' }
-      its(:version_tag) { should == '11.0.0' }
-      its(:prerelease_tag) { should == 'alpha2' }
-      its(:git_sha_tag) { should be_nil }
-      its(:commits_since_tag) { should == 0 }
-      its(:development_version?) { should be_false }
-      its(:prerelease_version?) { should be_true }
+      # WTF git tag
+      context '11.0.0-alpha2' do
+        let(:git_describe) { '11.0.0-alpha2' }
+        its(:version_tag) { should == '11.0.0' }
+        its(:prerelease_tag) { should == 'alpha2' }
+        its(:git_sha_tag) { should be_nil }
+        its(:commits_since_tag) { should == 0 }
+        its(:development_version?) { should be_false }
+        its(:prerelease_version?) { should be_true }
+      end
     end
-  end
 
-  describe 'semver output' do
-    let(:today_string) { Time.now.utc.strftime('%Y%m%d') }
+    describe 'semver output' do
+      let(:today_string) { Time.now.utc.strftime('%Y%m%d') }
 
-    it 'generates a valid semver version' do
-      expect(build_version.semver).to match(valid_semver_regex)
-    end
+      it 'generates a valid semver version' do
+        expect(build_version.semver).to match(valid_semver_regex)
+      end
 
-    it "generates a version matching format 'MAJOR.MINOR.PATCH-PRERELEASE+TIMESTAMP.git.COMMITS_SINCE.GIT_SHA'" do
-      expect(build_version.semver).to match(/11.0.0-alpha1\+#{today_string}[0-9]+.git.207.694b062/)
-    end
+      it "generates a version matching format 'MAJOR.MINOR.PATCH-PRERELEASE+TIMESTAMP.git.COMMITS_SINCE.GIT_SHA'" do
+        expect(build_version.semver).to match(/11.0.0-alpha1\+#{today_string}[0-9]+.git.207.694b062/)
+      end
 
-    it "uses ENV['BUILD_ID'] to generate timestamp if set" do
-      ENV['BUILD_ID'] = '2012-12-25_16-41-40'
-      expect(build_version.semver).to eq('11.0.0-alpha1+20121225164140.git.207.694b062')
-    end
+      it "uses ENV['BUILD_ID'] to generate timestamp if set" do
+        stub_env('BUILD_ID', '2012-12-25_16-41-40')
+        expect(build_version.semver).to eq('11.0.0-alpha1+20121225164140.git.207.694b062')
+      end
 
-    it "fails on invalid ENV['BUILD_ID'] values" do
-      ENV['BUILD_ID'] = 'AAAA'
-      expect { build_version.semver }.to raise_error(ArgumentError)
-    end
+      it "fails on invalid ENV['BUILD_ID'] values" do
+        stub_env('BUILD_ID', 'AAAA')
+        expect { build_version.semver }.to raise_error(ArgumentError)
+      end
 
-    context 'prerelease version with dashes' do
-      let(:git_describe) { '11.0.0-alpha-3-207-g694b062' }
+      context 'prerelease version with dashes' do
+        let(:git_describe) { '11.0.0-alpha-3-207-g694b062' }
 
-      it 'converts all dashes to dots' do
-        expect(build_version.semver).to match(/11.0.0-alpha.3\+#{today_string}[0-9]+.git.207.694b062/)
+        it 'converts all dashes to dots' do
+          expect(build_version.semver).to match(/11.0.0-alpha.3\+#{today_string}[0-9]+.git.207.694b062/)
+        end
       end
-    end
 
-    context 'exact version' do
-      let(:git_describe) { '11.0.0-alpha2' }
+      context 'exact version' do
+        let(:git_describe) { '11.0.0-alpha2' }
 
-      it 'appends a timestamp with no git info' do
-        expect(build_version.semver).to match(/11.0.0-alpha2\+#{today_string}[0-9]+/)
+        it 'appends a timestamp with no git info' do
+          expect(build_version.semver).to match(/11.0.0-alpha2\+#{today_string}[0-9]+/)
+        end
       end
-    end
 
-    describe 'appending a timestamp' do
-      let(:git_describe) { '11.0.0-alpha-3-207-g694b062' }
+      describe 'appending a timestamp' do
+        let(:git_describe) { '11.0.0-alpha-3-207-g694b062' }
 
-      it 'appends a timestamp by default' do
-        expect(build_version.semver).to match(/11.0.0-alpha.3\+#{today_string}[0-9]+.git.207.694b062/)
-      end
+        it 'appends a timestamp by default' do
+          expect(build_version.semver).to match(/11.0.0-alpha.3\+#{today_string}[0-9]+.git.207.694b062/)
+        end
+
+        describe "ENV['OMNIBUS_APPEND_TIMESTAMP'] is set" do
+          ['true', 't', 'yes', 'y', 1].each do |truthy|
+            context "to #{truthy}" do
+              before { stub_env('OMNIBUS_APPEND_TIMESTAMP', truthy) }
+
+              it 'appends a timestamp' do
+                expect(build_version.semver).to match(/11.0.0-alpha.3\+#{today_string}[0-9]+.git.207.694b062/)
+              end
+            end
+          end
+
+          ['false', 'f', 'no', 'n', 0].each do |falsey|
+            context "to #{falsey}" do
+              before { stub_env('OMNIBUS_APPEND_TIMESTAMP', falsey) }
+
+              it 'does not append a timestamp' do
+                expect(build_version.semver).to match(/11.0.0-alpha.3\+git.207.694b062/)
+              end
+            end
+          end
+        end
+
+        describe 'Config.append_timestamp is set' do
+          context 'is true' do
+            before { Config.stub(:append_timestamp).and_return(true) }
 
-      describe "ENV['OMNIBUS_APPEND_TIMESTAMP'] is set" do
-        ['true', 't', 'yes', 'y', 1].each do |truthy|
-          context "to #{truthy}" do
-            before { ENV['OMNIBUS_APPEND_TIMESTAMP'] = truthy.to_s }
             it 'appends a timestamp' do
               expect(build_version.semver).to match(/11.0.0-alpha.3\+#{today_string}[0-9]+.git.207.694b062/)
             end
           end
-        end
 
-        ['false', 'f', 'no', 'n', 0].each do |falsey|
-          context "to #{falsey}" do
-            before { ENV['OMNIBUS_APPEND_TIMESTAMP'] = falsey.to_s }
+          context 'is false' do
+            before { Config.stub(:append_timestamp).and_return(false) }
             it 'does not append a timestamp' do
               expect(build_version.semver).to match(/11.0.0-alpha.3\+git.207.694b062/)
             end
           end
         end
-      end
 
-      describe 'Omnibus::Config.append_timestamp is set' do
-        context 'is true' do
-          before { Omnibus::Config.append_timestamp(true) }
-          it 'appends a timestamp' do
-            expect(build_version.semver).to match(/11.0.0-alpha.3\+#{today_string}[0-9]+.git.207.694b062/)
+        describe 'both are set' do
+          before do
+            stub_env('OMNIBUS_APPEND_TIMESTAMP', 'false')
+            Config.stub(:append_timestamp).and_return(true)
           end
-        end
 
-        context 'is false' do
-          before { Omnibus::Config.append_timestamp(false) }
-          it 'does not append a timestamp' do
+          it "prefers the value from ENV['OMNIBUS_APPEND_TIMESTAMP']" do
             expect(build_version.semver).to match(/11.0.0-alpha.3\+git.207.694b062/)
           end
         end
       end
-
-      describe 'both are set' do
-        before do
-          ENV['OMNIBUS_APPEND_TIMESTAMP'] = 'false'
-          Omnibus::Config.append_timestamp(true)
-        end
-        it "prefers the value from ENV['OMNIBUS_APPEND_TIMESTAMP']" do
-          expect(build_version.semver).to match(/11.0.0-alpha.3\+git.207.694b062/)
-        end
-      end
     end
-  end
 
-  describe 'git describe output' do
-    it 'generates a valid git describe version' do
-      expect(build_version.git_describe).to match(valid_git_describe_regex)
-    end
+    describe 'git describe output' do
+      it 'generates a valid git describe version' do
+        expect(build_version.git_describe).to match(valid_git_describe_regex)
+      end
 
-    it "generates a version matching format 'MAJOR.MINOR.PATCH-PRELEASE.COMMITS_SINCE-gGIT_SHA'" do
-      expect(build_version.git_describe).to eq(git_describe)
+      it "generates a version matching format 'MAJOR.MINOR.PATCH-PRELEASE.COMMITS_SINCE-gGIT_SHA'" do
+        expect(build_version.git_describe).to eq(git_describe)
+      end
     end
-  end
 
-  describe 'deprecated full output' do
-    it 'generates a valid git describe version' do
-      expect(Omnibus::BuildVersion.full).to match(valid_git_describe_regex)
-    end
+    describe 'deprecated full output' do
+      it 'generates a valid git describe version' do
+        expect(BuildVersion.full).to match(valid_git_describe_regex)
+      end
 
-    it 'outputs a deprecation message' do
-      expect(Omnibus::BuildVersion).to receive(:puts).with(/is deprecated/)
-      Omnibus::BuildVersion.full
+      it 'outputs a deprecation message' do
+        output = capture_logging { BuildVersion.full }
+        expect(output).to include('DEPRECATED')
+      end
     end
-  end
 
-  describe '`git describe` command failure' do
-    before do
-      stderr = <<-STDERR
-fatal: No tags can describe '809ea1afcce67e1148c1bf0822d40a7ef12c380e'.
-Try --always, or create some tags.
-      STDERR
-      build_version.stub(:shellout)
-        .and_return(double('ouput', stderr: stderr, exitstatus: 128))
-    end
-    it 'sets the version to 0.0.0' do
-      expect(build_version.git_describe).to eq('0.0.0')
+    describe '`git describe` command failure' do
+      before do
+        stderr = <<-STDERR
+  fatal: No tags can describe '809ea1afcce67e1148c1bf0822d40a7ef12c380e'.
+  Try --always, or create some tags.
+        STDERR
+        build_version.stub(:shellout)
+          .and_return(double('ouput', stderr: stderr, exitstatus: 128))
+      end
+      it 'sets the version to 0.0.0' do
+        expect(build_version.git_describe).to eq('0.0.0')
+      end
     end
-  end
 
-  describe '#initialize `path` parameter' do
-    let(:path) { '/some/fake/path' }
-    subject(:build_version) { Omnibus::BuildVersion.new(path) }
+    describe '#initialize `path` parameter' do
+      let(:path) { '/some/fake/path' }
+      subject(:build_version) { BuildVersion.new(path) }
 
-    it 'runs `git describe` at an alternate path' do
-      expect(build_version).to receive(:shellout)
-        .with('git describe', live_stream: nil, cwd: path)
-        .and_return(double('ouput', stdout: git_describe, exitstatus: 0))
-      build_version.git_describe
+      it 'runs `git describe` at an alternate path' do
+        expect(build_version).to receive(:shellout)
+          .with('git describe --tags', live_stream: nil, cwd: path)
+          .and_return(double('ouput', stdout: git_describe, exitstatus: 0))
+        build_version.git_describe
+      end
     end
   end
 end