omnibus 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6c6004b5090f1bef33eea64eec8e741fef4af4d
-  data.tar.gz: 540e7c85bff51d2e8865325d388e08260be11b98
+  metadata.gz: d909e83257599b77c57d11ad3f4cad644286d005
+  data.tar.gz: ff63967a1b6a5189f29bb6524e73af08ecfc2d29
 SHA512:
-  metadata.gz: 3d4e0d40424b6e0e5d2ebbaa0fa411fe9435bde23c508dfa22e84a10337153415e6467c9c40a41cfed138c9cb1ec77660c19a211fe491e8d9839cf83e587a358
-  data.tar.gz: a6d063e1f4772956aa11a0264d5a06611b6de49ea184cc4a89aa0296a1c0cc02be3b21e721270b31730e9ccadff4578dca5edc0df60f5d10e91d77afc24b5efc
+  metadata.gz: 5c02188f92090b922772ffc0c9c50a92ae32224a90ae36d0c5b3fe3bf79c56e3e32043ef797ade533ac783700665ea8b8874bfea24954c8db5190a21321565ef
+  data.tar.gz: 67be7899e3af5eff14c57d54c2d414165daa3b4811a65e8f4491a355a2725274f6522ca6daa4a7b8a3df1251657659e71b1ed8d664afecdd6e7561522ff16726

data/CHANGELOG.md

@@ -1,6 +1,28 @@
 Omnibus CHANGELOG
 =================
 
+v5.2.0 (March 15, 2016)
+-----------------------
+### New Features
+
+- License reporting (#635):
+  - Add `license` & `license_file` DSL methods to software.
+    - `license` (String): Sets the license of the software component.
+    - `license_file` (String): The relative path or the url of the license file of the software to be included in `"LICENSES"` directory.
+      - Can be used multiple times.
+      - You can use `:project_license` as a special value if the software is build related code and if it is using project's license.
+  - Add `license`, `license_file` and `license_file_path` DSL methods to project.
+    - `license` (String): Sets the license of the project.
+    - `license_file` (String): The relative path or the url of the license file of the project to be included in the file that will be created at project.license_file_path.
+    - `license_file_path` (String): The relative path of the main license file that will be created for the project. Default: `"LICENSE"`.
+
+  With this omnibus will:
+
+  1. Collect all the license files specified in software components into `install_dir/LICENSES` directory.
+  2. Create a license file at `install_dir/LICENSE` which will contain license of the project and license information for all the software components that are being included.
+- Ability to change `dist_tag` in RPM packager. (#634)
+- Ability to update submodules during git checkout. (#603)
+
 v5.1.0 (March 10, 2016)
 -----------------------
 ### New Features

data/lib/omnibus.rb

@@ -62,6 +62,7 @@ module Omnibus
   autoload :Templating,       'omnibus/templating'
   autoload :ThreadPool,       'omnibus/thread_pool'
   autoload :Util,             'omnibus/util'
+  autoload :Licensing,        'omnibus/licensing'
 
   autoload :GitFetcher,  'omnibus/fetchers/git_fetcher'
   autoload :NetFetcher,  'omnibus/fetchers/net_fetcher'

data/lib/omnibus/fetchers/git_fetcher.rb

@@ -154,6 +154,7 @@ module Omnibus
       # default when a sha1 is provided).  git older than 1.7.5 doesn't
       # support the --detach flag.
       git("checkout #{resolved_version} -f -q")
+      git("submodule update --recursive") if clone_submodules?
     end
 
     #

data/lib/omnibus/licensing.rb

@@ -0,0 +1,227 @@
+#
+# Copyright 2015 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.
+#
+
+require 'uri'
+require 'fileutils'
+
+module Omnibus
+  class Licensing
+    include Logging
+
+    OUTPUT_DIRECTORY = "LICENSES".freeze
+
+    class << self
+      # @see (Licensing#create!)
+      def create!(project)
+        new(project).create!
+      end
+    end
+
+    #
+    # The project to create licenses for.
+    #
+    # @return [Project]
+    #
+    attr_reader :project
+
+    #
+    # @param [Project] project
+    #   the project to create licenses for.
+    #
+    def initialize(project)
+      @project = project
+    end
+
+    #
+    # Creates the license files for given project.
+    # It is assumed that the project has already been built.
+    #
+    # @return [void]
+    #
+    def create!
+      prepare
+      create_software_license_files
+      create_project_license_file
+    end
+
+    #
+    # Creates the required directories for licenses.
+    #
+    # @return [void]
+    #
+    def prepare
+      FileUtils.rm_rf(output_dir)
+      FileUtils.mkdir_p(output_dir)
+    end
+
+    #
+    # Creates the top level license file for the project.
+    # Top level file is created at #{project.license_file_path}
+    # and contains the name of the project, version of the project,
+    # text of the license of the project and a summary of the licenses
+    # of the included software components.
+    #
+    # @return [void]
+    #
+    def create_project_license_file
+      File.open(project.license_file_path, 'w') do |f|
+        f.puts "#{project.name} #{project.build_version} license: \"#{project.license}\""
+        f.puts ""
+        f.puts project_license_content
+        f.puts ""
+        f.puts components_license_summary
+      end
+    end
+
+    #
+    # Copies the license files specified by the software components into the
+    # output directory.
+    #
+    # @return [void]
+    #
+    def create_software_license_files
+      license_map.each do |name, values|
+        license_files = values[:license_files]
+
+        license_files.each do |license_file|
+          if license_file && local?(license_file)
+            input_file = File.expand_path(license_file, values[:project_dir])
+            output_file = license_package_location(name, license_file)
+            FileUtils.cp(input_file, output_file) if File.exist?(input_file)
+          end
+        end
+      end
+    end
+
+    #
+    # Contents of the project's license
+    #
+    # @return [String]
+    #
+    def project_license_content
+      project.license_file.nil? ? "" : IO.read(File.join(Config.project_root,project.license_file))
+    end
+
+    #
+    # Summary of the licenses included by the softwares of the project.
+    # It is in the form of:
+    # ...
+    # This product bundles python 2.7.9,
+    # which is available under a "Python" License.
+    # For details, see:
+    # /opt/opscode/LICENSES/python-LICENSE
+    # ...
+    #
+    # @return [String]
+    #
+    def components_license_summary
+      out = "\n\n"
+
+      license_map.keys.sort.each do |name|
+        license = license_map[name][:license]
+        license_files = license_map[name][:license_files]
+        version = license_map[name][:version]
+
+        out << "This product bundles #{name} #{version},\n"
+        out << "which is available under a \"#{license}\" License.\n"
+        if !license_files.empty?
+          out << "For details, see:\n"
+          license_files.each do |license_file|
+            out << "#{license_package_location(name, license_file)}\n"
+          end
+        end
+        out << "\n"
+      end
+
+      out
+    end
+
+    #
+    # Map that collects information about the licenses of the softwares
+    # included in the project.
+    #
+    # @example
+    # {
+    #   ...
+    #   "python" => {
+    #     "license" => "Python",
+    #     "license_files" => "LICENSE",
+    #     "version" => "2.7.9",
+    #     "project_dir" => "/var/cache/omnibus/src/python/Python-2.7.9/"
+    #   },
+    #   ...
+    # }
+    #
+    # @return [Hash]
+    #
+    def license_map
+      @license_map ||= begin
+        map = {}
+
+        project.library.each do |component|
+          # Some of the components do not bundle any software but contain
+          # some logic that we use during the build. These components are
+          # covered under the project's license and they do not need specific
+          # license files.
+          next if component.license == :project_license
+
+          map[component.name] = {
+            license: component.license,
+            license_files: component.license_files,
+            version: component.version,
+            project_dir: component.project_dir,
+          }
+        end
+
+        map
+      end
+    end
+
+    #
+    # Returns the location where the license file should reside in the package.
+    # License file is named as <project_name>-<license_file_name> and created
+    # under the output licenses directory.
+    #
+    # @return [String]
+    #
+    def license_package_location(component_name, where)
+      if local?(where)
+        File.join(output_dir, "#{component_name}-#{File.split(where).last}")
+      else
+        where
+      end
+    end
+
+    #
+    # Output directory to create the licenses in.
+    #
+    # @return [String]
+    #
+    def output_dir
+      File.expand_path(OUTPUT_DIRECTORY, project.install_dir)
+    end
+
+    #
+    # Returns if the given path to a license is local or a remote url.
+    #
+    # @return [Boolean]
+    #
+    def local?(license)
+      u = URI(license)
+      return u.scheme.nil?
+    end
+  end
+end

data/lib/omnibus/manifest.rb

@@ -24,13 +24,14 @@ module Omnibus
 
     include Logging
 
-    LATEST_MANIFEST_FORMAT = 1
+    LATEST_MANIFEST_FORMAT = 2
 
-    attr_reader :build_version, :build_git_revision
-    def initialize(version=nil, git_rev=nil)
+    attr_reader :build_version, :build_git_revision, :license
+    def initialize(version=nil, git_rev=nil, license="Unspecified")
       @data = {}
       @build_version = version
       @build_git_revision = git_rev
+      @license = license
     end
 
     def entry_for(name)
@@ -75,6 +76,7 @@ module Omnibus
       }
       ret['build_version'] = build_version if build_version
       ret['build_git_revision'] = build_git_revision if build_git_revision
+      ret['license'] = license
       ret
     end
 

data/lib/omnibus/manifest_entry.rb

@@ -16,13 +16,14 @@
 
 module Omnibus
   class ManifestEntry
-    attr_reader :locked_version, :locked_source, :source_type, :described_version, :name
+    attr_reader :locked_version, :locked_source, :source_type, :described_version, :name, :license
     def initialize(name, manifest_data)
       @name = name
       @locked_version = manifest_data[:locked_version]
       @locked_source = manifest_data[:locked_source]
       @source_type = manifest_data[:source_type]
       @described_version = manifest_data[:described_version]
+      @license = manifest_data[:license]
     end
 
     def to_hash
@@ -30,7 +31,8 @@ module Omnibus
         "locked_version" => @locked_version,
         "locked_source" => @locked_source,
         "source_type" => @source_type,
-        "described_version" => @described_version
+        "described_version" => @described_version,
+        "license" => @license
       }
     end
 

data/lib/omnibus/packagers/rpm.rb

@@ -202,6 +202,31 @@ module Omnibus
     end
     expose :category
 
+    #
+    # Set or return the dist_tag for this package
+    #
+    # The Dist Tag for this RPM package as per the Fedora packaging guidlines.
+    #
+    # @see http://fedoraproject.org/wiki/Packaging:DistTag
+    #
+    # @example
+    #   dist_tag ".#{Omnibus::Metadata.platform_shortname}#{Omnibus::Metadata.platform_version}"
+    #
+    # @param [String] val
+    #   the dist_tag for this package
+    #
+    # @return [String]
+    #   the dist_tag for this package
+    #
+    def dist_tag(val = NULL)
+      if null?(val)
+        @dist_tag || ".#{Omnibus::Metadata.platform_shortname}#{Omnibus::Metadata.platform_version}"
+      else
+        @dist_tag = val
+      end
+    end
+    expose :dist_tag
+
     #
     # @!endgroup
     # --------------------------------------------------
@@ -210,7 +235,11 @@ module Omnibus
     # @return [String]
     #
     def package_name
-      "#{safe_base_package_name}-#{safe_version}-#{safe_build_iteration}#{dist_tag}.#{safe_architecture}.rpm"
+      if dist_tag
+        "#{safe_base_package_name}-#{safe_version}-#{safe_build_iteration}#{dist_tag}.#{safe_architecture}.rpm"
+      else
+        "#{safe_base_package_name}-#{safe_version}-#{safe_build_iteration}.#{safe_architecture}.rpm"
+      end
     end
 
     #
@@ -435,17 +464,6 @@ module Omnibus
         .gsub("%", "[%]")
     end
 
-    #
-    # The Dist Tag for this RPM package per the Fedora packaging guidlines.
-    #
-    # @see http://fedoraproject.org/wiki/Packaging:DistTag
-    #
-    # @return [String]
-    #
-    def dist_tag
-      ".#{Omnibus::Metadata.platform_shortname}#{Omnibus::Metadata.platform_version}"
-    end
-
     #
     # Return the RPM-ready base package name, converting any invalid characters to
     # dashes (+-+).

data/lib/omnibus/project.rb

@@ -691,6 +691,70 @@ module Omnibus
     end
     expose :ohai
 
+    #
+    # Set or retrieve the {#license} of the project.
+    #
+    # @example
+    #   license 'Apache 2.0'
+    #
+    # @param [String] val
+    #   the license to set for the project.
+    #
+    # @return [String]
+    #
+    def license(val = NULL)
+      if null?(val)
+        @license || 'Unspecified'
+      else
+        @license = val
+      end
+    end
+    expose :license
+
+    #
+    # Set or retrieve the location of the {#license_file}
+    # of the project.  It can either be a relative path inside
+    # the project source directory or a URL.
+    #
+    #
+    # @example
+    #   license_file 'LICENSES/artistic.txt'
+    #
+    # @param [String] val
+    #   the location of the license file for the project.
+    #
+    # @return [String]
+    #
+    def license_file(val = NULL)
+      if null?(val)
+        @license_file
+      else
+        @license_file = val
+      end
+    end
+    expose :license_file
+
+    #
+    # Location of license file that omnibus will create and that will contain
+    # the information about the license of the project plus the details about
+    # the licenses of the software components included in the project.
+    #
+    # If no path is specified  install_dir/LICENSE is used.
+    #
+    # @example
+    #   license_file_path
+    #
+    # @return [String]
+    #
+    def license_file_path(path = NULL)
+      if null?(path)
+        @license_file_path || File.join(install_dir, "LICENSE")
+      else
+        @license_file_path = File.join(install_dir, path)
+      end
+    end
+    expose :license_file_path
+
     #
     # Location of json-formated version manifest, written at at the
     # end of the build. If no path is specified
@@ -983,7 +1047,7 @@ module Omnibus
     #
     def built_manifest
       log.info(log_key) { "Building version manifest" }
-      m = Omnibus::Manifest.new(build_version, build_git_revision)
+      m = Omnibus::Manifest.new(build_version, build_git_revision, license)
       softwares.each do |software|
         m.add(software.name, software.manifest_entry)
       end
@@ -1008,6 +1072,7 @@ module Omnibus
 
       write_json_manifest
       write_text_manifest
+      Licensing.create!(self)
       HealthCheck.run!(self)
       package_me
       compress_me

data/lib/omnibus/software.rb

@@ -327,6 +327,46 @@ module Omnibus
     end
     expose :default_version
 
+    #
+    # Set or retrieve the {#license} of the software to build.
+    #
+    # @example
+    #   license 'Apache 2.0'
+    #
+    # @param [String] val
+    #   the license to set for the software.
+    #
+    # @return [String]
+    #
+    def license(val = NULL)
+      if null?(val)
+        @license || 'Unspecified'
+      else
+        @license = val
+      end
+    end
+    expose :license
+
+    #
+    # Set or retrieve the location of a {#license_file}
+    # of the software.  It can either be a relative path inside
+    # the source package or a URL.
+    #
+    #
+    # @example
+    #   license_file 'LICENSES/artistic.txt'
+    #
+    # @param [String] val
+    #   the location of the license file for the software.
+    #
+    # @return [String]
+    #
+    def license_file(file)
+      license_files << file
+      license_files.dup
+    end
+    expose :license_file
+
     #
     # Evaluate a block only if the version matches.
     #
@@ -727,7 +767,9 @@ module Omnibus
                                    source_type: source_type,
                                    described_version: version,
                                    locked_version: Fetcher.resolve_version(version, source),
-                                   locked_source: source})
+                                   locked_source: source,
+                                   license: license
+      })
     end
 
     #
@@ -770,6 +812,17 @@ module Omnibus
       @whitelist_files ||= []
     end
 
+    #
+    # The list of license files for this software
+    #
+    # @see #license_file
+    #
+    # @return [Array<String>]
+    #
+    def license_files
+      @license_files ||= []
+    end
+
     #
     # The path (on disk) where this software came from. Warning: this can be
     # +nil+ if a software was dynamically created!

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = '5.1.0'
+  VERSION = '5.2.0'
 end

data/resources/rpm/spec.erb

@@ -17,7 +17,7 @@
 # Metadata
 Name: <%= name %>
 Version: <%= version %>
-Release: <%= iteration %><%= dist_tag %>
+Release: <%= iteration %><%= dist_tag ? dist_tag : '' %>
 Summary:  <%= description.split("\n").first.empty? ? "_" : description.split("\n").first %>
 AutoReqProv: no
 BuildRoot: %buildroot

data/spec/functional/builder_spec.rb

@@ -608,7 +608,7 @@ module Omnibus
       end
     end
 
-    describe '#update_config_guess', :not_supported_on_windows, :focus => true do
+    describe '#update_config_guess', :not_supported_on_windows do
       let(:config_guess_dir) { "#{install_dir}/embedded/lib/config_guess" }
 
       before do

data/spec/functional/licensing_spec.rb

@@ -0,0 +1,141 @@
+require "spec_helper"
+
+module Omnibus
+  describe Licensing do
+    let(:license) { nil }
+    let(:license_file_path) { nil }
+    let(:license_file) { nil }
+
+    let(:install_dir) { File.join(tmp_path, "install_dir")}
+    let(:software_project_dir) { File.join(tmp_path, "software_project_dir")}
+
+    before do
+      FileUtils.mkdir_p(install_dir)
+      FileUtils.mkdir_p(software_project_dir)
+      allow_any_instance_of(Software).to receive(:project_dir).and_return(software_project_dir)
+      %w{README LICENSE NOTICE}.each do |file|
+        File.open(File.join(software_project_dir, file), "w+") do |f|
+          f.puts "This file is #{file}."
+        end
+      end
+    end
+
+    shared_examples "correctly created licenses" do
+      it "creates the main license file for the project correctly" do
+        project_license = File.join(install_dir, expected_project_license_path)
+        expect(File.exist?(project_license)).to be(true)
+        project_license = File.read(project_license)
+        expect(project_license).to match /test-project 1.2.3 license: "#{expected_project_license}"/
+        expect(project_license).to match /#{expected_project_license_content}/
+        expect(project_license).to match /This product bundles private_code 1.7.2,\nwhich is available under a "Unspecified"/
+        expect(project_license).to match /This product bundles snoopy 1.0.0,\nwhich is available under a "GPL v2"/
+        expect(project_license).to match /This product bundles zlib 1.7.2,\nwhich is available under a "Zlib"/
+        expect(project_license).not_to match /preparation/
+        expect(project_license).to match /LICENSES\/snoopy-README/
+        expect(project_license).to match /LICENSES\/snoopy-NOTICE/
+        expect(project_license).to match /LICENSES\/zlib-LICENSE/
+      end
+
+      it "creates the license files of software components correctly" do
+        license_dir = File.join(install_dir, "LICENSES")
+        expect(Dir.glob("#{license_dir}/**/*").length).to be(3)
+
+        %w{snoopy-NOTICE snoopy-README zlib-LICENSE}.each do |software_license|
+          license_path = File.join(license_dir, software_license)
+          expect(File.exist?(license_path)).to be(true)
+          expect(File.read(license_path)).to match /#{software_license.split("-").last}/
+        end
+      end
+    end
+
+    let(:project) do
+      Project.new.tap do |project|
+        project.name('test-project')
+        project.install_dir(install_dir)
+        project.license(license) unless license.nil?
+        project.license_file_path(license_file_path) unless license_file_path.nil?
+        project.license_file(license_file) unless license_file.nil?
+        project.build_version('1.2.3')
+      end
+    end
+
+    let(:private_code) do
+      Software.new(project, 'private_code.rb').evaluate do
+        name 'private_code'
+        default_version '1.7.2'
+      end
+    end
+
+    let(:zlib) do
+      Software.new(project, 'zlib.rb').evaluate do
+        name 'zlib'
+        default_version '1.7.2'
+        license "Zlib"
+        license_file "LICENSE"
+      end
+    end
+
+    let(:snoopy) do
+      Software.new(project, 'snoopy.rb').evaluate do
+        name 'snoopy'
+        default_version '1.0.0'
+        license "GPL v2"
+        license_file "README"
+        license_file "NOTICE"
+      end
+    end
+
+    let(:preparation) do
+      Software.new(project, 'preparation.rb').evaluate do
+        name 'preparation'
+        default_version '1.0.0'
+        license :project_license
+      end
+    end
+
+    def create_licenses
+      project.library.component_added(preparation)
+      project.library.component_added(snoopy)
+      project.library.component_added(zlib)
+      project.library.component_added(private_code)
+
+      Licensing.create!(project)
+    end
+
+    describe "without license definitions in the project" do
+      let(:expected_project_license_path) { "LICENSE" }
+      let(:expected_project_license) { "Unspecified" }
+      let(:expected_project_license_content) { "" }
+
+      before do
+        create_licenses
+      end
+
+      it_behaves_like "correctly created licenses"
+    end
+
+    describe "with license definitions in the project" do
+      let(:license) { "Custom Chef" }
+      let(:license_file_path) { "CHEF.LICENSE" }
+      let(:license_file) { "CUSTOM_CHEF" }
+
+      let(:expected_project_license_path) { license_file_path }
+      let(:expected_project_license) { license }
+      let(:expected_project_license_content) { "Chef Custom License" }
+
+      before do
+        File.open(File.join(Config.project_root, license_file), "w+") do |f|
+          f.puts "Chef Custom License is awesome."
+        end
+
+        create_licenses
+      end
+
+      after do
+        FileUtils.rm_rf(license_file)
+      end
+
+      it_behaves_like "correctly created licenses"
+    end
+  end
+end

data/spec/unit/manifest_spec.rb

@@ -71,6 +71,10 @@ module Omnibus
       it "returns a build_git_revision if one was passed in" do
         expect(Omnibus::Manifest.new("1.2.3", "e8e8e8").to_hash["build_git_revision"]).to eq("e8e8e8")
       end
+
+      it "returns a license if one was passed in" do
+        expect(Omnibus::Manifest.new("1.2.3", "e8e8e8", "Apache").to_hash["license"]).to eq("Apache")
+      end
     end
 
     describe "#from_hash" do

data/spec/unit/packagers/rpm_spec.rb

@@ -105,6 +105,16 @@ module Omnibus
       end
     end
 
+    describe '#dist_tag' do
+      it 'is a DSL method' do
+        expect(subject).to have_exposed_method(:dist_tag)
+      end
+
+      it 'has a default value' do
+        expect(subject.dist_tag).to eq('.el6')
+      end
+    end
+
     describe '#id' do
       it 'is :rpm' do
         expect(subject.id).to eq(:rpm)
@@ -112,12 +122,24 @@ module Omnibus
     end
 
     describe '#package_name' do
-      before do
-        allow(subject).to receive(:safe_architecture).and_return('x86_64')
+      context 'when dist_tag is enabled' do
+        before do
+          allow(subject).to receive(:safe_architecture).and_return('x86_64')
+        end
+
+        it 'includes the name, version, and build iteration' do
+          expect(subject.package_name).to eq('project-1.2.3-2.el6.x86_64.rpm')
+        end
       end
 
-      it 'includes the name, version, and build iteration' do
-        expect(subject.package_name).to eq('project-1.2.3-2.el6.x86_64.rpm')
+      context 'when dist_tag is disabled' do
+        before do
+          allow(subject).to receive(:dist_tag).and_return(false)
+        end
+
+        it 'excludes dist tag' do
+          expect(subject.package_name).to eq('project-1.2.3-2.x86_64.rpm')
+        end
       end
     end
 
@@ -254,6 +276,20 @@ module Omnibus
           expect(contents).not_to include("BuildArch")
         end
       end
+
+      context 'when dist_tag is disabled' do
+        let(:spec_file) { "#{staging_dir}/SPECS/project-1.2.3-2.x86_64.rpm.spec" }
+
+        before do
+          allow(subject).to receive(:dist_tag).and_return(false)
+        end
+
+        it 'has the correct release' do
+          subject.write_rpm_spec
+          contents = File.read(spec_file)
+          expect(contents).to include("Release: 2")
+        end
+      end
     end
 
     describe '#create_rpm_file' do
@@ -319,12 +355,6 @@ module Omnibus
       end
     end
 
-    describe '#dist_tag' do
-      it 'returns the Fedora packaging guidelines dist tag for the package' do
-        expect(subject.dist_tag).to eq('.el6')
-      end
-    end
-
     describe '#safe_base_package_name' do
       context 'when the project name is "safe"' do
         it 'returns the value without logging a message' do

data/spec/unit/project_spec.rb

@@ -45,6 +45,9 @@ module Omnibus
     it_behaves_like 'a cleanroom setter', :json_manifest_path, %|json_manifest_path '/path/to/manifest.txt'|
     it_behaves_like 'a cleanroom setter', :build_git_revision, %|build_git_revision 'wombats'|
     it_behaves_like 'a cleanroom getter', :files_path
+    it_behaves_like 'a cleanroom setter', :license, %|license 'Apache 2.0'|
+    it_behaves_like 'a cleanroom setter', :license_file, %|license_file 'LICENSES/artistic.txt'|
+    it_behaves_like 'a cleanroom setter', :license_file_path, %|license_file_path 'CHEF_LICENSE'|
 
     describe 'basics' do
       it 'returns a name' do
@@ -142,6 +145,18 @@ module Omnibus
       end
     end
 
+    describe '#license' do
+      it "sets the default to Unspecified" do
+        expect(subject.license).to eq ('Unspecified')
+      end
+    end
+
+    describe '#license_file_path' do
+      it "sets the default to LICENSE" do
+        expect(subject.license_file_path).to eq ('/sample/LICENSE')
+      end
+    end
+
     describe '#dirty!' do
       let(:software) { double(Omnibus::Software) }
 

data/spec/unit/software_spec.rb

@@ -39,6 +39,8 @@ module Omnibus
     it_behaves_like 'a cleanroom setter', :source, %|source url: 'https://source.example.com'|
     it_behaves_like 'a cleanroom setter', :default_version, %|default_version '1.2.3'|
     it_behaves_like 'a cleanroom setter', :version, %|version '1.2.3'|
+    it_behaves_like 'a cleanroom setter', :license, %|license 'Apache 2.0'|
+    it_behaves_like 'a cleanroom setter', :license_file, %|license_file 'LICENSES/artistic.txt'|
     it_behaves_like 'a cleanroom setter', :whitelist_file, %|whitelist_file '/opt/whatever'|
     it_behaves_like 'a cleanroom setter', :relative_path, %|relative_path '/path/to/extracted'|
     it_behaves_like 'a cleanroom setter', :build, %|build {}|
@@ -56,6 +58,12 @@ module Omnibus
       it_behaves_like 'a cleanroom getter', :project_file
     end
 
+    context 'when no license is present' do
+      it "sets the defaults" do
+        expect(subject.license).to eq ('Unspecified')
+      end
+    end
+
     describe "with_standard_compiler_flags helper" do
       context "on ubuntu" do
         before { stub_ohai(platform: 'ubuntu', version: '12.04') }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-sugar
@@ -330,6 +330,7 @@ files:
 - lib/omnibus/health_check.rb
 - lib/omnibus/instrumentation.rb
 - lib/omnibus/library.rb
+- lib/omnibus/licensing.rb
 - lib/omnibus/logger.rb
 - lib/omnibus/logging.rb
 - lib/omnibus/manifest.rb
@@ -400,6 +401,7 @@ files:
 - spec/functional/fetchers/net_fetcher_spec.rb
 - spec/functional/fetchers/path_fetcher_spec.rb
 - spec/functional/file_syncer_spec.rb
+- spec/functional/licensing_spec.rb
 - spec/functional/templating_spec.rb
 - spec/spec_helper.rb
 - spec/support/env_helpers.rb
@@ -497,6 +499,7 @@ test_files:
 - spec/functional/fetchers/net_fetcher_spec.rb
 - spec/functional/fetchers/path_fetcher_spec.rb
 - spec/functional/file_syncer_spec.rb
+- spec/functional/licensing_spec.rb
 - spec/functional/templating_spec.rb
 - spec/spec_helper.rb
 - spec/support/env_helpers.rb