omnibus 2.0.1 → 2.0.2

data/.travis.yml

@@ -5,6 +5,8 @@ bundler_args: --jobs 7 --without docs
 
 branches:
   only:
+    - 2.0-stable
+    - 3.0-stable
     - master
 
 script: bundle exec rake travis:ci

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Omnibus Ruby CHANGELOG
 ======================
 
+v2.0.2 (September 16, 2014)
+-----------------------
+- Ensure default package user and group are `root`.
+- Fix S3 bucket retrieval.
+- Add metadata to support modern publishers.
+- Downgrade FPM to ~> 0.4 
+
 v2.0.1 (March 18, 2014)
 -----------------------
 - Fix the name of the `pkg` artifact created on OSX

data/lib/omnibus/artifact.rb

@@ -97,7 +97,9 @@ module Omnibus
         'version' => build_version,
         'basename' => File.basename(path),
         'md5' => md5,
+        'sha1' => sha1,
         'sha256' => sha256,
+        'sha512' => sha512,
       }
     end
 
@@ -129,11 +131,21 @@ module Omnibus
       @md5 ||= digest(Digest::MD5)
     end
 
-    # @return [String] hex encoded SHA2-256 of the package
+    # @return [String] hex encoded SHA1 of the package
+    def sha1
+      @sha1 ||= digest(Digest::SHA1)
+    end
+
+    # @return [String] hex encoded SHA-256 of the package
     def sha256
       @sha256 ||= digest(Digest::SHA256)
     end
 
+    # @return [String] hex encoded SHA-512 of the package
+    def sha512
+      @sha512 ||= digest(Digest::SHA512)
+    end
+
     private
 
     def digest(digest_class)

data/lib/omnibus/project.rb

@@ -249,13 +249,14 @@ module Omnibus
       @mac_pkg_identifier
     end
 
-    # Set or retrieve the {deb/rpm/solaris}-user fpm argument.
+    # Set or retrieve the +{deb/rpm/solaris}-user+ fpm argument. Defaults
+    # to +root+ if not otherwise set.
     #
     # @param val [String]
     # @return [String]
     def package_user(val = NULL_ARG)
       @pkg_user = val unless val.equal?(NULL_ARG)
-      @pkg_user
+      @pkg_user ||= 'root'
     end
 
     # Set or retrieve the full overrides hash for all software being overridden.  Calling it as
@@ -278,13 +279,14 @@ module Omnibus
       @overrides[name]
     end
 
-    # Set or retrieve the {deb/rpm/solaris}-group fpm argument.
+    # Set or retrieve the +{deb/rpm/solaris}-group+ fpm argument. Defaults
+    # to +root+ if not otherwise set.
     #
     # @param val [String]
     # @return [String]
     def package_group(val = NULL_ARG)
       @pkg_group = val unless val.equal?(NULL_ARG)
-      @pkg_group
+      @pkg_group ||= 'root'
     end
 
     # Add an Omnibus software dependency.
@@ -561,6 +563,8 @@ module Omnibus
       pkg_path = "#{config.package_dir}/#{basename}"
       artifact = Artifact.new(pkg_path, [platform_tuple], version: build_version)
       metadata = artifact.flat_metadata
+      metadata['name'] = name
+      metadata['homepage'] = homepage
       File.open("#{pkg_path}.metadata.json", 'w+') do |f|
         f.print(JSON.pretty_generate(metadata))
       end

data/lib/omnibus/s3_cacher.rb

@@ -122,10 +122,13 @@ module Omnibus
 
     def bucket
       @bucket ||= begin
-        b = UberS3::Bucket.new(@client, @client.bucket)
-        # creating the bucket is idempotent, make sure it's created:
-        @client.connection.put('/')
-        b
+        if @client.exists?('/')
+          @client.bucket
+        else
+          b = UberS3::Bucket.new(@client, @client.bucket)
+          @client.connection.put('/')
+          b
+        end
       end
     end
   end

data/lib/omnibus/version.rb

@@ -16,5 +16,5 @@
 #
 
 module Omnibus
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/omnibus.gemspec

@@ -25,12 +25,12 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'mixlib-config',   '~> 2.1'
   gem.add_dependency 'ohai',            '~> 6.12'
   gem.add_dependency 'rake'
-  gem.add_dependency 'fpm',             '~> 1.0.0'
+  gem.add_dependency 'fpm',             '~> 0.4'
   gem.add_dependency 'uber-s3'
   gem.add_dependency 'thor',            '>= 0.16.0'
 
-  gem.add_development_dependency 'rspec',   '~> 2.14'
-  gem.add_development_dependency 'rubocop', '~> 0.18'
+  gem.add_development_dependency 'rspec',   '~> 2.14.1'
+  gem.add_development_dependency 'rubocop', '~> 0.18.1'
 
   gem.add_development_dependency 'bundler'
 end

data/spec/artifact_spec.rb

@@ -32,6 +32,8 @@ describe Omnibus::Artifact do
 
   let(:artifact) { Omnibus::Artifact.new(path, platforms,  version: '11.4.0-1') }
 
+  let(:flat_metadata) { artifact.flat_metadata }
+
   it 'has the path to the package' do
     expect(artifact.path).to eq(path)
   end
@@ -51,8 +53,7 @@ describe Omnibus::Artifact do
   end
 
   it "generates 'flat' metadata" do
-    expect(File).to receive(:open).twice.with(path).and_return(content)
-    flat_metadata = artifact.flat_metadata
+    expect(File).to receive(:open).at_least(2).with(path).and_return(content)
     expect(flat_metadata['platform']).to eq('el')
     expect(flat_metadata['platform_version']).to eq('5')
     expect(flat_metadata['arch']).to eq('x86_64')

data/spec/project_spec.rb

@@ -135,4 +135,18 @@ describe Omnibus::Project do
       expect(project.override(:thing)[:version]).to eq('6.6.6')
     end
   end
+
+  describe '#package_user' do
+    it 'returns root by default' do
+      subject.instance_variable_set(:@package_user, nil)
+      expect(subject.package_user).to eq('root')
+    end
+  end
+
+  describe '#package_group' do
+    it 'returns root by default' do
+      subject.instance_variable_set(:@package_group, nil)
+      expect(subject.package_group).to eq('root')
+    end
+  end
 end

metadata

@@ -1,153 +1,174 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
+  prerelease: 
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '6.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '6.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fpm
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: uber-s3
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: 0.18.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Omnibus helps you build self-installing, full-stack software builds.
@@ -157,9 +178,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
+- .gitignore
+- .rubocop.yml
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -245,26 +266,30 @@ files:
 homepage: https://github.com/opscode/omnibus-ruby
 licenses:
 - Apache 2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4053594469113083441
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Omnibus helps you build self-installing, full-stack software builds.
 test_files:
 - spec/artifact_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 9cb199e33038976c285414cab34ac29647f747d0
-  data.tar.gz: 1a6b1c603430011d328ff2acee1efec31cc406a5
-SHA512:
-  metadata.gz: 6f4b8cdec1c3027860afd61552649b39ff5b3b51a88f77e28696d7e5dfe76df3a5076413522aadd482ded167d07270febe3f25a7eaf3f2235a914eb53fd8be29
-  data.tar.gz: 073cad03cc5dae6e817a725ad447d360028ed2e3864859b47d8aadb0d433a04526f07b46663102df8e657ba7d9e61b32aea771de13d1015bd2343e0f48431802