omnibus 1.3.0 → 2.0.0.rc1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3d821a5f79999239bb2350a3ab13b30b3c76e002
+  data.tar.gz: b9466b1623251bf432c310d28e3136752de2c8fa
+SHA512:
+  metadata.gz: f5702d3ac8776901b5f47bc2dfeb5b2755b7a50b296d0184a8003c8c27c662f16eb74a3b3e4c099760228f042a3449ba8630debbe93d5eeaa28cda1236c8e1a3
+  data.tar.gz: cba2accc31f58449f0eac9e4ccee20d1e82b9bf228809ddd9b47c2be21d697d64c924c0087c036a2b481c1f4aa2b5129b9bb11dfb1ed53502b128aeb7c06778d

data/.gitignore

@@ -1,9 +1,12 @@
 *.gem
 tmp
-
+# package file created by functional tests:
+*.pkg
 # Bundler related
 Gemfile.lock
 .bundle/
 vendor/
+.rspec
 .yardoc
+.yardopts
 doc/

data/.rubocop.yml

@@ -0,0 +1,30 @@
+ClassLength:
+  Enabled: false
+CyclomaticComplexity:
+  Max: 20
+Documentation:
+  Enabled: false
+GlobalVars:
+  Enabled: false
+Encoding:
+  Enabled: false
+HandleExceptions:
+  Enabled: false
+IfUnlessModifier:
+  Enabled: false
+LineLength:
+  Enabled: false
+MethodLength:
+  Enabled: false
+ModuleFunction:
+  Enabled: false
+ParameterLists:
+  Max: 6
+RaiseArgs:
+  Enabled: false
+RescueException:
+  Enabled: false
+TrailingComma:
+  EnforcedStyleForMultiline: comma
+TrivialAccessors:
+  Enabled: false

data/.travis.yml

@@ -1,5 +1,16 @@
-language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
-script: rake spec
+
+bundler_args: --jobs 7 --without docs
+
+branches:
+  only:
+    - master
+
+script: bundle exec rake travis:ci
+
+notifications:
+  hipchat:
+    rooms:
+      - secure: JdLOITSPHW5xk8eoFOmH1Js5PT6iFgswUG8fIqNq69ie2Qws2K58hPDR6HW2NBEsBb7dW1S5jT6V9RHhm0ykekvEJVa5AjebO3EsZa+Cu/VahFMg4DL+SGYgKlKrZQosd+EgVQQ3C9gj0dApGtKqf2Ej7RNESwCPY8SOduTC6d8= # Build Statuses
+      - secure: PmOaqp2DFyy79VpCuvSYILblK6tP0eDa9fDG9X2j+wggoosBkmlGfnSxp3A2TXlUyK62mr6/B89dRkL2aDWTJ/gqaZ34Elx2rV5S2A5YJIx9stA2+4iXeSlOF2YMNKGwBVmF/kp/nNoG2FqUkUBrRurWAOXZnwxKIhQ7+kLVb/0= # Release Engineering

data/CHANGELOG.md

@@ -1,135 +1,158 @@
+Omnibus Ruby CHANGELOG
+======================
+
+v2.0.0 (Unreleased)
+-------------------
+Major changes:
+- `version` is now `default_version`
+- Added support for multiple software versions and version overrides
+- Added support for project-specific overrides
+- Added Mac DMG packaging functionality
+- Require Mixlib::Config 2.0
+
+Minor changes:
+- Added a new CI pipeline on Travis
+- Switch to Ruby 1.9 hash syntaxes
+
+Tiny changes that probably won't affect you:
+- `.yardopts` are no longer committed
+- `.rspec` is no longer committed
+- Updated copyrights to new company name
+- Improved test coverage
+- Miscellaneous bug fixes
+
 ## 1.3.0 (December 6, 2013)
 
 FEATURES:
 
-* Add `build_retries` global config value (still 3 by default). ([@fujin][], [#63][])
-* Add support for pre-install scripts. ([@christophermaier][])
-* Add support for `*.tar.xz` files. ([@jf647][], [#71][])
-* Add `erb` builder command. ([@ohlol][], [#79][])
-* Add `package_user`, `package_group` to project definitions for setting 
+- Add `build_retries` global config value (still 3 by default). ([@fujin][], [#63][])
+- Add support for pre-install scripts. ([@christophermaier][])
+- Add support for `*.tar.xz` files. ([@jf647][], [#71][])
+- Add `erb` builder command. ([@ohlol][], [#79][])
+- Add `package_user`, `package_group` to project definitions for setting
   user and group ownership for of deb/rpm/solaris packages. ([@ohlol][], [#80][])
-* Add `config_file` to project definitions for passing `--config-files` 
+- Add `config_file` to project definitions for passing `--config-files`
   options to the `fpm` builder commands. ([@christophergeers][], [#85][])
 
 IMPROVEMENTS:
 
-* Bump default cpus to get better throughput when Ohai is wrong. ([@lamont-granquist][])
-* Whitelist `libnsl` on Arch Linux. ([@sl4mmy][], [#67][])
-* Switch to using pkgmk for Solaris. ([@lamont-granquist][], [#72][])
-* Remove make install from c-example. ([@johntdyer][], [#73][])
-* Update Vagrantfile template to use provisionerless base boxes. ([@schisamo][], [#74][])
-* Allow access to `Omnibus.project_root` in builder blocks. ([@ohlol][], [#78][])
-* Refactor how we handle loading dirs for software files. ([@benjaminws][], [#82][])
-* Update depdencies: ([@schisamo][], [#86][])
-  * fpm 1.0.0
-  * mixlib-config 2.1.0
-  * mixlib-shellout 1.3.0
+- Bump default cpus to get better throughput when Ohai is wrong. ([@lamont-granquist][])
+- Whitelist `libnsl` on Arch Linux. ([@sl4mmy][], [#67][])
+- Switch to using pkgmk for Solaris. ([@lamont-granquist][], [#72][])
+- Remove make install from c-example. ([@johntdyer][], [#73][])
+- Update Vagrantfile template to use provisionerless base boxes. ([@schisamo][], [#74][])
+- Allow access to `Omnibus.project_root` in builder blocks. ([@ohlol][], [#78][])
+- Refactor how we handle loading dirs for software files. ([@benjaminws][], [#82][])
+- Update depdencies: ([@schisamo][], [#86][])
+  - fpm 1.0.0
+  - mixlib-config 2.1.0
+  - mixlib-shellout 1.3.0
 
 BUG FIXES:
 
-* Properly handle `HTTP_PROXY_USER` and `HTTP_PROXY_PASS`. ([@databus23][], [#77][])
-* Fix the incorrect error message logged when the Git fetcher failed to 
+- Properly handle `HTTP_PROXY_USER` and `HTTP_PROXY_PASS`. ([@databus23][], [#77][])
+- Fix the incorrect error message logged when the Git fetcher failed to
   resolve refs to commits. ([@mumoshu][], [#81][])
-* Removin unsupported `config.ssh.max_tries` and `config.ssh.timeout` 
+- Removin unsupported `config.ssh.max_tries` and `config.ssh.timeout`
   from Vagrantfile template. ([@totally][], [#83][])
-* Mention the required Vagrant plugins. ([@jacobvosmaer][], [#70][])
+- Mention the required Vagrant plugins. ([@jacobvosmaer][], [#70][])
 
 ## 1.2.0 (July 12, 2013)
 
 FEATURES:
 
-* Add `whitelist_file` to software DSL. This allows an individual software 
+- Add `whitelist_file` to software DSL. This allows an individual software
   definition to declare files that should be ignored during health checking.
 
 IMPROVEMENTS:
 
-* Raise an exception if a project's dependency is not found.
+- Raise an exception if a project's dependency is not found.
 
 BUG FIXES:
 
-* Properly load a project's transitive dependencies.
-* Ensure a component is only added to a library one time.
+- Properly load a project's transitive dependencies.
+- Ensure a component is only added to a library one time.
 
 ## 1.1.1 (July 2, 2013)
 
 BUG FIXES:
 
-* Raise an exception if a patch file is not found.
-* Be more explicit about types in CPU computation.
-* Include pkg version, iteration, arch for solaris packages.
-* Fix assorted typos in CLI output.
+- Raise an exception if a patch file is not found.
+- Be more explicit about types in CPU computation.
+- Include pkg version, iteration, arch for solaris packages.
+- Fix assorted typos in CLI output.
 
 ## 1.1.0 (June 12, 2013)
 
 FEATURES:
 
-* AIX health check whitelist support
-* AIX Backup-File Format (BFF) package support
+- AIX health check whitelist support
+- AIX Backup-File Format (BFF) package support
 
 IMPROVEMENTS:
 
-* Add libstdc++ to SmartOS whitelist libs - this allows the health check pass when 
+- Add libstdc++ to SmartOS whitelist libs - this allows the health check pass when
   depending on C++ libs.
 
 BUG FIXES:
 
-* [CHEF-4246] - omnibus cache populate failing
+- [CHEF-4246] - omnibus cache populate failing
 
 ## 1.0.4 (May 23, 2013)
 
 FEATURES:
 
-* Add `release package` command which releases a single package with associated 
+- Add `release package` command which releases a single package with associated
   metadata file to a single S3 bucket.
-* Arch Linux health check whitelist support
+- Arch Linux health check whitelist support
 
 IMPROVEMENTS:
 
-* Add libstdc++ to Mac whitelist libs - this allows the health check pass when 
+- Add libstdc++ to Mac whitelist libs - this allows the health check pass when
   depending on C++ libs.
-* Change scope of `Omnibus::Library` instance from global to project.
+- Change scope of `Omnibus::Library` instance from global to project.
 
 BUG FIXES:
 
-* [CHEF-4214] - projects in multi-project omnibus repositories share dependency scope
+- [CHEF-4214] - projects in multi-project omnibus repositories share dependency scope
 
 ## 1.0.3 (May 2, 2013)
 
 FEATURES:
 
-* [CHEF-2576] - SmartOS health check whitelist support
-* [CHEF-4141] - FreeBSD health check whitelist support
-* [CHEF-3990] - Add support to uncompress zip file
+- [CHEF-2576] - SmartOS health check whitelist support
+- [CHEF-4141] - FreeBSD health check whitelist support
+- [CHEF-3990] - Add support to uncompress zip file
 
 BUG FIXES:
 
-* Fix project homepage in gemspec
-* Proper Thor 0.16.0, 0.17.0 suppport - Thor 0.18.0 renamed current_task to
+- Fix project homepage in gemspec
+- Proper Thor 0.16.0, 0.17.0 suppport - Thor 0.18.0 renamed current_task to
   current_command
 
 ## 1.0.2 (April 23, 2013)
 
 IMPROVEMENTS:
 
-* Travis CI support
+- Travis CI support
 
 BUG FIXES:
 
-* [CHEF-4112] `omnibus build project` command does not respect the
+- [CHEF-4112] `omnibus build project` command does not respect the
   `--no-timestamp` flag
 
 ## 1.0.1 (April 21, 2013)
 
 BUG FIXES:
 
-* Vagrant and Berkshelf Vagrant plugin version updates in generated project's
+- Vagrant and Berkshelf Vagrant plugin version updates in generated project's
   README.md. Current requirements for the virtualized build lab are:
-  * Vagrant 1.2.1+
-  * `vagrant-berkshelf` plugin (this was renamed from `berkshelf-vagrant`)
+  - Vagrant 1.2.1+
+  - `vagrant-berkshelf` plugin (this was renamed from `berkshelf-vagrant`)
 
 ## 1.0.0 (April 21, 2013)
 
-* The initial release.
+- The initial release.
 
 <!--- The following link definition list is generated by PimpMyChangelog --->
 [#63]: https://github.com/opscode/omnibus-ruby/issues/63

data/Gemfile

@@ -1,9 +1,12 @@
-source "https://rubygems.org"
-
+source 'https://rubygems.org'
 gemspec
 
 group :docs do
-  gem "yard", "~> 0.8.5"
-  gem "redcarpet", "~> 2.2.2"
-  gem "github-markup", "~> 0.7.5"
+  gem 'yard',          '~> 0.8'
+  gem 'redcarpet',     '~> 2.2.2'
+  gem 'github-markup', '~> 0.7'
+end
+
+group :test do
+  gem 'fauxhai'
 end

data/NOTICE

@@ -1,9 +1,9 @@
 omnibus-ruby NOTICE
 ===================
 
-Developed at Opscode (http://www.opscode.com).
+Developed at Chef Software, Inc (http://www.getchef.com).
 
 Contributors and Copyright holders:
 
- * Copyright 2012, Opscode, Inc. <legal@opscode.com>
+ * Copyright 2012-2014, Chef Software, Inc. <legal@getchef.com>
 

data/README.md

@@ -12,6 +12,8 @@ Building a Full-Stack Installer with Omnibus**
 ([video](http://www.youtube.com/watch?v=q8iJAntXCNY),
 [slides](https://speakerdeck.com/schisamo/eat-the-whole-bowl-building-a-full-stack-installer-with-omnibus)).
 
+This project is managed by the CHEF Release Engineering team. For more information on the Release Engineering team's contribution, triage, and release process, please consult the [CHEF Release Engineering OSS Management Guide](https://docs.google.com/a/opscode.com/document/d/1oJB0vZb_3bl7_ZU2YMDBkMFdL-EWplW1BJv_FXTUOzg/edit).
+
 ## Prerequisites
 
 Omnibus is designed to run with a minimal set of prerequisites. You'll
@@ -90,10 +92,10 @@ anything from the `omnibus-software` repository.)
 An example:
 
 ```ruby
-name    "ruby"
-version "1.9.2-p290"
-source  :url => "http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-#{version}.tar.gz",
-        :md5 => "604da71839a6ae02b5b5b5e1b792d5eb"
+name            "ruby"
+default_version "1.9.2-p290"
+source          :url => "http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-#{version}.tar.gz",
+                :md5 => "604da71839a6ae02b5b5b5e1b792d5eb"
 
 dependency "zlib"
 dependency "ncurses"
@@ -110,9 +112,9 @@ end
 
 Some of the DSL methods available include:
 
-**name**: The name of the software component.
+**name**: The name of the software component (this should come first).
 
-**version**: The version of the software component.
+**default_version**: The version of the software component.
 
 **source**: Directions to the location of the source.
 
@@ -177,11 +179,67 @@ platforms (though Omnibus is not limited to just those!) is created
 for each project that you generate using `omnibus project
 $MY_PROJECT_NAME`
 
+## Multiple Software Versions and Version Overrides
+
+You can support building multiple verisons of the same software in the same
+software definition file:
+
+```ruby
+name    "ruby"
+default_version "1.9.2-p290"
+
+version "1.9.2-p290" do
+  source  :url => "http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-#{version}.tar.gz",
+          :md5 => "604da71839a6ae02b5b5b5e1b792d5eb"
+end
+
+version "2.1.1" do
+  source  :url => "http://ftp.ruby-lang.org/pub/ruby/2.1/ruby-#{version}.tar.gz",
+          :md5 => "e57fdbb8ed56e70c43f39c79da1654b2"
+end
+
+
+dependency "zlib"
+dependency "ncurses"
+dependency "openssl"
+
+relative_path "ruby-#{version}"
+
+build do
+  command "./configure"
+  command "make"
+  command "make install"
+end
+```
+
+Since the software definitions are simply ruby code, you can conditionally
+execute anything by wrapping it with pure ruby that tests for the version number.
+
+The project definitions can then take advange of this by passing in overrides
+to use the correct version:
+
+```ruby
+name            "chef-full"
+maintainer      "YOUR NAME"
+homepage        "http://yoursite.com"
+
+install_path    "/opt/chef"
+build_version   "0.10.8"
+build_iteration 4
+
+override :chef, version: "2.1.1"
+
+dependency "chef"
+```
+
+There is no checking that the version override that you supply has been
+provided in a version override block in the software definition.
+
 ## License
 
 See the LICENSE and NOTICE files for more information.
 
-Copyright: Copyright (c) 2012--2013 Opscode, Inc.
+Copyright: Copyright (c) 2012--2013-2014 Chef Software, Inc.
 License: Apache License, Version 2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");

data/Rakefile

@@ -1,7 +1,16 @@
 require 'bundler/setup'
 require 'bundler/gem_tasks'
+
 require 'rspec/core/rake_task'
-require 'yard'
+RSpec::Core::RakeTask.new(:unit)
+
+require 'rubocop/rake_task'
+desc 'Run Ruby style checks'
+Rubocop::RakeTask.new(:style)
+
+namespace :travis do
+  desc 'Run tests on Travis'
+  task ci: ['style', 'unit']
+end
 
-RSpec::Core::RakeTask.new(:spec)
-YARD::Rake::YardocTask.new
+task default: ['travis:ci']

data/bin/makeself-header.sh

@@ -65,7 +65,7 @@ Makeself version $MS_VERSION
   \$0 --lsm    Print embedded lsm entry (or no LSM)
   \$0 --list   Print the list of files in the archive
   \$0 --check  Checks integrity of the archive
- 
+
  2) Running \$0 :
   \$0 [options] [--] [additional arguments to embedded script]
   with following options (in that order)

data/bin/makeself.sh

@@ -22,13 +22,13 @@
 #         support for non-temporary archives. Ideas thanks to Francois Petitjean
 # - 1.3 : More patches from Bjarni R. Einarsson and Francois Petitjean:
 #         Support for no compression (--nocomp), script is no longer mandatory,
-#         automatic launch in an xterm, optional verbose output, and -target 
+#         automatic launch in an xterm, optional verbose output, and -target
 #         archive option to indicate where to extract the files.
 # - 1.4 : Improved UNIX compatibility (Francois Petitjean)
 #         Automatic integrity checking, support of LSM files (Francois Petitjean)
 # - 1.5 : Many bugfixes. Optionally disable xterm spawning.
 # - 1.5.1 : More bugfixes, added archive options -list and -check.
-# - 1.5.2 : Cosmetic changes to inform the user of what's going on with big 
+# - 1.5.2 : Cosmetic changes to inform the user of what's going on with big
 #           archives (Quake III demo)
 # - 1.5.3 : Check for validity of the DISPLAY variable before launching an xterm.
 #           More verbosity in xterms and check for embedded command's return value.

data/bin/omnibus

@@ -2,9 +2,9 @@
 
 # Trap interrupts to quit cleanly. See
 # https://twitter.com/mitchellh/status/283014103189053442
-Signal.trap("INT") { exit 1 }
+Signal.trap('INT') { exit 1 }
 
-$:.unshift File.expand_path("../../lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require 'omnibus/cli'
 

data/functional/fixtures/mac_pkg/files/mac_pkg/Resources/license.html

@@ -0,0 +1 @@
+Apache 2 license

data/functional/fixtures/mac_pkg/files/mac_pkg/Resources/welcome.html

@@ -0,0 +1 @@
+Demonstration package.

data/functional/fixtures/mac_pkg/package-scripts/functional-test-project/postinstall

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "INSTALL WORKED"
+exit 0

data/functional/packagers/mac_pkg_spec.rb

@@ -0,0 +1,72 @@
+#
+# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+#
+
+require 'stringio'
+require 'omnibus/packagers/mac_pkg'
+require 'spec_helper'
+
+describe Omnibus::Packagers::MacPkg do
+
+  let(:mac_pkg_identifier) { 'test.pkg.functional-test-project' }
+
+  let(:omnibus_root) { File.expand_path('../../fixtures/mac_pkg', __FILE__) }
+
+  let(:scripts_path) { "#{omnibus_root}/package-scripts" }
+
+  let(:files_path) { "#{omnibus_root}/files" }
+
+  let(:package_dir) { Dir.pwd }
+
+  let(:project) do
+
+    Omnibus.stub(:project_root).and_return(omnibus_root)
+    Omnibus.config.stub(:package_dir).and_return(package_dir)
+
+    project_file = <<-P
+      name "functional-test-project"
+      maintainer "YOU"
+      homepage "http://www.theonion.com/articles/drunken-man-careens-wildly-across-internet,35249/"
+      build_version "23.4.2"
+      install_path "/opt/functional-test-project"
+      mac_pkg_identifier "#{mac_pkg_identifier}"
+    P
+    Omnibus::Project.new(project_file, __FILE__)
+  end
+
+  let(:packager) do
+    Omnibus::Packagers::MacPkg.new(project)
+  end
+
+  def create_app_dir
+    FileUtils.mkdir('/opt/functional-test-project') unless File.directory?('/opt/functional-test-project')
+    File.open('/opt/functional-test-project/itworks.txt', 'w+') do |f|
+      f.puts 'hello world'
+    end
+  end
+
+  # This will run the Omnibus::Packagers::MacPkg code without any stubs to
+  # verify it works.  In order for this test to run correctly, you have to run
+  # as root or manually create the /opt/functional-test-project directory.
+  #
+  # There is no verification that the package was correctly created, you have
+  # to install it yourself to verify.
+  it 'builds a package' do
+    create_app_dir
+    packager.build
+  end
+
+end

data/lib/omnibus/artifact.rb

@@ -1,6 +1,5 @@
 module Omnibus
   class Artifact
-
     attr_reader :path
     attr_reader :platforms
     attr_reader :config
@@ -65,9 +64,9 @@ module Omnibus
     def add_to_v2_release_manifest!(release_manifest)
       platforms.each do |distro, version, arch|
         pkg_info = {
-          "relpath" => relpath,
-          "md5" => md5,
-          "sha256" => sha256
+          'relpath' => relpath,
+          'md5'     => md5,
+          'sha256'  => sha256,
         }
 
         release_manifest[distro] ||= {}
@@ -92,13 +91,13 @@ module Omnibus
     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
+        'platform' => distro,
+        'platform_version' => version,
+        'arch' => arch,
+        'version' => build_version,
+        'basename' => File.basename(path),
+        'md5' => md5,
+        'sha256' => sha256,
       }
     end
 
@@ -140,7 +139,7 @@ module Omnibus
     def digest(digest_class)
       digest = digest_class.new
       File.open(path) do |io|
-        while chunk = io.read(1024 * 8)
+        while (chunk = io.read(1024 * 8))
           digest.update(chunk)
         end
       end
@@ -148,4 +147,3 @@ module Omnibus
     end
   end
 end
-