omnibus 4.0.0 → 4.1.0

data/spec/functional/fetchers/path_fetcher_spec.rb

@@ -10,11 +10,20 @@ module Omnibus
       { path: source_path }
     end
 
+    let(:manifest_entry) do
+      double(Omnibus::ManifestEntry,
+             name: 'pathelogical',
+             locked_version: nil,
+             described_version: nil,
+             locked_source: source)
+    end
+
     before do
       create_directory(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 directories have different files' do
@@ -93,5 +102,11 @@ module Omnibus
         expect(subject.version_for_cache).to eq("path:#{source_path}|shasum:#{sha}")
       end
     end
+
+    describe '#resolve_version' do
+      it 'just returns the version' do
+        expect(NetFetcher.resolve_version("1.2.3", source)).to eq("1.2.3")
+      end
+    end
   end
 end

data/spec/functional/file_syncer_spec.rb

@@ -75,6 +75,30 @@ module Omnibus
         end
       end
 
+      context 'when destination file exists' do
+
+        let(:source) {
+          s = File.join(tmp_path, 'source')
+          FileUtils.mkdir_p(s)
+          p = create_file(s, 'read-only-file') { 'new' }
+          FileUtils.chmod(0400, p)
+          s
+        }
+
+        let(:destination) {
+          dest = File.join(tmp_path, 'destination')
+          FileUtils.mkdir_p(dest)
+          create_file(dest, 'read-only-file') { 'old' }
+          FileUtils.chmod(0400, File.join(dest, 'read-only-file'))
+          dest
+        }
+
+        it 'copies over a read-only file' do
+          described_class.sync(source, destination)
+          expect("#{destination}/read-only-file").to have_content "new"
+        end
+      end
+
       context 'when the directory exists' do
         before { FileUtils.mkdir_p(destination) }
 
@@ -101,7 +125,36 @@ module Omnibus
         end
       end
 
-      context 'with deeply nested paths and symlinks' do
+      context 'when target files are hard links' do
+        let(:source) do
+          source = File.join(tmp_path, 'source')
+          FileUtils.mkdir_p(source)
+
+          create_directory(source, 'bin')
+               create_file(source, 'bin', 'git')
+               FileUtils.ln("#{source}/bin/git", "#{source}/bin/git-tag")
+               FileUtils.ln("#{source}/bin/git", "#{source}/bin/git-write-tree")
+
+          source
+        end
+
+        it 'copies the first instance and links to that instance thereafter' do
+          FileUtils.mkdir_p("#{destination}/bin")
+
+          described_class.sync(source, destination)
+
+          expect("#{destination}/bin/git").to be_a_file
+          if windows?
+            expect("#{destination}/bin/git-tag").to be_a_file
+            expect("#{destination}/bin/git-write-tree").to be_a_file
+          else
+            expect("#{destination}/bin/git-tag").to be_a_hardlink
+            expect("#{destination}/bin/git-write-tree").to be_a_hardlink
+          end
+        end
+      end
+
+      context 'with deeply nested paths and symlinks', :not_supported_on_windows do
         let(:source) do
           source = File.join(tmp_path, 'source')
           FileUtils.mkdir_p(source)
@@ -125,10 +178,10 @@ module Omnibus
           create_directory(source, 'empty_directory')
 
           create_directory(source, 'links')
-                 create_file(source, 'links', 'home.html')
-                 FileUtils.ln_s("./home.html", "#{source}/links/index.html")
-                 FileUtils.ln_s("./home.html", "#{source}/links/default.html")
-                 FileUtils.ln_s("../source/bin/apt", "#{source}/links/apt")
+               create_file(source, 'links', 'home.html')
+               FileUtils.ln_s('./home.html', "#{source}/links/index.html")
+               FileUtils.ln_s('./home.html', "#{source}/links/default.html")
+               FileUtils.ln_s('../source/bin/apt', "#{source}/links/apt")
 
           FileUtils.ln_s('/foo/bar', "#{source}/root")
 

data/spec/functional/templating_spec.rb

@@ -9,8 +9,8 @@ module Omnibus
     subject { RandomClass.new }
 
     describe '#render_template' do
-      let(:source)      { "#{tmp_path}/source.erb" }
-      let(:destination) { "#{tmp_path}/final" }
+      let(:source)      { File.join(tmp_path, 'source.erb') }
+      let(:destination) { File.join(tmp_path, 'final') }
       let(:mode)        { 0644 }
       let(:variables)   { { name: 'Name' } }
       let(:contents) do
@@ -40,19 +40,18 @@ module Omnibus
 
         it 'renders adjacent, without the erb extension' do
           subject.render_template(source, options)
-          expect("#{tmp_path}/source").to be_a_file
+          expect(File.join(tmp_path, 'source')).to be_a_file
         end
       end
 
       context 'when a destination is given' do
-
         it 'renders at the destination' do
           subject.render_template(source, options)
           expect(destination).to be_a_file
         end
       end
 
-      context 'when a mode is given' do
+      context 'when a mode is given', :not_supported_on_windows do
         let(:mode) { 0755 }
 
         it 'renders the object with the mode' do
@@ -65,7 +64,19 @@ module Omnibus
         let(:contents) { "<%= not_a_real_variable %>" }
 
         it 'raise an exception' do
-          expect { subject.render_template(source, options) }.to raise_error
+          expect do
+            subject.render_template(source, options)
+          end.to raise_error(NameError)
+        end
+      end
+
+      context 'when no variables are present' do
+        let(:content)   { "static content" }
+        let(:variables) { {} }
+
+        it 'renders the template' do
+          subject.render_template(source, options)
+          expect(destination).to be_a_file
         end
       end
     end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'rspec'
 require 'rspec/its'
+require 'webmock/rspec'
 
 require 'cleanroom/rspec'
 
@@ -33,6 +34,9 @@ RSpec.configure do |config|
   require_relative 'support/ohai_helpers'
   config.include(Omnibus::RSpec::OhaiHelpers)
 
+  require_relative 'support/output_helpers'
+  config.include(Omnibus::RSpec::OutputHelpers)
+
   require_relative 'support/path_helpers'
   config.include(Omnibus::RSpec::PathHelpers)
 
@@ -44,6 +48,15 @@ RSpec.configure do |config|
 
   config.filter_run_excluding(windows_only: true) unless windows?
   config.filter_run_excluding(mac_only: true) unless mac?
+  config.filter_run_excluding(not_supported_on_windows: true) if windows?
+
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+    config.color = true
+  end
 
   config.before(:each) do
     # Suppress logging
@@ -51,6 +64,7 @@ RSpec.configure do |config|
 
     # Reset config
     Omnibus.reset!
+    Omnibus::Config.append_timestamp(false)
 
     # Clear the tmp_path on each run
     FileUtils.rm_rf(tmp_path)
@@ -58,6 +72,9 @@ RSpec.configure do |config|
 
     # Don't run Ohai - tests can still override this
     stub_ohai(platform: 'ubuntu', version: '12.04')
+
+    # Default to real HTTP requests
+    WebMock.allow_net_connect!
   end
 
   config.after(:each) do

data/spec/support/file_helpers.rb

@@ -28,6 +28,7 @@ module Omnibus
         path = File.join(*paths)
 
         FileUtils.mkdir_p(File.dirname(path))
+        FileUtils.rm(path) if File.exist?(path)
 
         if block
           File.open(path, 'wb') { |f| f.write(block.call) }
@@ -38,8 +39,17 @@ module Omnibus
         path
       end
 
-      def create_link(a, b)
-        FileUtils.ln_s(a, b)
+      def create_link(src, dest)
+        # Windows has no symlinks. Documentation seems to suggest that
+        # ln will create hard-links - so attempt to elicit the behavior
+        # we want using hard-links.  If your test happens to fail even
+        # with this, consider what semantics you actually wish to have
+        # on windows and refactor your test or code.
+        if windows?
+          FileUtils.ln(src, dest) unless File.exist?(dest)
+        else
+          FileUtils.ln_s(src, dest) unless File.exist?(dest)
+        end
       end
     end
   end

data/spec/support/git_helpers.rb

@@ -9,28 +9,16 @@ module Omnibus
         "file://#{fake_git_remote("git://github.com/omnibus/#{repo}.git", options)}/.git"
       end
 
-      def remote_git_repo(name, options = {})
-        path = File.join(remotes, name)
-        remote_url = "file://#{path}"
-
-        # Create a bogus software
-        FileUtils.mkdir_p(path)
-
+      def local_git_repo(name, options={})
+        path = git_scratch
         Dir.chdir(path) do
-          git %|init --bare|
-          git %|config core.sharedrepository 1|
-          git %|config receive.denyNonFastforwards true|
-          git %|config receive.denyCurrentBranch ignore|
-        end
-
-        Dir.chdir(git_scratch) do
           # Create a bogus configure file
           File.open('configure', 'w') { |f| f.write('echo "Done!"') }
 
           git %|init .|
           git %|add .|
           git %|commit -am "Initial commit for #{name}..."|
-          git %|remote add origin "#{remote_url}"|
+          git %|remote add origin "#{options[:remote]}"| if options[:remote]
           git %|push origin master|
 
           options[:annotated_tags].each do |tag|
@@ -38,7 +26,7 @@ module Omnibus
             git %|add tag|
             git %|commit -am "Create tag #{tag}"|
             git %|tag "#{tag}" -m "#{tag}"|
-            git %|push origin "#{tag}"|
+            git %|push origin "#{tag}"| if options[:remote]
           end if options[:annotated_tags]
 
           options[:tags].each do |tag|
@@ -46,7 +34,7 @@ module Omnibus
             git %|add tag|
             git %|commit -am "Create tag #{tag}"|
             git %|tag "#{tag}"|
-            git %|push origin "#{tag}"|
+            git %|push origin "#{tag}"| if options[:remote]
           end if options[:tags]
 
           options[:branches].each do |branch|
@@ -54,11 +42,28 @@ module Omnibus
             File.open('branch', 'w') { |f| f.write(branch) }
             git %|add branch|
             git %|commit -am "Create branch #{branch}"|
-            git %|push origin "#{branch}"|
+            git %|push origin "#{branch}"| if options[:remote]
             git %|checkout master|
           end if options[:branches]
         end
+        path
+      end
+
+      def remote_git_repo(name, options = {})
+        path = File.join(remotes, name)
+        remote_url = "file://#{path}"
+        options[:remote] = remote_url
+        # Create a bogus software
+        FileUtils.mkdir_p(path)
+
+        Dir.chdir(path) do
+          git %|init --bare|
+          git %|config core.sharedrepository 1|
+          git %|config receive.denyNonFastforwards true|
+          git %|config receive.denyCurrentBranch ignore|
+        end
 
+        local_git_repo(name, options)
         path
       end
 

data/spec/support/matchers.rb

@@ -14,6 +14,21 @@ RSpec::Matchers.define :be_a_file do
   end
 end
 
+# expect('/path/to/file').to have_content
+RSpec::Matchers.define :have_content do |content|
+  match do |actual|
+    IO.read(actual) == content
+  end
+end
+
+# expect('/path/to/file').to have_permissions
+RSpec::Matchers.define :have_permissions do |perm|
+  match do |actual|
+    m = sprintf('%o', File.stat(actual).mode)
+    m == perm 
+  end
+end
+
 # expect('/path/to/directory').to be_a_symlink
 RSpec::Matchers.define :be_a_symlink do
   match do |actual|
@@ -34,3 +49,10 @@ RSpec::Matchers.define :be_an_executable do
     File.executable?(actual)
   end
 end
+
+# expect('/path/to/file').to be_a_hardlink
+RSpec::Matchers.define :be_a_hardlink do |path|
+  match do |actual|
+    File.stat(actual).nlink > 2
+  end
+end

data/spec/support/output_helpers.rb

@@ -0,0 +1,29 @@
+module Omnibus
+  module RSpec
+    module OutputHelpers
+      #
+      # Capture stdout within this block.
+      #
+      def capture_stdout(&block)
+        old = $stdout
+        $stdout = fake = StringIO.new
+        yield
+        fake.string
+      ensure
+        $stdout = old
+      end
+
+      #
+      # Capture stderr within this block.
+      #
+      def capture_stderr(&block)
+        old = $stderr
+        $stderr = fake = StringIO.new
+        yield
+        fake.string
+      ensure
+        $stderr = old
+      end
+    end
+  end
+end

data/spec/unit/build_version_dsl_spec.rb

@@ -7,13 +7,14 @@ module Omnibus
 
     let(:version_string) { "1.0.0" }
     let(:description) { nil }
+    let(:today_string) { Time.now.utc.strftime(Omnibus::BuildVersion::TIMESTAMP_FORMAT) }
 
-    let(:zoo_version) { double("BuildVersion", semver: "5.5.5", custom: "7.7.7") }
+    let(:zoo_version) { double("BuildVersion", semver: "5.5.5", custom: "7.7.7", build_start_time: today_string) }
     let(:zoo_software) { double("software", name: 'zoo', project_dir: '/etc/zoo', version: "6.6.6") }
 
     describe "when given nil" do
       it "fails" do
-        expect { subject.build_version }.to raise_error
+        expect { subject.build_version }.to raise_error(RuntimeError)
       end
     end
 
@@ -23,6 +24,32 @@ module Omnibus
       end
     end
 
+    describe "when Config.append_timestamp is true" do
+      let(:description) do
+        proc do
+            source(:git, from_dependency: 'zoo')
+        end
+      end
+
+      before { Config.append_timestamp(true) }
+
+      it "appends a timestamp to a static (String) version" do
+        expect(subject_with_version.build_version).to eq("1.0.0+#{today_string}")
+      end
+
+      it "doesn't append timestamp to something that already looks like it has a timestamp" do
+        semver = "1.0.0+#{today_string}.git.222.694b062"
+        expect(described_class.new(semver).build_version).to eq("1.0.0+#{today_string}.git.222.694b062")
+      end
+
+      it "appends a timestamp to a DSL-built version" do
+        allow(BuildVersion).to receive(:new).and_return(BuildVersion.new)
+        allow(BuildVersion).to receive(:new).with("/etc/zoo").and_return(zoo_version)
+        subject_with_description.resolve(zoo_software)
+        expect(subject_with_description.build_version).to eq("5.5.5+#{today_string}")
+      end
+    end
+
     describe "when given a :git source" do
       describe "when given a software as source" do
         let(:description) do
@@ -101,7 +128,7 @@ module Omnibus
         end
 
         it "fails" do
-          expect { subject_with_description.build_version }.to raise_error
+          expect { subject_with_description.build_version }.to raise_error(RuntimeError)
         end
       end
     end
@@ -114,7 +141,7 @@ module Omnibus
       end
 
       it "fails" do
-        expect { subject_with_description.build_version }.to raise_error
+        expect { subject_with_description.build_version }.to raise_error(RuntimeError)
       end
     end
   end