iesd 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d6447d914c3336dfcbd31bed32b08e466afd817
-  data.tar.gz: 1283183f073d822b41df8721be9068f6771645b7
+  metadata.gz: 80dda64df93f32d8ec52093215696a1b0d78ccc8
+  data.tar.gz: 96c94678e448ed676a32b93c0cd2f7f1aea9b023
 SHA512:
-  metadata.gz: 3891f8b6de4af530d2708ac096dab375d92cf88070d5fd9f89dced055503d4c15f320b6d7c9257da7f81bbe037080f45f9aa66ad1a2847f2efe4dc16899a5ff8
-  data.tar.gz: f181900399e4ed2f78d99cfd6929709a0c8085589ed12604f1d4e9c6ee01eefb3fd5d8308a78dc30aaacc924aa38c29d858aaf27163acdf6f277c700de941dfd
+  metadata.gz: 464aa366bbfd2f74f9d1a8c3242ec44d62c95ab71a87f1227a8607604d09f52a0ac9303b85b931f5eed3f73c641d9d59f5a3edff4958df5d0066146d63c6e562
+  data.tar.gz: b13944dd30ea5a6aa223185f0933684a6168db8f7735298b3ba50bb1f2628795870407049bae59acdfd522c7f0722bca98ed8e98d32650a698379fd32761d12d

data/iesd.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.9.2"
 
   s.name                  = "iesd"
-  s.version               = "1.2.0"
+  s.version               = "1.2.1"
   s.summary               = "Customize OS X InstallESD."
   s.description           = "Modify Extensions, Kextcache and Packages on InstallESD."
   s.authors               = "なつき"
@@ -11,10 +11,10 @@ Gem::Specification.new do |s|
   s.license               = "BSD-2-Clause"
 
   s.executables           = ["iesd"]
-  s.files                 = %w{
+  s.files                 = %w[
     README.md
     LICENSE.md
     bin/iesd
     iesd.gemspec
-  } + Dir["lib/**/*.rb"]
+  ] + Dir["lib/**/*.rb"]
 end

data/lib/iesd/InstallESD.rb

@@ -1,26 +1,41 @@
+# Install Electronic Software Delivery
 module IESD
+
+  # Initialize a new installer Object.
+  #
+  # Returns an installer APP or DMG if the type of the installer is detected, otherwise nil.
   def self.new url
     File.extname(url).downcase == ".app" ? IESD::APP.new(url) : IESD::DMG.new(url)
   end
 
+  # OS X Installer App
   class APP
+
+    # Initialize a new installer APP.
+    #
+    # Returns an installer APP if the type of the installer is detected, otherwise nil.
     def self.new url
       IESD::APP::InstallOSX.validate(url) ? IESD::APP::InstallOSX.new(url) : nil
     end
   end
 
+  # OS X Installer DMG
   class DMG
+
+    # Initialize a new installer DMG.
+    #
+    # Returns an installer DMG if the type of the installer is detected, otherwise nil.
     def self.new url
       i = nil
       if HDIUtil::validate url
         HDIUtil::DMG.new(url).show { |mountpoint|
           oh1 "Detecting #{url}"
           case
-          when (File.exist? File.join(mountpoint, *%w{ .IABootFiles }))
+          when (File.exist? File.join(mountpoint, *%w[ .IABootFiles ]))
             i = IESD::DMG::InstallOSX.new url
-          when (File.exist? File.join(mountpoint, *%w{ BaseSystem.dmg }))
+          when (File.exist? File.join(mountpoint, *%w[ BaseSystem.dmg ]))
             i = IESD::DMG::InstallESD.new url
-          when (File.exist? File.join(mountpoint, *%w{ System Installation }))
+          when (File.exist? File.join(mountpoint, *%w[ System Installation ]))
             i = IESD::DMG::BaseSystem.new url
           else
             raise "unknown type"

data/lib/iesd/InstallESD/BaseSystem.dmg.rb

@@ -1,8 +1,17 @@
 module IESD
   class DMG
+
+    # {BaseSystem.dmg}[rdoc-ref:IESD::DMG::BaseSystem]
+    #
+    # The installer DMG before OS X Lion.
     class BaseSystem < HDIUtil::DMG
-      PACKAGES = %w{ System Installation Packages }
 
+      # The relative path to the Packages.
+      PACKAGES = File.join %w[ System Installation Packages ]
+
+      # Export to a new DMG.
+      #
+      # options - The Dictionary of the export options
       def export options
         case options[:type]
         when :BaseSystem, nil
@@ -34,27 +43,39 @@ module IESD
 
       private
 
+      # Perform certain tasks before updating extensions.
+      #
+      # volume_root - The String path to the volume root
+      # options     - The Dictionary of the export options
       def pre_update_extension volume_root, options
         if !File.exist? (mach_kernel = File.join(volume_root, "mach_kernel")) and (options[:mach_kernel] or !options[:extensions][:up_to_date])
-          IESD::Packages::BaseSystemBinaries.new(File.join(volume_root, *PACKAGES, "BaseSystemBinaries.pkg")).extract_mach_kernel mach_kernel
+          IESD::Packages::BaseSystemBinaries.new(File.join(volume_root, PACKAGES, "BaseSystemBinaries.pkg")).extract_mach_kernel mach_kernel
           system("/usr/bin/env", "chflags", "hidden", mach_kernel)
         end
       end
 
+      # Perform certain tasks after updating extensions.
+      #
+      # volume_root - The String path to the volume root
+      # options     - The Dictionary of the export options
       def post_update_extension volume_root, options
         if !options[:extensions][:up_to_date] and options[:extensions][:postinstall]
-          IESD::Packages::OSInstall.new(File.join(volume_root, *PACKAGES, "OSInstall.pkg")).postinstall_extensions options[:extensions]
+          IESD::Packages::OSInstall.new(File.join(volume_root, PACKAGES, "OSInstall.pkg")).postinstall_extensions options[:extensions]
         end
         if !options[:mach_kernel] and File.exist? (mach_kernel = File.join(volume_root, "mach_kernel"))
           system("/usr/bin/env", "rm", mach_kernel)
         end
       end
 
-      class Extensions < IESD::Extensions
-        def update extensions
-          uninstall extensions[:uninstall]
-          install extensions[:install]
-          KextCache.update_volume @volume_root if extensions[:kextcache] or (extensions[:kextcache].nil? and !extensions[:up_to_date])
+      class Extensions < IESD::Extensions # :nodoc:
+
+        # Update the Extensions.
+        #
+        # extensions_options - The Dictionary of the extensions options.
+        def update extensions_options
+          uninstall extensions_options[:uninstall]
+          install extensions_options[:install]
+          KextCache.update_volume @volume_root if extensions_options[:kextcache] or (extensions_options[:kextcache].nil? and !extensions_options[:up_to_date])
         end
       end
     end

data/lib/iesd/InstallESD/Extensions.rb

@@ -1,16 +1,33 @@
 module IESD
+
+  # /System/Library/Extensions
   class Extensions
-    EXTENSIONS = %w{ System Library Extensions }
-    EXTRA_EXTENSIONS = %w{ Library Extensions }
 
-    attr_reader :volume_root, :url
+    # The relative path to the Extensions.
+    EXTENSIONS = File.join %w[ System Library Extensions ]
+
+    # The relative path to the Extra Extensions.
+    #
+    # Available on Mavericks and later.
+    EXTRA_EXTENSIONS = File.join %w[ Library Extensions ]
+
+    # The String path to the volume root.
+    attr_reader :volume_root
+    # The String path to the Extensions.
+    attr_reader :url
 
+    # Initialize an Extensions.
+    #
+    # volume_root - The String path to the volume root.
     def initialize volume_root
       @volume_root = volume_root
-      @extensions = File.join @volume_root, *EXTENSIONS
-      @extra_extensions = File.join @volume_root, *EXTRA_EXTENSIONS
+      @extensions = File.join @volume_root, EXTENSIONS
+      @extra_extensions = File.join @volume_root, EXTRA_EXTENSIONS
     end
 
+    # Uninstall extensions.
+    #
+    # kexts - The Array of extensions to be uninstalled.
     def uninstall kexts
       if !kexts.empty?
         oh1 "Uninstalling Extensions"
@@ -28,6 +45,9 @@ module IESD
       end
     end
 
+    # Install extensions.
+    #
+    # kexts - The Array of extensions to be installed.
     def install kexts
       if !kexts.empty?
         oh1 "Installing Extensions"

data/lib/iesd/InstallESD/InstallESD.dmg.rb

@@ -2,9 +2,19 @@ require "shellwords"
 
 module IESD
   class DMG
+
+    # {InstallESD.dmg}[rdoc-ref:IESD::DMG::InstallESD]
+    #
+    # The installer DMG for OS X Lion and later.
+    # It contains a {BaseSystem.dmg}[rdoc-ref:IESD::DMG::BaseSystem], which is used to install the OS X Recovery.
     class InstallESD < HDIUtil::DMG
-      PACKAGES = %w{ Packages }
 
+      # The relative path to the Packages.
+      PACKAGES = File.join %w[ Packages ]
+
+      # Export to a new DMG.
+      #
+      # options - The Dictionary of the export options
       def export options
         case options[:type]
         when :BaseSystem
@@ -20,7 +30,7 @@ module IESD
           show { |installesd|
             IESD::DMG::BaseSystem.new(File.join(installesd, "BaseSystem.dmg")).export(options) { |basesystem|
               installesd_packages = File.join installesd, PACKAGES
-              basesystem_packages = File.join basesystem, *IESD::DMG::BaseSystem::PACKAGES
+              basesystem_packages = File.join basesystem, IESD::DMG::BaseSystem::PACKAGES
               oh1 "Copying #{installesd_packages}"
               system("/usr/bin/env", "rm", basesystem_packages)
               system("/usr/bin/env", "ditto", installesd_packages, basesystem_packages)
@@ -87,29 +97,45 @@ module IESD
 
       private
 
+      # Perform certain tasks before updating extensions.
+      #
+      # volume_root - The String path to the volume root
+      # options     - The Dictionary of the export options
       def pre_update_extension volume_root, options
         if !File.exist? (mach_kernel = File.join(volume_root, "mach_kernel")) and (options[:mach_kernel] or !options[:extensions][:up_to_date])
-          IESD::Packages::BaseSystemBinaries.new(File.join(volume_root, *PACKAGES, "BaseSystemBinaries.pkg")).extract_mach_kernel mach_kernel
+          IESD::Packages::BaseSystemBinaries.new(File.join(volume_root, PACKAGES, "BaseSystemBinaries.pkg")).extract_mach_kernel mach_kernel
           system("/usr/bin/env", "chflags", "hidden", mach_kernel)
         end
       end
 
+      # Perform certain tasks after updating extensions.
+      #
+      # volume_root - The String path to the volume root
+      # options     - The Dictionary of the export options
       def post_update_extension volume_root, options
         if !options[:extensions][:up_to_date] and options[:extensions][:postinstall]
-          IESD::Packages::OSInstall.new(File.join(volume_root, *PACKAGES, "OSInstall.pkg")).postinstall_extensions options[:extensions]
+          IESD::Packages::OSInstall.new(File.join(volume_root, PACKAGES, "OSInstall.pkg")).postinstall_extensions options[:extensions]
         end
         if !options[:mach_kernel] and File.exist? (mach_kernel = File.join(volume_root, "mach_kernel"))
           system("/usr/bin/env", "rm", mach_kernel)
         end
       end
 
-      class BaseSystem < IESD::DMG::BaseSystem
+      class BaseSystem < IESD::DMG::BaseSystem # :nodoc:
         private
 
+        # Perform certain tasks before updating extensions.
+        #
+        # volume_root - The String path to the volume root
+        # options     - The Dictionary of the export options
         def pre_update_extension volume_root, options
 
         end
 
+        # Perform certain tasks after updating extensions.
+        #
+        # volume_root - The String path to the volume root
+        # options     - The Dictionary of the export options
         def post_update_extension volume_root, options
           if File.exist? (mach_kernel = File.join(volume_root, "mach_kernel"))
             system("/usr/bin/env", "rm", mach_kernel)

data/lib/iesd/InstallESD/InstallOSX.app.rb

@@ -1,20 +1,34 @@
 module IESD
   class APP
+
+    # {/Applications/Install OS X.app}[rdoc-ref:IESD::APP::InstallOSX]
+    #
+    # The installer app for OS X Lion and later.
+    # It contains an {InstallESD.dmg}[rdoc-ref:IESD::DMG::InstallESD].
     class InstallOSX
-      INSTALLESD_DMG = %w{Contents SharedSupport InstallESD.dmg}
 
+      # The relative path to {InstallESD.dmg}[rdoc-ref:IESD::DMG::InstallESD].
+      INSTALLESD_DMG = File.join %w[ Contents SharedSupport InstallESD.dmg ]
+
+      # Return true if the app is Install OS X.app, otherwise false.
+      #
+      # url - The String path to the app
       def self.validate url
-        File.exist? File.join(url, *INSTALLESD_DMG)
+        File.exist? File.join(url, INSTALLESD_DMG)
       end
 
-      def initialize url
+      def initialize url # :nodoc:
         @url = File.absolute_path url
       end
 
+      # Export to a new DMG.
+      #
+      # options - The Dictionary of the export options
       def export options
-        IESD::DMG::InstallESD.new(File.join @url, *INSTALLESD_DMG).export options
+        IESD::DMG::InstallESD.new(File.join @url, INSTALLESD_DMG).export options
       end
 
+      # Return true if the APP is an Install OS X.app, otherwise false.
       def valid?
         IESD::APP::InstallOSX.validate @url
       end

data/lib/iesd/InstallESD/InstallOSX.dmg.rb

@@ -1,6 +1,16 @@
 module IESD
   class DMG
+
+    # {Install OS X.dmg}[rdoc-ref:IESD::DMG::InstallOSX]
+    #
+    # The installer dmg for OS X Mavericks and later.
+    # It contains an {Install OS X.app}[rdoc-ref:IESD::APP::InstallOSX].
+    # It's generated by `createinstallmedia`, a tool come with the installer app.
     class InstallOSX < HDIUtil::DMG
+
+      # Export to a new DMG.
+      #
+      # options - The Dictionary of the export options
       def export options
         show { |mountpoint|
           IESD::APP::InstallOSX.new(Dir[File.join(mountpoint, "*.app")][0]).export options

data/lib/iesd/InstallESD/Packages.rb

@@ -1,4 +1,6 @@
 module IESD
+
+  # /System/Installation/Packages/
   class Packages
   end
 end

data/lib/iesd/InstallESD/Packages/BaseSystemBinaries.pkg.rb

@@ -2,7 +2,13 @@ require "shellwords"
 
 module IESD
   class Packages
+
+    # BaseSystemBinaries.pkg
     class BaseSystemBinaries < PKGUtil::PKG
+
+      # Extract the mach_kernel.
+      #
+      # output - The String path to the output file.
       def extract_mach_kernel output
         show { |pkg|
           payload = "#{pkg}/Payload"

data/lib/iesd/InstallESD/Packages/OSInstall.mpkg.rb

@@ -1,5 +1,7 @@
 module IESD
   class Packages
+
+    # OSInstall.mpkg
     class OSInstallM < PKGUtil::PKG
     end
   end

data/lib/iesd/InstallESD/Packages/OSInstall.pkg.rb

@@ -1,6 +1,12 @@
 module IESD
   class Packages
+
+    # OSInstall.pkg
     class OSInstall < PKGUtil::PKG
+
+      # Create the postinstall script for extensions.
+      #
+      # extensions - The Extensions to update.
       def postinstall_extensions extensions
         update { |pkg|
           oh1 "Creating Extensions Postinstall Script"

data/lib/iesd/InstallESD/Packages/OSUpgrade.pkg.rb

@@ -1,5 +1,7 @@
 module IESD
   class Packages
+
+    # OSUpgrade.pkg
     class OSUpgrade < PKGUtil::PKG
     end
   end

data/lib/iesd/utility/hdiutil.rb

@@ -2,24 +2,42 @@ require "shellwords"
 require "tmpdir"
 require_relative "tty"
 
+# +/usr/bin/hdiutil+
+#
+# https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/hdiutil.1.html
 module HDIUtil
-  DEFAULT_MOUNT_OPTIONS = %w{ -nobrowse -quiet -noverify }
-  DEFAULT_MOUNT_OPTIONS.concat(%w{ -owners on }) if Process.uid == 0
-  DEFAULT_UNMOUNT_OPTIONS = %w{ -quiet }
-  DEFAULT_CONVERT_OPTIONS = %w{ -quiet }
 
+  # The default options for +hdiutil+.
+  DEFAULT_OPTIONS = %w[ -quiet ]
+
+  # The default options for <code>hdiutil attach</code>.
+  DEFAULT_MOUNT_OPTIONS = %w[ -nobrowse -noverify ]
+  DEFAULT_MOUNT_OPTIONS.concat(%w[ -owners on ]) if Process.uid == 0
+
+  # Perform read-only actions on the input image.
+  #
+  # If a block is given the block will be yielded with the path of the mount point directory, otherwise a shell will be open.
+  #
+  # input - The String path to the input image.
   def self.read input
     Dir.mktmpdir { |mountpoint|
-      attach input, mountpoint, [*DEFAULT_MOUNT_OPTIONS]
+      attach input, mountpoint, [*DEFAULT_OPTIONS, *DEFAULT_MOUNT_OPTIONS]
       if block_given?
         yield mountpoint
       else
         shell mountpoint
       end
-      detach input, mountpoint, [*DEFAULT_UNMOUNT_OPTIONS]
+      detach input, mountpoint, [*DEFAULT_OPTIONS]
     }
   end
 
+  # Perform read-write actions on the input image and export as the output image.
+  #
+  # If a block is given the block will be yielded with the path of the mount point directory, otherwise a shell will be open.
+  #
+  # input   - The String path to the input image.
+  # output  - The String path to the output image.
+  # options - The Dictionary of hdiutil options.
   def self.write input, output, options = {}
     options = {
       :resize => {
@@ -36,39 +54,55 @@ module HDIUtil
         resize_limits = `/usr/bin/env hdiutil resize -limits -shadow #{shadow.shellescape} #{input.shellescape}`.chomp.split.map { |s| s.to_i }
         sectors = (resize_limits[1] + options[:resize][:grow]).to_s
         system("/usr/bin/env", "hdiutil", "resize", "-growonly", "-sectors", sectors, *shadow_options, input)
-        attach input, mountpoint, [*DEFAULT_MOUNT_OPTIONS, *shadow_options]
+        attach input, mountpoint, [*DEFAULT_OPTIONS, *DEFAULT_MOUNT_OPTIONS, *shadow_options]
         if block_given?
           yield mountpoint
         else
           shell mountpoint
         end
-        detach input, mountpoint, [*DEFAULT_UNMOUNT_OPTIONS]
+        detach input, mountpoint, [*DEFAULT_OPTIONS]
         system("/usr/bin/env", "hdiutil", "resize", "-shrinkonly", "-sectors", "min", *shadow_options, input) if options[:resize][:shrink]
       }
       oh1 "Merging #{shadow}"
-      system("/usr/bin/env", "hdiutil", "convert", *DEFAULT_CONVERT_OPTIONS, *format_options, *shadow_options, "-o", output, input)
+      system("/usr/bin/env", "hdiutil", "convert", *DEFAULT_OPTIONS, *format_options, *shadow_options, "-o", output, input)
       puts "Merged: #{output}"
     }
   end
 
-  def self.validate input
-    Kernel.system(%Q{/usr/bin/env hdiutil imageinfo #{input.shellescape} >/dev/null 2>&1})
+  # Returns true if the image is valid, false otherwise.
+  #
+  # url - The String path to the image.
+  def self.validate url
+    Kernel.system(%Q[/usr/bin/env hdiutil imageinfo #{url.shellescape} >/dev/null 2>&1])
   end
 
   private
 
+  # Mount a DMG.
+  #
+  # dmg        - The String path to the DMG.
+  # mountpoint - The String path to the mount directory.
+  # arguments  - The Array of the hdiutil attach options.
   def self.attach dmg, mountpoint, arguments = []
     ohai "Mounting #{dmg}"
     system("/usr/bin/env", "hdiutil", "attach", *arguments, "-mountpoint", mountpoint, dmg)
     puts "Mounted: #{mountpoint}"
   end
 
+  # Unmount a DMG.
+  #
+  # dmg        - The String path to the DMG.
+  # mountpoint - The String path to the unmount directory.
+  # arguments  - The Array of the hdiutil detach options.
   def self.detach dmg, mountpoint, arguments = []
     ohai "Unmounting #{dmg}"
     system("/usr/bin/env", "hdiutil", "detach", *arguments, mountpoint)
     puts "Unmounted: #{mountpoint}"
   end
 
+  # Open a shell in the directory.
+  #
+  # dir - The String path to the directory.
   def self.shell dir
     Dir.chdir(dir) {
       ohai ENV['SHELL']
@@ -77,22 +111,30 @@ module HDIUtil
   end
 end
 
-module HDIUtil
-  class DMG
+module HDIUtil # :nodoc:
+  class DMG # :nodoc:
+
+    # The String path to the DMG.
     attr_accessor :url
 
+    # Initialize a new DMG.
+    #
+    # url - The String path to the DMG.
     def initialize url
       @url = File.absolute_path url
     end
 
+    # Perform read-only actions on the DMG.
     def show &block
       HDIUtil.read(@url, &block)
     end
 
+    # Open a read-write shell in the DMG.
     def edit
       update
     end
 
+    # Perform read-write actions on the DMG.
     def update &block
       Dir.mktmpdir { |tmp|
         flags = `/usr/bin/env ls -lO #{@url.shellescape}`.split[4]
@@ -102,6 +144,7 @@ module HDIUtil
       }
     end
 
+    # Returns true if the DMG is a valid image, false otherwise.
     def valid?
       HDIUtil.validate @url
     end

data/lib/iesd/utility/kextcache.rb

@@ -1,29 +1,54 @@
 require_relative "tty"
 
+# +/usr/sbin/kextcache+
+#
+# https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man8/kextcache.8.html
 module KextCache
-  KEXTCACHE_DEFAULT_OPTIONS = %w{ -v 0 -no-authentication }
 
-  EXTENSIONS = %w{ System Library Extensions }
-  EXTRA_EXTENSIONS = %w{ Library Extensions }
-  KERNELCACHE = %w{ System Library Caches com.apple.kext.caches Startup kernelcache }
-  MKEXT = %w{ System Library Caches com.apple.kext.caches Startup Extensions.mkext }
-  MKEXT_PPC = %w{ System Library Extensions.mkext }
+  # The default options for kextcache.
+  DEFAULT_OPTIONS = %w[ -v 0 -no-authentication ]
 
+  # The relative path to Extensions.
+  EXTENSIONS = File.join %w[ System Library Extensions ]
+
+  # The relative path to Extra Extensions.
+  #
+  # Available on OS X Mavericks and later.
+  EXTRA_EXTENSIONS = File.join %w[ Library Extensions ]
+
+  # The relative path to kernelcache.
+  #
+  # Available on OS X Lion and later.
+  KERNELCACHE = File.join %w[ System Library Caches com.apple.kext.caches Startup kernelcache ]
+
+  # The relative path to Extensions.mkext.
+  #
+  # Available on OS X Snow Leopard.
+  MKEXT = File.join %w[ System Library Caches com.apple.kext.caches Startup Extensions.mkext ]
+
+  # The relative path to Extensions.mkext on PowerPC Macs.
+  #
+  # Available on OS X Leopard and eailer.
+  MKEXT_PPC = File.join %w[ System Library Extensions.mkext ]
+
+  # Update the kernelcache on a volume.
+  #
+  # volume_root - The String path to the volume root.
   def self.update_volume volume_root
     oh1 "Updating Kextcache"
     if File.exist? (mach_kernel = File.join(volume_root, "mach_kernel"))
-      extensions_path = [File.join(volume_root, *EXTENSIONS)]
-      extensions_path.push(File.join(volume_root, *EXTRA_EXTENSIONS)) if File.exist? File.join(volume_root, *EXTRA_EXTENSIONS)
+      extensions_path = [File.join(volume_root, EXTENSIONS)]
+      extensions_path.push(File.join(volume_root, EXTRA_EXTENSIONS)) if File.exist? File.join(volume_root, EXTRA_EXTENSIONS)
       case
-      when (File.exist? (url = File.join(volume_root, *KERNELCACHE)))
-        system("/usr/bin/env", "kextcache", *KEXTCACHE_DEFAULT_OPTIONS, "-prelinked-kernel", url, "-kernel", mach_kernel, "-volume-root", volume_root, "--", *extensions_path)
-      when (File.exist? (url = File.join(volume_root, *MKEXT)))
-        system("/usr/bin/env", "kextcache", *KEXTCACHE_DEFAULT_OPTIONS, *%w{ -a i386 -a x86_64 }, "-mkext", url, "-kernel", mach_kernel, "-volume-root", volume_root, "--", *extensions_path)
-        if File.exist? (mkext_ppc = File.join(volume_root, *MKEXT_PPC))
+      when (File.exist? (url = File.join(volume_root, KERNELCACHE)))
+        system("/usr/bin/env", "kextcache", *DEFAULT_OPTIONS, "-prelinked-kernel", url, "-kernel", mach_kernel, "-volume-root", volume_root, "--", *extensions_path)
+      when (File.exist? (url = File.join(volume_root, MKEXT)))
+        system("/usr/bin/env", "kextcache", *DEFAULT_OPTIONS, *%w[ -a i386 -a x86_64 ], "-mkext", url, "-kernel", mach_kernel, "-volume-root", volume_root, "--", *extensions_path)
+        if File.exist? (mkext_ppc = File.join(volume_root, MKEXT_PPC))
           system("/usr/bin/env", "ditto", url, mkext_ppc)
         end
-      when (File.exist? (url = File.join(volume_root, *MKEXT_PPC)))
-        system("/usr/bin/env", "ditto", *KEXTCACHE_DEFAULT_OPTIONS, *%w{ -a ppc -a i386 }, "-mkext", url, "-kernel", mach_kernel, "-volume-root", volume_root, "--", *extensions_path)
+      when (File.exist? (url = File.join(volume_root, MKEXT_PPC)))
+        system("/usr/bin/env", "kextcache", *DEFAULT_OPTIONS, *%w[ -a ppc -a i386 ], "-mkext", url, "-kernel", mach_kernel, "-volume-root", volume_root, "--", *extensions_path)
       else
         puts "kextcache aborted: unknown kernel cache type"
         return

data/lib/iesd/utility/pkgutil.rb

@@ -1,7 +1,16 @@
 require "tmpdir"
 require_relative "tty"
 
+# +/usr/sbin/pkgutil+
+#
+# https://developer.apple.com/library/mac/documentation/Darwin/Reference/Manpages/man1/pkgutil.1.html
 module PKGUtil
+
+  # Perform read-only actions on the input package.
+  #
+  # If a block is given the block will be yielded with the path of the package expanded directory, otherwise a shell will be open.
+  #
+  # input - The String path to the input package.
   def self.read input
     Dir.mktmpdir { |tmp|
       tmp = File.join tmp, File.basename(input)
@@ -14,6 +23,12 @@ module PKGUtil
     }
   end
 
+  # Perform read-write actions on the input package and export as the output package.
+  #
+  # If a block is given the block will be yielded with the path of the package expanded directory, otherwise a shell will be open.
+  #
+  # input  - The String path to the input package.
+  # output - The String path to the output package.
   def self.write input, output = input
     Dir.mktmpdir { |tmp|
       tmp = File.join tmp, File.basename(input)
@@ -29,18 +44,29 @@ module PKGUtil
 
   private
 
+  # Expand a PKG.
+  #
+  # pkg - The String path to the PKG.
+  # dir - The String path to the expand directory.
   def self.expand pkg, dir
     ohai "Expanding #{pkg}"
     system("/usr/bin/env", "pkgutil", "--expand", pkg, dir)
     puts "Expanded: #{dir}"
   end
 
+  # Flatten a PKG.
+  #
+  # dir - The String path to the flatten directory.
+  # pkg - The String path to the PKG.
   def self.flatten dir, pkg
     ohai "Flattening #{dir}"
     system("/usr/bin/env", "pkgutil", "--flatten", dir, pkg)
     puts "Flattened: #{pkg}"
   end
 
+  # Open a shell in the directory.
+  #
+  # dir - The String path to the directory.
   def self.shell dir
     Dir.chdir(dir) {
       ohai ENV['SHELL']
@@ -49,22 +75,30 @@ module PKGUtil
   end
 end
 
-module PKGUtil
-  class PKG
+module PKGUtil # :nodoc:
+  class PKG # :nodoc:
+
+    # The String path to the PKG.
     attr_accessor :url
 
+    # Initialize a new PKG.
+    #
+    # url - The String path to the PKG.
     def initialize url
       @url = File.absolute_path url
     end
 
+    # Perform read-only actions on the PKG.
     def show &block
       PKGUtil.read(@url, &block)
     end
 
+    # Open a read-write shell in the PKG.
     def edit
       update
     end
 
+    # Perform read-write actions on the PKG.
     def update &block
       PKGUtil.write(@url, &block)
     end

data/lib/iesd/utility/tty.rb

@@ -1,5 +1,6 @@
 require "shellwords"
 
+# :enddoc:
 module Tty extend self
   def blue; bold 34; end
   def white; bold 39; end
@@ -61,7 +62,7 @@ def odie error
 end
 
 def system *args
-  abort "Failed during: #{args.shelljoin}" unless Kernel.system *args
+  abort "Failed during: #{args.shelljoin}" unless Kernel.system(*args)
 end
 
 def sudo *args
@@ -70,6 +71,6 @@ def sudo *args
   else
     "/usr/bin/sudo #{args.first}"
   end
-  ohai *args
-  system *args
+  ohai(*args)
+  system(*args)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iesd
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - "なつき"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies: []
 description: Modify Extensions, Kextcache and Packages on InstallESD.
 email: i@ntk.me