iesd 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb4d3cc64133af8167ed061b619cc907b529f08b
-  data.tar.gz: 84fd6d472f6e46bc9d8447bcb9531e4be18f22f0
+  metadata.gz: 820dc77a28df65c45333a3f910cbb8fda1eea099
+  data.tar.gz: 8f96482b9edac3ea7dbc570fe516bd634453e950
 SHA512:
-  metadata.gz: dd9b62cf21516bbc29f1ebbadaa2cbf6fa7605e412660a94f271709b5ac3dc543c42a774892156caccecb5ec6b9bd0a7ebec33e27ba0afbb6a44b91569002d6e
-  data.tar.gz: d50a0b0af9cf6d710f995fb5e2228bb1fe97aea6ead280c39440b0d895e7a2f0fcc38ebcf7ac4db4b9ecd4ce947590ade597c4658abf146cd45b6ee51d79f7c2
+  metadata.gz: f7312647f7eb5c267f3da22306f4cb0e28c8c8b89daba60151ef4e54cd2ee75ec0de5c4d051d1252b3545d4dbdf3fa973886a59563ed1f1fd9c2c97e524a3c80
+  data.tar.gz: 7b5c2e6b0269c79ca9f0f49eae1e250a233907aecde2ac45959a8f5e63caddcfc5de461563cb75c34cdd2e413f78221a7319b9e8ae97f9accb8045417229ff07

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

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

@@ -54,7 +54,7 @@ module IESD
         def update extensions
           remove extensions[:remove]
           install extensions[:install]
-          @kextcache.update if extensions[:kextcache] or (extensions[:kextcache].nil? and !extensions[:up_to_date])
+          KextCache.update_volume @volume_root if extensions[:kextcache] or (extensions[:kextcache].nil? and !extensions[:up_to_date])
         end
       end
     end

data/lib/iesd/InstallESD/Extensions.rb

@@ -2,12 +2,11 @@ module IESD
   class Extensions
     EXTENSIONS = %w{ System Library Extensions }
 
-    attr_reader :volume_root, :url, :kextcache
+    attr_reader :volume_root, :url
 
     def initialize volume_root
       @volume_root = volume_root
       @url = File.join @volume_root, *EXTENSIONS
-      @kextcache = IESD::Extensions::KextCache.new self
     end
 
     def remove kexts
@@ -29,50 +28,5 @@ module IESD
         }
       end
     end
-
-    class KextCache
-      KEXTCACHE_DEFAULT_OPTIONS = %w{ -v 0 -no-authentication }
-      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 }
-
-      attr_reader :volume_root, :url, :type
-
-      def initialize extensions
-        @extensions = extensions
-        @volume_root = extensions.volume_root
-
-        case
-        when (File.exist? (@url = File.join(@volume_root, *KERNELCACHE)))
-          @type = :kernelcache
-        when (File.exist? (@url = File.join(@volume_root, *MKEXT)))
-          @type = :mkext
-        when (File.exist? (@url = File.join(@volume_root, *MKEXT_PPC)))
-          @type = :mkext_ppc
-        else
-          @url = nil
-        end
-      end
-
-      def update
-        if File.exist? (mach_kernel = File.join(@volume_root, "mach_kernel"))
-          oh1 "Updating Kextcache"
-          case @type
-          when :kernelcache
-            system(Utility::KEXTCACHE, *KEXTCACHE_DEFAULT_OPTIONS, "-prelinked-kernel", @url, "-kernel", mach_kernel, "-volume-root", @volume_root, "--", @extensions.url)
-          when :mkext
-            system(Utility::KEXTCACHE, *KEXTCACHE_DEFAULT_OPTIONS, *%w{ -a i386 -a x86_64 }, "-mkext", @url, "-kernel", mach_kernel, "-volume-root", @volume_root, "--", @extensions.url)
-            if File.exist? (mkext_ppc = File.join(@volume_root, *MKEXT_PPC))
-              system(Utility::DITTO, @url, mkext_ppc)
-            end
-          when :mkext_ppc
-            system(Utility::DITTO, *KEXTCACHE_DEFAULT_OPTIONS, *%w{ -a ppc -a i386 }, "-mkext", @url, "-kernel", mach_kernel, "-volume-root", @volume_root, "--", extensions.url)
-          end
-          puts "Updated: #{@url}"
-        else
-          opoo "kextcache aborted because mach_kernel is not available"
-        end
-      end
-    end
   end
 end

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

@@ -104,11 +104,11 @@ module IESD
       class BaseSystem < IESD::DMG::BaseSystem
         private
 
-        def pre_update volume_root, options
+        def pre_update_extension volume_root, options
 
         end
 
-        def post_update volume_root, options
+        def post_update_extension volume_root, options
           if File.exist? (mach_kernel = File.join(volume_root, "mach_kernel"))
             system(Utility::RM, mach_kernel)
           end

data/lib/iesd/utility/kextcache.rb

@@ -0,0 +1,31 @@
+module KextCache
+  KEXTCACHE_DEFAULT_OPTIONS = %w{ -v 0 -no-authentication }
+
+  EXTENSIONS = %w{ System 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 }
+
+  def self.update_volume volume_root
+    oh1 "Updating Kextcache"
+    if File.exist? (mach_kernel = File.join(volume_root, "mach_kernel"))
+      case
+      when (File.exist? (url = File.join(volume_root, *KERNELCACHE)))
+        system(Utility::KEXTCACHE, *KEXTCACHE_DEFAULT_OPTIONS, "-prelinked-kernel", url, "-kernel", mach_kernel, "-volume-root", volume_root, "--", File.join(volume_root, *EXTENSIONS))
+      when (File.exist? (url = File.join(volume_root, *MKEXT)))
+        system(Utility::KEXTCACHE, *KEXTCACHE_DEFAULT_OPTIONS, *%w{ -a i386 -a x86_64 }, "-mkext", url, "-kernel", mach_kernel, "-volume-root", volume_root, "--", File.join(volume_root, *EXTENSIONS))
+        if File.exist? (mkext_ppc = File.join(volume_root, *MKEXT_PPC))
+          system(Utility::DITTO, url, mkext_ppc)
+        end
+      when (File.exist? (url = File.join(volume_root, *MKEXT_PPC)))
+        system(Utility::DITTO, *KEXTCACHE_DEFAULT_OPTIONS, *%w{ -a ppc -a i386 }, "-mkext", url, "-kernel", mach_kernel, "-volume-root", volume_root, "--", File.join(volume_root, *EXTENSIONS))
+      else
+        puts "kextcache aborted: unknown kernel cache type"
+        return
+      end
+      puts "Updated: #{url}"
+    else
+      opoo "kextcache aborted: mach_kernel not found"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iesd
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - "なつき"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies: []
 description: Modify Extensions, Kextcache and Packages on InstallESD.
 email: i@ntk.me
@@ -35,6 +35,7 @@ files:
 - lib/iesd/InstallESD/Packages/OSUpgrade.pkg.rb
 - lib/iesd/utility.rb
 - lib/iesd/utility/hdiutil.rb
+- lib/iesd/utility/kextcache.rb
 - lib/iesd/utility/pkgutil.rb
 - lib/iesd/utility/tty.rb
 homepage: https://github.com/ntkme/iesd