omnibus 4.0.0.rc.2 → 4.0.0

data/spec/functional/fetchers/net_fetcher_spec.rb

@@ -93,6 +93,16 @@ module Omnibus
         subject.fetch
         expect(extracted).to be_a_directory
       end
+
+      context 'when the file is less than 10240 bytes' do
+        let(:source_url) { 'https://downloads.chef.io/packages-chef-io-public.key' }
+        let(:source_md5) { '369efc3a19b9118cdf51c7e87a34f266' }
+
+        it 'downloads the file' do
+          subject.fetch
+          expect(downloaded_file).to be_a_file
+        end
+      end
     end
 
     describe '#version_for_cache' do

data/spec/unit/omnibus_spec.rb

@@ -24,7 +24,7 @@ describe Omnibus do
       expect(subject.which('not_a_real_executable')).to be nil
     end
 
-    it 'retusnt the path when the file exists' do
+    it 'returns the path when the file exists' do
       ruby = Bundler.which('ruby')
       expect(subject.which(ruby)).to eq(ruby)
     end

data/spec/unit/packagers/bff_spec.rb

@@ -187,7 +187,7 @@ module Omnibus
             expect(subject.safe_base_package_name).to eq('pro-ject123.for-realz-2')
           end
 
-          expect(output).to include("The `name' compontent of BFF package names can only include")
+          expect(output).to include("The `name' component of BFF package names can only include")
         end
       end
     end

data/spec/unit/packagers/deb_spec.rb

@@ -260,16 +260,16 @@ module Omnibus
 
         it 'returns the value while logging a message' do
           output = capture_logging do
-            expect(subject.safe_base_package_name).to eq('Pro-ject123.for-realz-2')
+            expect(subject.safe_base_package_name).to eq('pro-ject123.for-realz-2')
           end
 
-          expect(output).to include("The `name' compontent of Debian package names can only include")
+          expect(output).to include("The `name' component of Debian package names can only include")
         end
       end
     end
 
     describe '#safe_build_iteration' do
-      it 'returns the build iternation' do
+      it 'returns the build iteration' do
         expect(subject.safe_build_iteration).to eq(project.build_iteration)
       end
     end
@@ -282,15 +282,27 @@ module Omnibus
         end
       end
 
+      context 'when the project build_version has dashes' do
+        before { project.build_version('1.2-rc.1') }
+
+        it 'returns the value while logging a message' do
+          output = capture_logging do
+            expect(subject.safe_version).to eq('1.2~rc.1')
+          end
+
+          expect(output).to include("Dashes hold special significance in the Debian package versions.")
+        end
+      end
+
       context 'when the project build_version has invalid characters' do
-        before { project.build_version("1.2$alpha.##__2") }
+        before { project.build_version("1.2$alpha.~##__2") }
 
         it 'returns the value while logging a message' do
           output = capture_logging do
-            expect(subject.safe_version).to eq('1.2-alpha.-2')
+            expect(subject.safe_version).to eq('1.2_alpha.~_2')
           end
 
-          expect(output).to include("The `version' compontent of Debian package names can only include")
+          expect(output).to include("The `version' component of Debian package names can only include")
         end
       end
     end

data/spec/unit/packagers/pkg_spec.rb

@@ -207,7 +207,7 @@ module Omnibus
             expect(subject.safe_base_package_name).to eq('project123forrealz2')
           end
 
-          expect(output).to include("The `name' compontent of Mac package names can only include")
+          expect(output).to include("The `name' component of Mac package names can only include")
         end
       end
     end
@@ -264,7 +264,7 @@ module Omnibus
             expect(subject.safe_version).to eq('1.2-alpha.-2')
           end
 
-          expect(output).to include("The `version' compontent of Mac package names can only include")
+          expect(output).to include("The `version' component of Mac package names can only include")
         end
       end
     end

data/spec/unit/packagers/rpm_spec.rb

@@ -217,6 +217,19 @@ module Omnibus
           expect(contents).to include("/file2")
         end
       end
+
+      context 'when leaf directories owned by the filesystem package are present' do
+        before do
+          create_file("#{staging_dir}/BUILD/opt")
+        end
+
+        it 'does not write them into the spec' do
+          subject.write_rpm_spec
+          contents = File.read(spec_file)
+
+          expect(contents).to_not include("/opt")
+        end
+      end
     end
 
     describe '#create_rpm_file' do
@@ -298,7 +311,7 @@ module Omnibus
             expect(subject.safe_base_package_name).to eq('pro-ject123.for-realz-2')
           end
 
-          expect(output).to include("The `name' compontent of RPM package names can only include")
+          expect(output).to include("The `name' component of RPM package names can only include")
         end
       end
     end
@@ -317,12 +330,24 @@ module Omnibus
         end
       end
 
+      context 'when the project build_version has dashes' do
+        before { project.build_version('1.2-rc.1') }
+
+        it 'returns the value while logging a message' do
+          output = capture_logging do
+            expect(subject.safe_version).to eq('1.2~rc.1')
+          end
+
+          expect(output).to include("Tildes hold special significance in the RPM package versions.")
+        end
+      end
+
       context 'when the project build_version has invalid characters' do
-        before { project.build_version("1.2-pre$alpha.##__2") }
+        before { project.build_version("1.2-pre_alpha.##__2") }
 
         it 'returns the value while logging a message' do
           output = capture_logging do
-            expect(subject.safe_version).to eq('1.2_pre$alpha.##__2')
+            expect(subject.safe_version).to eq('1.2~pre_alpha._2')
           end
 
           expect(output).to include("The `version' component of RPM package names can only include")

data/spec/unit/project_spec.rb

@@ -223,6 +223,14 @@ module Omnibus
         subject.override(:thing, version: '6.6.6')
         expect(subject.override(:thing)[:version]).to eq('6.6.6')
       end
+
+      it 'symbolizes #overrides' do
+        subject.override('thing', version: '6.6.6')
+        [:thing, 'thing'].each do |thing|
+          expect(subject.override(thing)).not_to be_nil
+        end
+        expect(subject.override(:thing)[:version]).to eq('6.6.6')
+      end
     end
 
     describe '#ohai' do

data/spec/unit/publishers/artifactory_publisher_spec.rb

@@ -47,6 +47,7 @@ module Omnibus
       before do
         allow(subject).to receive(:packages).and_return(packages)
         Config.artifactory_base_path('com/getchef')
+        Config.publish_retries(1)
       end
 
       it 'validates the package' do
@@ -64,6 +65,26 @@ module Omnibus
         subject.publish
       end
 
+      context 'when upload fails' do
+        before do
+          Config.publish_retries(3)
+
+          # This is really ugly but there is no easy way to stub a method to
+          # raise an exception a set number of times.
+          @times = 0
+          allow(artifact).to receive(:upload) do
+            @times += 1;
+            raise Artifactory::Error::HTTPError.new('status' => '409', 'message' => 'CONFLICT') unless @times > 1
+          end
+        end
+
+        it 'retries the upload ' do
+          output = capture_logging { subject.publish }
+          expect(output).to include('Retrying failed publish')
+        end
+
+      end
+
       context 'when an alternate platform and platform version are provided' do
         subject do
           described_class.new(path,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-sugar
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -334,6 +334,7 @@ files:
 - resources/pkg/distribution.xml.erb
 - resources/pkg/license.html.erb
 - resources/pkg/welcome.html.erb
+- resources/rpm/filesystem_list
 - resources/rpm/rpmmacros.erb
 - resources/rpm/signing.erb
 - resources/rpm/spec.erb
@@ -406,12 +407,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Omnibus is a framework for building self-installing, full-stack software