omnibus 6.1.7 → 6.1.9

data/lib/omnibus/packagers/ips.rb

@@ -209,8 +209,7 @@ module Omnibus
         destination: transform_file,
         variables: {
           pathdir: project.install_dir.split("/")[1],
-        }
-      )
+        })
     end
 
     #
@@ -242,8 +241,7 @@ module Omnibus
       render_template_content(resource_path(symlinks_file),
         {
           projectdir: project.install_dir,
-        }
-      )
+        })
     end
 
     #
@@ -262,8 +260,7 @@ module Omnibus
           description: project.description,
           summary: project.friendly_name,
           arch: safe_architecture,
-        }
-      )
+        })
 
       # Append the contents of symlinks_file if it exists
       if symlinks_file

data/lib/omnibus/packagers/makeself.rb

@@ -81,8 +81,7 @@ module Omnibus
         destination: makeselfinst_staging_path,
         variables: {
           install_dir: project.install_dir,
-        }
-      )
+        })
       FileUtils.chmod(0755, makeselfinst_staging_path)
     end
 

data/lib/omnibus/packagers/msi.rb

@@ -181,10 +181,12 @@ module Omnibus
       unless val.is_a?(TrueClass) || val.is_a?(FalseClass)
         raise InvalidValue.new(:iwix_light_delay_validation, "be TrueClass or FalseClass")
       end
+
       @delay_validation ||= val
       unless @delay_validation
         return ""
       end
+
       "-sval"
     end
     expose :wix_light_delay_validation
@@ -225,6 +227,7 @@ module Omnibus
       unless val.is_a?(TrueClass) || val.is_a?(FalseClass)
         raise InvalidValue.new(:bundle_msi, "be TrueClass or FalseClass")
       end
+
       @bundle_msi ||= val
     end
     expose :bundle_msi
@@ -244,6 +247,7 @@ module Omnibus
       unless val.is_a?(TrueClass) || val.is_a?(FalseClass)
         raise InvalidValue.new(:fast_msi, "be TrueClass or FalseClass")
       end
+
       @fast_msi ||= val
     end
     expose :fast_msi
@@ -298,6 +302,7 @@ module Omnibus
 
       raise "Could not find `#{search_pattern}'!" if file_paths.none?
       raise "Multiple possible matches of `#{search_pattern}'! : #{file_paths}" if file_paths.count > 1
+
       file_paths.first.relative_path_from(install_path).to_s
     end
     expose :gem_path
@@ -340,8 +345,7 @@ module Omnibus
           name: project.package_name,
           friendly_name: project.friendly_name,
           maintainer: project.maintainer,
-        }
-      )
+        })
     end
 
     #
@@ -360,8 +364,7 @@ module Omnibus
           parameters: parameters,
           version: windows_package_version,
           display_version: msi_display_version,
-        }
-      )
+        })
     end
 
     #
@@ -408,8 +411,7 @@ module Omnibus
           hierarchy: hierarchy,
           fastmsi: fast_msi,
           wix_install_dir: wix_install_dir,
-        }
-      )
+        })
     end
 
     #
@@ -429,8 +431,7 @@ module Omnibus
           version: windows_package_version,
           display_version: msi_display_version,
           msi: windows_safe_path(Config.package_dir, msi_name),
-        }
-      )
+        })
     end
 
     #
@@ -487,7 +488,7 @@ module Omnibus
           -ext WixBalExtension
           #{wix_extension_switches(wix_candle_extensions)}
           -dOmnibusCacheDir="#{windows_safe_path(File.expand_path(Config.cache_dir))}"
-          "#{windows_safe_path(staging_dir, 'bundle.wxs')}"
+          "#{windows_safe_path(staging_dir, "bundle.wxs")}"
         EOH
       else
         <<-EOH.split.join(" ").squeeze(" ").strip
@@ -496,7 +497,7 @@ module Omnibus
             #{wix_candle_flags}
             #{wix_extension_switches(wix_candle_extensions)}
             -dProjectSourceDir="#{windows_safe_path(project.install_dir)}" "project-files.wxs"
-            "#{windows_safe_path(staging_dir, 'source.wxs')}"
+            "#{windows_safe_path(staging_dir, "source.wxs")}"
         EOH
       end
     end
@@ -588,7 +589,7 @@ module Omnibus
     # @return [String]
     #
     def wix_extension_switches(arr)
-      "#{arr.map { |e| "-ext '#{e}'" }.join(' ')}"
+      "#{arr.map { |e| "-ext '#{e}'" }.join(" ")}"
     end
   end
 end

data/lib/omnibus/packagers/pkg.rb

@@ -44,8 +44,7 @@ module Omnibus
           maintainer: project.maintainer,
           build_version: project.build_version,
           package_name: project.package_name,
-        }
-      )
+        })
 
       # Render the welcome template
       render_template(resource_path("welcome.html.erb"),
@@ -56,8 +55,7 @@ module Omnibus
           maintainer: project.maintainer,
           build_version: project.build_version,
           package_name: project.package_name,
-        }
-      )
+        })
 
       # "Render" the assets
       copy_file(resource_path("background.png"), "#{resources_dir}/background.png")
@@ -221,8 +219,7 @@ module Omnibus
           identifier: safe_identifier,
           version: safe_version,
           component_pkg: component_pkg,
-        }
-      )
+        })
     end
 
     #

data/lib/omnibus/packagers/rpm.rb

@@ -243,7 +243,7 @@ module Omnibus
       if null?(val)
         @compression_type || :gzip
       else
-        unless val.is_a?(Symbol) && [:gzip, :bzip2, :xz].member?(val)
+        unless val.is_a?(Symbol) && %i{gzip bzip2 xz}.member?(val)
           raise InvalidValue.new(:compression_type, "be a Symbol (:gzip, :bzip2, or :xz)")
         end
 
@@ -317,7 +317,7 @@ module Omnibus
     # @return [Array]
     #
     def filesystem_directories
-      @filesystem_directories ||= IO.readlines(resource_path("filesystem_list")).map { |f| f.chomp }
+      @filesystem_directories ||= IO.readlines(resource_path("filesystem_list")).map(&:chomp)
     end
 
     #
@@ -356,7 +356,7 @@ module Omnibus
 
       # Get a list of all files
       files = FileSyncer.glob("#{build_dir}/**/*")
-                .map { |path| build_filepath(path) }
+        .map { |path| build_filepath(path) }
 
       render_template(resource_path("spec.erb"),
         destination: spec_file,
@@ -383,8 +383,7 @@ module Omnibus
           build_dir: build_dir,
           platform_family: Ohai["platform_family"],
           compression: compression,
-        }
-      )
+        })
     end
 
     #
@@ -422,8 +421,8 @@ module Omnibus
       if signing_passphrase
         log.info(log_key) { "Signing enabled for .rpm file" }
 
-        if File.exist?("#{ENV['HOME']}/.rpmmacros")
-          log.info(log_key) { "Detected .rpmmacros file at `#{ENV['HOME']}'" }
+        if File.exist?("#{ENV["HOME"]}/.rpmmacros")
+          log.info(log_key) { "Detected .rpmmacros file at `#{ENV["HOME"]}'" }
           home = ENV["HOME"]
         else
           log.info(log_key) { "Using default .rpmmacros file from Omnibus" }
@@ -435,9 +434,8 @@ module Omnibus
             destination: "#{home}/.rpmmacros",
             variables: {
               gpg_name: project.maintainer,
-              gpg_path: "#{ENV['HOME']}/.gnupg", # TODO: Make this configurable
-            }
-          )
+              gpg_path: "#{ENV["HOME"]}/.gnupg", # TODO: Make this configurable
+            })
         end
 
         command << " --sign"
@@ -466,11 +464,13 @@ module Omnibus
     def build_filepath(path)
       filepath = rpm_safe("/" + path.gsub("#{build_dir}/", ""))
       return if config_files.include?(filepath)
+
       full_path = build_dir + filepath.gsub("[%]", "%")
       # FileSyncer.glob quotes pathnames that contain spaces, which is a problem on el7
       full_path.delete!('"')
       # Mark directories with the %dir directive to prevent rpmbuild from counting their contents twice.
       return mark_filesystem_directories(filepath) if !File.symlink?(full_path) && File.directory?(full_path)
+
       filepath
     end
 
@@ -502,8 +502,7 @@ module Omnibus
         mode: 0700,
         variables: {
           passphrase: signing_passphrase,
-        }
-      )
+        })
 
       # Yield the destination to the block
       yield(destination)

data/lib/omnibus/packagers/solaris.rb

@@ -76,7 +76,7 @@ module Omnibus
     # Generate a Prototype file for solaris build
     #
     def write_prototype_file
-      shellout! "cd #{install_dirname} && find #{install_basename} -print > #{staging_dir_path('files')}"
+      shellout! "cd #{install_dirname} && find #{install_basename} -print > #{staging_dir_path("files")}"
 
       File.open staging_dir_path("files.clean"), "w+" do |fout|
         File.open staging_dir_path("files") do |fin|
@@ -100,10 +100,10 @@ module Omnibus
       end
 
       # generate the prototype's file list
-      shellout! "cd #{install_dirname} && pkgproto < #{staging_dir_path('files.clean')} > #{staging_dir_path('Prototype.files')}"
+      shellout! "cd #{install_dirname} && pkgproto < #{staging_dir_path("files.clean")} > #{staging_dir_path("Prototype.files")}"
 
       # fix up the user and group in the file list to root
-      shellout! "awk '{ $5 = \"root\"; $6 = \"root\"; print }' < #{staging_dir_path('Prototype.files')} >> #{staging_dir_path('Prototype')}"
+      shellout! "awk '{ $5 = \"root\"; $6 = \"root\"; print }' < #{staging_dir_path("Prototype.files")} >> #{staging_dir_path("Prototype")}"
     end
 
     #
@@ -139,7 +139,7 @@ module Omnibus
     # @return [void]
     #
     def create_solaris_file
-      shellout! "pkgmk -o -r #{install_dirname} -d #{staging_dir} -f #{staging_dir_path('Prototype')}"
+      shellout! "pkgmk -o -r #{install_dirname} -d #{staging_dir} -f #{staging_dir_path("Prototype")}"
       shellout! "pkgchk -vd #{staging_dir} #{project.package_name}"
       shellout! "pkgtrans #{staging_dir} #{package_path} #{project.package_name}"
     end

data/lib/omnibus/packagers/windows_base.rb

@@ -59,11 +59,11 @@ module Omnibus
             raise InvalidValue.new(:params, "be a Hash")
           end
 
-          valid_keys = [:store, :timestamp_servers, :machine_store, :algorithm]
+          valid_keys = %i{store timestamp_servers machine_store algorithm}
           invalid_keys = params.keys - valid_keys
           unless invalid_keys.empty?
-            raise InvalidValue.new(:params, "contain keys from [#{valid_keys.join(', ')}]. "\
-                                   "Found invalid keys [#{invalid_keys.join(', ')}]")
+            raise InvalidValue.new(:params, "contain keys from [#{valid_keys.join(", ")}]. "\
+                                   "Found invalid keys [#{invalid_keys.join(", ")}]")
           end
 
           if !params[:machine_store].nil? && !(
@@ -117,11 +117,11 @@ module Omnibus
         success = try_sign(package_file, ts)
         break if success
       end
-      raise FailedToSignWindowsPackage.new if !success
+      raise FailedToSignWindowsPackage.new unless success
     end
 
     def try_sign(package_file, url)
-      cmd = Array.new.tap do |arr|
+      cmd = [].tap do |arr|
         arr << "signtool.exe"
         arr << "sign /v"
         arr << "/t #{url}"
@@ -158,8 +158,9 @@ module Omnibus
     #
     def certificate_subject
       return "CN=#{project.package_name}" unless signing_identity
+
       store = machine_store? ? "LocalMachine" : "CurrentUser"
-      cmd = Array.new.tap do |arr|
+      cmd = [].tap do |arr|
         arr << "powershell.exe"
         arr << "-ExecutionPolicy Bypass"
         arr << "-NoProfile"

data/lib/omnibus/project.rb

@@ -1007,6 +1007,7 @@ module Omnibus
     #
     def dirty!(software)
       raise ProjectAlreadyDirty.new(self) if culprit
+
       @culprit = software
     end
 

data/lib/omnibus/publisher.rb

@@ -69,7 +69,7 @@ module Omnibus
     #
     def packages
       @packages ||= begin
-        publish_packages = Array.new
+        publish_packages = []
         build_packages   = FileSyncer.glob(@pattern).map { |path| Package.new(path) }
 
         if @options[:platform_mappings]
@@ -88,7 +88,7 @@ module Omnibus
             if packages.empty?
               log.warn(log_key) do
                 "Could not locate a package for build platform #{build_platform}-#{build_platform_version}-#{build_architecture}. " \
-                "Publishing will be skipped for: #{publish_platforms.join(', ')}"
+                "Publishing will be skipped for: #{publish_platforms.join(", ")}"
               end
             end
 

data/lib/omnibus/software.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2017, Chef Software Inc.
+# Copyright 2012-2018, 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.
@@ -305,7 +305,7 @@ module Omnibus
             "only include valid keys. Invalid keys: #{extra_keys.inspect}")
         end
 
-        duplicate_keys = val.keys & [:git, :file, :path, :url]
+        duplicate_keys = val.keys & %i{git file path url}
         unless duplicate_keys.size < 2
           raise InvalidValue.new(:source,
             "not include duplicate keys. Duplicate keys: #{duplicate_keys.inspect}")
@@ -509,7 +509,7 @@ module Omnibus
     #   the list of currently whitelisted files
     #
     def whitelist_file(file)
-      file = Regexp.new(file) unless file.kind_of?(Regexp)
+      file = Regexp.new(file) unless file.is_a?(Regexp)
       whitelist_files << file
       whitelist_files.dup
     end
@@ -987,17 +987,18 @@ module Omnibus
       fetcher.version_guid
     end
 
+    # This is the real version if one exists (nil if there's no real version)
+    def real_version
+      @real_version ||= fetcher.version_for_cache || version
+    end
+
     # Returns the version to be used in cache.
     def version_for_cache
-      @version_for_cache ||= if fetcher.version_for_cache
-                               fetcher.version_for_cache
-                             elsif version
-                               version
+      @version_for_cache ||= if real_version
+                               real_version
                              else
                                log.warn(log_key) do
-                                 "No version given! This is probably a bad thing. I am going to " \
-                                 "assume the version `0.0.0', but that is most certainly not your " \
-                                 "desired behavior. If git caching seems off, this is probably why."
+                                 "No version given! Git caching disabled." \
                                end
 
                                "0.0.0"
@@ -1070,7 +1071,13 @@ module Omnibus
     #
     def build_me(build_wrappers = [])
       if Config.use_git_caching
-        if project.dirty?
+        if !real_version
+          log.info(log_key) do
+            "Forcing a build because resolved version is nil"
+          end
+          execute_build
+          project.dirty!(self)
+        elsif project.dirty?
           log.info(log_key) do
             "Building because `#{project.culprit.name}' dirtied the cache"
           end

data/lib/omnibus/templating.rb

@@ -73,7 +73,7 @@ module Omnibus
 
       unless options.empty?
         raise ArgumentError,
-          "Unknown option(s): #{options.keys.map(&:inspect).join(', ')}"
+          "Unknown option(s): #{options.keys.map(&:inspect).join(", ")}"
       end
 
       # String value returned from #render_template_content

data/lib/omnibus/util.rb

@@ -80,7 +80,7 @@ module Omnibus
     #   populated with results of the command.
     #
     def shellout(*args)
-      options = args.last.kind_of?(Hash) ? args.pop : {}
+      options = args.last.is_a?(Hash) ? args.pop : {}
       options = SHELLOUT_OPTIONS.merge(options)
 
       command_string = args.join(" ")
@@ -158,6 +158,7 @@ module Omnibus
       yield
     rescue Exception => e
       raise e unless retried_exceptions.any? { |eclass| e.is_a?(eclass) }
+
       if retries != 0
         log.info(log_key) { "Retrying failed #{logstr} due to #{e} (#{retries} retries left)..." }
         retries -= 1
@@ -196,7 +197,7 @@ module Omnibus
     #
     def compiler_safe_path(*pieces)
       path = File.join(*pieces)
-      path = path.sub(/^([A-Za-z]):\//, "/\\1/") if ENV["MSYSTEM"]
+      path = path.sub(%r{^([A-Za-z]):/}, "/\\1/") if ENV["MSYSTEM"]
       path
     end