omnibus 4.0.0 → 4.1.0

data/spec/unit/fetchers/path_fetcher_spec.rb

@@ -4,16 +4,17 @@ module Omnibus
   describe PathFetcher do
     let(:source_path) { '/local/path' }
     let(:project_dir) { '/project/dir' }
+    let(:build_dir) { '/build/dir' }
 
-    let(:software) do
-      double(Software,
+    let(:manifest_entry) do
+      double(ManifestEntry,
         name: 'software',
-        source: { path: source_path },
-        project_dir: project_dir,
-      )
+        locked_version: nil,
+        described_version: nil,
+        locked_source: { path: source_path })
     end
 
-    subject { described_class.new(software) }
+    subject { described_class.new(manifest_entry, project_dir, build_dir) }
 
     describe '#fetch_required?' do
       context 'when the SHAs match' do
@@ -89,7 +90,7 @@ module Omnibus
       end
 
       it 'copies the new files over' do
-        expect(FileSyncer).to receive(:sync).with(source_path, project_dir)
+        expect(FileSyncer).to receive(:sync).with(source_path, project_dir, {})
         subject.fetch
       end
     end

data/spec/unit/generator_spec.rb

@@ -52,7 +52,7 @@ module Omnibus
         Generator.new(['name'], path: tmp_path, bff_assets: true).invoke_all
 
         expect(structure).to include(*%w(
-          omnibus-name/resources/bff/gen.template.erb
+          omnibus-name/resources/name/bff/gen.template.erb
         ))
       end
     end
@@ -62,9 +62,9 @@ module Omnibus
         Generator.new(['name'], path: tmp_path, deb_assets: true).invoke_all
 
         expect(structure).to include(*%w(
-          omnibus-name/resources/deb/conffiles.erb
-          omnibus-name/resources/deb/control.erb
-          omnibus-name/resources/deb/md5sums.erb
+          omnibus-name/resources/name/deb/conffiles.erb
+          omnibus-name/resources/name/deb/control.erb
+          omnibus-name/resources/name/deb/md5sums.erb
         ))
       end
     end
@@ -74,8 +74,8 @@ module Omnibus
         Generator.new(['name'], path: tmp_path, dmg_assets: true).invoke_all
 
         expect(structure).to include(*%w(
-          omnibus-name/resources/dmg/background.png
-          omnibus-name/resources/dmg/icon.png
+          omnibus-name/resources/name/dmg/background.png
+          omnibus-name/resources/name/dmg/icon.png
         ))
       end
     end
@@ -85,15 +85,15 @@ module Omnibus
         Generator.new(['name'], path: tmp_path, msi_assets: true).invoke_all
 
         expect(structure).to include(*%w(
-          omnibus-name/resources/msi/assets/LICENSE.rtf
-          omnibus-name/resources/msi/assets/banner_background.bmp
-          omnibus-name/resources/msi/assets/dialog_background.bmp
-          omnibus-name/resources/msi/assets/project.ico
-          omnibus-name/resources/msi/assets/project_16x16.ico
-          omnibus-name/resources/msi/assets/project_32x32.ico
-          omnibus-name/resources/msi/localization-en-us.wxl.erb
-          omnibus-name/resources/msi/parameters.wxi.erb
-          omnibus-name/resources/msi/source.wxs.erb
+          omnibus-name/resources/name/msi/assets/LICENSE.rtf
+          omnibus-name/resources/name/msi/assets/banner_background.bmp
+          omnibus-name/resources/name/msi/assets/dialog_background.bmp
+          omnibus-name/resources/name/msi/assets/project.ico
+          omnibus-name/resources/name/msi/assets/project_16x16.ico
+          omnibus-name/resources/name/msi/assets/project_32x32.ico
+          omnibus-name/resources/name/msi/localization-en-us.wxl.erb
+          omnibus-name/resources/name/msi/parameters.wxi.erb
+          omnibus-name/resources/name/msi/source.wxs.erb
         ))
       end
     end
@@ -103,9 +103,10 @@ module Omnibus
         Generator.new(['name'], path: tmp_path, pkg_assets: true).invoke_all
 
         expect(structure).to include(*%w(
-          omnibus-name/resources/pkg/background.png
-          omnibus-name/resources/pkg/license.html.erb
-          omnibus-name/resources/pkg/welcome.html.erb
+          omnibus-name/resources/name/pkg/background.png
+          omnibus-name/resources/name/pkg/license.html.erb
+          omnibus-name/resources/name/pkg/welcome.html.erb
+          omnibus-name/resources/name/pkg/distribution.xml.erb
         ))
       end
     end
@@ -115,9 +116,9 @@ module Omnibus
         Generator.new(['name'], path: tmp_path, rpm_assets: true).invoke_all
 
         expect(structure).to include(*%w(
-          omnibus-name/resources/rpm/rpmmacros.erb
-          omnibus-name/resources/rpm/signing.erb
-          omnibus-name/resources/rpm/spec.erb
+          omnibus-name/resources/name/rpm/rpmmacros.erb
+          omnibus-name/resources/name/rpm/signing.erb
+          omnibus-name/resources/name/rpm/spec.erb
         ))
       end
     end

data/spec/unit/git_repository_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+module Omnibus
+  describe GitRepository do
+    let(:git_repo) do
+      path = local_git_repo("foobar", annotated_tags: ["1.0", "2.0", "3.0"])
+      Omnibus::GitRepository.new(path)
+    end
+
+    describe "#authors" do
+      it "returns an array of authors between two tags" do
+        expect(git_repo.authors("1.0", "2.0")).to eq(["omnibus"])
+      end
+
+      it "returns an empty array if start_ref == end_ref" do
+        expect(git_repo.authors("3.0", "3.0")).to eq([])
+      end
+
+      it "doesn't return duplicates" do
+        expect(git_repo.authors("1.0", "3.0")).to eq(["omnibus"])
+      end
+
+      it "returns an error if the tags don't exist" do
+        expect{git_repo.authors("1.0", "WUT")}.to raise_error(RuntimeError)
+      end
+    end
+
+    describe "#latest_tag" do
+      it "returns the latest annotated tag" do
+        expect(git_repo.latest_tag).to eq("3.0")
+      end
+    end
+
+    describe "#revision" do
+      it "returns the current revision at HEAD" do
+        expect(git_repo.revision).to eq("632501dde2c41f3bdd988b818b4c008e2ff398dc")
+      end
+    end
+
+    describe "#file_at_revision" do
+      it "returns the text of the specified file in a repository at a given revision" do
+        expect(git_repo.file_at_revision("configure", "1.0")).to eq("echo \"Done!\"")
+      end
+    end
+
+    describe "#commit_messages" do
+      it "returns the raw text from commits between two tags as an array of lines" do
+        expect(git_repo.commit_messages("1.0", "3.0")).to eq(["Create tag 3.0\n", "\n", "Create tag 2.0\n"])
+      end
+
+      it "returns lines with the newline attached" do
+        expect(git_repo.commit_messages("1.0", "3.0").first[-1]).to eq("\n")
+      end
+
+      it "returns an empty array if start_ref == end_ref" do
+        expect(git_repo.commit_messages("3.0", "3.0")).to eq([])
+      end
+    end
+  end
+end

data/spec/unit/manifest_diff_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+module Omnibus
+  describe ManifestDiff do
+    def manifest_entry_for(name, dv, lv)
+      Omnibus::ManifestEntry.new(name, {:described_version => dv,
+                                   :locked_version => lv,
+                                   :locked_source => {
+                                     :git => "git://#{name}@example.com"},
+                                   :source_type => :git
+                                 })
+    end
+
+
+    let(:manifest_one) do
+      m = Omnibus::Manifest.new()
+      m.add("foo", manifest_entry_for("foo", "1.2.4", "deadbeef"))
+      m.add("bar", manifest_entry_for("bar", "1.2.4", "deadbeef"))
+      m.add("baz", manifest_entry_for("baz", "1.2.4", "deadbeef"))
+      m
+    end
+
+    let(:manifest_two) do
+      m = Omnibus::Manifest.new()
+      m.add("foo", manifest_entry_for("foo", "1.2.5", "deadbea0"))
+      m.add("baz", manifest_entry_for("baz", "1.2.4", "deadbeef"))
+      m.add("quux", manifest_entry_for("quux", "1.2.4", "deadbeef"))
+      m
+    end
+
+    subject { described_class.new(manifest_one, manifest_two)}
+
+    describe "#updated" do
+      it "returns items that existed in the first manifest but have been changed" do
+        expect(subject.updated).to eq([{ :name => "foo",
+                                         :old_version => "deadbeef",
+                                         :new_version => "deadbea0",
+                                         :source_type => :git,
+                                         :source => {:git => "git://foo@example.com"}
+                                       }])
+      end
+
+      describe "#removed" do
+        it "returns items that existed in the first manfiest but don't exist in the second" do
+          expect(subject.removed).to eq([{ :name => "bar",
+                                           :old_version => "deadbeef",
+                                           :source_type => :git,
+                                           :source => {:git => "git://bar@example.com"}
+                                         }])
+        end
+      end
+
+      describe "#added" do
+        it "returns items that did not exist in the first manifest but do exist in the second" do
+          expect(subject.added).to eq([{ :name => "quux",
+                                         :new_version => "deadbeef",
+                                         :source_type => :git,
+                                         :source => {:git => "git://quux@example.com"}
+                                       }])
+        end
+      end
+
+      describe "#empty?" do
+        it "returns false if there have been changes" do
+          expect(subject.empty?).to eq(false)
+        end
+
+        it "returns true if nothing changed" do
+          diff = Omnibus::ManifestDiff.new(manifest_one, manifest_one)
+          expect(diff.empty?).to eq(true)
+        end
+      end
+    end
+  end
+end

data/spec/unit/manifest_spec.rb

@@ -0,0 +1,116 @@
+require 'spec_helper'
+require 'omnibus/manifest'
+require 'omnibus/manifest_entry'
+
+module Omnibus
+  describe Manifest do
+    subject { described_class.new }
+
+    describe "#add" do
+      it "stores manifest entries" do
+        me = ManifestEntry.new("womabt", {})
+        expect {subject.add("wombat", me)}.to_not raise_error
+      end
+
+      it "raises an error if it isn't given a ManifestEntry" do
+        expect {subject.add("foobar", {})}.to raise_error Manifest::NotAManifestEntry
+      end
+    end
+
+    describe "#entry_for" do
+      it "returns a ManifestEntry for the requested software" do
+        me = ManifestEntry.new("foobar", {})
+        subject.add("foobar", me)
+        expect(subject.entry_for("foobar")).to eq(me)
+      end
+
+      it "raises an error if no such manifest entry exists" do
+        expect {subject.entry_for("non-existant-entry")}.to raise_error Manifest::MissingManifestEntry
+      end
+    end
+
+    describe "#each" do
+      it "yields each item to the block" do
+        first  = ManifestEntry.new("foobar", {})
+        second = ManifestEntry.new("wombat", {})
+        subject.add("foobar", first)
+        subject.add("wombat", second)
+        expect{ |b| subject.each &b }.to yield_successive_args(first, second)
+      end
+    end
+
+    describe "#entry_names" do
+      it "returns an array of software names present in the manifest" do
+        first  = ManifestEntry.new("foobar", {})
+        second = ManifestEntry.new("wombat", {})
+        subject.add("foobar", first)
+        subject.add("wombat", second)
+        expect(subject.entry_names).to eq(["foobar", "wombat"])
+      end
+    end
+
+    describe "#to_hash" do
+      it "returns a Hash containg the current manifest format" do
+        expect(subject.to_hash['manifest_format']).to eq(Manifest::LATEST_MANIFEST_FORMAT)
+      end
+
+      it "includes entries for software in the manifest" do
+        subject.add("foobar", ManifestEntry.new("foobar", {}))
+        expect(subject.to_hash['software']).to have_key("foobar")
+      end
+
+      it "converts the manifest entries to hashes" do
+        subject.add("foobar", ManifestEntry.new("foobar", {}))
+        expect(subject.to_hash['software']['foobar']).to be_a(Hash)
+      end
+
+      it "returns a build_version if one was passed in" do
+        expect(Omnibus::Manifest.new("1.2.3").to_hash["build_version"]).to eq("1.2.3")
+      end
+
+      it "returns a build_git_revision if one was passed in" do
+        expect(Omnibus::Manifest.new("1.2.3", "e8e8e8").to_hash["build_git_revision"]).to eq("e8e8e8")
+      end
+    end
+
+    describe "#from_hash" do
+      let(:manifest) {
+        { "manifest_format" => 1,
+          "build_version" => "12.4.0+20150629082811",
+          "build_git_revision" => "2e763ac957b308ba95cef256c2491a5a55a163cc",
+          "software" => {
+            "zlib" => {
+              "locked_source" => {
+                "url" => "an_url"
+              },
+              "locked_version" => "new.newer",
+              "source_type" => "url",
+              "described_version" => "new.newer"}}}
+      }
+
+      let(:v2_manifest) {
+        {"manifest_format" => 2}
+      }
+
+      it "has a build_version" do
+        expect(Manifest.from_hash(manifest).build_version).to eq('12.4.0+20150629082811')
+      end
+
+      it "has a build_git_revision" do
+        expect(Manifest.from_hash(manifest).build_git_revision).to eq('2e763ac957b308ba95cef256c2491a5a55a163cc')
+      end
+
+      it "returns a manifest from a hash" do
+        expect(Manifest.from_hash(manifest)).to be_a(Manifest)
+      end
+
+      it "normalizes the source to use symbols" do
+        expect(Manifest.from_hash(manifest).entry_for("zlib").locked_source).to eq({:url => "an_url"})
+      end
+
+      it "raises an error if it doesn't recognize the manifest version" do
+        expect{Manifest.from_hash(v2_manifest)}.to raise_error Manifest::InvalidManifestFormat
+      end
+    end
+  end
+end

data/spec/unit/metadata_spec.rb

@@ -28,6 +28,16 @@ module Omnibus
         end
         expect(described_class.arch).to eq('x86_64')
       end
+
+      context 'on windows' do
+        it 'returns a 32-bit value based on Config.windows_arch being set to x86' do
+          stub_ohai(platform: 'windows', version: '2012R2') do |data|
+            data['kernel']['machine'] = 'x86_64'
+          end
+          expect(Config).to receive(:windows_arch).and_return(:x86)
+          expect(described_class.arch).to eq('i386')
+        end
+      end
     end
 
     describe '.platform_shortname' do
@@ -93,6 +103,7 @@ module Omnibus
       it_behaves_like 'a version manipulator', 'windows', '6.2.9200', '8'
       it_behaves_like 'a version manipulator', 'windows', '6.3.9200', '8.1'
       it_behaves_like 'a version manipulator', 'windows', '6.3.9600', '8.1'
+      it_behaves_like 'a version manipulator', 'windows', '10.0.10240', '10'
 
       context 'given an unknown platform' do
         before do

data/spec/unit/omnibus_spec.rb

@@ -7,14 +7,14 @@ describe Omnibus do
 
     allow(Gem::Specification).to receive(:find_all_by_name)
       .with('omnibus-software')
-      .and_return([double(gem_dir: '/gem/omnibus-software')])
+      .and_return([double(gem_dir: File.join(tmp_path, '/gem/omnibus-software'))])
 
     allow(Gem::Specification).to receive(:find_all_by_name)
       .with('custom-omnibus-software')
-      .and_return([double(gem_dir: '/gem/custom-omnibus-software')])
+      .and_return([double(gem_dir: File.join(tmp_path, '/gem/custom-omnibus-software'))])
 
-    Omnibus::Config.project_root('/foo/bar')
-    Omnibus::Config.local_software_dirs(['/local', '/other'])
+    Omnibus::Config.project_root(File.join(tmp_path, '/foo/bar'))
+    Omnibus::Config.local_software_dirs([File.join(tmp_path, '/local'), File.join(tmp_path, '/other')])
     Omnibus::Config.software_gems(['omnibus-software', 'custom-omnibus-software'])
   end
 
@@ -25,8 +25,11 @@ describe Omnibus do
     end
 
     it 'returns the path when the file exists' do
-      ruby = Bundler.which('ruby')
+
+      ruby_cmd = windows? ? 'ruby.exe' : 'ruby'
+      ruby = Bundler.which(ruby_cmd)
       expect(subject.which(ruby)).to eq(ruby)
+      expect(subject.which(ruby_cmd)).to eq(ruby)
     end
   end
 
@@ -76,7 +79,7 @@ describe Omnibus do
         /other/file
         /gem/omnibus-software/file
         /gem/custom-omnibus-software/file
-      ))
+      ).map { |path| File.join(tmp_path, path) })
     end
   end
 end

data/spec/unit/package_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Omnibus
   describe Package do
-    let(:path) { '/path/to/files/thing.deb' }
+    let(:path) { windows? ? 'C:/path/to/files/thing.deb' : '/path/to/files/thing.deb' }
 
     subject { described_class.new(path) }
 

data/spec/unit/packagers/base_spec.rb

@@ -5,7 +5,7 @@ module Omnibus
     let(:project) do
       Project.new.tap do |project|
         project.name('project')
-        project.install_dir('/opt/project')
+        project.install_dir(File.join(tmp_path, 'opt/project'))
         project.homepage('https://example.com')
         project.build_version('1.2.3')
         project.build_iteration('2')
@@ -15,7 +15,7 @@ module Omnibus
 
     before do
       # Force the Dir.mktmpdir call on staging_dir
-      allow(Dir).to receive(:mktmpdir).and_return('/tmp/dir')
+      allow(Dir).to receive(:mktmpdir).and_return(File.join(tmp_path, 'tmp/dir'))
 
       Config.package_dir(tmp_path)
     end
@@ -77,7 +77,7 @@ module Omnibus
       end
 
       it 'returns the project instances install_dir' do
-        expect(subject.install_dir).to eq('/opt/project')
+        expect(subject.install_dir).to eq(project.install_dir)
       end
     end
 
@@ -117,7 +117,7 @@ module Omnibus
       before { allow(subject).to receive(:id).and_return(id) }
 
       context 'when a local resource exists' do
-        let(:resources_path) { '/resources/path' }
+        let(:resources_path) { File.join(tmp_path, '/resources/path') }
 
         before do
           project.resources_path(resources_path)
@@ -130,6 +130,10 @@ module Omnibus
         it 'returns the local path' do
           expect(subject.resource_path('foo/bar.erb')).to eq("#{resources_path}/#{id}/foo/bar.erb")
         end
+
+        it 'returns the path with the id' do
+          expect(subject.resources_path).to eq("#{resources_path}/#{id}")
+        end
       end
 
       context 'when a local resource does not exist' do
@@ -138,19 +142,5 @@ module Omnibus
         end
       end
     end
-
-    describe '#resoures_path' do
-      let(:id) { :base }
-      let(:resources_path) { '/resources/path' }
-
-      before do
-        project.resources_path(resources_path)
-        allow(subject).to receive(:id).and_return(id)
-      end
-
-      it 'returns the path with the id' do
-        expect(subject.resources_path).to eq("#{resources_path}/#{id}")
-      end
-    end
   end
 end