iesd 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22dd8da8e5ab36c59736224a7f76e7042a75970e
-  data.tar.gz: 67aaeabf09594bb882c726575c856120df92533d
+  metadata.gz: fb4d3cc64133af8167ed061b619cc907b529f08b
+  data.tar.gz: 84fd6d472f6e46bc9d8447bcb9531e4be18f22f0
 SHA512:
-  metadata.gz: ce21b053f50b227d8e7174b4aa6391f81219bca1f44d33b53eb0119b44169dccea7fcf5bf7f948962dc328572fd34a8bbd81bed3558f616bc08474bd40313674
-  data.tar.gz: 43881eae97886ff44d6d0ec1ac278067e9c6f282f1c64e45fe5c886fe0eea28b3abcc375f411d29a2652202568d3ba6a70e5fa64f393c760686f2594ea5d9068
+  metadata.gz: dd9b62cf21516bbc29f1ebbadaa2cbf6fa7605e412660a94f271709b5ac3dc543c42a774892156caccecb5ec6b9bd0a7ebec33e27ba0afbb6a44b91569002d6e
+  data.tar.gz: d50a0b0af9cf6d710f995fb5e2228bb1fe97aea6ead280c39440b0d895e7a2f0fcc38ebcf7ac4db4b9ecd4ce947590ade597c4658abf146cd45b6ee51d79f7c2

data/bin/iesd

@@ -17,13 +17,20 @@ options = {
   :input => nil,
   :output => nil,
   :type => nil,
+  :interactive => false,
+  :hdiutil => {
+    :resize => {
+      :grow => 0,
+      :shrink => false
+    }
+  },
+  :mach_kernel => nil,
   :extensions => {
     :install => [],
     :remove => [],
     :kextcache => nil,
     :postinstall => true
-  },
-  :mach_kernel => nil
+  }
 }
 
 optparse = OptionParser.new do |opts|
@@ -33,48 +40,70 @@ optparse = OptionParser.new do |opts|
   opts.separator "Specific options:"
 
   opts.on("-i", "--input inputfile",
-          "Specify inputfile (dmg or app)") do |input|
+          "Input file (dmg or app)") do |input|
     options[:input] = File.absolute_path input
   end
 
   opts.on("-o", "--output outputfile",
-          "Specify outputfile (dmg)") do |output|
+          "Output file (dmg)") do |output|
     output << ".dmg" if File.extname(output).downcase != ".dmg"
     options[:output] = File.absolute_path output
   end
 
   opts.on("-t", "--type type", [:BaseSystem, :InstallESD],
-          "Specify type (BaseSystem, InstallESD)") do |type|
+          "Output type (BaseSystem, InstallESD)") do |type|
     options[:type] = type
   end
 
-  opts.on("--install-kexts x.kext,y.kext,z.kext", Array, "Specify list of kexts to install") do |list|
-    options[:extensions][:install] = list.map { |kext| File.absolute_path kext }
+  opts.on("-s", "--[no-]interactive-shell", "Edit in #{ENV["SHELL"]}") do |interactive|
+    options[:interactive] = interactive
+  end
+
+  opts.separator ""
+  opts.separator "HDIUtil options:"
+
+  opts.on("--grow sectors", OptionParser::DecimalInteger,
+          "Grow dmg size by number of sectors") do |sectors|
+    options[:hdiutil][:resize][:grow] = sectors
+  end
+
+  opts.on("--[no-]shrink", "Shrink output dmg") do |s|
+    options[:hdiutil][:resize][:shrink] = s
+  end
+
+  opts.separator ""
+  opts.separator "Boot options:"
+
+  opts.on("--[no-]kernel", "Use mach_kernel as fallback to kernelcache") do |k|
+    options[:mach_kernel] = k
   end
 
-  opts.on("--remove-kexts x.kext,y.kext,z.kext", Array, "Specify list of kexts to remove") do |list|
+  opts.separator ""
+  opts.separator "Extension options:"
+
+  opts.on("--remove-kexts x.kext,y.kext,z.kext", Array, "Kexts to remove") do |list|
     options[:extensions][:remove] = list
   end
 
-  opts.on("--[no-]kextcache", "Rebuild kernelcache") do |c|
-    options[:extensions][:kextcache] = c
+  opts.on("--install-kexts x.kext,y.kext,z.kext", Array, "Kexts to install") do |list|
+    options[:extensions][:install] = list.map { |kext| File.absolute_path kext }
   end
 
-  opts.on("--[no-]postinstall-kexts", "Patch OSInstall.pkg for postinstall kexts") do |p|
+  opts.on("--[no-]postinstall-kexts", "Patch OSInstall.pkg to postinstall kexts") do |p|
     options[:extensions][:postinstall] = p
   end
 
-  opts.on("--[no-]kernel", "Use mach_kernel as fallback to kextcache") do |k|
-    options[:mach_kernel] = k
+  opts.on("--[no-]kextcache", "Rebuild kernelcache") do |c|
+    options[:extensions][:kextcache] = c
   end
 
+  opts.separator ""
+  opts.separator "Common options:"
+
   opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
     ENV['VERBOSE'] = '1'
   end
 
-  opts.separator ""
-  opts.separator "Common options:"
-
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit

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.0.3"
+  s.version               = "1.1.0"
   s.summary               = "Customize OS X InstallESD."
   s.description           = "Modify Extensions, Kextcache and Packages on InstallESD."
   s.authors               = "なつき"

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

@@ -3,21 +3,27 @@ module IESD
     class BaseSystem < HDIUtil::DMG
       PACKAGES = %w{ System Installation Packages }
 
-      def export options, add_sectors = 0
+      def export options
         case options[:type]
         when :BaseSystem, nil
           Dir.mktmpdir { |tmp|
-            HDIUtil.write(@url, (tmpfile = File.join(tmp, File.basename(@url))), add_sectors) { |volume_root|
+            HDIUtil.write(@url, (tmpfile = File.join(tmp, File.basename(@url))), options[:hdiutil]) { |volume_root|
               options[:extensions][:up_to_date] = (options[:extensions][:remove].empty? and options[:extensions][:install].empty?)
               options[:mach_kernel] = File.exist? File.join(volume_root, "mach_kernel") if options[:mach_kernel].nil?
 
               yield volume_root if block_given?
 
-              pre_update volume_root, options
+              pre_update_extension volume_root, options
 
               IESD::DMG::BaseSystem::Extensions.new(volume_root).update options[:extensions]
 
-              post_update volume_root, options
+              post_update_extension volume_root, options
+
+              if options[:interactive]
+                oh1 "Starting Interactive Shell"
+                puts "Environment: BaseSystem"
+                HDIUtil.shell volume_root
+              end
             }
             system(Utility::MV, tmpfile, options[:output])
           }
@@ -28,14 +34,14 @@ module IESD
 
       private
 
-      def pre_update volume_root, 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
           system(Utility::CHFLAGS, "hidden", mach_kernel)
         end
       end
 
-      def post_update volume_root, 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]
         end

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

@@ -6,9 +6,17 @@ module IESD
       def export options
         case options[:type]
         when :BaseSystem
-          resize_limits = `#{Utility::HDIUTIL} resize -limits "#{@url}"`.chomp.split.map { |s| s.to_i }
+          options = {
+            :hdiutil => {
+              :resize => {
+                :grow => 0,
+              }
+            }
+          }.merge(options)
+          options[:hdiutil][:resize][:grow] += ( `#{Utility::HDIUTIL} resize -limits "#{@url}"`.chomp.split.map { |s| s.to_i } ).first
+
           show { |installesd|
-            IESD::DMG::BaseSystem.new(File.join(installesd, "BaseSystem.dmg")).export(options, resize_limits[0]) { |basesystem|
+            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
               oh1 "Copying #{installesd_packages}"
@@ -28,13 +36,13 @@ module IESD
           }
         when :InstallESD, nil
           Dir.mktmpdir { |tmp|
-            HDIUtil.write(@url, (tmpfile = File.join(tmp, File.basename(@url)))) { |installesd|
+            HDIUtil.write(@url, (tmpfile = File.join(tmp, File.basename(@url))), options[:hdiutil]) { |installesd|
               options[:extensions][:up_to_date] = (options[:extensions][:remove].empty? and options[:extensions][:install].empty?)
               options[:mach_kernel] = File.exist? File.join(installesd, "mach_kernel") if options[:mach_kernel].nil?
 
               yield installesd if block_given?
 
-              pre_update installesd, options
+              pre_update_extension installesd, options
 
               basesystem_options = options.clone
               basesystem_options[:input] = basesystem_options[:output] = File.join(installesd, "BaseSystem.dmg")
@@ -60,7 +68,13 @@ module IESD
                 }
               end
 
-              post_update installesd, options
+              post_update_extension installesd, options
+
+              if options[:interactive]
+                oh1 "Starting Interactive Shell"
+                puts "Environment: InstallESD"
+                HDIUtil.shell installesd
+              end
             }
             system(Utility::MV, tmpfile, options[:output])
           }
@@ -71,14 +85,14 @@ module IESD
 
       private
 
-      def pre_update volume_root, 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
           system(Utility::CHFLAGS, "hidden", mach_kernel)
         end
       end
 
-      def post_update volume_root, 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]
         end

data/lib/iesd/utility/hdiutil.rb

@@ -1,5 +1,5 @@
 module HDIUtil
-  DEFAULT_MOUNT_OPTIONS = %w{ -nobrowse -quiet -noverify}
+  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 }
@@ -16,14 +16,21 @@ module HDIUtil
     }
   end
 
-  def self.write input, output, add_sectors = 0
+  def self.write input, output, options = {}
+    options = {
+      :resize => {
+        :grow => 0,
+        :shrink => false
+      }
+    }.merge(options)
+
     Dir.mktmpdir { |tmp|
       shadow = File.join(tmp, "#{File.basename input}.shadow")
       shadow_options = ["-shadow", shadow]
       format_options = ["-format", `#{Utility::HDIUTIL} imageinfo -format "#{input}"`.chomp]
       Dir.mktmpdir(nil, tmp) { |mountpoint|
         resize_limits = `#{Utility::HDIUTIL} resize -limits -shadow "#{shadow}" "#{input}"`.chomp.split.map { |s| s.to_i }
-        sectors = (resize_limits[1] + add_sectors).to_s
+        sectors = (resize_limits[1] + options[:resize][:grow]).to_s
         system(Utility::HDIUTIL, "resize", "-growonly", "-sectors", sectors, *shadow_options, input)
         attach input, mountpoint, [*DEFAULT_MOUNT_OPTIONS, *shadow_options]
         if block_given?
@@ -32,7 +39,7 @@ module HDIUtil
           shell mountpoint
         end
         detach input, mountpoint, [*DEFAULT_UNMOUNT_OPTIONS]
-        system(Utility::HDIUTIL, "resize", "-shrinkonly", "-sectors", "min", *shadow_options, input)
+        system(Utility::HDIUTIL, "resize", "-shrinkonly", "-sectors", "min", *shadow_options, input) if options[:resize][:shrink]
       }
       oh1 "Merging #{shadow}"
       system(Utility::HDIUTIL, "convert", *DEFAULT_CONVERT_OPTIONS, *format_options, *shadow_options, "-o", output, input)
@@ -46,22 +53,22 @@ module HDIUtil
 
   private
 
-  def self.attach dmg, mountpoint, options = []
+  def self.attach dmg, mountpoint, arguments = []
     ohai "Mounting #{dmg}"
-    system(Utility::HDIUTIL, "attach", *options, "-mountpoint", mountpoint, dmg)
+    system(Utility::HDIUTIL, "attach", *arguments, "-mountpoint", mountpoint, dmg)
     puts "Mounted: #{mountpoint}"
   end
 
-  def self.detach dmg, mountpoint, options = []
+  def self.detach dmg, mountpoint, arguments = []
     ohai "Unmounting #{dmg}"
-    system(Utility::HDIUTIL, "detach", *options, mountpoint)
+    system(Utility::HDIUTIL, "detach", *arguments, mountpoint)
     puts "Unmounted: #{mountpoint}"
   end
 
   def self.shell dir
     Dir.chdir(dir) {
       ohai ENV['SHELL']
-      system(ENV, ENV['SHELL'])
+      Kernel.system ENV, ENV['SHELL']
     }
   end
 end

data/lib/iesd/utility/pkgutil.rb

@@ -41,7 +41,7 @@ module PKGUtil
   def self.shell dir
     Dir.chdir(dir) {
       ohai ENV['SHELL']
-      system(ENV, ENV['SHELL'])
+      Kernel.system ENV, ENV['SHELL']
     }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iesd
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - "なつき"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies: []
 description: Modify Extensions, Kextcache and Packages on InstallESD.
 email: i@ntk.me
@@ -17,26 +17,26 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - LICENSE.md
+- README.md
 - bin/iesd
 - iesd.gemspec
+- lib/iesd.rb
+- lib/iesd/InstallESD.rb
 - lib/iesd/InstallESD/BaseSystem.dmg.rb
 - lib/iesd/InstallESD/Extensions.rb
 - lib/iesd/InstallESD/InstallESD.dmg.rb
 - lib/iesd/InstallESD/InstallOSX.app.rb
 - lib/iesd/InstallESD/InstallOSX.dmg.rb
+- lib/iesd/InstallESD/Packages.rb
 - lib/iesd/InstallESD/Packages/BaseSystemBinaries.pkg.rb
 - lib/iesd/InstallESD/Packages/OSInstall.mpkg.rb
 - lib/iesd/InstallESD/Packages/OSInstall.pkg.rb
 - lib/iesd/InstallESD/Packages/OSUpgrade.pkg.rb
-- lib/iesd/InstallESD/Packages.rb
-- lib/iesd/InstallESD.rb
+- lib/iesd/utility.rb
 - lib/iesd/utility/hdiutil.rb
 - lib/iesd/utility/pkgutil.rb
 - lib/iesd/utility/tty.rb
-- lib/iesd/utility.rb
-- lib/iesd.rb
 homepage: https://github.com/ntkme/iesd
 licenses:
 - BSD-2-Clause
@@ -57,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Customize OS X InstallESD.