omnibus 3.1.1 → 3.2.0.rc.1

data/spec/unit/sugarable_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+module Omnibus
+  describe Software do
+    it 'is a sugarable' do
+      expect(described_class.ancestors).to include(Sugarable)
+    end
+  end
+
+  describe Project do
+    it 'is a sugarable' do
+      expect(described_class.ancestors).to include(Sugarable)
+    end
+  end
+
+  describe Sugarable do
+    context 'in a cleanroom' do
+      let(:klass) do
+        Class.new do
+          include Cleanroom
+          include Sugarable
+        end
+      end
+
+      let(:instance) { klass.new }
+
+      it 'includes the DSL methods' do
+        expect(klass).to be_method_defined(:windows?)
+        expect(klass).to be_method_defined(:vagrant?)
+        expect(klass).to be_method_defined(:_64_bit?)
+      end
+
+      it 'makes the DSL methods available in the cleanroom' do
+        expect {
+          instance.evaluate <<-EOH.gsub(/^ {12}/, '')
+            windows?
+            vagrant?
+          EOH
+        }.to_not raise_error
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0.rc.1
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-sugar
@@ -30,56 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: mixlib-config
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.12'
+        version: 7.2.0.rc
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.12'
+        version: 7.2.0.rc
 - !ruby/object:Gem::Dependency
   name: fpm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: uber-s3
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
+- !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
@@ -151,19 +151,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -204,7 +204,6 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Guardfile
 - LICENSE
 - NOTICE
 - README.md
@@ -224,19 +223,20 @@ files:
 - features/step_definitions/generator_steps.rb
 - features/support/env.rb
 - lib/omnibus.rb
-- lib/omnibus/artifact.rb
 - lib/omnibus/assets/README-logo.png
 - lib/omnibus/assets/logo.psd
 - lib/omnibus/build_version.rb
 - lib/omnibus/build_version_dsl.rb
 - lib/omnibus/builder.rb
 - lib/omnibus/cleaner.rb
+- lib/omnibus/cleanroom.rb
 - lib/omnibus/cli.rb
 - lib/omnibus/cli/base.rb
 - lib/omnibus/cli/cache.rb
 - lib/omnibus/cli/deprecated.rb
-- lib/omnibus/cli/release.rb
+- lib/omnibus/cli/publish.rb
 - lib/omnibus/config.rb
+- lib/omnibus/digestable.rb
 - lib/omnibus/exceptions.rb
 - lib/omnibus/fetcher.rb
 - lib/omnibus/fetchers/git_fetcher.rb
@@ -249,14 +249,13 @@ files:
 - lib/omnibus/generator_files/Berksfile.erb
 - lib/omnibus/generator_files/Gemfile.erb
 - lib/omnibus/generator_files/README.md.erb
-- lib/omnibus/generator_files/Vagrantfile.erb
 - lib/omnibus/generator_files/gitignore.erb
 - lib/omnibus/generator_files/mac_dmg/background.png
 - lib/omnibus/generator_files/mac_dmg/icon.png
 - lib/omnibus/generator_files/mac_pkg/background.png
 - lib/omnibus/generator_files/mac_pkg/license.html.erb
 - lib/omnibus/generator_files/mac_pkg/welcome.html.erb
-- lib/omnibus/generator_files/omnibus.rb.example.erb
+- lib/omnibus/generator_files/omnibus.rb.erb
 - lib/omnibus/generator_files/package_scripts/makeselfinst.erb
 - lib/omnibus/generator_files/package_scripts/postinst.erb
 - lib/omnibus/generator_files/package_scripts/postrm.erb
@@ -275,25 +274,28 @@ files:
 - lib/omnibus/generator_files/windows_msi/localization-en-us.wxl.erb
 - lib/omnibus/generator_files/windows_msi/parameters.wxi.erb
 - lib/omnibus/generator_files/windows_msi/source.wxs.erb
+- lib/omnibus/git_cache.rb
 - lib/omnibus/health_check.rb
-- lib/omnibus/install_path_cache.rb
 - lib/omnibus/library.rb
 - lib/omnibus/logger.rb
 - lib/omnibus/logging.rb
+- lib/omnibus/null_argumentable.rb
 - lib/omnibus/null_builder.rb
 - lib/omnibus/ohai.rb
-- lib/omnibus/overrides.rb
-- lib/omnibus/package_release.rb
+- lib/omnibus/package.rb
 - lib/omnibus/packagers/base.rb
 - lib/omnibus/packagers/mac_dmg.rb
 - lib/omnibus/packagers/mac_pkg.rb
 - lib/omnibus/packagers/windows_msi.rb
 - lib/omnibus/project.rb
+- lib/omnibus/publisher.rb
+- lib/omnibus/publishers/artifactory_publisher.rb
+- lib/omnibus/publishers/null_publisher.rb
+- lib/omnibus/publishers/s3_publisher.rb
 - lib/omnibus/reports.rb
 - lib/omnibus/s3_cache.rb
 - lib/omnibus/software.rb
-- lib/omnibus/software_s3_urls.rb
-- lib/omnibus/sugar.rb
+- lib/omnibus/sugarable.rb
 - lib/omnibus/util.rb
 - lib/omnibus/version.rb
 - omnibus.gemspec
@@ -444,23 +446,28 @@ files:
 - spec/functional/packagers/mac_spec.rb
 - spec/functional/packagers/windows_spec.rb
 - spec/spec_helper.rb
-- spec/unit/artifact_spec.rb
 - spec/unit/build_version_dsl_spec.rb
 - spec/unit/build_version_spec.rb
+- spec/unit/cleanroom_spec.rb
 - spec/unit/config_spec.rb
+- spec/unit/digestable_spec.rb
 - spec/unit/fetchers/git_fetcher_spec.rb
 - spec/unit/fetchers/net_fetcher_spec.rb
-- spec/unit/install_path_cache_spec.rb
+- spec/unit/git_cache_spec.rb
+- spec/unit/health_check_spec.rb
 - spec/unit/library_spec.rb
+- spec/unit/ohai_spec.rb
 - spec/unit/omnibus_spec.rb
-- spec/unit/overrides_spec.rb
-- spec/unit/package_release_spec.rb
+- spec/unit/package_spec.rb
 - spec/unit/packagers/base_spec.rb
 - spec/unit/packagers/mac_pkg_spec.rb
 - spec/unit/project_spec.rb
+- spec/unit/publisher_spec.rb
+- spec/unit/publishers/artifactory_publisher_spec.rb
+- spec/unit/publishers/s3_publisher_spec.rb
 - spec/unit/s3_cacher_spec.rb
 - spec/unit/software_spec.rb
-- spec/unit/sugar_spec.rb
+- spec/unit/sugarable_spec.rb
 homepage: https://github.com/opscode/omnibus-ruby
 licenses:
 - Apache 2.0
@@ -476,12 +483,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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Omnibus helps you build self-installing, full-stack software builds.
@@ -641,21 +648,26 @@ test_files:
 - spec/functional/packagers/mac_spec.rb
 - spec/functional/packagers/windows_spec.rb
 - spec/spec_helper.rb
-- spec/unit/artifact_spec.rb
 - spec/unit/build_version_dsl_spec.rb
 - spec/unit/build_version_spec.rb
+- spec/unit/cleanroom_spec.rb
 - spec/unit/config_spec.rb
+- spec/unit/digestable_spec.rb
 - spec/unit/fetchers/git_fetcher_spec.rb
 - spec/unit/fetchers/net_fetcher_spec.rb
-- spec/unit/install_path_cache_spec.rb
+- spec/unit/git_cache_spec.rb
+- spec/unit/health_check_spec.rb
 - spec/unit/library_spec.rb
+- spec/unit/ohai_spec.rb
 - spec/unit/omnibus_spec.rb
-- spec/unit/overrides_spec.rb
-- spec/unit/package_release_spec.rb
+- spec/unit/package_spec.rb
 - spec/unit/packagers/base_spec.rb
 - spec/unit/packagers/mac_pkg_spec.rb
 - spec/unit/project_spec.rb
+- spec/unit/publisher_spec.rb
+- spec/unit/publishers/artifactory_publisher_spec.rb
+- spec/unit/publishers/s3_publisher_spec.rb
 - spec/unit/s3_cacher_spec.rb
 - spec/unit/software_spec.rb
-- spec/unit/sugar_spec.rb
+- spec/unit/sugarable_spec.rb
 has_rdoc: 

data/Guardfile

@@ -1,10 +0,0 @@
-guard :rspec do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/omnibus/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb') { 'spec' }
-end
-
-guard :rubocop do
-  watch(%r{.+\.rb$})
-  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
-end

data/lib/omnibus/artifact.rb

@@ -1,165 +0,0 @@
-#
-# Copyright 2014 Chef Software, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-module Omnibus
-  class Artifact
-    attr_reader :path
-    attr_reader :platforms
-    attr_reader :config
-
-    # @param path [String] relative or absolute path to a package file.
-    # @param platforms [Array<Array<String, String, String>>] an Array of
-    #   distro, distro version, architecture tuples. By convention, the first
-    #   platform is the platform on which the artifact was built.
-    # @param config [#Hash<Symbol, Object>] configuration for the release.
-    #   Artifact only uses `:build_version => String`.
-    def initialize(path, platforms, config)
-      @path = path
-      @platforms = platforms
-      @config = config
-    end
-
-    # Adds this artifact to the `release_manifest`, which is mutated. Intended
-    # to be used in a visitor-pattern fashion over a collection of Artifacts to
-    # generate a final release manifest.
-    #
-    # @param release_manifest [Hash{ String => Hash }] a version 1 style release
-    #   manifest Hash (see example)
-    #
-    # @example Add the package to release_manifest:
-    #   add_to_release_manifest!( {} )
-    #     "el" => {
-    #       "5" => { "x86_64" => { "11.4.0-1" => "/el/5/x86_64/demoproject-11.4.0-1.el5.x86_64.rpm" } }
-    #     }
-    # @return [Hash{String=>Hash}] the updated release manifest.
-    def add_to_release_manifest!(release_manifest)
-      platforms.each do |distro, version, arch|
-        release_manifest[distro] ||= {}
-        release_manifest[distro][version] ||= {}
-        release_manifest[distro][version][arch] = { build_version => relpath }
-        # TODO: when adding checksums, the desired format is like this:
-        # build_support_json[platform][platform_version][machine_architecture][options[:version]]["relpath"] = build_location
-      end
-      release_manifest
-    end
-
-    # Adds this artifact to the `release_manifest`, which is mutated. Intended
-    # to be used in a visitor-pattern fashion over a collection of Artifacts to
-    # generate a final release manifest.
-    #
-    # @param release_manifest [Hash{ String => Hash }] a version 2 style release
-    #   manifest Hash (see example)
-    #
-    # @example Add the package to release_manifest:
-    #   add_to_release_manifest!( {} )
-    #     "el" => {
-    #       "5" => {
-    #         "x86_64" => {
-    #           "11.4.0-1" => {
-    #             "relpath" => "/el/5/x86_64/demoproject-11.4.0-1.el5.x86_64.rpm",
-    #             "md5" => "123f00d...",
-    #             "sha256" => 456beef..."
-    #           }
-    #         }
-    #       }
-    #     }
-    # @return [Hash{String=>Hash}] the updated release manifest.
-    def add_to_v2_release_manifest!(release_manifest)
-      platforms.each do |distro, version, arch|
-        pkg_info = {
-          'relpath' => relpath,
-          'md5'     => md5,
-          'sha256'  => sha256,
-        }
-
-        release_manifest[distro] ||= {}
-        release_manifest[distro][version] ||= {}
-        release_manifest[distro][version][arch] = { build_version => pkg_info  }
-      end
-      release_manifest
-    end
-
-    # Metadata about the artifact as a flat Hash.
-    #
-    # @example For a RHEL/CentOS 6, 64-bit package of project version 11.4.0-1
-    #   flat_metadata
-    #     { "platform" => "el",
-    #       "platform_version" => "6",
-    #       "arch" => "x86_64",
-    #       "version" => "11.4.0-1",
-    #       "md5" => "d41d8cd98f00b204e9800998ecf8427e",
-    #       "sha256" => "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" }
-    #
-    # @return [Hash{String=>String}] the artifact metadata
-    def flat_metadata
-      distro, version, arch = build_platform
-      {
-        'platform' => distro,
-        'platform_version' => version,
-        'arch' => arch,
-        'version' => build_version,
-        'basename' => File.basename(path),
-        'md5' => md5,
-        'sha256' => sha256,
-      }
-    end
-
-    # Platform on which the artifact was built. By convention, this is the
-    # first in the list of platforms passed to {#initialize}.
-    # @return [Array<String, String, String>] an Array of distro, distro
-    #   version, architecture.
-    def build_platform
-      platforms.first
-    end
-
-    # @return [String] build version of the project.
-    def build_version
-      config[:version]
-    end
-
-    # @return [String] relative path at which the artifact should be located
-    #   when uploaded to artifact repo.
-    # @example Chef 11.4.0-1 on 64 bit RHEL 6:
-    #   relpath
-    #     "/el/6/x86_64/chef-11.4.0-1.el5.x86_64.rpm"
-    def relpath
-      # upload build to build platform directory
-      "/#{build_platform.join('/')}/#{path.split('/').last}"
-    end
-
-    # @return [String] hex encoded MD5 of the package
-    def md5
-      @md5 ||= digest(Digest::MD5)
-    end
-
-    # @return [String] hex encoded SHA2-256 of the package
-    def sha256
-      @sha256 ||= digest(Digest::SHA256)
-    end
-
-    private
-
-    def digest(digest_class)
-      digest = digest_class.new
-      File.open(path) do |io|
-        while (chunk = io.read(1024 * 8))
-          digest.update(chunk)
-        end
-      end
-      digest.hexdigest
-    end
-  end
-end