omnibus 1.3.0 → 2.0.0.rc1

data/lib/omnibus/build_version.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,6 @@ require 'time'
 require 'omnibus/util'
 
 module Omnibus
-
   # Provides methods for generating Omnibus project build version
   # strings automatically from Git repository information.
   #
@@ -37,18 +36,18 @@ 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'
 
     # @deprecated Use {#semver} or {#git_describe} instead
     def self.full
-      puts "#{self.name}.full is deprecated. Use #{self.name}.new.semver or #{self.name}.new.git_describe."
+      puts "#{name}.full is deprecated. Use #{name}.new.semver or #{name}.new.git_describe."
       Omnibus::BuildVersion.new.git_describe
     end
 
     # Create a new BuildVersion
     #
     # @param [String] path      Path from which to read git version information
-    def initialize(path=Omnibus.root)
+    def initialize(path = Omnibus.root)
       @path = path
     end
 
@@ -87,8 +86,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.gsub('-', '.')
+        build_tag << '-' << prerelease
       end
 
       # BUILD VERSION
@@ -107,11 +106,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
@@ -130,17 +129,15 @@ module Omnibus
     # @return [String]
     def git_describe
       @git_describe ||= begin
-                          git_cmd = "git describe"
-                          cmd = shellout(git_cmd,
-                                         :live_stream => nil,
-                                         :cwd => @path)
+                          git_cmd = 'git describe'
+                          cmd = shellout(git_cmd, live_stream: nil, cwd: @path)
                           if cmd.exitstatus == 0
                             cmd.stdout.chomp
                           else
-                            msg =  "Could not extract version information from `git describe`. "
-                            msg << "Setting version to 0.0.0"
+                            msg =  'Could not extract version information from `git describe`. '
+                            msg << 'Setting version to 0.0.0'
                             puts msg
-                            "0.0.0"
+                            '0.0.0'
                           end
                         end
     end
@@ -161,7 +158,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}.
@@ -245,11 +242,11 @@ module Omnibus
       @build_start_time ||= begin
                               if !ENV['BUILD_ID'].nil?
                                 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

data/lib/omnibus/builder.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,6 @@ require 'ostruct'
 
 module Omnibus
   class Builder
-
     # Proxies method calls to either a Builder object or the Software that the
     # builder belongs to. Provides compatibility with our DSL where we never
     # yield objects to blocks and hopefully hides some of the confusion that
@@ -29,8 +28,6 @@ module Omnibus
     class DSLProxy
       extend Forwardable
 
-      # @todo def_delegators :@builder, :patch, :command, :ruby, ...
-
       def_delegator :@builder, :patch
       def_delegator :@builder, :erb
       def_delegator :@builder, :command
@@ -65,13 +62,10 @@ module Omnibus
           super
         end
       end
-
     end
 
-
     # @todo code duplication with {Fetcher::ErrorReporter}
     class ErrorReporter
-
       # @todo fetcher isn't even used
       def initialize(error, fetcher)
         @error, @fetcher = error, fetcher
@@ -83,28 +77,29 @@ module Omnibus
       end
 
       def explain(why)
-        $stderr.puts "* " * 40
+        $stderr.puts '* ' * 40
         $stderr.puts why
-        $stderr.puts "Exception:"
+        $stderr.puts 'Exception:'
         $stderr.puts indent("#{e.class}: #{e.message.strip}", 2)
-        Array(e.backtrace).each {|l| $stderr.puts indent(l, 4) }
-        $stderr.puts "* " * 40
+        Array(e.backtrace).each { |l| $stderr.puts indent(l, 4) }
+        $stderr.puts '* ' * 40
       end
 
       private
 
       def indent(string, n)
-        string.split("\n").map {|l| " ".rjust(n) << l }.join("\n")
+        string.split("\n").map { |l| ' '.rjust(n) << l }.join("\n")
       end
-
     end
 
     # @todo Look at using Bundler.with_clean_env{ ... } instead
-    BUNDLER_BUSTER = {  "RUBYOPT"         => nil,
-                        "BUNDLE_BIN_PATH" => nil,
-                        "BUNDLE_GEMFILE"  => nil,
-                        "GEM_PATH"        => nil,
-                        "GEM_HOME"        => nil }
+    BUNDLER_BUSTER = {
+      'RUBYOPT'         => nil,
+      'BUNDLE_BIN_PATH' => nil,
+      'BUNDLE_GEMFILE'  => nil,
+      'GEM_PATH'        => nil,
+      'GEM_HOME'        => nil,
+    }
 
     attr_reader :build_commands
 
@@ -135,19 +130,19 @@ module Omnibus
         File.expand_path("#{root}/config/patches/#{name}/#{args[:source]}")
       end
 
-      source = candidate_paths.find{|path| File.exists?(path) }
+      source = candidate_paths.find { |path| File.exists?(path) }
 
       unless source
-        raise MissingPatch.new(args[:source], candidate_paths)
+        fail MissingPatch.new(args[:source], candidate_paths)
       end
 
       plevel = args[:plevel] || 1
-      if args[:target] 
+      if args[:target]
         target = File.expand_path("#{project_dir}/#{args[:target]}")
-        @build_commands << 
+        @build_commands <<
          "cat #{source} | patch -p#{plevel} #{target}"
       else
-        @build_commands << 
+        @build_commands <<
          "patch -d #{project_dir} -p#{plevel} -i #{source}"
       end
     end
@@ -158,12 +153,12 @@ module Omnibus
       source_path = File.expand_path("#{Omnibus.project_root}/config/templates/#{name}/#{args[:source]}")
 
       unless File.exists?(source_path)
-        raise MissingTemplate.new(args[:source], "#{Omnibus.project_root}/config/templates/#{name}")
+        fail MissingTemplate.new(args[:source], "#{Omnibus.project_root}/config/templates/#{name}")
       end
 
       block do
-        template = ERB.new(File.new(source_path).read, nil, "%")
-        File.open(args[:dest], "w") do |file|
+        template = ERB.new(File.new(source_path).read, nil, '%')
+        File.open(args[:dest], 'w') do |file|
           file.write(template.result(OpenStruct.new(args[:vars]).instance_eval { binding }))
         end
 
@@ -212,6 +207,8 @@ module Omnibus
 
     def build
       log "building #{name}"
+      log "version overridden from #{@software.default_version} to " \
+          "#{@software.version}" if @software.overridden?
       time_it("#{name} build") do
         @build_commands.each do |cmd|
           execute(cmd)
@@ -248,8 +245,8 @@ module Omnibus
       shell = nil
       cmd_args = Array(cmd)
       options = {
-        :cwd => project_dir,
-        :timeout => 5400
+        cwd: project_dir,
+        timeout: 5400,
       }
       options[:live_stream] = STDOUT if ENV['DEBUG']
       if cmd_args.last.is_a? Hash
@@ -265,7 +262,7 @@ module Omnibus
       log "Executing: `#{cmd_string}` with #{cmd_opts_for_display}"
 
       shell = Mixlib::ShellOut.new(*cmd)
-      shell.environment["HOME"] = "/tmp" unless ENV["HOME"]
+      shell.environment['HOME'] = '/tmp' unless ENV['HOME']
 
       cmd_name = cmd_string.split(/\s+/).first
       time_it("#{cmd_name} command") do
@@ -281,8 +278,8 @@ module Omnibus
         ErrorReporter.new(e, self).explain("Failed to build #{name} while running `#{cmd_string}` with #{cmd_opts_for_display}")
         raise
       else
-        time_to_sleep = 5 * (2 ** retries)
-        retries +=1
+        time_to_sleep = 5 * (2**retries)
+        retries += 1
         log "Failed to execute cmd #{cmd} #{retries} time(s). Retrying in #{time_to_sleep}s."
         sleep(time_to_sleep)
         retry
@@ -297,7 +294,7 @@ module Omnibus
         # command as a string w/ opts
         ["#{str} #{cmd_args.first}", cmd_args.last]
       elsif cmd_args.size == 0
-        raise ArgumentError, "I don't even"
+        fail ArgumentError, "I don't even"
       else
         # cmd given as argv array
         cmd_args.dup.unshift(str)
@@ -311,11 +308,10 @@ module Omnibus
         cmd_opts[:env] = cmd_opts[:env] ? BUNDLER_BUSTER.merge(cmd_opts[:env]) : BUNDLER_BUSTER
         cmd_args << cmd_opts
       else
-        cmd_args << {:env => BUNDLER_BUSTER}
+        cmd_args << { env: BUNDLER_BUSTER }
       end
     end
 
-
     def time_it(what)
       start = Time.now
       yield
@@ -331,29 +327,22 @@ module Omnibus
     # Convert a hash to a string in the form `key=value`. It should work with
     # whatever input is given but is designed to make the options to ShellOut
     # look nice.
-    def to_kv_str(hash, join_str=",")
-      hash.inject([]) do |kv_pair_strs, (k,v)|
+    def to_kv_str(hash, join_str = ',')
+      hash.reduce([]) do |kv_pair_strs, (k, v)|
         val_str = case v
-        when Hash
-          %Q["#{to_kv_str(v, " ")}"]
-        else
-          v.to_s
-        end
+                  when Hash
+                    %Q["#{to_kv_str(v, " ") }"]
+                  else
+                    v.to_s
+                  end
         kv_pair_strs << "#{k}=#{val_str}"
       end.join(join_str)
     end
-
   end
 
-  # @todo What's the point of this class?  Can we not just detect that
-  #   there are no commands in {Omnibus::Builder#build} and output the
-  #   appropriate message?  Seems like a lot of extra ceremony.
   class NullBuilder < Builder
-
     def build
       log "Nothing to build for #{name}"
     end
-
   end
-
 end

data/lib/omnibus/clean_tasks.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,8 +23,6 @@
 
 require 'rake/clean'
 
-::CLEAN.include("#{Omnibus.config.source_dir}/**/*",
-                "#{Omnibus.config.build_dir}/**/*")
+::CLEAN.include("#{Omnibus.config.source_dir}/**/*", "#{Omnibus.config.build_dir}/**/*")
 
-::CLOBBER.include("#{Omnibus.config.cache_dir}/**/*",
-                  "#{Omnibus.config.package_dir}/**/*")
+::CLOBBER.include("#{Omnibus.config.cache_dir}/**/*", "#{Omnibus.config.package_dir}/**/*")

data/lib/omnibus/cli/application.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2014 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,17 +24,16 @@ require 'omnibus/cli/release'
 module Omnibus
   module CLI
     class Application < Base
-
       method_option :purge,
-        :type => :boolean,
-        :default => false,
-        :desc => "Remove ALL files generated during the build (including packages)."
+                    type: :boolean,
+                    default: false,
+                    desc: 'Remove ALL files generated during the build (including packages).'
       method_option :path,
-        :aliases => [:p],
-        :type => :string,
-        :default => Dir.pwd,
-        :desc => "Path to the Omnibus project root."
-      desc "clean PROJECT", "Remove temporary files generated during the build process."
+                    aliases: [:p],
+                    type: :string,
+                    default: Dir.pwd,
+                    desc: 'Path to the Omnibus project root.'
+      desc 'clean PROJECT', 'Remove temporary files generated during the build process.'
       def clean(project_name)
         project = load_project!(project_name)
 
@@ -49,45 +48,42 @@ module Omnibus
         end
 
         deletion_list.flatten!
-        deletion_list.each{|f| remove_file(f) }
+        deletion_list.each { |f| remove_file(f) }
       end
 
-      desc "project PROJECT", "Creates a skeletal Omnibus project"
+      desc 'project PROJECT', 'Creates a skeletal Omnibus project'
       def project(name)
-        name = name.chomp("/") # remove trailing slash if present
+        name = name.chomp('/') # remove trailing slash if present
         target = File.join(Dir.pwd, "omnibus-#{name}")
-        install_path = File.join("/opt", name)
+        install_path = File.join('/opt', name)
         opts = {
-          :name => name,
-          :install_path => install_path
+          name: name,
+          install_path: install_path,
         }
 
         # core project files
-        template(File.join("Gemfile.erb"), File.join(target, "Gemfile"), opts)
-        template(File.join("gitignore.erb"), File.join(target, ".gitignore"), opts)
-        template(File.join("README.md.erb"), File.join(target, "README.md"), opts)
-        template(File.join("omnibus.rb.example.erb"), File.join(target, "omnibus.rb.example"), opts)
+        template(File.join('Gemfile.erb'), File.join(target, 'Gemfile'), opts)
+        template(File.join('gitignore.erb'), File.join(target, '.gitignore'), opts)
+        template(File.join('README.md.erb'), File.join(target, 'README.md'), opts)
+        template(File.join('omnibus.rb.example.erb'), File.join(target, 'omnibus.rb.example'), opts)
 
         # project definition
-        template(File.join("project.rb.erb"), File.join(target, "config", "projects", "#{name}.rb"), opts)
+        template(File.join('project.rb.erb'), File.join(target, 'config', 'projects', "#{name}.rb"), opts)
 
         # example software definitions
-        config_software = File.join(target, "config", "software")
-        template(File.join("software", "c-example.rb.erb"),
-                 File.join(config_software, "c-example.rb"), opts)
-        template(File.join("software", "erlang-example.rb.erb"),
-                 File.join(config_software, "erlang-example.rb"), opts)
-        template(File.join("software", "ruby-example.rb.erb"),
-                 File.join(config_software, "ruby-example.rb"), opts)
+        config_software = File.join(target, 'config', 'software')
+        template(File.join('software', 'c-example.rb.erb'), File.join(config_software, 'c-example.rb'), opts)
+        template(File.join('software', 'erlang-example.rb.erb'), File.join(config_software, 'erlang-example.rb'), opts)
+        template(File.join('software', 'ruby-example.rb.erb'), File.join(config_software, 'ruby-example.rb'), opts)
 
         # Vagrant build lab
-        template(File.join("Berksfile.erb"), File.join(target, "Berksfile"), opts)
-        template(File.join("Vagrantfile.erb"), File.join(target, "Vagrantfile"), opts)
+        template(File.join('Berksfile.erb'), File.join(target, 'Berksfile'), opts)
+        template(File.join('Vagrantfile.erb'), File.join(target, 'Vagrantfile'), opts)
 
         # render out stub packge scripts
         %w{ makeselfinst preinst prerm postinst postrm }.each do |package_script|
-          script_path = File.join(target, "package-scripts", name, package_script)
-          template_path = File.join("package_scripts", "#{package_script}.erb")
+          script_path = File.join(target, 'package-scripts', name, package_script)
+          template_path = File.join('package_scripts', "#{package_script}.erb")
           # render the package script
           template(template_path, script_path, opts)
           # ensure the package script is executable
@@ -95,7 +91,7 @@ module Omnibus
         end
       end
 
-      desc "version", "Display version information"
+      desc 'version', 'Display version information'
       def version
         say("Omnibus: #{Omnibus::VERSION}", :yellow)
       end
@@ -104,14 +100,14 @@ module Omnibus
       # Subcommands
       ###########################################################################
 
-      desc "build [COMMAND]", "Perform build-related tasks"
-      subcommand "build", Omnibus::CLI::Build
+      desc 'build [COMMAND]', 'Perform build-related tasks'
+      subcommand 'build', Omnibus::CLI::Build
 
-      desc "cache [COMMAND]", "Perform cache management tasks"
-      subcommand "cache", Omnibus::CLI::Cache
+      desc 'cache [COMMAND]', 'Perform cache management tasks'
+      subcommand 'cache', Omnibus::CLI::Cache
 
-      desc "release [COMMAND]", "Perform release tasks"
-      subcommand "release", Omnibus::CLI::Release
+      desc 'release [COMMAND]', 'Perform release tasks'
+      subcommand 'release', Omnibus::CLI::Release
 
       ###########################################################################
       # Class Methods
@@ -119,22 +115,19 @@ module Omnibus
 
       # Override start so we can catch and process any exceptions bubbling up
       def self.start(*args)
-        begin
-          super
-        rescue => e
-          error_msg = "Something went wrong...the Omnibus just ran off the road!"
-          error_msg << "\n\nError raised was:\n\n\t#{$!}"
-          error_msg << "\n\nBacktrace:\n\n\t#{e.backtrace.join("\n\t")}"
-          if e.respond_to?(:original) && e.original
-            error_msg << "\n\nOriginal Error:\n\n\t#{e.original}"
-            error_msg << "\n\nOriginal Backtrace:\n\n\t#{e.original.backtrace.join("\n\t")}"
-          end
-          # TODO - we need a proper UI class
-          Thor::Base.shell.new.say(error_msg, :red)
-          exit 1
+        super
+      rescue => e
+        error_msg = 'Something went wrong...the Omnibus just ran off the road!'
+        error_msg << "\n\nError raised was:\n\n\t#{$ERROR_INFO}"
+        error_msg << "\n\nBacktrace:\n\n\t#{e.backtrace.join("\n\t") }"
+        if e.respond_to?(:original) && e.original
+          error_msg << "\n\nOriginal Error:\n\n\t#{e.original}"
+          error_msg << "\n\nOriginal Backtrace:\n\n\t#{e.original.backtrace.join("\n\t") }"
         end
+        # TODO: we need a proper UI class
+        Thor::Base.shell.new.say(error_msg, :red)
+        exit 1
       end
-
     end
   end
 end

data/lib/omnibus/cli/base.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2014 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,20 +24,21 @@ module Omnibus
       include Thor::Actions
 
       class_option :config,
-        :aliases => [:c],
-        :type => :string,
-        :default => File.join(Dir.pwd, Omnibus::DEFAULT_CONFIG_FILENAME),
-        :desc => "Path to the Omnibus configuration file to use."
+                   aliases: [:c],
+                   type: :string,
+                   default: File.join(Dir.pwd, Omnibus::DEFAULT_CONFIG_FILENAME),
+                   desc: 'Path to the Omnibus configuration file to use.'
 
       def initialize(args, options, config)
         super(args, options, config)
         $stdout.sync = true
 
-        # Don't try to initialize the Omnibus project for help commands. current_task renamed to current_command in Thor 0.18.0
+        # Don't try to initialize the Omnibus project for help commands.#
+        # current_task renamed to current_command in Thor 0.18.0
         current_command = config[:current_command] ? config[:current_command].name : config[:current_task].name
-        return if current_command == "help"
+        return if current_command == 'help'
 
-        if config = @options[:config]
+        if (config = @options[:config])
           if config && File.exist?(@options[:config])
             say("Using Omnibus configuration file #{config}", :green)
             Omnibus.load_configuration(config)
@@ -46,24 +47,23 @@ module Omnibus
           end
         end
 
-        if path = @options[:path]
+        if (path = @options[:path])
           # TODO: merge in all relevant CLI options here, as they should
           # override anything from a configuration file.
           Omnibus::Config.project_root(path)
           Omnibus::Config.append_timestamp(@options[:timestamp]) if @options.key?('timestamp')
 
           unless Omnibus.project_files.any?
-            raise Omnibus::CLI::Error, "Given path '#{path}' does not appear to be a valid Omnibus project root."
+            fail Omnibus::CLI::Error, "Given path '#{path}' does not appear to be a valid Omnibus project root."
           end
 
           begin
             Omnibus.process_configuration
           rescue => e
-            error_msg = "Could not load the Omnibus projects."
+            error_msg = 'Could not load the Omnibus projects.'
             raise Omnibus::CLI::Error.new(error_msg, e)
           end
         end
-
       end
 
       ##################################################################
@@ -91,10 +91,8 @@ module Omnibus
       def self.banner(command, namespace = nil, subcommand = false)
         # Main commands have an effective namespace of 'application' OR
         # contain subcommands
-        if (self.namespace.split(':').last != 'application') || self.subcommands.empty?
-          subcommand = true
-        end
-        "#{basename} #{command.formatted_usage(self, $thor_runner, subcommand)}"
+        subcommand = self.namespace.split(':').last != 'application' || subcommands.empty?
+        "#{basename} #{command.formatted_usage(self, $thor_runner, subcommand) }"
       end
 
       protected
@@ -107,12 +105,11 @@ module Omnibus
         project = Omnibus.project(project_name)
         unless project
           error_msg = "I don't know anything about project '#{project_name}'."
-          error_msg << " Valid project names include: #{Omnibus.project_names.join(', ')}"
-          raise Omnibus::CLI::Error, error_msg
+          error_msg << " Valid project names include: #{Omnibus.project_names.join(', ') }"
+          fail Omnibus::CLI::Error, error_msg
         end
         project
       end
-
     end
   end
 end

data/lib/omnibus/cli/build.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2014 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,21 +20,22 @@ require 'omnibus/cli/base'
 module Omnibus
   module CLI
     class Build < Base
-
       namespace :build
 
       class_option :path,
-        :aliases => [:p],
-        :type => :string,
-        :default => Dir.pwd,
-        :desc => "Path to the Omnibus project root."
+                   aliases: [:p],
+                   type: :string,
+                   default: Dir.pwd,
+                   desc: 'Path to the Omnibus project root.'
 
       method_option :timestamp,
-        :aliases => [:t],
-        :type => :boolean,
-        :default => true,
-        :desc => "Append timestamp information to the version identifier? Add a timestamp for build versions; leave it off for release and pre-release versions"
-      desc "project PROJECT", "Build the given Omnibus project"
+                    aliases: [:t],
+                    type: :boolean,
+                    default: true,
+                    desc: 'Append timestamp information to the version ' \
+                          'identifier? Add a timestamp for build versions; ' \
+                          'leave it off for release and pre-release versions'
+      desc 'project PROJECT', 'Build the given Omnibus project'
       def project(project_name)
         project = load_project!(project_name)
         project_task_name = "projects:#{project.name}"
@@ -47,7 +48,7 @@ module Omnibus
         Rake::Task[project_task_name].invoke
       end
 
-      desc "software PROJECT SOFTWARE", "Build the given software component"
+      desc 'software PROJECT SOFTWARE', 'Build the given software component'
       def software(project_name, software_name)
         project = load_project!(project_name)
         software_task_name = "projects:#{project.name}:software:#{software_name}"
@@ -56,7 +57,6 @@ module Omnibus
 
         Rake::Task[software_task_name].invoke
       end
-
     end
   end
 end