omnibus 5.4.0 → 5.5.0

data/lib/omnibus/exceptions.rb

@@ -46,9 +46,9 @@ EOH
   end
 
   class MissingRequiredAttribute < Error
-    def initialize(instance, name, sample = '<VALUE>')
+    def initialize(instance, name, sample = "<VALUE>")
       @instance, @name, @sample = instance, name, sample
-      @class = instance.class.name.split('::').last
+      @class = instance.class.name.split("::").last
     end
 
     def to_s
@@ -105,7 +105,7 @@ EOH
       <<-EOH
 I could not find a project named `#{@name}' in any of the project locations:"
 
-#{@possible_paths.map { |path| "    #{path}"}.join("\n")}
+#{@possible_paths.map { |path| "    #{path}" }.join("\n")}
 EOH
     end
   end
@@ -120,7 +120,7 @@ EOH
       <<-EOH
 I could not find a software named `#{@name}' in any of the software locations:"
 
-#{@possible_paths.map { |path| "    #{path}"}.join("\n")}
+#{@possible_paths.map { |path| "    #{path}" }.join("\n")}
 EOH
     end
   end
@@ -249,14 +249,14 @@ EOH
       if cmd.environment.nil? || cmd.environment.empty?
         env = nil
       else
-        env = cmd.environment.sort.map { |k,v| "#{k}=#{v}" }.join(' ')
+        env = cmd.environment.sort.map { |k, v| "#{k}=#{v}" }.join(" ")
       end
 
       command = cmd.command
-      command_with_env = [env, command].compact.join(' ')
+      command_with_env = [env, command].compact.join(" ")
 
-      stdout = cmd.stdout.empty? ? '(nothing)' : cmd.stdout.strip
-      stderr = cmd.stderr.empty? ? '(nothing)' : cmd.stderr.strip
+      stdout = cmd.stdout.empty? ? "(nothing)" : cmd.stdout.strip
+      stderr = cmd.stderr.empty? ? "(nothing)" : cmd.stderr.strip
 
       super <<-EOH
 The following shell command exited with status #{status}:
@@ -281,13 +281,13 @@ EOH
       if cmd.environment.nil? || cmd.environment.empty?
         env = nil
       else
-        env = cmd.environment.sort.map { |k,v| "#{k}=#{v}" }.join(' ')
+        env = cmd.environment.sort.map { |k, v| "#{k}=#{v}" }.join(" ")
       end
 
       command = cmd.command
-      command_with_env = [env, command].compact.join(' ')
+      command_with_env = [env, command].compact.join(" ")
 
-      timeout = cmd.timeout.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse
+      timeout = cmd.timeout.to_s.reverse.gsub(/...(?=.)/, '\&,').reverse
 
       super <<-EOH
 The following shell command timed out at #{timeout} seconds:
@@ -330,9 +330,25 @@ EOF
     end
   end
 
-  class FailedToTimestampMSI < Error
+  class FailedToSignWindowsPackage < Error
     def initialize
-      super("Failed to add timestamp to MSI.")
+      super("Failed to sign Windows Package.")
+    end
+  end
+
+  class LicensingError < Error
+    def initialize(errors)
+      @errors = errors
+    end
+
+    def to_s
+      <<-EOH
+Encountered error(s) with project's licensing information.
+Failing the build because :fatal_licensing_warnings is set in the configuration.
+Error(s):
+
+    #{@errors.join("\n    ")}
+EOH
     end
   end
 end

data/lib/omnibus/fetcher.rb

@@ -72,7 +72,6 @@ module Omnibus
     attr_reader :project_dir
     attr_reader :build_dir
 
-
     #
     # Create a new Fetcher object from the given software.
     #

data/lib/omnibus/fetchers/git_fetcher.rb

@@ -46,9 +46,9 @@ module Omnibus
     #   git checkout/clean.
     #
     def clean
-      log.info(log_key) { 'Cleaning existing clone' }
+      log.info(log_key) { "Cleaning existing clone" }
       git_checkout
-      git('clean -fdx')
+      git("clean -fdx")
       true
     end
 
@@ -114,7 +114,7 @@ module Omnibus
     # @return [true, false]
     #
     def dir_empty?(dir)
-      Dir.entries(dir).reject {|d| ['.', '..'].include?(d) }.empty?
+      Dir.entries(dir).reject { |d| [".", ".."].include?(d) }.empty?
     end
 
     #
@@ -164,7 +164,7 @@ module Omnibus
     #
     def git_fetch
       fetch_cmd = "fetch #{source_url} #{described_version}"
-      fetch_cmd << ' --recurse-submodules=on-demand' if clone_submodules?
+      fetch_cmd << " --recurse-submodules=on-demand" if clone_submodules?
       git(fetch_cmd)
     end
 
@@ -174,7 +174,7 @@ module Omnibus
     # @return [String]
     #
     def current_revision
-      cmd = git('rev-parse HEAD')
+      cmd = git("rev-parse HEAD")
       cmd.stdout.strip
     rescue CommandFailed
       log.debug(log_key) { "unable to determine current revision" }
@@ -188,7 +188,7 @@ module Omnibus
     #
     def contains_revision?(rev)
       cmd = git("cat-file -t #{rev}")
-      cmd.stdout.strip == 'commit'
+      cmd.stdout.strip == "commit"
     rescue CommandFailed
       log.debug(log_key) { "unable to determine presence of commit #{rev}" }
       false
@@ -230,7 +230,7 @@ module Omnibus
         # Only when the service is specifically configured with
         # uploadpack.allowReachableSHA1InWant is there any guarantee that it
         # considers "naked" wants.
-        log.warn(log_key) { 'git fetch on a sha1 is not guaranteed to work' }
+        log.warn(log_key) { "git fetch on a sha1 is not guaranteed to work" }
         log.warn(log_key) { "Specify a ref name instead of #{ref} on #{source}" }
         ref
       else

data/lib/omnibus/fetchers/net_fetcher.rb

@@ -14,19 +14,19 @@
 # limitations under the License.
 #
 
-require 'fileutils'
-require 'omnibus/download_helpers'
+require "fileutils"
+require "omnibus/download_helpers"
 
 module Omnibus
   class NetFetcher < Fetcher
     include DownloadHelpers
 
     # Use 7-zip to extract 7z/zip for Windows
-    WIN_7Z_EXTENSIONS = %w(.7z .zip)
+    WIN_7Z_EXTENSIONS = %w{.7z .zip}
 
     # tar probably has compression scheme linked in, otherwise for tarballs
-    COMPRESSED_TAR_EXTENSIONS = %w(.tar.gz .tgz tar.bz2 .tar.xz .txz .tar.lzma)
-    TAR_EXTENSIONS = COMPRESSED_TAR_EXTENSIONS + ['.tar']
+    COMPRESSED_TAR_EXTENSIONS = %w{.tar.gz .tgz tar.bz2 .tar.xz .txz .tar.lzma}
+    TAR_EXTENSIONS = COMPRESSED_TAR_EXTENSIONS + [".tar"]
 
     ALL_EXTENSIONS = WIN_7Z_EXTENSIONS + TAR_EXTENSIONS
 
@@ -118,7 +118,7 @@ module Omnibus
     # @return [String]
     #
     def downloaded_file
-      filename = File.basename(source[:url], '?*')
+      filename = File.basename(source[:url], "?*")
       File.join(Config.cache_dir, filename)
     end
 
@@ -168,7 +168,7 @@ module Omnibus
       end
 
       # Set the cookie if one was given
-      options['Cookie'] = source[:cookie] if source[:cookie]
+      options["Cookie"] = source[:cookie] if source[:cookie]
 
       download_file!(download_url, downloaded_file, options)
     end
@@ -229,18 +229,18 @@ module Omnibus
     #
     def extract
       # Only used by tar
-      compression_switch = ''
-      compression_switch = 'z'        if downloaded_file.end_with?('gz')
-      compression_switch = '--lzma -' if downloaded_file.end_with?('lzma')
-      compression_switch = 'j'        if downloaded_file.end_with?('bz2')
-      compression_switch = 'J'        if downloaded_file.end_with?('xz')
+      compression_switch = ""
+      compression_switch = "z"        if downloaded_file.end_with?("gz")
+      compression_switch = "--lzma -" if downloaded_file.end_with?("lzma")
+      compression_switch = "j"        if downloaded_file.end_with?("bz2")
+      compression_switch = "J"        if downloaded_file.end_with?("xz")
 
-      if Ohai['platform'] == 'windows'
+      if Ohai["platform"] == "windows"
         if downloaded_file.end_with?(*TAR_EXTENSIONS) && source[:extract] != :seven_zip
           returns = [0]
           returns << 1 if source[:extract] == :lax_tar
 
-          shellout!("tar.exe #{compression_switch}xf #{safe_downloaded_file} -C#{safe_project_dir}", returns: returns)
+          shellout!("tar #{compression_switch}xf #{safe_downloaded_file} -C#{safe_project_dir}", returns: returns)
         elsif downloaded_file.end_with?(*COMPRESSED_TAR_EXTENSIONS)
           Dir.mktmpdir do |temp_dir|
             log.debug(log_key) { "Temporarily extracting `#{safe_downloaded_file}' to `#{temp_dir}'" }
@@ -248,7 +248,7 @@ module Omnibus
             shellout!("7z.exe x #{safe_downloaded_file} -o#{windows_safe_path(temp_dir)} -r -y")
 
             fname = File.basename(downloaded_file, File.extname(downloaded_file))
-            fname << ".tar" if downloaded_file.end_with?('tgz', 'txz')
+            fname << ".tar" if downloaded_file.end_with?("tgz", "txz")
             next_file = windows_safe_path(File.join(temp_dir, fname))
 
             log.debug(log_key) { "Temporarily extracting `#{next_file}' to `#{safe_project_dir}'" }
@@ -257,9 +257,9 @@ module Omnibus
         else
           shellout!("7z.exe x #{safe_downloaded_file} -o#{safe_project_dir} -r -y")
         end
-      elsif downloaded_file.end_with?('.7z')
+      elsif downloaded_file.end_with?(".7z")
         shellout!("7z x #{safe_downloaded_file} -o#{safe_project_dir} -r -y")
-      elsif downloaded_file.end_with?('.zip')
+      elsif downloaded_file.end_with?(".zip")
         shellout!("unzip #{safe_downloaded_file} -d #{safe_project_dir}")
       else
         shellout!("#{tar} #{compression_switch}xf #{safe_downloaded_file} -C#{safe_project_dir}")
@@ -288,7 +288,7 @@ module Omnibus
     #   if the checksum does not match
     #
     def verify_checksum!
-      log.info(log_key) { 'Verifying checksum' }
+      log.info(log_key) { "Verifying checksum" }
 
       expected = checksum
       actual   = digest(downloaded_file, digest_type)
@@ -321,7 +321,7 @@ module Omnibus
     # @return [String]
     #
     def tar
-      Omnibus.which('gtar') ? 'gtar' : 'tar'
+      Omnibus.which("gtar") ? "gtar" : "tar"
     end
   end
 end

data/lib/omnibus/fetchers/path_fetcher.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require 'fileutils'
+require "fileutils"
 
 module Omnibus
   class PathFetcher < Fetcher

data/lib/omnibus/file_syncer.rb

@@ -14,14 +14,14 @@
 # limitations under the License.
 #
 
-require 'fileutils'
+require "fileutils"
 
 module Omnibus
   module FileSyncer
     extend self
 
     # Files to be ignored during a directory globbing
-    IGNORED_FILES = %w(. ..).freeze
+    IGNORED_FILES = %w{. ..}.freeze
 
     #
     # Glob across the given pattern, accounting for dotfiles, removing Ruby's
@@ -58,7 +58,7 @@ module Omnibus
         [exclude, "#{exclude}/*"]
       end.flatten
 
-      source_files = glob(File.join(source, '**/*'))
+      source_files = glob(File.join(source, "**/*"))
       source_files = source_files.reject do |source_file|
         basename = relative_path_for(source_file, source)
         excludes.any? { |exclude| File.fnmatch?(exclude, basename, File::FNM_DOTMATCH) }

data/lib/omnibus/generator.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require 'thor'
+require "thor"
 
 module Omnibus
   class Generator < Thor::Group
@@ -23,78 +23,83 @@ module Omnibus
     namespace :new
 
     argument :name,
-      banner: 'NAME',
-      desc: 'The name of the Omnibus project',
+      banner: "NAME",
+      desc: "The name of the Omnibus project",
       type: :string,
       required: true
 
     class_option :path,
-      banner: 'PATH',
-      aliases: '-p',
-      desc: 'The path to create the Omnibus project',
+      banner: "PATH",
+      aliases: "-p",
+      desc: "The path to create the Omnibus project",
       type: :string,
-      default: '.'
+      default: "."
+
+    class_option :appx_assets,
+      desc: "Generate Windows APPX assets",
+      type: :boolean,
+      default: false
 
     class_option :bff_assets,
-      desc: 'Generate AIX bff assets',
+      desc: "Generate AIX bff assets",
       type: :boolean,
       default: false
 
     class_option :deb_assets,
-      desc: 'Generate Debian deb assets',
+      desc: "Generate Debian deb assets",
       type: :boolean,
       default: false
 
     class_option :dmg_assets,
-      desc: 'Generate Mac OS X dmg assets',
+      desc: "Generate Mac OS X dmg assets",
       type: :boolean,
       default: false
 
     class_option :msi_assets,
-      desc: 'Generate Windows MSI assets',
+      desc: "Generate Windows MSI assets",
       type: :boolean,
       default: false
 
     class_option :pkg_assets,
-      desc: 'Generate Mac OS X pkg assets',
+      desc: "Generate Mac OS X pkg assets",
       type: :boolean,
       default: false
 
     class_option :rpm_assets,
-      desc: 'Generate RHEL/CentOS rpm assets',
+      desc: "Generate RHEL/CentOS rpm assets",
       type: :boolean,
       default: false
 
     class << self
       # Set the source root for Thor
       def source_root
-        File.expand_path('../generator_files', __FILE__)
+        File.expand_path("../generator_files", __FILE__)
       end
     end
 
     def create_project_files
-      template('Gemfile.erb', "#{target}/Gemfile", template_options)
-      template('gitignore.erb', "#{target}/.gitignore", template_options)
-      template('README.md.erb', "#{target}/README.md", template_options)
-      template('omnibus.rb.erb', "#{target}/omnibus.rb", template_options)
+      template("Gemfile.erb", "#{target}/Gemfile", template_options)
+      template("gitignore.erb", "#{target}/.gitignore", template_options)
+      template("README.md.erb", "#{target}/README.md", template_options)
+      template("omnibus.rb.erb", "#{target}/omnibus.rb", template_options)
     end
 
     def create_project_definition
-      template('config/projects/project.rb.erb', "#{target}/config/projects/#{name}.rb", template_options)
+      template("config/projects/project.rb.erb", "#{target}/config/projects/#{name}.rb", template_options)
     end
 
     def create_example_software_definitions
-      template('config/software/zlib.rb.erb', "#{target}/config/software/#{name}-zlib.rb", template_options)
+      template("config/software/zlib.rb.erb", "#{target}/config/software/#{name}-zlib.rb", template_options)
     end
 
     def create_kitchen_files
-      template('.kitchen.local.yml.erb', "#{target}/.kitchen.local.yml", template_options)
-      template('.kitchen.yml.erb', "#{target}/.kitchen.yml", template_options)
-      template('Berksfile.erb', "#{target}/Berksfile", template_options)
+      template(".kitchen.local.yml.erb", "#{target}/.kitchen.local.yml", template_options)
+      template(".kitchen.yml.erb", "#{target}/.kitchen.yml", template_options)
+      template("Berksfile.erb", "#{target}/Berksfile", template_options)
     end
 
     def create_package_scripts
-      %w(preinst prerm postinst postrm).each do |package_script|
+      %w{preinst prerm postinst postrm}.each do |package_script|
         script_path = "#{target}/package-scripts/#{name}/#{package_script}"
         template("package_scripts/#{package_script}.erb", script_path, template_options)
 
@@ -103,58 +108,66 @@ module Omnibus
       end
     end
 
+    def create_appx_assets
+      return unless options[:appx_assets]
+
+      copy_file(resource_path("appx/AppxManifest.xml.erb"), "#{target}/resources/#{name}/appx/AppxManifest.xml.erb")
+      copy_file(resource_path("appx/assets/clear.png"), "#{target}/resources/#{name}/appx/assets/clear.png")
+    end
+
     def create_bff_assets
       return unless options[:bff_assets]
 
-      copy_file(resource_path('bff/gen.template.erb'), "#{target}/resources/#{name}/bff/gen.template.erb")
+      copy_file(resource_path("bff/gen.template.erb"), "#{target}/resources/#{name}/bff/gen.template.erb")
     end
 
     def create_deb_assets
       return unless options[:deb_assets]
 
-      copy_file(resource_path('deb/conffiles.erb'), "#{target}/resources/#{name}/deb/conffiles.erb")
-      copy_file(resource_path('deb/control.erb'), "#{target}/resources/#{name}/deb/control.erb")
-      copy_file(resource_path('deb/md5sums.erb'), "#{target}/resources/#{name}/deb/md5sums.erb")
+      copy_file(resource_path("deb/conffiles.erb"), "#{target}/resources/#{name}/deb/conffiles.erb")
+      copy_file(resource_path("deb/control.erb"), "#{target}/resources/#{name}/deb/control.erb")
+      copy_file(resource_path("deb/md5sums.erb"), "#{target}/resources/#{name}/deb/md5sums.erb")
     end
 
     def create_dmg_assets
       return unless options[:dmg_assets]
 
-      copy_file(resource_path('dmg/background.png'), "#{target}/resources/#{name}/dmg/background.png")
-      copy_file(resource_path('dmg/icon.png'), "#{target}/resources/#{name}/dmg/icon.png")
+      copy_file(resource_path("dmg/background.png"), "#{target}/resources/#{name}/dmg/background.png")
+      copy_file(resource_path("dmg/icon.png"), "#{target}/resources/#{name}/dmg/icon.png")
     end
 
     def create_msi_assets
       return unless options[:msi_assets]
 
-      copy_file(resource_path('msi/localization-en-us.wxl.erb'), "#{target}/resources/#{name}/msi/localization-en-us.wxl.erb")
-      copy_file(resource_path('msi/parameters.wxi.erb'), "#{target}/resources/#{name}/msi/parameters.wxi.erb")
-      copy_file(resource_path('msi/source.wxs.erb'), "#{target}/resources/#{name}/msi/source.wxs.erb")
+      copy_file(resource_path("msi/localization-en-us.wxl.erb"), "#{target}/resources/#{name}/msi/localization-en-us.wxl.erb")
+      copy_file(resource_path("msi/parameters.wxi.erb"), "#{target}/resources/#{name}/msi/parameters.wxi.erb")
+      copy_file(resource_path("msi/source.wxs.erb"), "#{target}/resources/#{name}/msi/source.wxs.erb")
 
-      copy_file(resource_path('msi/assets/LICENSE.rtf'), "#{target}/resources/#{name}/msi/assets/LICENSE.rtf")
-      copy_file(resource_path('msi/assets/banner_background.bmp'), "#{target}/resources/#{name}/msi/assets/banner_background.bmp")
-      copy_file(resource_path('msi/assets/dialog_background.bmp'), "#{target}/resources/#{name}/msi/assets/dialog_background.bmp")
-      copy_file(resource_path('msi/assets/project.ico'), "#{target}/resources/#{name}/msi/assets/project.ico")
-      copy_file(resource_path('msi/assets/project_16x16.ico'), "#{target}/resources/#{name}/msi/assets/project_16x16.ico")
-      copy_file(resource_path('msi/assets/project_32x32.ico'), "#{target}/resources/#{name}/msi/assets/project_32x32.ico")
+      copy_file(resource_path("msi/assets/LICENSE.rtf"), "#{target}/resources/#{name}/msi/assets/LICENSE.rtf")
+      copy_file(resource_path("msi/assets/banner_background.bmp"), "#{target}/resources/#{name}/msi/assets/banner_background.bmp")
+      copy_file(resource_path("msi/assets/dialog_background.bmp"), "#{target}/resources/#{name}/msi/assets/dialog_background.bmp")
+      copy_file(resource_path("msi/assets/project.ico"), "#{target}/resources/#{name}/msi/assets/project.ico")
+      copy_file(resource_path("msi/assets/project_16x16.ico"), "#{target}/resources/#{name}/msi/assets/project_16x16.ico")
+      copy_file(resource_path("msi/assets/project_32x32.ico"), "#{target}/resources/#{name}/msi/assets/project_32x32.ico")
     end
 
     def create_pkg_assets
       return unless options[:pkg_assets]
 
-      copy_file(resource_path('pkg/background.png'), "#{target}/resources/#{name}/pkg/background.png")
-      copy_file(resource_path('pkg/license.html.erb'), "#{target}/resources/#{name}/pkg/license.html.erb")
-      copy_file(resource_path('pkg/welcome.html.erb'), "#{target}/resources/#{name}/pkg/welcome.html.erb")
-      copy_file(resource_path('pkg/distribution.xml.erb'), "#{target}/resources/#{name}/pkg/distribution.xml.erb")
+      copy_file(resource_path("pkg/background.png"), "#{target}/resources/#{name}/pkg/background.png")
+      copy_file(resource_path("pkg/license.html.erb"), "#{target}/resources/#{name}/pkg/license.html.erb")
+      copy_file(resource_path("pkg/welcome.html.erb"), "#{target}/resources/#{name}/pkg/welcome.html.erb")
+      copy_file(resource_path("pkg/distribution.xml.erb"), "#{target}/resources/#{name}/pkg/distribution.xml.erb")
     end
 
     def create_rpm_assets
       return unless options[:rpm_assets]
 
-      copy_file(resource_path('rpm/rpmmacros.erb'), "#{target}/resources/#{name}/rpm/rpmmacros.erb")
-      copy_file(resource_path('rpm/signing.erb'), "#{target}/resources/#{name}/rpm/signing.erb")
-      copy_file(resource_path('rpm/spec.erb'), "#{target}/resources/#{name}/rpm/spec.erb")
+      copy_file(resource_path("rpm/rpmmacros.erb"), "#{target}/resources/#{name}/rpm/rpmmacros.erb")
+      copy_file(resource_path("rpm/signing.erb"), "#{target}/resources/#{name}/rpm/signing.erb")
+      copy_file(resource_path("rpm/spec.erb"), "#{target}/resources/#{name}/rpm/spec.erb")
     end
+
     private
 
     #
@@ -184,7 +197,7 @@ module Omnibus
     # @return [String]
     #
     def resource_path(*args)
-      Omnibus.source_root.join('resources', *args).to_s
+      Omnibus.source_root.join("resources", *args).to_s
     end
   end
 end

data/lib/omnibus/git_cache.rb

@@ -14,22 +14,33 @@
 # limitations under the License.
 #
 
-require 'digest'
-require 'fileutils'
+require "digest"
+require "fileutils"
 
 module Omnibus
   class GitCache
     include Util
     include Logging
 
-    REQUIRED_GIT_FILES = [
-      'HEAD',
-      'description',
-      'hooks',
-      'info',
-      'objects',
-      'refs',
-    ].freeze
+    # The serial number represents compatibility of a cache entry with the
+    # current version of the omnibus code base. Any time a change is made to
+    # omnibus that makes the code incompatible with any cache entries created
+    # before the code change, the serial number should be incremented.
+    #
+    # For example, if a code change generates content in the `install_dir`
+    # before cache snapshots are taken, any snapshots created before upgrade
+    # will not have the generated content, so these snapshots would be
+    # incompatible with the current omnibus codebase. Incrementing the serial
+    # number ensures these old shapshots will not be used in subsequent builds.
+    SERIAL_NUMBER = 1
+
+    REQUIRED_GIT_FILES = %w{
+HEAD
+description
+hooks
+info
+objects
+refs}.freeze
 
     #
     # @return [Software]
@@ -64,7 +75,7 @@ module Omnibus
         false
       else
         create_directory(File.dirname(cache_path))
-        git_cmd('init -q')
+        git_cmd("init -q")
         true
       end
     end
@@ -98,8 +109,8 @@ module Omnibus
       # This is the list of all the unqiue shasums of all the software build
       # dependencies, including the on currently being acted upon.
       shasums = [dep_list.map(&:shasum), software.shasum].flatten
-      suffix  = Digest::SHA256.hexdigest(shasums.join('|'))
-      @tag    = "#{software.name}-#{suffix}"
+      suffix  = Digest::SHA256.hexdigest(shasums.join("|"))
+      @tag    = "#{software.name}-#{suffix}-#{SERIAL_NUMBER}"
 
       log.internal(log_key) { "tag: #{@tag}" }
 
@@ -108,29 +119,29 @@ module Omnibus
 
     # Create an incremental install path cache for the software step
     def incremental
-      log.internal(log_key) { 'Performing incremental cache' }
+      log.internal(log_key) { "Performing incremental cache" }
 
       create_cache_path
       remove_git_dirs
 
-      git_cmd('add -A -f')
+      git_cmd("add -A -f")
 
       begin
-        git_cmd(%Q(commit -q -m "Backup of #{tag}"))
+        git_cmd(%Q{commit -q -m "Backup of #{tag}"})
       rescue CommandFailed => e
-        raise unless e.message.include?('nothing to commit')
+        raise unless e.message.include?("nothing to commit")
       end
 
-      git_cmd(%Q(tag -f "#{tag}"))
+      git_cmd(%Q{tag -f "#{tag}"})
     end
 
     def restore
-      log.internal(log_key) { 'Performing cache restoration' }
+      log.internal(log_key) { "Performing cache restoration" }
 
       create_cache_path
 
       restore_me = false
-      cmd = git_cmd(%Q(tag -l "#{tag}"))
+      cmd = git_cmd(%Q{tag -l "#{tag}"})
 
       cmd.stdout.each_line do |line|
         restore_me = true if tag == line.chomp
@@ -138,7 +149,7 @@ module Omnibus
 
       if restore_me
         log.internal(log_key) { "Detected tag `#{tag}' can be restored, restoring" }
-        git_cmd(%Q(checkout -f "#{tag}"))
+        git_cmd(%Q{checkout -f "#{tag}"})
         true
       else
         log.internal(log_key) { "Could not find tag `#{tag}', skipping restore" }
@@ -190,7 +201,7 @@ module Omnibus
     # @return [String]
     #
     def install_dir
-      @install_dir ||= software.project.install_dir.sub(/^([A-Za-z]:)/, '')
+      @install_dir ||= software.project.install_dir.sub(/^([A-Za-z]:)/, "")
     end
 
     # Override the log_key for this class to include the software name