omnibus 5.5.0 → 5.6.0

data/lib/omnibus/packagers/deb.rb

@@ -166,6 +166,86 @@ module Omnibus
     end
     expose :section
 
+    #
+    # Compression algorithm (gzip, xz, none) to use (-Z).
+    #
+    # @example
+    #   compression_type :xz
+    #
+    # @param [Symbol] val
+    #   type of compression (:gzip, :xz, :none)
+    #
+    # @return [Symbol]
+    #   type of compression for this package
+    #
+    def compression_type(val = NULL)
+      if null?(val)
+        @compression_type || :gzip
+      else
+        unless val.is_a?(Symbol) && [:gzip, :xz, :none].member?(val)
+          raise InvalidValue.new(:compression_type, "be a Symbol (:gzip, :xz, or :none)")
+        end
+
+        @compression_type = val
+      end
+    end
+    expose :compression_type
+
+    #
+    # Compression level (1-9) to use (-Z).
+    #
+    # @example
+    #   compression_level 1
+    #
+    # @param [Integer] val
+    #   level of compression (1, .., 9)
+    #
+    # @return [Integer]
+    #   level of compression for this package
+    #
+    def compression_level(val = NULL)
+      if null?(val)
+        @compression_level || 9
+      else
+        unless val.is_a?(Integer) && 1 <= val && 9 >= val
+          raise InvalidValue.new(:compression_level, "be an Integer between 1 and 9")
+        end
+
+        @compression_level = val
+      end
+    end
+    expose :compression_level
+
+    #
+    # Compression strategy to use (-Z).
+    # For gzip: :filtered, :huffman, :rle, or :fixed;
+    # for xz: :extreme
+    # (nil means parameter will not be passsed to dpkg-deb)
+    #
+    # @example
+    #   compression_strategy :extreme
+    #
+    # @param [Symbol] val
+    #   compression strategy
+    #
+    # @return [Symbol]
+    #   compression strategy for this package
+    #
+    def compression_strategy(val = NULL)
+      if null?(val)
+        @compression_strategy
+      else
+        unless val.is_a?(Symbol) &&
+            [:filtered, :huffman, :rle, :fixed, :extreme].member?(val)
+          raise InvalidValue.new(:compression_strategy, "be a Symbol (:filtered, "\
+                                                        ":huffman, :rle, :fixed, or :extreme)")
+        end
+
+        @compression_strategy = val
+      end
+    end
+    expose :compression_strategy
+
     #
     # @!endgroup
     # --------------------------------------------------
@@ -291,7 +371,21 @@ module Omnibus
 
       # Execute the build command
       Dir.chdir(Config.package_dir) do
-        shellout!("fakeroot dpkg-deb -z9 -Zgzip -D --build #{staging_dir} #{package_name}")
+        shellout!("fakeroot dpkg-deb #{compression_params} -D --build #{staging_dir} #{package_name}")
+      end
+    end
+
+    #
+    # Return the parameters passed to dpkg-deb for setting the compression
+    # according to configuration.
+    #
+    # @return [String]
+    #
+    def compression_params
+      if compression_strategy
+        "-z#{compression_level} -Z#{compression_type} -S#{compression_strategy}"
+      else
+        "-z#{compression_level} -Z#{compression_type}"
       end
     end
 

data/lib/omnibus/packagers/ips.rb

@@ -28,6 +28,7 @@ module Omnibus
       destination = File.join(source_dir, project.install_dir)
       FileSyncer.sync(project.install_dir, destination, exclude: exclusions)
       write_transform_file
+      write_versionlock_file
     end
 
     build do
@@ -81,8 +82,7 @@ module Omnibus
     # @see Base#package_name
     #
     def package_name
-      version = project.build_version.split(/[^\d]/)[0..2].join(".")
-      "#{safe_base_package_name}-#{version}-#{project.build_iteration}.#{safe_architecture}.p5p"
+      "#{safe_base_package_name}-#{project.build_version}-#{project.build_iteration}.#{safe_architecture}.p5p"
     end
 
     #
@@ -105,6 +105,15 @@ module Omnibus
       @transform_file ||= File.join(staging_dir, "doc-transform")
     end
 
+    #
+    # The full path to the version-lock file on disk.
+    #
+    # @return [String]
+    #
+    def versionlock_file
+      @versionlock_file ||= File.join(staging_dir, "version-lock")
+    end
+
     #
     # The full path to the pkg metadata file on disk.
     #
@@ -178,6 +187,17 @@ module Omnibus
       end
     end
 
+    #
+    # A version-lock rule that `pkgmogrify' will apply to at the end of package
+    # manifest.
+    #
+    # @return [void]
+    #
+    def write_versionlock_file
+      transform_str = "<transform pkg depend -> default facet.version-lock.*> false>"
+      File.write("#{staging_dir}/version-lock", transform_str)
+    end
+
     #
     # A set of transform rules that `pkgmogrify' will apply to the package
     # manifest.
@@ -193,6 +213,24 @@ module Omnibus
       )
     end
 
+    #
+    # A set of symbolic links to installed commands that
+    #`pkgmogrify' will apply to the package manifest. Is called only when
+    # symlinks.erb template exists
+    # The resource exists locally. For example for project omnibus-toolchain
+    # resource_path("symlinks.erb") #=>
+    # {"/path/to/omnibus-toolchain/resources/omnibus-toolchain/ips/symlinks.erb"}
+    #
+    # @return [String]
+    #
+    def render_symlinks
+      render_template_content(resource_path("symlinks.erb"),
+        {
+          projectdir: project.install_dir,
+        }
+      )
+    end
+
     #
     # Generate package metadata
     #
@@ -212,6 +250,13 @@ module Omnibus
         }
       )
 
+      # Append the contents of symlinks.erb if it exists
+      if File.exists?(resource_path("symlinks.erb"))
+        File.open(pkg_metadata_file, "a") do |symlink|
+          symlink.write(render_symlinks)
+        end
+      end
+
       # Print the full contents of the rendered template file to generate package contents
       log.debug(log_key) { "Rendered Template:\n" + File.read(pkg_metadata_file) }
     end
@@ -235,6 +280,7 @@ module Omnibus
       shellout!("pkgdepend generate -md #{source_dir} #{pkg_manifest_file}.2 | pkgfmt > #{pkg_manifest_file}.3")
       shellout!("pkgmogrify -DARCH=`uname -p` #{pkg_manifest_file}.3 #{transform_file} | pkgfmt > #{pkg_manifest_file}.4")
       shellout!("pkgdepend resolve -m #{pkg_manifest_file}.4")
+      shellout!("pkgmogrify #{pkg_manifest_file}.4.res #{versionlock_file} > #{pkg_manifest_file}.5.res")
     end
 
     #
@@ -244,7 +290,7 @@ module Omnibus
     #
     def validate_pkg_manifest
       log.info(log_key) { "Validating package manifest" }
-      shellout!("pkglint -c /tmp/lint-cache -r http://pkg.oracle.com/solaris/release #{pkg_manifest_file}.4.res")
+      shellout!("pkglint -c /tmp/lint-cache -r http://pkg.oracle.com/solaris/release #{pkg_manifest_file}.5.res")
     end
 
     #
@@ -264,7 +310,7 @@ module Omnibus
     #
     def publish_ips_pkg
       shellout!("pkgrepo -s #{repo_dir} set publisher/prefix=#{publisher_prefix}")
-      shellout!("pkgsend publish -s #{repo_dir} -d #{source_dir} #{pkg_manifest_file}.4.res")
+      shellout!("pkgsend publish -s #{repo_dir} -d #{source_dir} #{pkg_manifest_file}.5.res")
       log.info(log_key) { "Published IPS package to repo: #{repo_dir}" }
 
       repo_info = shellout("pkg list -afv -g #{repo_dir}").stdout

data/lib/omnibus/packagers/pkgsrc.rb

@@ -0,0 +1,112 @@
+#
+# Copyright 2016 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.
+#
+
+module Omnibus
+  class Packager::PKGSRC < Packager::Base
+    id :pkgsrc
+
+    PKGTOOLS_VERSION = "20091115".freeze
+
+    build do
+      write_buildinfo
+      write_buildver
+      write_comment
+      write_packlist
+      create_pkg
+    end
+
+    def build_info
+      staging_dir_path("build-info")
+    end
+
+    def build_ver
+      staging_dir_path("build-ver")
+    end
+
+    def comment_file
+      staging_dir_path("comment")
+    end
+
+    def pack_list
+      staging_dir_path("packlist")
+    end
+
+    def create_pkg
+      postinst = "#{project.package_scripts_path}/postinst"
+      postrm = "#{project.package_scripts_path}/postrm"
+
+      shellout! "cd #{Config.package_dir} && pkg_create -i #{postinst} -k #{postrm} -p  #{project.install_dir} -b #{build_ver} -B #{build_info} -c #{comment_file} -d #{comment_file} -f #{pack_list} -I #{project.install_dir} -l -U #{package_name}"
+    end
+
+    def package_name
+      "#{project.package_name}-#{project.build_version}.tgz"
+    end
+
+    def write_buildver
+      File.open build_ver, "w+" do |f|
+        f.write"#{project.build_version}-#{project.build_iteration}"
+      end
+    end
+
+    def write_buildinfo
+      buildinfo_content = <<-EOF
+MACHINE_ARCH=#{safe_architecture}
+OPSYS=#{opsys}
+OS_VERSION=#{os_version}
+PKGTOOLS_VERSION=#{PKGTOOLS_VERSION}
+      EOF
+
+      File.open(build_info, "w+") do |f|
+        f.write(buildinfo_content)
+      end
+    end
+
+    def write_comment
+      File.open(comment_file, "w+") do |f|
+        f.write(project.description)
+      end
+    end
+
+    def write_packlist
+      File.open pack_list, "w+" do |f|
+        f.write "@pkgdir #{project.install_dir}\n@cwd #{project.install_dir}/\n"
+      end
+
+      shellout! "cd #{project.install_dir} && find . -type l -or -type f | sort >> #{pack_list}"
+    end
+
+    def opsys
+      Ohai["kernel"]["name"]
+    end
+
+    def os_version
+      Ohai["kernel"]["release"]
+    end
+
+    def safe_architecture
+      if smartos?
+        if Ohai["kernel"]["update"] == "86_64"
+          "x86_64"
+        else
+          "i386"
+        end
+      else
+        # FIXME: this undoubtedly will need filling out once we make this go for platforms that aren't SmartOS
+        Ohai["kernel"]["machine"]
+      end
+    end
+  end
+end

data/lib/omnibus/packagers/rpm.rb

@@ -227,6 +227,56 @@ module Omnibus
     end
     expose :dist_tag
 
+    #
+    # Set or return the compression type (:gzip, :bzip2, :xz) for this package
+    #
+    # @example
+    #   compression_type :xz
+    #
+    # @param [Symbol] val
+    #   the compression type
+    #
+    # @return [String]
+    #   the compression type for this package
+    #
+    def compression_type(val = NULL)
+      if null?(val)
+        @compression_type || :gzip
+      else
+        unless val.is_a?(Symbol) && [:gzip, :bzip2, :xz].member?(val)
+          raise InvalidValue.new(:compression_type, "be a Symbol (:gzip, :bzip2, or :xz)")
+        end
+
+        @compression_type = val
+      end
+    end
+    expose :compression_type
+
+    #
+    # Set or return the compression level (1-9) for this package
+    #
+    # @example
+    #   compression_level 6
+    #
+    # @param [Integer] val
+    #   the compression level
+    #
+    # @return [Integer]
+    #   the compression level for this package
+    #
+    def compression_level(val = NULL)
+      if null?(val)
+        @compression_level || 9
+      else
+        unless val.is_a?(Integer) && 1 <= val && 9 >= val
+          raise InvalidValue.new(:compression_level, "be an Integer (between 1 and 9)")
+        end
+
+        @compression_level = val
+      end
+    end
+    expose :compression_level
+
     #
     # @!endgroup
     # --------------------------------------------------
@@ -278,11 +328,11 @@ module Omnibus
     #
     def mark_filesystem_directories(fsdir)
       if fsdir.eql?("/") || fsdir.eql?("/usr/lib") || fsdir.eql?("/usr/share/empty")
-        return "%dir %attr(0555,root,root) #{fsdir}"
+        "%dir %attr(0555,root,root) #{fsdir}"
       elsif filesystem_directories.include?(fsdir)
-        return "%dir %attr(0755,root,root) #{fsdir}"
+        "%dir %attr(0755,root,root) #{fsdir}"
       else
-        return "%dir #{fsdir}"
+        "%dir #{fsdir}"
       end
     end
 
@@ -332,10 +382,29 @@ module Omnibus
           files:           files,
           build_dir:       build_dir,
           platform_family: Ohai["platform_family"],
+          compression:     compression,
         }
       )
     end
 
+    #
+    # Returns the RPM spec "_binary_payload" line corresponding to the
+    # compression configuration.
+    #
+    # @return [String]
+    #
+    def compression
+      compression_name = case compression_type
+                         when :bzip2
+                           "bzdio"
+                         when :xz
+                           "xzdio"
+                         else # default to gzip
+                           "gzdio"
+                         end
+      "w#{compression_level}.#{compression_name}"
+    end
+
     #
     # Generate the RPM file using +rpmbuild+. Unlike debian,the +fakeroot+
     # command is not required for the package to be owned by +root:root+. The

data/lib/omnibus/packagers/solaris.rb

@@ -54,10 +54,6 @@ module Omnibus
       File.basename(project.install_dir)
     end
 
-    def staging_dir_path(file_name)
-      File.join(staging_dir, file_name)
-    end
-
     #
     # Copy all scripts in {Project#package_scripts_path} to the control
     # directory of this repo.

data/lib/omnibus/packagers/windows_base.rb

@@ -76,7 +76,7 @@ module Omnibus
         end
 
         @signing_identity[:store] = params[:store] || "My"
-        @signing_identity[:algorithm] = params[:algorithm] || "SHA1"
+        @signing_identity[:algorithm] = params[:algorithm] || "SHA256"
         servers = params[:timestamp_servers] || DEFAULT_TIMESTAMP_SERVERS
         @signing_identity[:timestamp_servers] = [servers].flatten
         @signing_identity[:machine_store] = params[:machine_store] || false