omnibus 5.5.0 → 5.6.0

data/lib/omnibus/util.rb

@@ -34,6 +34,36 @@ module Omnibus
       environment: {},
     }.freeze
 
+    #
+    # The proper platform-specific "$PATH" key.
+    #
+    # @return [String]
+    #
+    def path_key
+      # The ruby devkit needs ENV['Path'] set instead of ENV['PATH'] because
+      # $WINDOWSRAGE, and if you don't set that your native gem compiles
+      # will fail because the magic fixup it does to add the mingw compiler
+      # stuff won't work.
+      #
+      # Turns out there is other build environments that only set ENV['PATH'] and if we
+      # modify ENV['Path'] then it ignores that.  So, we scan ENV and returns the first
+      # one that we find.
+      #
+      if windows?
+        result = ENV.keys.grep(/\Apath\Z/i)
+        case result.length
+        when 0
+          raise "The current omnibus environment has no PATH"
+        when 1
+          result.first
+        else
+          raise "The current omnibus environment has multiple PATH/Path variables."
+        end
+      else
+        "PATH"
+      end
+    end
+
     #
     # Shells out and runs +command+.
     #
@@ -53,6 +83,14 @@ module Omnibus
       options = args.last.kind_of?(Hash) ? args.pop : {}
       options = SHELLOUT_OPTIONS.merge(options)
 
+      command_string = args.join(" ")
+      in_msys = options.delete(:in_msys_bash) && ENV["MSYSTEM"]
+      # Mixlib will handle escaping characters for cmd but our command might
+      # contain '. For now, assume that won't happen because I don't know
+      # whether this command is going to be played via cmd or through
+      # ProcessCreate.
+      command_string = "bash -c \'#{command_string}\'" if in_msys
+
       # Grab the log_level
       log_level = options.delete(:log_level)
 
@@ -74,9 +112,9 @@ module Omnibus
       end
 
       # Log the actual command
-      log.public_send(log_level, log_key) { "$ #{args.join(' ')}" }
+      log.public_send(log_level, log_key) { "$ #{command_string}" }
 
-      cmd = Mixlib::ShellOut.new(*args, options)
+      cmd = Mixlib::ShellOut.new(command_string, options)
       cmd.environment["HOME"] = "/tmp" unless ENV["HOME"]
       cmd.run_command
       cmd
@@ -103,6 +141,33 @@ module Omnibus
       raise CommandTimeout.new(cmd)
     end
 
+    #
+    # Retry the given block if a retriable exception is
+    # raised. Returns the value of the block call if successful.
+    #
+    # @param [String] logstr
+    #   Description of the action being retried. Used in log output.
+    #
+    # @param [Array<Exception>] retried_exceptions
+    #   List of exceptions to retry.  Any other exceptions are raisesd.
+    #
+    # @param [Integer] retries
+    #   Number of times to retry the given block.
+    #
+    def retry_block(logstr, retried_exceptions = [], retries = Omnibus::Config.fetcher_retries, &block)
+      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
+        retry
+      else
+        log.error(log_key) { "#{logstr} failed - #{e.class}!" }
+        raise
+      end
+    end
+
     #
     # Convert the given path to be appropiate for shelling out on Windows.
     #
@@ -121,6 +186,20 @@ module Omnibus
       end
     end
 
+    #
+    # Convert the given path to be appropriate for usage with the given compiler
+    #
+    # @param [String, Array<String>] pieces
+    #   the pieces of the path to join and fix
+    # @return [String]
+    #   the path with applied changes
+    #
+    def compiler_safe_path(*pieces)
+      path = File.join(*pieces)
+      path = path.sub(/^([A-Za-z]):\//, "/\\1/") if ENV["MSYSTEM"]
+      path
+    end
+
     #
     # Create a directory at the given +path+.
     #

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = "5.5.0"
+  VERSION = "5.6.0"
 end

data/lib/omnibus/whitelist.rb

@@ -0,0 +1,228 @@
+
+# Copyright 2012-2014 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.
+#
+
+WHITELIST_LIBS = [
+    /ld-linux/,
+    /libc\.so/,
+    /libcrypt\.so/,
+    /libdl/,
+    /libfreebl\d\.so/,
+    /libgcc_s\.so/,
+    /libm\.so/,
+    /libnsl\.so/,
+    /libpthread/,
+    /libresolv\.so/,
+    /librt\.so/,
+    /libstdc\+\+\.so/,
+    /libutil\.so/,
+    /linux-vdso.+/,
+    /linux-gate\.so/,
+  ].freeze
+
+ARCH_WHITELIST_LIBS = [
+  /libc\.so/,
+  /libcrypt\.so/,
+  /libdb-5\.3\.so/,
+  /libdl\.so/,
+  /libffi\.so/,
+  /libgdbm\.so/,
+  /libm\.so/,
+  /libnsl\.so/,
+  /libpthread\.so/,
+  /librt\.so/,
+  /libutil\.so/,
+].freeze
+
+AIX_WHITELIST_LIBS = [
+  /libpthread\.a/,
+  /libpthreads\.a/,
+  /libdl.a/,
+  /librtl\.a/,
+  /libc\.a/,
+  /libcrypt\.a/,
+  /unix$/,
+].freeze
+
+SOLARIS_WHITELIST_LIBS = [
+  /libaio\.so/,
+  /libavl\.so/,
+  /libcrypt_[di]\.so/,
+  /libcrypto.so/,
+  /libcurses\.so/,
+  /libdoor\.so/,
+  /libgen\.so/,
+  /libmd5\.so/,
+  /libmd\.so/,
+  /libmp\.so/,
+  /libresolv\.so/,
+  /libscf\.so/,
+  /libsec\.so/,
+  /libsocket\.so/,
+  /libssl.so/,
+  /libthread.so/,
+  /libuutil\.so/,
+  /libkstat\.so/,
+  # solaris 11 libraries:
+  /libc\.so\.1/,
+  /libm\.so\.2/,
+  /libdl\.so\.1/,
+  /libnsl\.so\.1/,
+  /libpthread\.so\.1/,
+  /librt\.so\.1/,
+  /libcrypt\.so\.1/,
+  /libgdbm\.so\.3/,
+  /libgcc_s\.so\.1/,
+  /libcryptoutil\.so\.1/,
+  /libucrypto\.so\.1/,
+  /libz\.so\.1/, # while we package our own libz, this get dragged along from Solaris 11's libelf library for some reason...
+  /libelf\.so\.1/,
+  /libssp\.so\.0/,
+  # solaris 9 libraries:
+  /libm\.so\.1/,
+  /libc_psr\.so\.1/,
+  /s9_preload\.so\.1/,
+].freeze
+
+SMARTOS_WHITELIST_LIBS = [
+  /libm.so/,
+  /libpthread.so/,
+  /librt.so/,
+  /libsocket.so/,
+  /libdl.so/,
+  /libnsl.so/,
+  /libgen.so/,
+  /libmp.so/,
+  /libmd.so/,
+  /libc.so/,
+  /libgcc_s.so/,
+  /libstdc\+\+\.so/,
+  /libcrypt.so/,
+  /libcrypto.so/,
+  /libssl.so/,
+  /libssp\.so/,
+  /libumem\.so/,
+  /libffi\.so/,
+  /libz\.so/, # while we package our own libz, this get dragged along from Solaris 11's libelf library for some reason...
+].freeze
+
+MAC_WHITELIST_LIBS = [
+  /libobjc\.A\.dylib/,
+  /libSystem\.B\.dylib/,
+  /CoreFoundation/,
+  /CoreServices/,
+  /Tcl$/,
+  /Cocoa$/,
+  /Carbon$/,
+  /IOKit$/,
+  /Tk$/,
+  /libutil\.dylib/,
+  /libffi\.dylib/,
+  /libncurses\.5\.4\.dylib/,
+  /libiconv/,
+  /libstdc\+\+\.6\.dylib/,
+  /libc\+\+\.1\.dylib/,
+].freeze
+
+FREEBSD_WHITELIST_LIBS = [
+  /libc\.so/,
+  /libgcc_s\.so/,
+  /libcrypt\.so/,
+  /libm\.so/,
+  /librt\.so/,
+  /libthr\.so/,
+  /libutil\.so/,
+  /libelf\.so/,
+  /libkvm\.so/,
+  /libprocstat\.so/,
+  /libmd\.so/,
+].freeze
+
+IGNORED_ENDINGS = %w{
+  .TXT
+  .[ch]
+  .[ch]pp
+  .[eh]rl
+  .app
+  .appup
+  .bat
+  .beam
+  .cc
+  .cmake
+  .conf
+  .css
+  .e*rb
+  .feature
+  .gemspec
+  .gif
+  .gitignore
+  .gitkeep
+  .h*h
+  .jar
+  .java
+  .jpg
+  .js
+  .jsm
+  .json
+  .lock
+  .log
+  .lua
+  .md
+  .mkd
+  .npmignore
+  .out
+  .packlist
+  .perl
+  .pl
+  .pm
+  .png
+  .pod
+  .properties
+  .py[oc]*
+  .r*html
+  .rake
+  .rdoc
+  .ri
+  .rst
+  .scss
+  .sh
+  .sql
+  .svg
+  .toml
+  .ttf
+  .txt
+  .xml
+  .yml
+  Gemfile
+  LICENSE
+  Makefile
+  README
+  Rakefile
+  VERSION
+  license
+}.freeze
+
+IGNORED_PATTERNS = %w{
+  /build_info/
+  /licenses/
+  /LICENSES/
+  /man/
+  /share/doc/
+  /share/info/
+  /share/postgresql/
+  /share/terminfo/
+  /share/timezone/
+  /terminfo/
+}.freeze

data/omnibus.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.description    = gem.summary
   gem.homepage       = "https://github.com/opscode/omnibus"
 
-  gem.required_ruby_version = ">= 2.1"
+  gem.required_ruby_version = ">= 2.2"
 
   gem.files = `git ls-files`.split($/)
   gem.bindir = "bin"
@@ -21,24 +21,25 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(/^(test|spec|features)\//)
   gem.require_paths = ["lib"]
 
-  # https://github.com/ksubrama/pedump, branch 'patch-1'
-  # is declared in the Gemfile because of its outdated
-  # dependency on multipart-post (~> 1.1.4)
+  gem.add_dependency "aws-sdk",          "~> 2"
   gem.add_dependency "chef-sugar",       "~> 3.3"
   gem.add_dependency "cleanroom",        "~> 1.0"
+  gem.add_dependency "ffi-yajl",         "~> 2.2"
   gem.add_dependency "mixlib-shellout",  "~> 2.0"
-  gem.add_dependency "mixlib-versioning"
   gem.add_dependency "ohai",             "~> 8.0"
   gem.add_dependency "ruby-progressbar", "~> 1.7"
-  gem.add_dependency "aws-sdk",          "~> 2"
   gem.add_dependency "thor",             "~> 0.18"
-  gem.add_dependency "ffi-yajl",         "~> 2.2"
+
+  gem.add_dependency "mixlib-versioning"
+  gem.add_dependency "pedump"
+
+  # from Gemfile
   gem.add_dependency "license_scout"
 
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "artifactory", "~> 2.0"
   gem.add_development_dependency "aruba",       "~> 0.5"
-  gem.add_development_dependency "chefstyle",   "~> 0.3"
+  gem.add_development_dependency "chefstyle"
   gem.add_development_dependency "fauxhai",     "~> 3.2"
   gem.add_development_dependency "rspec",       "~> 3.0"
   gem.add_development_dependency "rspec-json_expectations"

data/resources/dmg/create_dmg.osascript.erb

@@ -1,17 +1,37 @@
+# find disks that start with <%= volume_name %>
+set found_disk to do shell script "ls /Volumes/ | grep '<%= volume_name %>*'"
+
+if found_disk is {} then
+	set errormsg to "Disk " & found_disk & " not found"
+	error errormsg
+end if
+
 tell application "Finder"
-  tell disk "<%= volume_name %>"
-    open
-    set current view of container window to icon view
-    set toolbar visible of container window to false
-    set statusbar visible of container window to false
-    set the bounds of container window to {<%= window_bounds %>}
-    set theViewOptions to the icon view options of container window
-    set arrangement of theViewOptions to not arranged
-    set icon size of theViewOptions to 72
+	# In case finder has been closed somehow
+	reopen
+	# Reactivate it in case it is "out of focus"
+	activate
+	# Deactivate any current selections
+	set selection to {}
+	# Set it to the location of the proper volume
+	set target of Finder window 1 to found_disk
+	# We like icons
+	set current view of Finder window 1 to icon view
+	# No toolbar or statusbar
+	set toolbar visible of Finder window 1 to false
+	set statusbar visible of Finder window 1 to false
+	# How big and where does it live on the desktop
+	set the bounds of Finder window 1 to {<%= window_bounds %>}
+  # We now talk to the disk object that is a subset of the "Finder"
+  tell disk found_disk
+  	# Pull the view options from the Icon View object
+    # The container window is how we grab hold of the "Finder" window in the
+    # context of the disk object (the disk object is a sub-thing of the app)
+  	set theViewOptions to the icon view options of container window
     set background picture of theViewOptions to file ".support:background.png"
-    delay 5
-    set position of item "<%= pkg_name %>" of container window to {<%= pkg_position %>}
-    update without registering applications
-    delay 5
+  	set arrangement of theViewOptions to not arranged
+  	set icon size of theViewOptions to 72
+  	set position of item "<%= pkg_name %>" of container window to {<%= pkg_position %>}
+  	update without registering applications
   end tell
 end tell

data/resources/ips/doc-transform.erb

@@ -1,2 +1,4 @@
 <transform dir path=<%= pathdir %>$ -> edit group bin sys>
 <transform file depend -> edit pkg.debug.depend.file ruby env>
+<transform file depend -> edit pkg.debug.depend.file make env>
+<transform file depend -> edit pkg.debug.depend.file perl env>