omnibus 5.4.0 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 407d08f9b06a939ef258ff8c14f27b12afb74234
-  data.tar.gz: 84d25b4c5c73eede7828af010d99273771f2d547
+  metadata.gz: df89be1587ea0dd7f53b9d049fd0b98e59303696
+  data.tar.gz: 3dbf3e7857bfd275f4d35e04d1b2522259a82f01
 SHA512:
-  metadata.gz: fecc2417ce2c9137d12a2675e52105e9f2b263e8953a1f264582c15204614fd8de7cb62792c9e6d9b46a18b69ce707973f275ce46490703eabbea4ee7c0e5b0f
-  data.tar.gz: b7d07fb926de84af9f2bb56b526bca9594a634c0b20a92e4b88d5daf206f595035ddf06bbe138c61b5a361f44b071bfb867f0ac2ce57dfee1336585cbf6b11fb
+  metadata.gz: 73d9cf647ab0734f4e13797ae98f7baff5d1f03011bcd826c291cab03f8fd4c7448fc8328d903211a675b1b023034b84d84a2bd85f304c901e9cc47b6f88fcba
+  data.tar.gz: 895ab544f10c0cd284965c21c586c30b439ba679f1898b14d1f72671d91c21de43eca176141cdb681f9e8c18de8b93ea9b4e7d62eeb316fa4175fb0f50bbefbf

data/.travis.yml

@@ -1,8 +1,7 @@
 sudo: false
 rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2
+  - 2.1.9
+  - 2.2.5
 bundler_args: "--jobs 7 --without docs local"
 branches:
   only:

data/CHANGELOG.md

@@ -1,6 +1,27 @@
 Omnibus CHANGELOG
 =================
 
+v5.5.0 (August 16, 2016)
+-----------------------
+### New Features
+- Add build timings to the local output (#669)
+- Add `appx` packager (#675, #676, #677)
+- `fatal_licensing_warnings` configuration to fail the build when there are licensing problems (#678)
+- Ensure consistent code style using Chefstyle \o/ (#681)
+- Drop Ruby 2.0 support (#697)
+- Remove fakeroot from RPM packager (#698)
+- Support license collection with git cache (#700)
+- Add `SERIAL_NUMBER` to omnibus code, which is used in git caching to invalidate caches when omnibus code changes require it to be invalidated  (#704)
+- Support license collection of transitive dependencies (via license_scout gem) (#705)
+- Add `skip_transitive_dependency_licensing` dsl method to Software. Use this when the software does not use any dependency manager. (#705)
+
+### Bug Fixes
+- Make license files readable inside the packages (#673)
+- Prefer server marketing names on windows (#679)
+- Instead of exe, use bat if present on windows (#684)
+- Fix changelog generation with symbolized keys (#687)
+
+
 v5.4.0 (April 18, 2016)
 -----------------------
 ### New Features

data/Gemfile

@@ -1,11 +1,14 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 gemspec
 
 # Fork to allow for a recent version of multipart-post.
-gem 'pedump', git: 'https://github.com/ksubrama/pedump', branch: 'patch-1'
+gem "pedump", git: "https://github.com/ksubrama/pedump", branch: "patch-1"
+
+# Always use license_scout from master
+gem "license_scout", github: "chef/license_scout"
 
 group :docs do
-  gem 'yard',          '~> 0.8'
-  gem 'redcarpet',     '~> 2.2.2'
-  gem 'github-markup', '~> 0.7'
+  gem "yard",          "~> 0.8"
+  gem "redcarpet",     "~> 2.2.2"
+  gem "github-markup", "~> 0.7"
 end

data/README.md

@@ -1,10 +1,12 @@
 ![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/chef/omnibus.svg)][travis]
+[![Travis Build Status](http://img.shields.io/travis/chef/omnibus.svg?label=Travis CI)][travis]
+[![AppVeyor Build Status](http://img.shields.io/appveyor/ci/chef/omnibus.svg?label=AppVeyor)][appveyor]
 
 [gem]: https://rubygems.org/gems/omnibus
 [travis]: https://travis-ci.org/chef/omnibus
+[appveyor]: https://ci.appveyor.com/project/chef/omnibus
 
 Easily create full-stack installers for your project across a variety of platforms.
 

data/Rakefile

@@ -1,28 +1,35 @@
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 [:unit, :functional].each do |type|
   RSpec::Core::RakeTask.new(type) do |t|
     t.pattern = "spec/#{type}/**/*_spec.rb"
     t.rspec_opts = [].tap do |a|
-      a.push('--color')
-      a.push('--format progress')
-    end.join(' ')
+      a.push("--color")
+      a.push("--format progress")
+    end.join(" ")
   end
 end
 
-require 'cucumber/rake/task'
+require "cucumber/rake/task"
 Cucumber::Rake::Task.new(:acceptance) do |t|
   t.cucumber_opts = [].tap do |a|
-    a.push('--color')
-    a.push('--format progress')
-    a.push('--strict')
-  end.join(' ')
+    a.push("--color")
+    a.push("--format progress")
+    a.push("--strict")
+  end.join(" ")
+end
+
+require "chefstyle"
+require "rubocop/rake_task"
+desc " Run ChefStyle"
+RuboCop::RakeTask.new(:chefstyle) do |task|
+  task.options << "--display-cop-names"
 end
 
 namespace :travis do
-  desc 'Run tests on Travis'
-  task ci: %w(unit functional acceptance)
+  desc "Run tests on Travis"
+  task ci: %w{chefstyle unit functional acceptance}
 end
 
-task default: %w(travis:ci)
+task default: %w{travis:ci}

data/appveyor.yml

@@ -6,7 +6,8 @@ platform:
 
 environment:
   matrix:
-    - ruby_version: "200"
+    - RUBY_VERSION: 22
+    - RUBY_VERSION: 21
 
 clone_folder: c:\projects\omnibus
 clone_depth: 1
@@ -16,13 +17,13 @@ branches:
     - master
 
 install:
-  - SET PATH=C:\Ruby%ruby_version%\bin;C:\Ruby21%ruby_version:~3%\Devkit\mingw\bin;%PATH%
+  - SET PATH=C:\Ruby%RUBY_VERSION%\bin;C:\Ruby23-x64\DevKit\mingw\bin;%PATH%
   - echo %PATH%
   - ruby --version
   - gem --version
   - gem install bundler -v 1.10.6 --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
+  - cp C:\Ruby23-x64\DevKit\mingw\bin\bsdtar.exe C:\Ruby23-x64\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
   - git config --global user.email "clouseau@chef.io"

data/bin/omnibus

@@ -2,12 +2,12 @@
 
 # Trap interrupts to quit cleanly. See
 # https://twitter.com/mitchellh/status/283014103189053442
-Signal.trap('INT') { exit 1 }
+Signal.trap("INT") { exit 1 }
 
-$:.push File.expand_path('../../lib', __FILE__)
+$:.push File.expand_path("../../lib", __FILE__)
 $stdout.sync = true
 
-require 'omnibus/cli'
+require "omnibus/cli"
 
 # Some platforms do not have a UTF-8 locale, so we need to enforce one
 # or else the cacert chain will break among other things

data/features/commands/manifest.feature

@@ -14,7 +14,10 @@ Feature: omnibus manifest
   Scenario: When the project has no software definitions
     When I run `omnibus manifest hamlet`
 
-    Then it should pass with "[Project: hamlet] I | Building version manifest"
+    Then it should pass with "[Project: hamlet] I | "
+
+    And the output should match /^[Project: hamlet] I | \d\d\d\d-[0-1]\d-[0-3]\dT[0-2]\d:[0-6]\d:[0-6]\d(\+|\-)\d\d:\d\d | Building version manifest$/
+
     And  the output should contain:
          """
            "software": {
@@ -35,7 +38,9 @@ Feature: omnibus manifest
 
     When  I run `omnibus manifest hamlet`
 
-    Then it should pass with "[Project: hamlet] I | Building version manifest"
+    Then it should pass with "[Project: hamlet] I | "
+
+    And the output should match /^[Project: hamlet] I | \d\d\d\d-[0-1]\d-[0-3]\dT[0-2]\d:[0-6]\d:[0-6]\d(\+|\-)\d\d:\d\d | Building version manifest$/
     And  the output should contain:
          """
            "software": {
@@ -62,7 +67,10 @@ Feature: omnibus manifest
 
     When  I run `omnibus manifest hamlet`
 
-    Then it should pass with "[Project: hamlet] I | Building version manifest"
+    Then it should pass with "[Project: hamlet] I | "
+
+    And the output should match /^[Project: hamlet] I | \d\d\d\d-[0-1]\d-[0-3]\dT[0-2]\d:[0-6]\d:[0-6]\d(\+|\-)\d\d:\d\d | Building version manifest$/
+
     And  the output should contain:
          """
            "software": {
@@ -90,7 +98,10 @@ Feature: omnibus manifest
 
     When  I run `omnibus manifest hamlet --os=linux --platform_family=debian --platform=ubuntu --platform_version=14.04`
 
-    Then it should pass with "[Project: hamlet] I | Building version manifest"
+    Then it should pass with "[Project: hamlet] I "
+
+    And the output should match /^[Project: hamlet] I | \d\d\d\d-[0-1]\d-[0-3]\dT[0-2]\d:[0-6]\d:[0-6]\d(\+|\-)\d\d:\d\d | Building version manifest$/
+
     And  the output should contain:
          """
            "software": {
@@ -117,7 +128,10 @@ Feature: omnibus manifest
 
     When  I run `omnibus manifest hamlet --os=windows --platform_family=windows --platform=windows --platform_version=2012r2`
 
-    Then it should pass with "[Project: hamlet] I | Building version manifest"
+    Then it should pass with "[Project: hamlet] I | "
+
+    And the output should match /^[Project: hamlet] I | \d\d\d\d-[0-1]\d-[0-3]\dT[0-2]\d:[0-6]\d:[0-6]\d(\+|\-)\d\d:\d\d | Building version manifest$/
+
     And  the output should contain:
          """
            "software": {

data/features/step_definitions/generator_steps.rb

@@ -1,4 +1,4 @@
-require 'aruba/api'
+require "aruba/api"
 
 Given(/^I have an omnibus project named "(.+)"$/) do |name|
   create_directory(name)
@@ -10,7 +10,7 @@ Given(/^I have an omnibus project named "(.+)"$/) do |name|
   # Single top level output dir
   create_directory("output")
 
-  write_file("config/projects/#{name}.rb", <<-EOH.gsub(/^ {4}/, ''))
+  write_file("config/projects/#{name}.rb", <<-EOH.gsub(/^ {4}/, ""))
     name '#{name}'
     maintainer 'Mrs. Maintainer'
     homepage 'https://example.com'
@@ -27,7 +27,7 @@ Given(/^I have an omnibus project named "(.+)"$/) do |name|
     end
   EOH
 
-  write_file('omnibus.rb', <<-EOH.gsub(/^ {4}/, ''))
+  write_file("omnibus.rb", <<-EOH.gsub(/^ {4}/, ""))
     # Build configuration
     append_timestamp false
     cache_dir     '#{abs_path}/local/omnibus/cache'
@@ -40,12 +40,11 @@ Given(/^I have an omnibus project named "(.+)"$/) do |name|
 end
 
 Given(/^I debug$/) do
-  require 'pry'
-  binding.pry
+  require "pry"
 end
 
 Given(/^I have a platform mappings file named "(.+)"$/) do |name|
-  write_file(name, <<-EOH.gsub(/^ {4}/, ''))
+  write_file(name, <<-EOH.gsub(/^ {4}/, ""))
     {
       "ubuntu-10.04": [
         "ubuntu-10.04",

data/features/support/env.rb

@@ -1,8 +1,8 @@
-require 'aruba'
-require 'aruba/cucumber'
-require 'aruba/in_process'
+require "aruba"
+require "aruba/cucumber"
+require "aruba/in_process"
 
-require 'omnibus/cli'
+require "omnibus/cli"
 
 Aruba.configure do |config|
   config.command_launcher = :in_process

data/lib/omnibus/build_version.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require 'time'
+require "time"
 
 module Omnibus
   # Provides methods for generating Omnibus project build version
@@ -34,7 +34,7 @@ module Omnibus
     #
     # @see Omnibus::BuildVersion#semver
     # @see Time#strftime
-    TIMESTAMP_FORMAT = '%Y%m%d%H%M%S'
+    TIMESTAMP_FORMAT = "%Y%m%d%H%M%S"
 
     class << self
       # @see (BuildVersion#git_describe)
@@ -92,8 +92,8 @@ module Omnibus
       if prerelease_version?
         # ensure all dashes are dots per precedence rules (#12) in Semver
         # 2.0.0-rc.1
-        prerelease = prerelease_tag.gsub('-', '.')
-        build_tag << '-' << prerelease
+        prerelease = prerelease_tag.tr("-", ".")
+        build_tag << "-" << prerelease
       end
 
       # BUILD VERSION
@@ -114,11 +114,11 @@ module Omnibus
       #
       # format: git.COMMITS_SINCE_TAG.GIT_SHA example: git.207.694b062
       unless commits_since_tag == 0
-        build_version_items << ['git', commits_since_tag, git_sha_tag].join('.')
+        build_version_items << ["git", commits_since_tag, git_sha_tag].join(".")
       end
 
       unless build_version_items.empty?
-        build_tag << '+' << build_version_items.join('.')
+        build_tag << "+" << build_version_items.join(".")
       end
 
       build_tag
@@ -129,13 +129,13 @@ module Omnibus
     # same build will share the same timestamp.
     def build_start_time
       @build_start_time ||= begin
-                              if ENV['BUILD_ID']
+                              if ENV["BUILD_ID"]
                                 begin
-                                  Time.strptime(ENV['BUILD_ID'], '%Y-%m-%d_%H-%M-%S')
+                                  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.'
+                                  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
@@ -157,7 +157,7 @@ module Omnibus
     # @return [String]
     def git_describe
       @git_describe ||= begin
-        cmd = shellout('git describe --tags', cwd: @path)
+        cmd = shellout("git describe --tags", cwd: @path)
 
         if cmd.exitstatus == 0
           cmd.stdout.chomp
@@ -166,7 +166,7 @@ module Omnibus
             "Could not extract version information from 'git describe'! " \
             "Setting version to 0.0.0."
           end
-          '0.0.0'
+          "0.0.0"
         end
       end
     end
@@ -187,7 +187,7 @@ module Omnibus
     #
     # @return [String]
     def version_tag
-      version_composition.join('.')
+      version_composition.join(".")
     end
 
     # Return a prerelease tag string (if it exists), as extracted from {#git_describe}.

data/lib/omnibus/build_version_dsl.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require 'time'
+require "time"
 
 module Omnibus
   class BuildVersionDSL
@@ -132,9 +132,9 @@ module Omnibus
     # @param [String] version
     # @return [Boolean]
     def has_timestamp?(version)
-      _ver, build_info = version.split('+')
+      _ver, build_info = version.split("+")
       return false if build_info.nil?
-      build_info.split('.').any? do |part|
+      build_info.split(".").any? do |part|
         begin
           Time.strptime(part, Omnibus::BuildVersion::TIMESTAMP_FORMAT)
           true