omnibus 6.0.30 → 6.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed65ad83fa1ddd7ebc9be5254d38054d3de93cc8ba6f681538a2d3bd25356b46
-  data.tar.gz: c848e02cedec959d16e647abb94fe08fb708550c1325d49a0ad3af6557181e1e
+  metadata.gz: 5094211ab9d21742c4b0df1f711cd73b8f7ac9c275886fa4411a7ac8683fb287
+  data.tar.gz: 370b50282eb2a4d9ab9cfae046dce0856957e3ee672f7138df19f4e52e59b0f4
 SHA512:
-  metadata.gz: d967c3cd4a784d1839cae80a2aa00efd06fe8f6a757ad372f4d0839f332c4c3e65d43d199dc8136fc5827791e543a82dfc2bb2ad7dade918647286b0ee153853
-  data.tar.gz: d5a38d81451a488fde804af1d19f8dc8515b4d3b087d12b7eb305b528e8943d88e5e6e5255940c771a78b795d028b1a406d1cef0b68a006665228b6bfdb0383a
+  metadata.gz: 763997a408440c9194de3596088d6936d9c86a4ffdc67506058d82518580d4dcd25d314885fa592472dbc3796ff958ddbae957e9708456e8c0c138422ac726f7
+  data.tar.gz: ad013568c56d30105bdac1715fff11632e24ef91542ab8658e5f6fd0d710b5fc6ddd734210cf8e0e8927d579bd2441cdc55fcc6c387ec921acb8914b87ce192a

data/README.md

@@ -4,6 +4,14 @@
 [![Build Status](https://badge.buildkite.com/446fd6049a9a5eeab50112aba117d3b7670ec085acb91f78dd.svg?branch=master)](https://buildkite.com/chef-oss/chef-omnibus-master-verify)
 [![AppVeyor Build Status](http://img.shields.io/appveyor/ci/chef/omnibus.svg?label=AppVeyor)][appveyor]
 
+**Umbrella Project**: [Chef Foundation](https://github.com/chef/chef-oss-practices/blob/master/projects/chef-foundation.md)
+
+**Project State**: [Active](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md#active)
+
+**Issues [Response Time Maximum](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md)**: 14 days
+
+**Pull Request [Response Time Maximum](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md)**: 14 days
+
 Easily create full-stack installers for your project across a variety of platforms.
 
 Seth Chisamore and Christopher Maier of CHEF gave an introductory talk on Omnibus at ChefConf 2013, entitled **Eat the Whole Bowl: Building a Full-Stack Installer with Omnibus**:

data/lib/omnibus/cli.rb

@@ -91,7 +91,7 @@ module Omnibus
       if @options[:output_manifest]
         FileUtils.mkdir_p("pkg")
         File.open(::File.join("pkg", "version-manifest.json"), "w") do |f|
-          f.write(FFI_Yajl::Encoder.encode(project.built_manifest.to_hash))
+          f.write(FFI_Yajl::Encoder.encode(project.built_manifest.to_hash, pretty: true))
         end
       end
     end

data/lib/omnibus/cli/publish.rb

@@ -26,10 +26,10 @@ module Omnibus
     #
     # @example JSON
     #   {
-    #     "ubuntu-10.04": [
-    #       "ubuntu-10.04",
-    #       "ubuntu-12.04",
-    #       "ubuntu-14.04"
+    #     "ubuntu-10.04-x86_64": [
+    #       "ubuntu-10.04-x86_64",
+    #       "ubuntu-12.04-x86_64",
+    #       "ubuntu-14.04-x86_64"
     #     ]
     #   }
     #
@@ -99,7 +99,7 @@ module Omnibus
       end
 
       klass.publish(pattern, options) do |package|
-        say("Published '#{package.name}' for #{package.metadata[:platform]}-#{package.metadata[:platform_version]}", :green)
+        say("Published '#{package.name}' for #{package.metadata[:platform]}-#{package.metadata[:platform_version]}-#{package.metadata[:arch]}", :green)
       end
     end
   end

data/lib/omnibus/compressors/dmg.rb

@@ -43,6 +43,8 @@ module Omnibus
       prettify_dmg
       compress_dmg
       set_dmg_icon
+      verify_dmg
+      remove_writable_dmg
     end
 
     #
@@ -143,7 +145,8 @@ module Omnibus
           -fs HFS+ \\
           -fsargs "-c c=64,a=16,e=16" \\
           -size 512000k \\
-          "#{writable_dmg}"
+          "#{writable_dmg}" \\
+          -puppetstrings
       EOH
     end
 
@@ -159,6 +162,7 @@ module Omnibus
 
         cmd = shellout! <<-EOH.gsub(/^ {10}/, "")
           hdiutil attach \\
+            -puppetstrings \\
             -readwrite \\
             -noverify \\
             -noautoopen \\
@@ -254,13 +258,48 @@ module Omnibus
         shellout! <<-EOH.gsub(/^ {10}/, "")
           chmod -Rf go-w "/Volumes/#{volume_name}"
           sync
-          hdiutil detach "#{@device}"
+          hdiutil unmount "#{@device}"
+          # Give some time to the system so unmount dmg
+          sleep 5
+          hdiutil detach "#{@device}" &&  \
           hdiutil convert \\
             "#{writable_dmg}" \\
             -format UDZO \\
             -imagekey \\
             zlib-level=9 \\
-            -o "#{package_path}"
+            -o "#{package_path}" \\
+            -puppetstrings
+        EOH
+      end
+    end
+
+    #
+    # Verify checksum on created dmg.
+    #
+    # @return [void]
+    #
+    def verify_dmg
+      log.info(log_key) { "Verifying dmg" }
+
+      Dir.chdir(staging_dir) do
+        shellout! <<-EOH.gsub(/^ {10}/, "")
+          hdiutil verify \\
+            "#{package_path}" \\
+            -puppetstrings
+        EOH
+      end
+    end
+
+    #
+    # Remove writable dmg.
+    #
+    # @return [void]
+    #
+    def remove_writable_dmg
+      log.info(log_key) { "Removing writable dmg" }
+
+      Dir.chdir(staging_dir) do
+        shellout! <<-EOH.gsub(/^ {10}/, "")
           rm -rf "#{writable_dmg}"
         EOH
       end

data/lib/omnibus/file_syncer.rb

@@ -56,13 +56,13 @@ module Omnibus
     #
     def all_files_under(source, options = {})
       excludes = Array(options[:exclude]).map do |exclude|
-        [exclude, "#{exclude}/*"]
+        [exclude, "#{exclude}/**"]
       end.flatten
 
       source_files = glob(File.join(source, "**/*"))
       source_files = source_files.reject do |source_file|
         basename = relative_path_for(source_file, source)
-        excludes.any? { |exclude| File.fnmatch?(exclude, basename, File::FNM_DOTMATCH) }
+        excludes.any? { |exclude| File.fnmatch?(exclude, basename, File::FNM_DOTMATCH | File::FNM_PATHNAME) }
       end
     end
 

data/lib/omnibus/publisher.rb

@@ -44,10 +44,10 @@ module Omnibus
     #   mapping of build to publish platform(s)
     # @example
     #   {
-    #     'ubuntu-10.04' => [
-    #       'ubuntu-10.04',
-    #       'ubuntu-12.04',
-    #       'ubuntu-14.04',
+    #     'ubuntu-10.04-x86_64' => [
+    #       'ubuntu-10.04-x86_64',
+    #       'ubuntu-12.04-x86_64',
+    #       'ubuntu-14.04-x86_64',
     #     ],
     #   }
     #
@@ -75,33 +75,35 @@ module Omnibus
         if @options[:platform_mappings]
           # the platform map is a simple hash with publish to build platform mappings
           @options[:platform_mappings].each_pair do |build_platform, publish_platforms|
-            # Splits `ubuntu-12.04` into `ubuntu` and `12.04`
-            build_platform, build_platform_version = build_platform.rpartition("-") - %w{ - }
+            # Splits `ubuntu-12.04-x86_64` into `ubuntu`, `12.04` and `x86_64`
+            build_platform, build_platform_version, build_architecture = build_platform.split("-")
 
             # locate the package for the build platform
             packages = build_packages.select do |p|
               p.metadata[:platform] == build_platform &&
-                p.metadata[:platform_version] == build_platform_version
+                p.metadata[:platform_version] == build_platform_version &&
+                p.metadata[:arch] == build_architecture
             end
 
             if packages.empty?
               log.warn(log_key) do
-                "Could not locate a package for build platform #{build_platform}-#{build_platform_version}. " \
+                "Could not locate a package for build platform #{build_platform}-#{build_platform_version}-#{build_architecture}. " \
                 "Publishing will be skipped for: #{publish_platforms.join(', ')}"
               end
             end
 
             publish_platforms.each do |publish_platform|
-              publish_platform, publish_platform_version = publish_platform.rpartition("-") - %w{ - }
+              publish_platform, publish_platform_version, publish_architecture = publish_platform.split("-")
 
               packages.each do |p|
                 # create a copy of our package before mucking with its metadata
                 publish_package  = p.dup
                 publish_metadata = p.metadata.dup.to_hash
 
-                # override the platform and platform version in the metadata
+                # override the platform, platform version and architecture in the metadata
                 publish_metadata[:platform]         = publish_platform
                 publish_metadata[:platform_version] = publish_platform_version
+                publish_metadata[:arch]             = publish_architecture
 
                 # Set the updated metadata on the package object
                 publish_package.metadata = Metadata.new(publish_package, publish_metadata)

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = "6.0.30".freeze
+  VERSION = "6.1.4".freeze
 end

data/omnibus.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "aws-sdk-s3",       "~> 1"
-  gem.add_dependency "chef-sugar",       ">= 3.3"
-  gem.add_dependency "cleanroom",        "~> 1.0"
+  gem.add_dependency "chef-sugar-ng",    ">= 3.3"
+  gem.add_dependency "chef-cleanroom",   "~> 1.0"
   gem.add_dependency "ffi-yajl",         "~> 2.2"
   gem.add_dependency "mixlib-shellout",  ">= 2.0", "< 4.0"
   gem.add_dependency "ohai",             ">= 13", "< 16"

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/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/publisher_spec.rb

@@ -47,9 +47,9 @@ module Omnibus
         let(:options) do
           {
             platform_mappings: {
-              "ubuntu-12.04" => [
-                "ubuntu-12.04",
-                "ubuntu-14.04",
+              "ubuntu-12.04-x86_64" => [
+                "ubuntu-12.04-x86_64",
+                "ubuntu-14.04-x86_64",
               ],
             },
           }
@@ -155,9 +155,9 @@ module Omnibus
           let(:options) do
             {
               platform_mappings: {
-                "ubuntu-10.04" => [
-                  "ubuntu-12.04",
-                  "ubuntu-14.04",
+                "ubuntu-10.04-x86_64" => [
+                  "ubuntu-12.04-x86_64",
+                  "ubuntu-14.04-x86_64",
                 ],
               },
             }
@@ -165,7 +165,7 @@ module Omnibus
 
           it "prints a warning" do
             output = capture_logging { subject.packages }
-            expect(output).to include("Could not locate a package for build platform ubuntu-10.04. Publishing will be skipped for: ubuntu-12.04, ubuntu-14.04")
+            expect(output).to include("Could not locate a package for build platform ubuntu-10.04-x86_64. Publishing will be skipped for: ubuntu-12.04-x86_64, ubuntu-14.04-x86_64")
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 6.0.30
+  version: 6.1.4
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2019-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: chef-sugar
+  name: chef-sugar-ng
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: cleanroom
+  name: chef-cleanroom
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"