omnibus 6.0.25 → 7.0.12

data/spec/functional/fetchers/file_fetcher_spec.rb

@@ -13,10 +13,10 @@ module Omnibus
 
     let(:manifest_entry) do
       double(Omnibus::ManifestEntry,
-             name: "pathelogical",
-             locked_version: nil,
-             described_version: nil,
-             locked_source: source)
+        name: "pathelogical",
+        locked_version: nil,
+        described_version: nil,
+        locked_source: source)
     end
 
     subject { described_class.new(manifest_entry, project_dir, build_dir) }

data/spec/functional/fetchers/git_fetcher_spec.rb

@@ -110,10 +110,10 @@ module Omnibus
       let(:remote)   { remote_git_repo("zlib", annotated_tags: [version]) }
       let(:manifest_entry) do
         double(ManifestEntry,
-               name: "software",
-               locked_version: "efde208366abd0f91419d8a54b45e3f6e0540105",
-               described_version: version,
-               locked_source: source)
+          name: "software",
+          locked_version: "efde208366abd0f91419d8a54b45e3f6e0540105",
+          described_version: version,
+          locked_source: source)
       end
 
       subject { described_class.new(manifest_entry, project_dir, build_dir) }

data/spec/functional/fetchers/net_fetcher_spec.rb

@@ -4,8 +4,7 @@ module Omnibus
   module RSpec
     module OhaiHelpers
       # Turn off the mandatory Ohai helper.
-      def stub_ohai(options = {}, &block)
-      end
+      def stub_ohai(options = {}, &block); end
     end
   end
 
@@ -29,10 +28,10 @@ module Omnibus
 
     let(:manifest_entry) do
       double(ManifestEntry,
-             name: "software",
-             locked_version: "1.2.8",
-             described_version: "1.2.8",
-             locked_source: source)
+        name: "software",
+        locked_version: "1.2.8",
+        described_version: "1.2.8",
+        locked_source: source)
     end
 
     subject { described_class.new(manifest_entry, project_dir, build_dir) }

data/spec/functional/fetchers/path_fetcher_spec.rb

@@ -12,10 +12,10 @@ module Omnibus
 
     let(:manifest_entry) do
       double(Omnibus::ManifestEntry,
-             name: "pathelogical",
-             locked_version: nil,
-             described_version: nil,
-             locked_source: source)
+        name: "pathelogical",
+        locked_version: nil,
+        described_version: nil,
+        locked_source: source)
     end
 
     before do

data/spec/functional/file_syncer_spec.rb

@@ -56,6 +56,14 @@ module Omnibus
         FileUtils.touch(File.join(source, ".dot_folder", "file_f"))
 
         FileUtils.touch(File.join(source, ".file_g"))
+
+        FileUtils.mkdir_p(File.join(source, "nested", "deep", "folder"))
+        FileUtils.touch(File.join(source, "nested", "deep", "folder", "file_h"))
+        FileUtils.touch(File.join(source, "nested", "deep", "folder", "file_i"))
+
+        FileUtils.mkdir_p(File.join(source, "nested", "deep", "deep", "folder"))
+        FileUtils.touch(File.join(source, "nested", "deep", "deep", "folder", "file_j"))
+        FileUtils.touch(File.join(source, "nested", "deep", "deep", "folder", "file_k"))
         source
       end
 
@@ -233,6 +241,40 @@ module Omnibus
           expect("#{destination}/.file_g").to be_a_file
         end
 
+        it "does not copy files and folders that match the wildcard pattern" do
+          described_class.sync(source, destination, exclude: "nested/*/folder")
+
+          expect("#{destination}/file_a").to be_a_file
+          expect("#{destination}/file_b").to be_a_file
+          expect("#{destination}/file_c").to be_a_file
+          expect("#{destination}/folder/file_d").to be_a_file
+          expect("#{destination}/folder/file_e").to be_a_file
+          expect("#{destination}/.dot_folder").to be_a_directory
+          expect("#{destination}/.dot_folder/file_f").to be_a_file
+          expect("#{destination}/.file_g").to be_a_file
+          expect("#{destination}/nested/deep/folder/file_h").to_not be_a_file
+          expect("#{destination}/nested/deep/folder/file_i").to_not be_a_file
+          expect("#{destination}/nested/deep/deep/folder/file_j").to be_a_file
+          expect("#{destination}/nested/deep/deep/folder/file_k").to be_a_file
+        end
+
+        it "does not copy files and folders that match the super wildcard pattern" do
+          described_class.sync(source, destination, exclude: "nested/**/folder")
+
+          expect("#{destination}/file_a").to be_a_file
+          expect("#{destination}/file_b").to be_a_file
+          expect("#{destination}/file_c").to be_a_file
+          expect("#{destination}/folder/file_d").to be_a_file
+          expect("#{destination}/folder/file_e").to be_a_file
+          expect("#{destination}/.dot_folder").to be_a_directory
+          expect("#{destination}/.dot_folder/file_f").to be_a_file
+          expect("#{destination}/.file_g").to be_a_file
+          expect("#{destination}/nested/deep/folder/file_h").to_not be_a_file
+          expect("#{destination}/nested/deep/folder/file_i").to_not be_a_file
+          expect("#{destination}/nested/deep/deep/folder/file_j").to_not be_a_file
+          expect("#{destination}/nested/deep/deep/folder/file_k").to_not be_a_file
+        end
+
         it "removes existing files and folders in destination" do
           FileUtils.mkdir_p("#{destination}/existing_folder")
           FileUtils.touch("#{destination}/existing_file")

data/spec/functional/licensing_spec.rb

@@ -37,14 +37,14 @@ module Omnibus
         expect(project_license).to match /This product bundles private_code 1.7.2,\nwhich is available under a "Unspecified"/
         expect(project_license).to match /This product bundles snoopy 1.0.0,\nwhich is available under a "GPL v2"/
         expect(project_license).not_to match /preparation/
-        expect(project_license).to match /LICENSES\/snoopy-artistic.html/
-        expect(project_license).to match /LICENSES\/snoopy-NOTICE/
+        expect(project_license).to match %r{LICENSES/snoopy-artistic.html}
+        expect(project_license).to match %r{LICENSES/snoopy-NOTICE}
         if zlib_version_override
           expect(project_license).to match /This product bundles zlib 1.8.0,\nwhich is available under a "Apache-2.0"/
-          expect(project_license).to match /LICENSES\/zlib-APACHE/
+          expect(project_license).to match %r{LICENSES/zlib-APACHE}
         else
           expect(project_license).to match /This product bundles zlib 1.7.2,\nwhich is available under a "Zlib"/
-          expect(project_license).to match /LICENSES\/zlib-LICENSE/
+          expect(project_license).to match %r{LICENSES/zlib-LICENSE}
         end
       end
 
@@ -263,7 +263,7 @@ module Omnibus
       it "should log a warning for the missing file" do
         output = capture_logging { create_licenses }
         expect(output).to match(/Retrying failed download/)
-        expect(output).to match(/Can not download license file 'https:\/\/downloads.chef.io\/LICENSE' for software 'problematic'./)
+        expect(output).to match(%r{Can not download license file 'https://downloads.chef.io/LICENSE' for software 'problematic'.})
       end
     end
 

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+Encoding.default_external = Encoding::UTF_8
+
 require "rspec"
 require "rspec/its"
 require "rspec/json_expectations"
@@ -16,6 +18,10 @@ def mac?
 end
 
 RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.max_formatted_output_length = 1000
+  end
+
   # Custom matchers and shared examples
   require_relative "support/examples"
   require_relative "support/matchers"

data/spec/support/examples.rb

@@ -27,8 +27,7 @@ RSpec.shared_examples "a software" do |name = "chefdk"|
       install_dir: install_dir,
       project_dir: project_dir,
       source:      source,
-      overridden?: false
-    )
+      overridden?: false)
   end
 
   before do
@@ -56,12 +55,12 @@ RSpec.shared_examples "a software" do |name = "chefdk"|
     FileUtils.mkdir_p(embedded_bin_dir)
 
     allow(software).to receive(:with_embedded_path).and_return(
-      "PATH" => "#{bin_dir}:#{embedded_bin_dir}:#{ENV['PATH']}"
+      "PATH" => "#{bin_dir}:#{embedded_bin_dir}:#{ENV["PATH"]}"
     )
 
     allow(software).to receive(:embedded_bin) do |binary|
       p = File.join(embedded_bin_dir, binary)
-      p.gsub!(/\//, '\\') if windows?
+      p.gsub!(%r{/}, '\\') if windows?
       p
     end
   end

data/spec/unit/builder_spec.rb

@@ -6,8 +6,7 @@ module Omnibus
       double(Software,
         name: "chefdk",
         install_dir: project_dir,
-        project_dir: project_dir
-      )
+        project_dir: project_dir)
     end
 
     let(:project_dir) { on_windows ? "C:/opscode/chefdk" : "/opt/chefdk" }
@@ -238,7 +237,7 @@ module Omnibus
         it "appends platform host to the options" do
           expect(subject).to receive(:command)
             .with("./configure --build=x86_64-w64-mingw32 --prefix=#{project_dir}/embedded", in_msys_bash: true)
-          subject.configure()
+          subject.configure
         end
       end
 
@@ -254,7 +253,7 @@ module Omnibus
         it "appends platform host to the options" do
           expect(subject).to receive(:command)
             .with("./configure --build=i686-w64-mingw32 --prefix=#{project_dir}/embedded", in_msys_bash: true)
-          subject.configure()
+          subject.configure
         end
       end
 
@@ -305,7 +304,8 @@ module Omnibus
           .with("config/patches", "good_patch")
           .and_return(
             [ ["#{project_dir}/patch_location1/good_patch", "#{project_dir}/patch_location2/good_patch"],
-              "#{project_dir}/patch_location2/good_patch" ])
+              "#{project_dir}/patch_location2/good_patch" ]
+          )
       end
 
       it "is a DSL method" do
@@ -355,10 +355,10 @@ module Omnibus
 
       let(:software) do
         double(Software,
-               name: "chefdk",
-               install_dir: tmp_dir,
-               project_dir: tmp_dir,
-               overridden?: false)
+          name: "chefdk",
+          install_dir: tmp_dir,
+          project_dir: tmp_dir,
+          overridden?: false)
       end
 
       let(:before_build_shasum) do

data/spec/unit/changelogprinter_spec.rb

@@ -16,16 +16,18 @@ module Omnibus
 
       let(:changelog) do
         double(ChangeLog,
-                               changelog_entries: %w{entry1 entry2},
-                               authors: %w{alice bob}) end
+          changelog_entries: %w{entry1 entry2},
+          authors: %w{alice bob})
+      end
       let(:git_changelog) do
         double(ChangeLog,
-                                   changelog_entries:
-                                   %w{sub-entry1 sub-entry2}) end
+          changelog_entries:
+          %w{sub-entry1 sub-entry2})
+      end
       let(:now) { double(Time) }
       let(:emptydiff) { EmptyManifestDiff.new }
       let(:old_manifest) do
-        m = Manifest.new()
+        m = Manifest.new
         m.add("updated-comp", manifest_entry_for("updated-comp", "v9", "v9"))
         m.add("updated-comp-2", manifest_entry_for("updated-comp-2", "someref0", "someref0", :git))
         m.add("removed-comp", manifest_entry_for("removed-comp", "v9", "v9"))
@@ -33,7 +35,7 @@ module Omnibus
         m
       end
       let(:new_manifest) do
-        m = Manifest.new()
+        m = Manifest.new
         m.add("updated-comp", manifest_entry_for("updated-comp", "v10", "v10"))
         m.add("updated-comp-2", manifest_entry_for("updated-comp-2", "someotherref", "someotherref", :git))
         m.add("added-comp", manifest_entry_for("added-comp", "v100", "v100"))

data/spec/unit/compressor_spec.rb

@@ -8,13 +8,13 @@ module Omnibus
 
         context "when :dmg is activated" do
           it "prefers dmg" do
-            expect(described_class.for_current_system([:tgz, :dmg])).to eq(Compressor::DMG)
+            expect(described_class.for_current_system(%i{tgz dmg})).to eq(Compressor::DMG)
           end
         end
 
         context "when :dmg is not activated" do
           it "prefers tgz" do
-            expect(described_class.for_current_system([:tgz, :foo])).to eq(Compressor::TGZ)
+            expect(described_class.for_current_system(%i{tgz foo})).to eq(Compressor::TGZ)
           end
         end
 
@@ -30,7 +30,7 @@ module Omnibus
 
         context "when :tgz activated" do
           it "prefers tgz" do
-            expect(described_class.for_current_system([:tgz, :foo])).to eq(Compressor::TGZ)
+            expect(described_class.for_current_system(%i{tgz foo})).to eq(Compressor::TGZ)
           end
         end
 

data/spec/unit/compressors/dmg_spec.rb

@@ -90,7 +90,8 @@ module Omnibus
               -fs HFS+ \\
               -fsargs "-c c=64,a=16,e=16" \\
               -size 512000k \\
-              "#{staging_dir}/project-writable.dmg"
+              "#{staging_dir}/project-writable.dmg" \\
+              -puppetstrings
           EOH
 
         subject.create_writable_dmg
@@ -114,6 +115,7 @@ module Omnibus
         expect(subject).to receive(:shellout!)
           .with <<-EOH.gsub(/^ {12}/, "")
             hdiutil attach \\
+              -puppetstrings \\
               -readwrite \\
               -noverify \\
               -noautoopen \\
@@ -215,20 +217,57 @@ module Omnibus
           .with <<-EOH.gsub(/^ {12}/, "")
             chmod -Rf go-w "/Volumes/Project One"
             sync
-            hdiutil detach "#{device}"
+            hdiutil unmount "#{device}"
+            # Give some time to the system so unmount dmg
+            sleep 5
+            hdiutil detach "#{device}" &&\
             hdiutil convert \\
               "#{staging_dir}/project-writable.dmg" \\
               -format UDZO \\
               -imagekey \\
               zlib-level=9 \\
-              -o "#{package_dir}/project-1.2.3-2.dmg"
-            rm -rf "#{staging_dir}/project-writable.dmg"
+              -o "#{package_dir}/project-1.2.3-2.dmg" \\
+              -puppetstrings
           EOH
 
         subject.compress_dmg
       end
     end
 
+    describe "#verify_dmg" do
+      it "logs a message" do
+        output = capture_logging { subject.verify_dmg }
+        expect(output).to include("Verifying dmg")
+      end
+
+      it "runs the command" do
+        expect(subject).to receive(:shellout!)
+          .with <<-EOH.gsub(/^ {12}/, "")
+            hdiutil verify \\
+              "#{package_dir}/project-1.2.3-2.dmg" \\
+              -puppetstrings
+          EOH
+
+        subject.verify_dmg
+      end
+    end
+
+    describe "#remove_writable_dmg" do
+      it "logs a message" do
+        output = capture_logging { subject.remove_writable_dmg }
+        expect(output).to include("Removing writable dmg")
+      end
+
+      it "runs the command" do
+        expect(subject).to receive(:shellout!)
+          .with <<-EOH.gsub(/^ {12}/, "")
+            rm -rf "#{staging_dir}/project-writable.dmg"
+          EOH
+
+        subject.remove_writable_dmg
+      end
+    end
+
     describe "#set_dmg_icon" do
       it "logs a message" do
         output = capture_logging { subject.set_dmg_icon }

data/spec/unit/fetchers/net_fetcher_spec.rb

@@ -11,10 +11,10 @@ module Omnibus
 
     let(:manifest_entry) do
       double(Omnibus::ManifestEntry,
-             name: "file",
-             locked_version: "1.2.3",
-             described_version: "1.2.3",
-             locked_source: source)
+        name: "file",
+        locked_version: "1.2.3",
+        described_version: "1.2.3",
+        locked_source: source)
     end
 
     let(:cache_dir) { "/cache" }
@@ -331,11 +331,10 @@ module Omnibus
       context "when the file is a .#{extension}" do
         let(:manifest_entry) do
           double(Omnibus::ManifestEntry,
-                 name: "file",
-                 locked_version: "1.2.3",
-                 described_version: "1.2.3",
-                 locked_source: { url: "https://get.example.com/file.#{extension}", md5: "abcd1234" }.merge(source_options)
-                )
+            name: "file",
+            locked_version: "1.2.3",
+            described_version: "1.2.3",
+            locked_source: { url: "https://get.example.com/file.#{extension}", md5: "abcd1234" }.merge(source_options))
         end
 
         subject { described_class.new(manifest_entry, project_dir, build_dir) }
@@ -361,10 +360,10 @@ module Omnibus
       context "when the downloaded file is a folder" do
         let(:manifest_entry) do
           double(Omnibus::ManifestEntry,
-                 name: "file",
-                 locked_version: "1.2.3",
-                 described_version: "1.2.3",
-                 locked_source: { url: "https://get.example.com/folder", md5: "abcd1234" })
+            name: "file",
+            locked_version: "1.2.3",
+            described_version: "1.2.3",
+            locked_source: { url: "https://get.example.com/folder", md5: "abcd1234" })
         end
 
         subject { described_class.new(manifest_entry, project_dir, build_dir) }
@@ -382,10 +381,10 @@ module Omnibus
       context "when the downloaded file is a regular file" do
         let(:manifest_entry) do
           double(Omnibus::ManifestEntry,
-                 name: "file",
-                 locked_version: "1.2.3",
-                 described_version: "1.2.3",
-                 locked_source: { url: "https://get.example.com/file", md5: "abcd1234" })
+            name: "file",
+            locked_version: "1.2.3",
+            described_version: "1.2.3",
+            locked_source: { url: "https://get.example.com/file", md5: "abcd1234" })
         end
 
         subject { described_class.new(manifest_entry, project_dir, build_dir) }

data/spec/unit/generator_spec.rb

@@ -36,6 +36,7 @@ module Omnibus
           omnibus-name/config/projects/name.rb
           omnibus-name/config/software
           omnibus-name/config/software/name-zlib.rb
+          omnibus-name/config/software/preparation.rb
           omnibus-name/omnibus.rb
           omnibus-name/package-scripts
           omnibus-name/package-scripts/name