omnibus 5.4.0 → 5.5.0

data/spec/unit/publisher_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Omnibus
   # Used in the tests
@@ -7,26 +7,26 @@ module Omnibus
   describe Publisher do
     it { should be_a_kind_of(Logging) }
 
-    describe '.publish' do
+    describe ".publish" do
       let(:publisher) { double(described_class) }
 
       before { allow(described_class).to receive(:new).and_return(publisher) }
 
-      it 'creates a new instance of the class' do
+      it "creates a new instance of the class" do
         expect(described_class).to receive(:new).once
         expect(publisher).to receive(:publish).once
-        described_class.publish('/path/to/*.deb')
+        described_class.publish("/path/to/*.deb")
       end
     end
 
-    let(:pattern) { '/path/to/files/*.deb' }
+    let(:pattern) { "/path/to/files/*.deb" }
     let(:options) { { some_option: true } }
 
     subject { described_class.new(pattern, options) }
 
     describe '#packages' do
-      let(:a) { '/path/to/files/a.deb' }
-      let(:b) { '/path/to/files/b.deb' }
+      let(:a) { "/path/to/files/a.deb" }
+      let(:b) { "/path/to/files/b.deb" }
       let(:glob) { [a, b] }
 
       before do
@@ -35,104 +35,104 @@ module Omnibus
           .and_return(glob)
       end
 
-      it 'returns an array' do
+      it "returns an array" do
         expect(subject.packages).to be_an(Array)
       end
 
-      it 'returns an array of Package objects' do
+      it "returns an array of Package objects" do
         expect(subject.packages.first).to be_a(Package)
       end
 
-      context 'a platform mappings matrix is provided' do
+      context "a platform mappings matrix is provided" do
         let(:options) do
           {
             platform_mappings: {
-              'ubuntu-12.04' => [
-                'ubuntu-12.04',
-                'ubuntu-14.04',
+              "ubuntu-12.04" => [
+                "ubuntu-12.04",
+                "ubuntu-14.04",
               ],
             },
           }
         end
 
         let(:package) do
-          Package.new('/path/to/files/chef.deb')
+          Package.new("/path/to/files/chef.deb")
         end
 
         let(:metadata) do
           Metadata.new(package,
-            name: 'chef',
-            friendly_name: 'Chef',
-            homepage: 'https://www.getchef.com',
-            version: '11.0.6',
+            name: "chef",
+            friendly_name: "Chef",
+            homepage: "https://www.getchef.com",
+            version: "11.0.6",
             iteration: 1,
-            basename: 'chef.deb',
-            license: 'Apache-2.0',
-            platform: 'ubuntu',
-            platform_version: '12.04',
-            arch: 'x86_64',
-            sha1: 'SHA1',
-            md5: 'ABCDEF123456',
+            basename: "chef.deb",
+            license: "Apache-2.0",
+            platform: "ubuntu",
+            platform_version: "12.04",
+            arch: "x86_64",
+            sha1: "SHA1",
+            md5: "ABCDEF123456",
             version_manifest: {
               manifest_format: 1,
-              build_version: '11.0.6',
-              build_git_revision: '2e763ac957b308ba95cef256c2491a5a55a163cc',
+              build_version: "11.0.6",
+              build_git_revision: "2e763ac957b308ba95cef256c2491a5a55a163cc",
               software: {
                 zlib: {
                   locked_source: {
-                    md5: '44d667c142d7cda120332623eab69f40',
-                    url: 'http://iweb.dl.sourceforge.net/project/libpng/zlib/1.2.8/zlib-1.2.8.tar.gz',
+                    md5: "44d667c142d7cda120332623eab69f40",
+                    url: "http://iweb.dl.sourceforge.net/project/libpng/zlib/1.2.8/zlib-1.2.8.tar.gz",
                   },
-                  locked_version: '1.2.8',
-                  source_type: 'url',
-                  described_version: '1.2.8',
-                  license: 'Zlib',
+                  locked_version: "1.2.8",
+                  source_type: "url",
+                  described_version: "1.2.8",
+                  license: "Zlib",
                 },
                 openssl: {
                   locked_source: {
-                    md5: '562986f6937aabc7c11a6d376d8a0d26',
-                    extract: 'lax_tar',
-                    url: 'http://iweb.dl.sourceforge.net/project/libpng/zlib/1.2.8/zlib-1.2.8.tar.gz',
+                    md5: "562986f6937aabc7c11a6d376d8a0d26",
+                    extract: "lax_tar",
+                    url: "http://iweb.dl.sourceforge.net/project/libpng/zlib/1.2.8/zlib-1.2.8.tar.gz",
                   },
-                  locked_version: '1.0.1s',
-                  source_type: 'url',
-                  described_version: '1.0.1s',
-                  license: 'OpenSSL',
+                  locked_version: "1.0.1s",
+                  source_type: "url",
+                  described_version: "1.0.1s",
+                  license: "OpenSSL",
                 },
                 ruby: {
                   locked_source: {
-                    md5: '091b62f0a9796a3c55de2a228a0e6ef3',
-                    url: 'https://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.8.tar.gz',
+                    md5: "091b62f0a9796a3c55de2a228a0e6ef3",
+                    url: "https://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.8.tar.gz",
                   },
-                  locked_version: '2.1.8',
-                  source_type: 'url',
-                  described_version: '2.1.8',
-                  license: 'BSD-2-Clause',
+                  locked_version: "2.1.8",
+                  source_type: "url",
+                  described_version: "2.1.8",
+                  license: "BSD-2-Clause",
                 },
                 ohai: {
                   locked_source: {
-                    git: 'https://github.com/opscode/ohai.git'
+                    git: "https://github.com/opscode/ohai.git",
                   },
-                  locked_version: 'fec0959aa5da5ce7ba0e07740dbc08546a8f53f0',
-                  source_type: 'git',
-                  described_version: 'master',
-                  license: 'Apache-2.0',
+                  locked_version: "fec0959aa5da5ce7ba0e07740dbc08546a8f53f0",
+                  source_type: "git",
+                  described_version: "master",
+                  license: "Apache-2.0",
                 },
                 chef: {
                   locked_source: {
-                    path: '/home/jenkins/workspace/chef-build/architecture/x86_64/platform/ubuntu-10.04/project/chef/role/builder/omnibus/files/../..',
+                    path: "/home/jenkins/workspace/chef-build/architecture/x86_64/platform/ubuntu-10.04/project/chef/role/builder/omnibus/files/../..",
                     options: {
                       exclude: [
-                        'omnibus/vendor',
+                        "omnibus/vendor",
                       ],
                     },
                   },
-                  locked_version: 'local_source',
-                  source_type: 'path',
-                  described_version: 'local_source',
-                  license: 'Apache-2.0',
+                  locked_version: "local_source",
+                  source_type: "path",
+                  described_version: "local_source",
+                  license: "Apache-2.0",
                 },
-              }
+              },
             }
           )
         end
@@ -142,51 +142,51 @@ module Omnibus
           allow(FileSyncer).to receive_message_chain(:glob, :map).and_return([package])
         end
 
-        it 'creates a package for each publish platform' do
+        it "creates a package for each publish platform" do
           expect(subject.packages.size).to eq(2)
           expect(
             subject.packages.map do |p|
               p.metadata[:platform_version]
             end
-          ).to include('12.04', '14.04')
+          ).to include("12.04", "14.04")
         end
 
-        context 'the build platform does not exist' do
+        context "the build platform does not exist" do
           let(:options) do
             {
               platform_mappings: {
-                'ubuntu-10.04' => [
-                  'ubuntu-12.04',
-                  'ubuntu-14.04',
+                "ubuntu-10.04" => [
+                  "ubuntu-12.04",
+                  "ubuntu-14.04",
                 ],
               },
             }
           end
 
-          it 'prints a warning' do
+          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. Publishing will be skipped for: ubuntu-12.04, ubuntu-14.04")
           end
         end
       end
 
-      context 'there are no packages to publish' do
+      context "there are no packages to publish" do
         before do
           allow(FileSyncer).to receive(:glob)
             .with(pattern)
             .and_return([])
         end
 
-        it 'prints a warning' do
+        it "prints a warning" do
           output = capture_logging { subject.packages }
-          expect(output).to include('No packages found, skipping publish')
+          expect(output).to include("No packages found, skipping publish")
         end
       end
 
     end
 
     describe '#publish' do
-      it 'is an abstract method' do
+      it "is an abstract method" do
         expect { subject.publish }.to raise_error(NotImplementedError)
       end
     end

data/spec/unit/publishers/artifactory_publisher_spec.rb

@@ -1,103 +1,103 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Omnibus
   describe ArtifactoryPublisher do
-    let(:path) { '/path/to/files/*.deb' }
-    let(:repository) { 'REPO' }
+    let(:path) { "/path/to/files/*.deb" }
+    let(:repository) { "REPO" }
 
     let(:package) do
       double(Package,
-        path: '/path/to/files/chef.deb',
-        name: 'chef.deb',
-        content: 'BINARY',
-        validate!: true,
+        path: "/path/to/files/chef.deb",
+        name: "chef.deb",
+        content: "BINARY",
+        validate!: true
       )
     end
 
     let(:metadata) do
       Metadata.new(package,
-        name: 'chef',
-        friendly_name: 'Chef',
-        homepage: 'https://www.getchef.com',
-        version: '11.0.6',
+        name: "chef",
+        friendly_name: "Chef",
+        homepage: "https://www.getchef.com",
+        version: "11.0.6",
         iteration: 1,
-        license:  'Apache-2.0',
-        basename: 'chef.deb',
-        platform: 'ubuntu',
-        platform_version: '14.04',
-        arch: 'x86_64',
-        sha1: 'SHA1',
-        sha256: 'SHA256',
-        sha512: 'SHA512',
-        md5: 'ABCDEF123456',
+        license:  "Apache-2.0",
+        basename: "chef.deb",
+        platform: "ubuntu",
+        platform_version: "14.04",
+        arch: "x86_64",
+        sha1: "SHA1",
+        sha256: "SHA256",
+        sha512: "SHA512",
+        md5: "ABCDEF123456",
         version_manifest: {
           manifest_format: 1,
-          build_version: '11.0.6',
-          build_git_revision: '2e763ac957b308ba95cef256c2491a5a55a163cc',
+          build_version: "11.0.6",
+          build_git_revision: "2e763ac957b308ba95cef256c2491a5a55a163cc",
           software: {
             zlib: {
               locked_source: {
-                md5: '44d667c142d7cda120332623eab69f40',
-                url: 'http://iweb.dl.sourceforge.net/project/libpng/zlib/1.2.8/zlib-1.2.8.tar.gz',
+                md5: "44d667c142d7cda120332623eab69f40",
+                url: "http://iweb.dl.sourceforge.net/project/libpng/zlib/1.2.8/zlib-1.2.8.tar.gz",
               },
-              locked_version: '1.2.8',
-              source_type: 'url',
-              described_version: '1.2.8',
-              license: 'Zlib',
+              locked_version: "1.2.8",
+              source_type: "url",
+              described_version: "1.2.8",
+              license: "Zlib",
             },
             openssl: {
               locked_source: {
-                md5: '562986f6937aabc7c11a6d376d8a0d26',
-                extract: 'lax_tar',
-                url: 'http://iweb.dl.sourceforge.net/project/libpng/zlib/1.2.8/zlib-1.2.8.tar.gz',
+                md5: "562986f6937aabc7c11a6d376d8a0d26",
+                extract: "lax_tar",
+                url: "http://iweb.dl.sourceforge.net/project/libpng/zlib/1.2.8/zlib-1.2.8.tar.gz",
               },
-              locked_version: '1.0.1s',
-              source_type: 'url',
-              described_version: '1.0.1s',
-              license: 'OpenSSL',
+              locked_version: "1.0.1s",
+              source_type: "url",
+              described_version: "1.0.1s",
+              license: "OpenSSL",
             },
             ruby: {
               locked_source: {
-                md5: '091b62f0a9796a3c55de2a228a0e6ef3',
-                url: 'https://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.8.tar.gz',
+                md5: "091b62f0a9796a3c55de2a228a0e6ef3",
+                url: "https://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.8.tar.gz",
               },
-              locked_version: '2.1.8',
-              source_type: 'url',
-              described_version: '2.1.8',
-              license: 'BSD-2-Clause',
+              locked_version: "2.1.8",
+              source_type: "url",
+              described_version: "2.1.8",
+              license: "BSD-2-Clause",
             },
             ohai: {
               locked_source: {
-                git: 'https://github.com/opscode/ohai.git'
+                git: "https://github.com/opscode/ohai.git",
               },
-              locked_version: 'fec0959aa5da5ce7ba0e07740dbc08546a8f53f0',
-              source_type: 'git',
-              described_version: 'master',
-              license: 'Apache-2.0',
+              locked_version: "fec0959aa5da5ce7ba0e07740dbc08546a8f53f0",
+              source_type: "git",
+              described_version: "master",
+              license: "Apache-2.0",
             },
             chef: {
               locked_source: {
-                path: '/home/jenkins/workspace/chef-build/architecture/x86_64/platform/ubuntu-10.04/project/chef/role/builder/omnibus/files/../..',
+                path: "/home/jenkins/workspace/chef-build/architecture/x86_64/platform/ubuntu-10.04/project/chef/role/builder/omnibus/files/../..",
                 options: {
                   exclude: [
-                    'omnibus/vendor',
+                    "omnibus/vendor",
                   ],
                 },
               },
-              locked_version: 'local_source',
-              source_type: 'path',
-              described_version: 'local_source',
-              license: 'Apache-2.0',
+              locked_version: "local_source",
+              source_type: "path",
+              described_version: "local_source",
+              license: "Apache-2.0",
             },
-          }
+          },
         }
       )
     end
 
     let(:packages) { [package] }
-    let(:client)   { double('Artifactory::Client') }
-    let(:artifact) { double('Artifactory::Resource::Artifact', upload: nil) }
-    let(:build)    { double('Artifactory::Resource::Build') }
+    let(:client)   { double("Artifactory::Client") }
+    let(:artifact) { double("Artifactory::Resource::Artifact", upload: nil) }
+    let(:build)    { double("Artifactory::Resource::Build") }
 
     let(:package_properties) do
       {
@@ -116,7 +116,7 @@ module Omnibus
     end
     let(:metadata_json_properites) do
       # we don't attache checksum properties to the *.metadata.json
-      package_properties.delete_if { |k,v| k =~ /md5|sha/ }
+      package_properties.delete_if { |k, v| k =~ /md5|sha/ }
     end
     let(:build_values) do
       {
@@ -125,7 +125,7 @@ module Omnibus
       }
     end
 
-    let(:options) { {repository: repository} }
+    let(:options) { { repository: repository } }
 
     before do
       allow(subject).to receive(:client).and_return(client)
@@ -140,20 +140,20 @@ module Omnibus
     describe '#publish' do
       before do
         allow(subject).to receive(:packages).and_return(packages)
-        Config.artifactory_base_path('com/getchef')
+        Config.artifactory_base_path("com/getchef")
         Config.publish_retries(1)
       end
 
-      it 'validates the package' do
+      it "validates the package" do
         expect(package).to receive(:validate!).once
         subject.publish
       end
 
-      it 'uploads the package' do
+      it "uploads the package" do
         expect(artifact).to receive(:upload).with(
           repository,
-          'com/getchef/chef/11.0.6/ubuntu/14.04/chef.deb',
-          hash_including(package_properties),
+          "com/getchef/chef/11.0.6/ubuntu/14.04/chef.deb",
+          hash_including(package_properties)
         ).once
 
         subject.publish
@@ -162,28 +162,28 @@ module Omnibus
       it "uploads the package's associated *.metadata.json" do
         expect(artifact).to receive(:upload).with(
           repository,
-          'com/getchef/chef/11.0.6/ubuntu/14.04/chef.deb.metadata.json',
-          hash_including(metadata_json_properites),
+          "com/getchef/chef/11.0.6/ubuntu/14.04/chef.deb.metadata.json",
+          hash_including(metadata_json_properites)
         ).once
 
         subject.publish
       end
 
-      it 'it creates a build record for all packages' do
+      it "it creates a build record for all packages" do
         expect(build).to receive(:save).once
         subject.publish
       end
 
-      context 'when no packages exist' do
+      context "when no packages exist" do
         let(:packages) { [] }
 
-        it 'does nothing' do
+        it "does nothing" do
           expect(artifact).to_not receive(:upload)
           expect(build).to_not    receive(:save)
         end
       end
 
-      context 'when upload fails' do
+      context "when upload fails" do
         before do
           Config.publish_retries(3)
 
@@ -192,39 +192,39 @@ module Omnibus
           @times = 0
           allow(artifact).to receive(:upload) do
             @times += 1;
-            raise Artifactory::Error::HTTPError.new('status' => '409', 'message' => 'CONFLICT') unless @times > 1
+            raise Artifactory::Error::HTTPError.new("status" => "409", "message" => "CONFLICT") unless @times > 1
           end
         end
 
-        it 'retries the upload ' do
+        it "retries the upload " do
           output = capture_logging { subject.publish }
-          expect(output).to include('Retrying failed publish')
+          expect(output).to include("Retrying failed publish")
         end
 
       end
 
-      context 'when a block is given' do
-        it 'yields the package to the block' do
+      context "when a block is given" do
+        it "yields the package to the block" do
           block = ->(package) { package.do_something! }
           expect(package).to receive(:do_something!).once
           subject.publish(&block)
         end
       end
 
-      context 'when the :build_record option is false' do
+      context "when the :build_record option is false" do
         subject { described_class.new(path, repository: repository, build_record: false) }
 
-        it 'does not create a build record at the end of publishing' do
+        it "does not create a build record at the end of publishing" do
           expect(build).to_not receive(:save)
           subject.publish
         end
       end
 
-      context 'additional properties are provided' do
+      context "additional properties are provided" do
         let(:delivery_props) do
           {
-            'delivery.change' => '4dbf38de-3e82-439f-8090-c5f3e11aeba6',
-            'delivery.sha' => 'ec1cb62616350176fc6fd9b1dc4ad3153caa0791',
+            "delivery.change" => "4dbf38de-3e82-439f-8090-c5f3e11aeba6",
+            "delivery.sha" => "ec1cb62616350176fc6fd9b1dc4ad3153caa0791",
           }
         end
         let(:options) do
@@ -234,11 +234,11 @@ module Omnibus
           }
         end
 
-        it 'uploads the package with the provided properties' do
+        it "uploads the package with the provided properties" do
           expect(artifact).to receive(:upload).with(
             repository,
-            'com/getchef/chef/11.0.6/ubuntu/14.04/chef.deb',
-            hash_including(package_properties.merge(delivery_props)),
+            "com/getchef/chef/11.0.6/ubuntu/14.04/chef.deb",
+            hash_including(package_properties.merge(delivery_props))
           ).once
 
           subject.publish
@@ -247,11 +247,11 @@ module Omnibus
     end
 
     describe '#metadata_properties_for' do
-      it 'returns the transformed package metadata values' do
+      it "returns the transformed package metadata values" do
         expect(subject.send(:metadata_properties_for, package)).to include(package_properties.merge(build_values))
       end
 
-      context ':build_record is false' do
+      context ":build_record is false" do
         let(:options) do
           {
             build_record: false,
@@ -259,7 +259,7 @@ module Omnibus
           }
         end
 
-        it 'does not include `build.*` values' do
+        it "does not include `build.*` values" do
           expect(subject.send(:metadata_properties_for, package)).to include(package_properties)
           expect(subject.send(:metadata_properties_for, package)).to_not include(build_values)
         end