omnibus 5.5.0 → 5.6.0

data/spec/unit/compressors/null_spec.rb

@@ -7,13 +7,13 @@ module Omnibus
 
     subject { described_class.new(project) }
 
-    describe '#id' do
+    describe "#id" do
       it "is :dmg" do
         expect(subject.id).to eq(:null)
       end
     end
 
-    describe '#run!' do
+    describe "#run!" do
       it "does nothing" do
         expect(subject).to_not receive(:instance_eval)
         subject.run!

data/spec/unit/compressors/tgz_spec.rb

@@ -36,13 +36,13 @@ module Omnibus
       allow(subject).to receive(:shellout!)
     end
 
-    describe '#package_name' do
+    describe "#package_name" do
       it "returns the name of the packager" do
         expect(subject.package_name).to eq("project-1.2.3-2.pkg.tar.gz")
       end
     end
 
-    describe '#write_tgz' do
+    describe "#write_tgz" do
       before do
         File.open("#{staging_dir}/project-1.2.3-2.pkg", "wb") do |f|
           f.write " " * 1_000_000

data/spec/unit/config_spec.rb

@@ -45,8 +45,9 @@ module Omnibus
     include_examples "a configurable", :fetcher_read_timeout, 60
     include_examples "a configurable", :fetcher_retries, 5
     include_examples "a configurable", :fatal_licensing_warnings, false
+    include_examples "a configurable", :fips_mode, false
 
-    describe '#workers' do
+    describe "#workers" do
       context "when the Ohai data is not present" do
         before do
           stub_ohai(platform: "ubuntu", version: "12.04") do |data|

data/spec/unit/digestable_spec.rb

@@ -7,14 +7,14 @@ module Omnibus
 
     subject { Class.new { include Digestable }.new }
 
-    describe '#digest' do
+    describe "#digest" do
       it "reads the IO in chunks" do
         expect(File).to receive(:open).with(path).and_yield(io)
         expect(subject.digest(path)).to eq("d41d8cd98f00b204e9800998ecf8427e")
       end
     end
 
-    describe '#digest_directory' do
+    describe "#digest_directory" do
       let(:path)    { "/path/to/dir" }
       let(:glob)    { "#{path}/**/*" }
       let(:subdir)  { "/path/to/dir/subdir" }

data/spec/unit/fetchers/git_fetcher_spec.rb

@@ -16,7 +16,7 @@ module Omnibus
 
     subject { described_class.new(manifest_entry, project_dir, build_dir) }
 
-    describe '#fetch_required?' do
+    describe "#fetch_required?" do
 
       context "when the repository is not cloned" do
         before { allow(subject).to receive(:cloned?).and_return(false) }
@@ -47,7 +47,7 @@ module Omnibus
       end
     end
 
-    describe '#version_guid' do
+    describe "#version_guid" do
       let(:revision) { "abcd1234" }
 
       before do
@@ -59,7 +59,7 @@ module Omnibus
       end
     end
 
-    describe '#clean' do
+    describe "#clean" do
       before do
         allow(subject).to receive(:git)
         allow(subject).to receive(:resolved_version).and_return("12341235")
@@ -80,7 +80,7 @@ module Omnibus
       end
     end
 
-    describe '#fetch' do
+    describe "#fetch" do
       before do
         allow(subject).to receive(:create_required_directories)
       end
@@ -118,7 +118,7 @@ module Omnibus
       end
     end
 
-    describe '#version_for_cache' do
+    describe "#version_for_cache" do
       it "returns the shasum of the commit that we expect to be at" do
         expect(subject.version_for_cache).to eq("revision:123abcd1234")
       end

data/spec/unit/fetchers/net_fetcher_spec.rb

@@ -25,7 +25,7 @@ module Omnibus
 
     subject { described_class.new(manifest_entry, project_dir, build_dir) }
 
-    describe '#fetch_required?' do
+    describe "#fetch_required?" do
       context "when file is not downloaded" do
         before { allow(File).to receive(:exist?).and_return(false) }
 
@@ -61,7 +61,7 @@ module Omnibus
       end
     end
 
-    describe '#version_guid' do
+    describe "#version_guid" do
       context "source with md5" do
         it "returns the shasum" do
           expect(subject.version_guid).to eq("md5:abcd1234")
@@ -99,7 +99,7 @@ module Omnibus
       end
     end
 
-    describe '#clean' do
+    describe "#clean" do
       before do
         allow(FileUtils).to receive(:rm_rf)
         allow(subject).to receive(:deploy)
@@ -138,7 +138,7 @@ module Omnibus
       end
     end
 
-    describe '#version_for_cache' do
+    describe "#version_for_cache" do
       context "source with md5" do
         it "returns the download URL and md5" do
           expect(subject.version_for_cache).to eq("download_url:https://get.example.com/file.tar.gz|md5:abcd1234")
@@ -176,6 +176,46 @@ module Omnibus
       end
     end
 
+    describe "#download_url" do
+      context "s3 cache enabled" do
+        before do
+          Config.use_s3_caching(true)
+          Config.s3_access_key("ABCD1234")
+          Config.s3_secret_key("EFGH5678")
+          Config.s3_bucket("mybucket")
+
+          # clear cache
+          S3Cache.remove_instance_variable(:@s3_client) if S3Cache.instance_variable_defined?(:@s3_client)
+        end
+
+        it "returns the source s3 generated url" do
+          expect(subject.send(:download_url)).to eq("https://mybucket.s3.amazonaws.com/file-1.2.3-abcd1234")
+        end
+
+        context "custom endpoint" do
+          before { Config.s3_endpoint("http://example.com") }
+
+          it "returns the url using custom s3 endpoint" do
+            expect(subject.send(:download_url)).to eq("http://mybucket.example.com/file-1.2.3-abcd1234")
+          end
+        end
+
+        context "s3 transfer acceleration" do
+          before { Config.s3_accelerate(true) }
+
+          it "returns the url using s3 accelerate endpoint" do
+            expect(subject.send(:download_url)).to eq("https://mybucket.s3-accelerate.amazonaws.com/file-1.2.3-abcd1234")
+          end
+        end
+      end
+
+      context "s3 cache disabled" do
+        it "returns the source url" do
+          expect(subject.send(:download_url)).to eq("https://get.example.com/file.tar.gz")
+        end
+      end
+    end
+
     describe "downloading the file" do
 
       let(:expected_open_opts) do
@@ -274,7 +314,7 @@ module Omnibus
       end
     end
 
-    describe '#deploy' do
+    describe "#deploy" do
       before do
         described_class.send(:public, :deploy)
       end
@@ -322,7 +362,7 @@ module Omnibus
       end
     end
 
-    describe '#extract' do
+    describe "#extract" do
 
       context "on Windows" do
         let(:root_prefix) { "C:" }

data/spec/unit/fetchers/path_fetcher_spec.rb

@@ -16,7 +16,7 @@ module Omnibus
 
     subject { described_class.new(manifest_entry, project_dir, build_dir) }
 
-    describe '#fetch_required?' do
+    describe "#fetch_required?" do
       context "when the SHAs match" do
         before do
           allow(subject).to receive(:target_shasum).and_return("abcd1234")
@@ -40,19 +40,19 @@ module Omnibus
       end
     end
 
-    describe '#version_guid' do
+    describe "#version_guid" do
       it "returns the path" do
         expect(subject.version_guid).to eq("path:#{source_path}")
       end
     end
 
-    describe '#clean' do
+    describe "#clean" do
       it "returns true" do
         expect(subject.clean).to be_truthy
       end
     end
 
-    describe '#fetch' do
+    describe "#fetch" do
       before do
         allow(subject).to receive(:create_required_directories)
         allow(FileSyncer).to receive(:sync)
@@ -64,7 +64,7 @@ module Omnibus
       end
     end
 
-    describe '#version_for_cache' do
+    describe "#version_for_cache" do
       let(:shasum) { "abcd1234" }
 
       before do

data/spec/unit/file_syncer_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+require "omnibus/file_syncer"
+
+module Omnibus
+  describe FileSyncer do
+    let(:fixture_dir) { "C:\\test" }
+
+    describe "#glob", :windows_only do
+
+      [ "/", "\\", "\\\\" ].each do |sep|
+        it "should correctly clean the path with #{sep}" do
+          pattern = fixture_dir + sep + "postinstall"
+          expect(Dir).to receive(:glob).with("C:/test/postinstall", File::FNM_DOTMATCH).and_return(["C:/test/postinstall"])
+          FileSyncer.glob(pattern)
+        end
+      end
+    end
+  end
+end

data/spec/unit/git_cache_spec.rb

@@ -52,13 +52,15 @@ module Omnibus
       described_class.new(zlib)
     end
 
-    describe '#cache_path' do
+    let(:git_flags) { %Q{-c core.autocrlf=false -c core.ignorecase=false --git-dir="#{cache_path}" --work-tree="#{install_dir}"} }
+
+    describe "#cache_path" do
       it "returns the install path appended to the install_cache path" do
         expect(ipc.cache_path).to eq(cache_path)
       end
     end
 
-    describe '#tag' do
+    describe "#tag" do
       it "returns the correct tag" do
         expect(ipc.tag).to eql("zlib-24a8ec71da04059dcf7ed3c6e8e0fd9d155476abe4b5156d1f13c42e85478c2b-#{cache_serial_number}")
       end
@@ -74,7 +76,7 @@ module Omnibus
       end
     end
 
-    describe '#create_cache_path' do
+    describe "#create_cache_path" do
       it "runs git init if the cache path does not exist" do
         allow(File).to receive(:directory?)
           .with(ipc.cache_path)
@@ -85,7 +87,11 @@ module Omnibus
         expect(FileUtils).to receive(:mkdir_p)
           .with(File.dirname(ipc.cache_path))
         expect(ipc).to receive(:shellout!)
-          .with("git -c core.autocrlf=false --git-dir=#{cache_path} --work-tree=#{install_dir} init -q")
+          .with("git #{git_flags} init -q")
+        expect(ipc).to receive(:shellout!)
+          .with("git #{git_flags} config --local user.name \"Omnibus Git Cache\"")
+        expect(ipc).to receive(:shellout!)
+          .with("git #{git_flags} config --local user.email \"omnibus@localhost\"")
         ipc.create_cache_path
       end
 
@@ -101,7 +107,7 @@ module Omnibus
       end
     end
 
-    describe '#incremental' do
+    describe "#incremental" do
       before(:each) do
         allow(ipc).to receive(:shellout!)
         allow(ipc).to receive(:create_cache_path)
@@ -115,24 +121,24 @@ module Omnibus
       it "adds all the changes to git removing git directories" do
         expect(ipc).to receive(:remove_git_dirs)
         expect(ipc).to receive(:shellout!)
-          .with("git -c core.autocrlf=false --git-dir=#{cache_path} --work-tree=#{install_dir} add -A -f")
+          .with("git #{git_flags} add -A -f")
         ipc.incremental
       end
 
       it "commits the backup for the software" do
         expect(ipc).to receive(:shellout!)
-          .with(%Q{git -c core.autocrlf=false --git-dir=#{cache_path} --work-tree=#{install_dir} commit -q -m "Backup of #{ipc.tag}"})
+          .with(%Q{git #{git_flags} commit -q -m "Backup of #{ipc.tag}"})
         ipc.incremental
       end
 
       it "tags the software backup" do
         expect(ipc).to receive(:shellout!)
-          .with(%Q{git -c core.autocrlf=false --git-dir=#{cache_path} --work-tree=#{install_dir} tag -f "#{ipc.tag}"})
+          .with(%Q{git #{git_flags} tag -f "#{ipc.tag}"})
         ipc.incremental
       end
     end
 
-    describe '#remove_git_dirs' do
+    describe "#remove_git_dirs" do
       let(:git_files) { ["git/HEAD", "git/description", "git/hooks", "git/info", "git/objects", "git/refs" ] }
       it "removes bare git directories" do
         allow(Dir).to receive(:glob).and_return(["git/config"])
@@ -155,7 +161,7 @@ module Omnibus
       end
     end
 
-    describe '#restore' do
+    describe "#restore" do
       let(:git_tag_output) { "#{ipc.tag}\n" }
 
       let(:tag_cmd) do
@@ -167,10 +173,10 @@ module Omnibus
 
       before(:each) do
         allow(ipc).to receive(:shellout!)
-          .with(%Q{git -c core.autocrlf=false --git-dir=#{cache_path} --work-tree=#{install_dir} tag -l "#{ipc.tag}"})
+          .with(%Q{git #{git_flags} tag -l "#{ipc.tag}"})
           .and_return(tag_cmd)
         allow(ipc).to receive(:shellout!)
-          .with(%Q{git -c core.autocrlf=false --git-dir=#{cache_path} --work-tree=#{install_dir} checkout -f "#{ipc.tag}"})
+          .with(%Q{git #{git_flags} tag -f restore_here "#{ipc.tag}"})
         allow(ipc).to receive(:create_cache_path)
       end
 
@@ -179,26 +185,74 @@ module Omnibus
         ipc.restore
       end
 
-      it "checks for a tag with the software and version, and if it finds it, checks it out" do
+      it "checks for a tag with the software and version, and if it finds it, marks it as restoration point" do
         expect(ipc).to receive(:shellout!)
-          .with(%Q{git -c core.autocrlf=false --git-dir=#{cache_path} --work-tree=#{install_dir} tag -l "#{ipc.tag}"})
+          .with(%Q{git #{git_flags} tag -l "#{ipc.tag}"})
           .and_return(tag_cmd)
         expect(ipc).to receive(:shellout!)
-          .with(%Q{git -c core.autocrlf=false --git-dir=#{cache_path} --work-tree=#{install_dir} checkout -f "#{ipc.tag}"})
+          .with(%Q{git #{git_flags} tag -f restore_here "#{ipc.tag}"})
         ipc.restore
       end
 
       describe "if the tag does not exist" do
         let(:git_tag_output) { "\n" }
+        let(:restore_tag_cmd) do
+          cmd_double = double(Mixlib::ShellOut)
+          allow(cmd_double).to receive(:stdout).and_return(git_restore_tag_output)
+          allow(cmd_double).to receive(:error!).and_return(cmd_double)
+          cmd_double
+        end
 
-        it "does nothing" do
-          expect(ipc).to receive(:shellout!)
-            .with(%Q{git -c core.autocrlf=false --git-dir=#{cache_path} --work-tree=#{install_dir} tag -l "#{ipc.tag}"})
-            .and_return(tag_cmd)
-          expect(ipc).to_not receive(:shellout!)
-            .with(%Q{git -c core.autocrlf=false --git-dir=#{cache_path} --work-tree=#{install_dir} checkout -f "#{ipc.tag}"})
-          ipc.restore
+        describe "if the restore marker tag exists" do
+          let(:git_restore_tag_output) { "restore_here\n" }
+
+          it "checks out the last save restoration point and deletes the marker tag" do
+            expect(ipc).to receive(:shellout!)
+              .with(%Q{git #{git_flags} tag -l "restore_here"})
+              .and_return(restore_tag_cmd)
+            expect(ipc).to receive(:shellout!)
+              .with(%Q{git #{git_flags} tag -l "#{ipc.tag}"})
+              .and_return(tag_cmd)
+            expect(ipc).to receive(:shellout!)
+              .with(%Q{git #{git_flags} checkout -f restore_here})
+            expect(ipc).to receive(:shellout!)
+              .with(%Q{git #{git_flags} tag -d restore_here})
+            ipc.restore
+          end
         end
+
+        describe "if the restore marker tag does not exist" do
+          let(:git_restore_tag_output) { "\n" }
+
+          it "does nothing" do
+            expect(ipc).to receive(:shellout!)
+              .with(%Q{git #{git_flags} tag -l "restore_here"})
+              .and_return(restore_tag_cmd)
+            expect(ipc).to receive(:shellout!)
+              .with(%Q{git #{git_flags} tag -l "#{ipc.tag}"})
+              .and_return(tag_cmd)
+            ipc.restore
+          end
+        end
+      end
+    end
+
+    describe "#git_cmd" do
+      let(:terrible_install_dir) { %q{/opt/why  please don't do this} }
+
+      before(:each) do
+        allow(project).to receive(:install_dir)
+          .and_return(terrible_install_dir)
+        allow(ipc).to receive(:shellout!)
+          .with(%Q{git #{git_flags} version})
+          .and_return("git version 2.11.0")
+      end
+
+      it "doesn't mangle an #install_dir with spaces" do
+        expect(ipc.send(:install_dir)).to eq(terrible_install_dir)
+        expect(ipc).to receive(:shellout!)
+          .with(%Q{git #{git_flags} version})
+        ipc.send(:git_cmd, "version")
       end
     end
   end

data/spec/unit/health_check_spec.rb

@@ -139,7 +139,7 @@ module Omnibus
         )
       end
 
-      let(:regexp) { ".*(\\.[ch]|\\.e*rb|\\.gemspec|\\.gitignore|\\.h*h|\\.java|\\.js|\\.json|\\.lock|\\.log|\\.lua|\\.md|\\.mkd|\\.out|\\.pl|\\.pm|\\.png|\\.py[oc]*|\\.r*html|\\.rdoc|\\.ri|\\.sh|\\.sql|\\.toml|\\.ttf|\\.txt|\\.xml|\\.yml|Gemfile|LICENSE|README|Rakefile|VERSION)$|.*\\/share\\/doc\\/.*|.*\\/share\\/postgresql\\/.*|.*\\/share\\/terminfo\\/.*|.*\\/terminfo\\/.*" }
+      let(:regexp) { ".*(\\.TXT|\\.[ch]|\\.[ch]pp|\\.[eh]rl|\\.app|\\.appup|\\.bat|\\.beam|\\.cc|\\.cmake|\\.conf|\\.css|\\.e*rb|\\.feature|\\.gemspec|\\.gif|\\.gitignore|\\.gitkeep|\\.h*h|\\.jar|\\.java|\\.jpg|\\.js|\\.jsm|\\.json|\\.lock|\\.log|\\.lua|\\.md|\\.mkd|\\.npmignore|\\.out|\\.packlist|\\.perl|\\.pl|\\.pm|\\.png|\\.pod|\\.properties|\\.py[oc]*|\\.r*html|\\.rake|\\.rdoc|\\.ri|\\.rst|\\.scss|\\.sh|\\.sql|\\.svg|\\.toml|\\.ttf|\\.txt|\\.xml|\\.yml|Gemfile|LICENSE|Makefile|README|Rakefile|VERSION|license)$|.*\\/build_info\\/.*|.*\\/licenses\\/.*|.*\\/LICENSES\\/.*|.*\\/man\\/.*|.*\\/share\\/doc\\/.*|.*\\/share\\/info\\/.*|.*\\/share\\/postgresql\\/.*|.*\\/share\\/terminfo\\/.*|.*\\/share\\/timezone\\/.*|.*\\/terminfo\\/.*" }
 
       it "raises an exception when there are external dependencies" do
         allow(subject).to receive(:shellout)