omnibus 3.2.0 → 3.2.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDQ2ZjE2OWViMWMxZGQ1NjIyOGRkZTc5ZGVmNTVlMTVlYmY4Njk0MQ==
-  data.tar.gz: !binary |-
-    MmM1ODJlYTM0MzU2M2Y4NzI0ZmVlNTQ0NjFkMDExNDE3ODg2M2FjMA==
+SHA1:
+  metadata.gz: 918d6850bef241b13e3ff6665654df11a2ae6a2b
+  data.tar.gz: 05f1d0d1328afd8c59f9662a8e400ff409de4d5c
 SHA512:
-  metadata.gz: !binary |-
-    ZDQzMjQ2MDk0MDU5NmFhMDczZDNiZTYwZjk3NDE3ZGY5NDU3MjYxYmVhNzUw
-    ZGQxNGQ3YWE2NjFiNWFhYzUxOTM4ZjEwYzcxMjVmY2U2NmU0ZTNjODYwOGZj
-    NTdhNzAxMjZhNjcyNjQzMWU0ZjVkODAzM2M4ZTRjMTU0ZWIxNTQ=
-  data.tar.gz: !binary |-
-    NTdiYmVlYmExNzk2NTg4ODAwYjQxNGQ4YWZkOGZiNDlhZmNiZjMwNjA0MTI0
-    OWE4NzljZmI3MTM2MTllZDgyMGM4ZGJmNTdiMzhkNTNjMWMwOTFkYmU0Zjdm
-    ZTdlOWZmYTY4OWY5NjAzYTg0MGY2NjdjNTA0MzA5Y2Y5NDIzNTk=
+  metadata.gz: 05c1df0c773e1dbce6e2de4e6e2019dc5a8c135c61121134af9959b6c742e6c9d3e7c7f274607bf64f724d4c4967a133af2c55ed00ac15887803e71ed66c2d05
+  data.tar.gz: a6acb3352284b375ac8359ad060eaabc75d18e0871b8c3eda968a3434d7088fbc58dab8336e2bd635b7124366782caa38a56eb75b404378956b36797ee154322

data/.travis.yml

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

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Omnibus Ruby CHANGELOG
 ======================
 
+v3.2.1 (July 26, 2014)
+----------------------
+- Add support for overriding publish platform/version
+- Expose platform/version override options on `omnibus publish`
+- Expose the `sync` method in the builder DSL and fix the broken tests
+
 v3.2.0 (July 23, 2014)
 ----------------------
 - Make build commands output during `log.info` instead of `log.debug`

data/features/commands/publish.feature

@@ -0,0 +1,13 @@
+Feature: omnibus publish
+  Scenario: Overriding publishing platform
+    * I run `omnibus publish artifactory fake * --platform debian`
+    * the output should contain:
+      """
+      Publishing platform has been overriden to 'debian'
+      """
+  Scenario: Overriding publishing platform version
+    * I run `omnibus publish artifactory fake * --platform-version 7`
+    * the output should contain:
+      """
+      Publishing platform version has been overriden to '7'
+      """

data/lib/omnibus/builder.rb

@@ -567,6 +567,7 @@ module Omnibus
         end
       end
     end
+    expose :sync
 
     #
     # @!endgroup

data/lib/omnibus/cli/publish.rb

@@ -18,6 +18,21 @@ module Omnibus
   class Command::Publish < Command::Base
     namespace :publish
 
+    # These options are useful for publish packages that were built for a
+    # paticluar platform/version and tested on another platform/version.
+    #
+    # For example, one might build on Ubuntu 10.04 and test/publish on
+    # Ubuntu 11.04, 12.04 and Debian 7.
+    #
+    # If these options are used with the glob pattern support all packages
+    # will be published to the same platform/version.
+    class_option :platform,
+      desc: 'The platform to publish for',
+      type: :string
+    class_option :platform_version,
+      desc: 'The platform version to publish for',
+      type: :string
+
     #
     # Publish to S3.
     #

data/lib/omnibus/publisher.rb

@@ -41,6 +41,18 @@ module Omnibus
     def initialize(pattern, options = {})
       @pattern = pattern
       @options = options.dup
+
+      if @options[:platform]
+        log.warn(log_key) do
+          "Publishing platform has been overriden to '#{@options[:platform]}'"
+        end
+      end
+
+      if @options[:platform_version]
+        log.warn(log_key) do
+          "Publishing platform version has been overriden to '#{@options[:platform_version]}'"
+        end
+      end
     end
 
     #
@@ -67,6 +79,45 @@ module Omnibus
 
     private
 
+    #
+    # The platform to publish a package for. A publisher can be optionally
+    # initialized with a platform which should be used in all publishing
+    # logic. This allows a package built on one platform to be published
+    # for another platform. For example, one might build on Ubuntu and
+    # test/publish on Ubuntu and Debian.
+    #
+    # @note Even if a glob pattern matches multiple packages (potentially
+    #   across multiple platforms) all packages will be published for the
+    #   same platform.
+    #
+    # @param [Package] package
+    #
+    # @return [String]
+    #
+    def publish_platform(package)
+      @options[:platform] || package.metadata[:platform]
+    end
+
+    #
+    # The platform version to publish a package for. A publisher can be
+    # optionally initialized with a platform version which should be used
+    # in all publishing logic. This allows a package built on one
+    # platform to be published for another platform version. For example,
+    # one might build on Ubuntu 10.04 and test/publish on Ubuntu 10.04
+    # and 12.04.
+    #
+    # @note Even if a glob pattern matches multiple packages (potentially
+    #   across multiple platforms) all packages will be published for the
+    #   same platform version.
+    #
+    # @param [Package] package
+    #
+    # @return [String]
+    #
+    def publish_platform_version(package)
+      @options[:platform_version] || package.metadata[:platform_version]
+    end
+
     def safe_require(name)
       require name
     rescue LoadError

data/lib/omnibus/publishers/artifactory_publisher.rb

@@ -91,8 +91,8 @@ module Omnibus
     def metadata_for(package)
       {
         'omnibus.project'          => package.metadata[:name],
-        'omnibus.platform'         => package.metadata[:platform],
-        'omnibus.platform_version' => package.metadata[:platform_version],
+        'omnibus.platform'         => publish_platform(package),
+        'omnibus.platform_version' => publish_platform_version(package),
         'omnibus.architecture'     => package.metadata[:arch],
         'omnibus.version'          => package.metadata[:version],
         'omnibus.iteration'        => package.metadata[:iteration],
@@ -130,8 +130,8 @@ module Omnibus
         Config.artifactory_base_path,
         package.metadata[:name],
         package.metadata[:version],
-        package.metadata[:platform],
-        package.metadata[:platform_version],
+        publish_platform(package),
+        publish_platform_version(package),
         package.metadata[:basename],
       )
     end

data/lib/omnibus/publishers/s3_publisher.rb

@@ -72,8 +72,8 @@ module Omnibus
     #
     def key_for(package, *stuff)
       File.join(
-        package.metadata[:platform],
-        package.metadata[:platform_version],
+        publish_platform(package),
+        publish_platform_version(package),
         package.metadata[:arch],
         package.name,
         *stuff,

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = '3.2.0'
+  VERSION = '3.2.1'
 end

data/spec/unit/builder_spec.rb

@@ -39,7 +39,7 @@ module Omnibus
       it_behaves_like 'a cleanroom setter', :copy, %|copy 'file', 'file2'|
       it_behaves_like 'a cleanroom setter', :move, %|move 'file', 'file2'|
       it_behaves_like 'a cleanroom setter', :link, %|link 'file', 'file2'|
-      it_behaves_like 'a cleanroom setter', :sync, %|link 'a/', 'b/'|
+      it_behaves_like 'a cleanroom setter', :sync, %|sync 'a/', 'b/'|
       it_behaves_like 'a cleanroom getter', :project_root, %|puts project_root|
       it_behaves_like 'a cleanroom getter', :windows_safe_path, %|puts windows_safe_path('foo')|
 

data/spec/unit/publishers/artifactory_publisher_spec.rb

@@ -58,12 +58,32 @@ module Omnibus
         expect(artifact).to receive(:upload).with(
           repository,
           'com/getchef/chef/11.0.6/ubuntu/14.04/chef.deb',
-          an_instance_of(Hash)
+          an_instance_of(Hash),
         ).once
 
         subject.publish
       end
 
+      context 'when an alternate platform and platform version are provided' do
+        subject do
+          described_class.new(path,
+            repository: repository,
+            platform: 'debian',
+            platform_version: '7',
+          )
+        end
+
+        it 'overrides the platform and platform version used for publishing' do
+          expect(artifact).to receive(:upload).with(
+            repository,
+            'com/getchef/chef/11.0.6/debian/7/chef.deb',
+            an_instance_of(Hash),
+          ).once
+
+          subject.publish
+        end
+      end
+
       context 'when a block is given' do
         it 'yields the package to the block' do
           block = ->(package) { package.do_something! }

data/spec/unit/publishers/s3_publisher_spec.rb

@@ -96,6 +96,26 @@ module Omnibus
         end
       end
 
+      context 'when an alternate platform and platform version are provided' do
+        subject do
+          described_class.new(path,
+            platform: 'debian',
+            platform_version: '7',
+          )
+        end
+
+        it 'overrides the platform and platform version used for publishing' do
+          expect(client).to receive(:store).with(
+            'debian/7/x86_64/chef.deb/chef.deb',
+            package.content,
+            access: :private,
+            content_md5: package.metadata[:md5],
+          ).once
+
+          subject.publish
+        end
+      end
+
       context 'when a block is given' do
         it 'yields the package to the block' do
           block = ->(package) { package.do_something! }

metadata

@@ -1,195 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-sugar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '7.2'
 - !ruby/object:Gem::Dependency
   name: fpm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: uber-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: artifactory
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: fauxhai
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Omnibus is a framework for building self-installing, full-stack software
@@ -200,9 +200,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -219,6 +219,7 @@ files:
 - features/commands/clean.feature
 - features/commands/list.feature
 - features/commands/new.feature
+- features/commands/publish.feature
 - features/commands/version.feature
 - features/step_definitions/generator_steps.rb
 - features/support/env.rb
@@ -481,17 +482,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Omnibus is a framework for building self-installing, full-stack software
@@ -502,6 +503,7 @@ test_files:
 - features/commands/clean.feature
 - features/commands/list.feature
 - features/commands/new.feature
+- features/commands/publish.feature
 - features/commands/version.feature
 - features/step_definitions/generator_steps.rb
 - features/support/env.rb