omnibus 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42ba84e6247d1cec8f21fb01ec6324e850a1e10e
-  data.tar.gz: 74c043e787a3728d746c282cadb46ed4024cb99c
+  metadata.gz: 163fba58e122c1c52362ace044e0c484ad1862ee
+  data.tar.gz: 7964e3d739d4eaf3122f51e3e0a0127e74cb13d5
 SHA512:
-  metadata.gz: 954792cc931a139486c646236e63c8d1a87c9f8841600918c769d262d943e886ed85fa7698b543acc6c0385849a55ea620331b6220812b2c57fcc9039192fa9c
-  data.tar.gz: 81830612f63dc5664bd3257c9b232911c1730af9f0d3b7f31f53684424272d34262b9e154013caacc4f05c51531e25a3b382539a888fb49ac7ddf39a057cf69e
+  metadata.gz: 8de529d87a1c80f38e530d63a4f94fe9e3e7e354e4d41b73ce328f7a37ad01dd9e813a5fa1c29e98e2c2154dc0be72ff57257a74b1a35ae23fcd179080081153
+  data.tar.gz: 839e4f49104f111afcf88f4dc2d24a964bc0186d4c2dcb6b92c5857875b682c51ea4693ec0723d55dd17c7249eeed93dbce6da67bf505b831d685e04e4565200

data/.gitignore

@@ -83,6 +83,14 @@ Gemfile.lock
 *.tmproject
 tmtags
 
+# avoid generic ctags files too
+tags
+gems.tags
+gemtags
+.tags
+.gem.tags
+.gemtags
+.tags_sorted_by_file
 
 ### SublimeText ###
 # workspace files are user-specific

data/.travis.yml

@@ -1,26 +1,18 @@
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1
-
-bundler_args: --jobs 7 --without docs local
-
+bundler_args: "--jobs 7 --without docs local"
 branches:
   only:
     - 2.0-stable
     - 3.0-stable
     - master
-
 script: bundle exec rake travis:ci
-
 notifications:
-  hipchat:
+  slack:
     on_change: true
     on_failure: true
     on_success: false
     on_pull_requests: false
     rooms:
-      # Build Statuses
-      - secure: JdLOITSPHW5xk8eoFOmH1Js5PT6iFgswUG8fIqNq69ie2Qws2K58hPDR6HW2NBEsBb7dW1S5jT6V9RHhm0ykekvEJVa5AjebO3EsZa+Cu/VahFMg4DL+SGYgKlKrZQosd+EgVQQ3C9gj0dApGtKqf2Ej7RNESwCPY8SOduTC6d8=
-      # Release Engineering
-      - secure: PmOaqp2DFyy79VpCuvSYILblK6tP0eDa9fDG9X2j+wggoosBkmlGfnSxp3A2TXlUyK62mr6/B89dRkL2aDWTJ/gqaZ34Elx2rV5S2A5YJIx9stA2+4iXeSlOF2YMNKGwBVmF/kp/nNoG2FqUkUBrRurWAOXZnwxKIhQ7+kLVb/0=
+      secure: udLCoBl71xJBsW3P+YqZbA5xfaB8l4IIF6SKEXpjIUYNYyP6m77uoY9PZ/M/5EN1ojPXDxsZ6SiPEJifVpkX5Hqd0eu1MwWyRXvOwiDf/nkg2Y3mqwUQRb3LDYWZxPn+xp5mHePe3mvTICR1zH49yx7fdZs8Qvzhh3Lno/w/qZ4=

data/CHANGELOG.md

@@ -1,5 +1,55 @@
 Omnibus CHANGELOG
 =================
+v4.1.0 (September 1, 2015)
+-------------------------
+### New Features
+- Allow semver prefixes that start with "v"
+- Reset target_shasum in PathFetcher after every fetch, preventing erroneous GitCache misses for builds that produced local artifacts during the previous omnibus run.
+- Allow users to specify options to the underlying FileSyncer in a Software definition
+- Add CPPFLAGS in with_standard_compiler_flags
+- Add a Fedora dist tag to package name and spec release
+- Copy distribution.xml.erb also when creating project with --pkg-assets
+- Manage version manifests with Omnibus. Omnibus now creates a version manifest in text and JSON.
+- Retry failed downloads
+- Support inclusion of email address in Wix template
+- Allow solaris to use mapfiles
+- A new `omnibus generate changelog` command generates an opinionated CHANGELOG entry based on metadata in commit messages.
+- Add warnings on empty globs.
+- Raspberry Pi 2 support
+- Clone git repositories with --recursive flag
+- Add ability to sign MSIs
+- Support running Omnibus with 64-bit ruby on Windows
+- Create an Artifactory build for published packages
+- Add a "windows_arch" omnibus option to choose 32/64 bit builds.
+- Set directory ownership/permissions to match the filesystem package.
+- Allow Windows 10 builders
+- Allow omnibus to build "bundled" Windows installers
+- Set perms on control files per Ubuntu Software Center's lintian checks.
+- Replace uber-s3 dependency with aws-sdk
+
+### Bug Fixes
+- Config.append_timestamp is now properly handled by the build_version
+  DSL.  For some users, this may introduce a change in behavior.  To
+  revert to the old behavior set append_timestamp to false in
+  `omnibus.rb` or use --override append_timestamp:false at the command
+  line.
+- Do not memoize current_revision to avoid returning incorrect data. Memoizing current_revision was previously causing version_for_cache to return the pre-fetch revision of the software, leading us to erroneously restore an older revision from the cache.
+- Clean up "files listed twice" warnings. This should allow signing RPMs on EL 7
+- dpkg uses arch name ppc64el (instead of ppc64le) for little endian
+- Override equality operator for ManifestEntry. Prior to this, we simply tested basic object identity, which would result in many "updated" dependencies
+- Correctly determine git repository when running in a subdirectory
+- Forcibly remove a non-empty project dir before cloning because if multiple projects are using the same maching for building, they might have two different software definitions that share the same name but a different source.
+- Accomidate hardlinks properly
+- When building spec file, handle path names that contain spaces
+- Add libkvm and libprocstat to freebsd whitelist
+- Properly render ERB templates that do not have variables
+- Change git fetcher to correctly fetch when repo name is the same but branch/version is different.
+
+### Potentially Breaking Changes
+- `Omnibus::SemanticVersion.new` now raises `Omnibus::InvalidVersion` instead of `Omnibus::SemanticVersion::InvalidVersion`
+- Cache Builder#shasum before Builder#build to ensure consistent result.
+- Update chef-sugar to 3.0 which adds ppc64le support.
+- The MSI packager now adds the architecture to the msi name. The file names go from `package_name-build_version-build_iteration` to `package_name-build_version-build_iteration-arch`.
 
 v4.0.0 (December 15, 2014)
 --------------------------

data/MAINTAINERS.md

@@ -0,0 +1,26 @@
+# Maintainers
+
+This file lists how the Omnibus project is maintained. When making changes
+to the system, this file tells you who needs to review your patch - you need a
+simple majority of maintainers for the relevant subsystems to provide a :+1: on
+your pull request. Additionally, you need to not receive a veto from a
+Lieutenant or the Project Lead.
+
+Check out
+[How Chef is Maintained](https://github.com/chef/chef-rfc/blob/master/rfc030-maintenance-policy.md#how-the-project-is-maintained)
+for details on the process, how to become a maintainer, lieutenant, or the
+project lead.
+
+## Project Lead
+
+* [Seth Chisamore](https://github.com/schisamo)
+
+## Maintainers
+
+* [Daniel DeLeo](https://github.com/danielsdeleo)
+* [Jay Mundrawala](https://github.com/jdmundrawala)
+* [Lamont Granquist](https://github.com/lamont-granquist)
+* [Scott Hain](https://github.com/scotthain)
+* [Seth Vargo](http://github.com/sethvargo)
+* [Steven Danna](https://github.com/stevendanna)
+* [Yvonne Lam](http://github.com/yzl)

data/README.md

@@ -1,10 +1,10 @@
 ![Omnibus Icon](lib/omnibus/assets/README-logo.png) Omnibus
 ===========================================================
 [![Gem Version](http://img.shields.io/gem/v/omnibus.svg)][gem]
-[![Build Status](http://img.shields.io/travis/opscode/omnibus.svg)][travis]
+[![Build Status](http://img.shields.io/travis/chef/omnibus.svg)][travis]
 
 [gem]: https://rubygems.org/gems/omnibus
-[travis]: http://travis-ci.org/opscode/omnibus
+[travis]: http://travis-ci.org/chef/omnibus
 
 Easily create full-stack installers for your project across a variety of platforms.
 
@@ -19,7 +19,7 @@ Prerequisites
 -------------
 Omnibus is designed to run with a minimal set of prerequisites. You will need the following:
 
-- Ruby 1.9+
+- Ruby 2.0.0+
 - Bundler
 
 
@@ -128,6 +128,11 @@ Some DSL methods available include:
 | `package`         | Invoke a packager-specific DSL              |
 | `compress`        | Invoke a compressor-specific DSL            |
 
+By default a timestamp is appended to the build_version.  You can turn
+this behavior off by setting `append_timestamp` to `false` in your
+configuration file or using `--override append_timestamp:false` at the
+command line.
+
 For more information, please see the [`Project` documentation](http://rubydoc.info/github/opscode/omnibus/Omnibus/Project).
 
 ### Software
@@ -214,7 +219,7 @@ 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.
 
 #### Sharing software definitions
-The easiest way to share organization-wide software is via bundler and Rubygems. For an example software repository, look at Chef's [omnibus-software](https://github.com/opscode/omnibus-software). For more information, please see the [Rubygems documentation](http://guides.rubygems.org/publishing/).
+The easiest way to share organization-wide software is via bundler and Rubygems. For an example software repository, look at Chef's [omnibus-software](https://github.com/chef/omnibus-software). For more information, please see the [Rubygems documentation](http://guides.rubygems.org/publishing/).
 
 It is recommended you use bundler to pull down these gems (as bundler also permits pulling software directly from GitHub):
 
@@ -248,6 +253,58 @@ $PWD/config/software/foo.rb
 
 The first instance of `foo.rb` that is encountered will be used. Please note that **local** (vendored) softare definitions take precedence!
 
+Version Manifest
+----------------
+
+Git-based software definitions may specify branches as their
+default_version. In this case, the exact git revision to use will be
+determined at build-time unless a project override (see below) or
+external version manifest is used. To generate a version manifest use
+the `omnibus manifest` command:
+
+```
+omnibus manifest PROJECT -l warn
+```
+
+This will output a JSON-formatted manifest containing the resolved
+version of every software definition.
+
+Whitelisting Libraries
+----------------------
+
+Sometimes a platform has libraries that need to be whitelisted so the healthcheck
+can pass. The whitelist found in the [healthcheck](https://github.com/chef/omnibus/blob/master/lib/omnibus/health_check.rb)
+code comprises the minimal required for successful builds on supported platforms.
+
+To add your own whitelisted library, simply add the a regex to your software
+definition in your omnibus project as follows:
+```
+whitelist_file /libpcrecpp\.so\..+/
+```
+It is typically a good idea to add a conditional to whitelist based on the specific
+platform that requires it.
+
+*Warning: You should only add libraries to the whitelist that are guaranteed to
+be on the system you install to; if a library comes from a non-default package
+you should instead build it into the package.*
+
+Changelog
+---------
+STATUS: *EXPERIMENTAL*
+
+`omnibus changelog generate` will generate a changelog for an omnibus
+project.  This command currently assumes:
+
+- version-manifest.json is checked into the project root
+- the project is a git repository
+- each version is tagged with a SemVer compliant annotated tag
+- Any git-based sources are checked out at ../COMPONENT_NAME
+- Any commit message line prepended with ChangeLog-Entry: should be
+  added to the changelog.
+
+These assumptions *will* change as we determine what works best for a
+number of our projects.
+
 
 Caveats
 -------

data/appveyor.yml

@@ -0,0 +1,35 @@
+version: "{build}"
+
+os: Windows Server 2012
+platform:
+  - x64
+
+environment:
+  matrix:
+    - ruby_version: "200"
+
+clone_folder: c:\projects\omnibus
+clone_depth: 1
+skip_tags: true
+branches:
+  only:
+    - master
+
+install:
+  - SET PATH=C:\Ruby%ruby_version%\bin;C:\Ruby21%ruby_version:~3%\Devkit\mingw\bin;%PATH%
+  - echo %PATH%
+  - ruby --version
+  - gem --version
+  - gem install bundler --quiet --no-ri --no-rdoc
+  - bundler --version
+  - cp C:\Ruby21%ruby_version:~3%\Devkit\mingw\bin\bsdtar.exe C:\Ruby21%ruby_version:~3%\Devkit\mingw\bin\tar.exe
+  - appveyor DownloadFile http://curl.haxx.se/ca/cacert.pem -FileName C:\cacert.pem
+  - set SSL_CERT_FILE=C:\cacert.pem
+
+build_script:
+  - bundle install
+
+test_script:
+  - bundle exec rake unit
+  - bundle exec rake functional
+  - bundle exec rake acceptance

data/docs/Build Cache.md

@@ -22,7 +22,7 @@ repository) is
 customize the location of the cache in the `omnibus.rb` config file
 using the key `git_cache_dir`. For example:
 
-    git_cache_dir "/opt/ominbus-caches"
+    git_cache_dir "/opt/omnibus-caches"
 
 ## How It Works ##
 
@@ -67,8 +67,33 @@ You can inspect the cache keys like this:
     git --git-dir=$CACHE_PATH tag -l
 
 You can manually remove a cache entry using `git tag --delete
-$TAG`. In theory, you can share the cache among build slaves using
-`git clone/fetch`.
+$TAG`.
+
+
+## Build Slaves ##
+
+You can share the cache among build slaves using `git clone/fetch`.
+
+Using git bundles is another option (if you're using Jenkins, the bundle
+can be persisted as an artifact):
+
+  + Backup: `git --git-dir=$CACHE_PATH bundle create $CACHE_BUNDLE --tags`
+  + Restore: `git clone --mirror $CACHE_BUNDLE $CACHE_PATH`
+
+(CACHE_BUNDLE is anywhere you're persisting the bundle to)
+
+
+### Important Caveat ###
+
+Note that Omnibus caches instructions *exactly as they will be executed*
+(e.g. Omnibus caches `make -j 9`, it doesn't cache `make -j #{workers}`).
+
+So, if you intend to share your build cache among slaves, you should ensure
+that their build environments are identical (failing which you'll bust the
+cache with commands that depend on the environment).
+
+
+## Mac OS X Caveats ##
 
 When running a build vm on OS X, note that you will likely run into
 trouble if you attempt to locate your cache on your local

data/docs/Building on RHEL.md

@@ -65,7 +65,7 @@ Some DSL methods available include:
 | `vendor`             | The name of the package producer            |
 | `license`            | The default license for the package         |
 | `priority`           | The priority for the package                |
-| `catetory`           | The catetory for this package               |
+| `category`           | The category for this package               |
 
 If you are unfamilar with any of these terms, you should just accept the defaults. For more information on the purpose of any of these configuration options, please see the RPM spec.
 

data/features/commands/publish.feature

@@ -1,13 +1,8 @@
 Feature: omnibus publish
-  Scenario: Overriding publishing platform
-    * I run `omnibus publish artifactory fake * --platform debian`
+  Scenario: Providing platform mappings file
+    * I have a platform mappings file named "platform_mappings.json"
+    * I run `omnibus publish artifactory fake * --platform-mappings platform_mappings.json`
     * 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'
+      Publishing will be performed using provided platform mappings.
       """

data/features/step_definitions/generator_steps.rb

@@ -1,7 +1,7 @@
 require 'aruba/api'
 
 Given(/^I have an omnibus project named "(.+)"$/) do |name|
-  create_dir(name)
+  create_directory(name)
   cd(name)
 
   write_file("config/projects/#{name}.rb", <<-EOH.gsub(/^ {4}/, ''))
@@ -18,6 +18,7 @@ Given(/^I have an omnibus project named "(.+)"$/) do |name|
 
   write_file('omnibus.rb', <<-EOH.gsub(/^ {4}/, ''))
     # Build configuration
+    append_timestamp false
     cache_dir     './local/omnibus/cache'
     git_cache_dir './local/omnibus/cache/git_cache'
     source_dir    './local/omnibus/src'
@@ -26,3 +27,15 @@ Given(/^I have an omnibus project named "(.+)"$/) do |name|
     package_tmp   './local/omnibus/pkg-tmp'
   EOH
 end
+
+Given(/^I have a platform mappings file named "(.+)"$/) do |name|
+  write_file(name, <<-EOH.gsub(/^ {4}/, ''))
+    {
+      "ubuntu-10.04": [
+        "ubuntu-10.04",
+        "ubuntu-12.04",
+        "ubuntu-14.04"
+      ]
+    }
+  EOH
+end

data/features/support/env.rb

@@ -4,10 +4,12 @@ require 'aruba/in_process'
 
 require 'omnibus/cli'
 
+Aruba.configure do |config|
+  config.command_launcher = :in_process
+  config.main_class = Omnibus::CLI::Runner
+end
+
 Before do
   # Reset anything that might have been cached in the Omnibus project
   Omnibus.reset!(true)
-
-  Aruba::InProcess.main_class = Omnibus::CLI::Runner
-  Aruba.process = Aruba::InProcess
 end

data/lib/omnibus.rb

@@ -72,10 +72,20 @@ module Omnibus
   autoload :NullPublisher,        'omnibus/publishers/null_publisher'
   autoload :S3Publisher,          'omnibus/publishers/s3_publisher'
 
+  autoload :Manifest,      'omnibus/manifest'
+  autoload :ManifestEntry, 'omnibus/manifest_entry'
+  autoload :ManifestDiff,  'omnibus/manifest_diff'
+
+  autoload :ChangeLog, 'omnibus/changelog'
+  autoload :GitRepository, 'omnibus/git_repository'
+
+  autoload :SemanticVersion, 'omnibus/semantic_version'
+
   module Command
     autoload :Base,    'omnibus/cli/base'
     autoload :Cache,   'omnibus/cli/cache'
     autoload :Publish, 'omnibus/cli/publish'
+    autoload :ChangeLog, 'omnibus/cli/changelog'
   end
 
   class << self

data/lib/omnibus/build_version.rb

@@ -46,6 +46,10 @@ module Omnibus
       def semver
         new.semver
       end
+
+      def build_start_time
+        new.build_start_time
+      end
     end
 
     # Create a new BuildVersion
@@ -102,7 +106,7 @@ module Omnibus
       #
       # format: YYYYMMDDHHMMSS example: 20130131123345
       if Config.append_timestamp
-        build_version_items << build_start_time.strftime(TIMESTAMP_FORMAT)
+        build_version_items << build_start_time
       end
 
       # We'll append the git describe information unless we are sitting right
@@ -120,6 +124,26 @@ module Omnibus
       build_tag
     end
 
+    # We'll attempt to retrive the timestamp from the Jenkin's set BUILD_ID
+    # environment variable. This will ensure platform specfic packages for the
+    # same build will share the same timestamp.
+    def build_start_time
+      @build_start_time ||= begin
+                              if ENV['BUILD_ID']
+                                begin
+                                  Time.strptime(ENV['BUILD_ID'], '%Y-%m-%d_%H-%M-%S')
+                                rescue ArgumentError
+                                  error_message =  'BUILD_ID environment variable '
+                                  error_message << 'should be in YYYY-MM-DD_hh-mm-ss '
+                                  error_message << 'format.'
+                                  raise ArgumentError, error_message
+                                end
+                              else
+                                Time.now.utc
+                              end
+                            end.strftime(TIMESTAMP_FORMAT)
+    end
+
     # Generates a version string by running
     # {https://www.kernel.org/pub/software/scm/git/docs/git-describe.html
     # git describe} in the root of the Omnibus project.
@@ -179,9 +203,9 @@ module Omnibus
     # @return [nil] if no pre-release tag was found
     def prerelease_tag
       prerelease_regex = if commits_since_tag > 0
-                           /^\d+\.\d+\.\d+(?:-|\.)([0-9A-Za-z.-]+)-\d+-g[0-9a-f]+$/
+                           /^v?\d+\.\d+\.\d+(?:-|\.)([0-9A-Za-z.-]+)-\d+-g[0-9a-f]+$/
                          else
-                           /^\d+\.\d+\.\d+(?:-|\.)([0-9A-Za-z.-]+)$/
+                           /^v?\d+\.\d+\.\d+(?:-|\.)([0-9A-Za-z.-]+)$/
                          end
       match = prerelease_regex.match(git_describe)
       match ? match[1] : nil
@@ -237,26 +261,6 @@ module Omnibus
 
     private
 
-    # We'll attempt to retrive the timestamp from the Jenkin's set BUILD_ID
-    # environment variable. This will ensure platform specfic packages for the
-    # same build will share the same timestamp.
-    def build_start_time
-      @build_start_time ||= begin
-                              if ENV['BUILD_ID']
-                                begin
-                                  Time.strptime(ENV['BUILD_ID'], '%Y-%m-%d_%H-%M-%S')
-                                rescue ArgumentError
-                                  error_message =  'BUILD_ID environment variable '
-                                  error_message << 'should be in YYYY-MM-DD_hh-mm-ss '
-                                  error_message << 'format.'
-                                  raise ArgumentError, error_message
-                                end
-                              else
-                                Time.now.utc
-                              end
-                            end
-    end
-
     # Pulls out the major, minor, and patch components from the output
     # of {#git_describe}.
     #
@@ -267,8 +271,13 @@ module Omnibus
     #
     # @todo Compute this once and store the result in an instance variable
     def version_composition
-      version_regexp = /^(\d+)\.(\d+)\.(\d+)/
-      version_regexp.match(git_describe)[1..3]
+      version_regexp = /^v?(\d+)\.(\d+)\.(\d+)/
+
+      if match = version_regexp.match(git_describe)
+        match[1..3]
+      else
+        raise "Invalid semver tag `#{git_describe}'!"
+      end
     end
   end
 end