iesd 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83ac285ba6d8e68745e95ab7aaf7fe67bcec32cb
-  data.tar.gz: bf8acf88c5566b7c4b64a606d72f889a9e9bda42
+  metadata.gz: 64881b06a382ac55aa98e0cae658a8873433591d
+  data.tar.gz: 5c6f83c95e0aedff81585b30b9dc025cf35ae6f6
 SHA512:
-  metadata.gz: 0661aea24b29fc5afb5da83b91c06619a95924898172fd7eb507a4d113547fe58dd1102246686f38ebcd04c2b92f29f6f14be4d0cc7cbd377afafa3c7b6df866
-  data.tar.gz: dd631ca752031ed39edc3cf168b386e964929de2ffbb6e6003bd2d45c566866bc365c6b7d8ddb40a6c5f6c85565c0092de9f663834fe42acefc45ad4ba9a1eb9
+  metadata.gz: a19c4bbea44fd3ce487ab40378fe5e7baee976c029fa837e8a895d02f667d4ce25c8692757253e48a0849afc32de58691878077632365e21ca8408155f3b9fdb
+  data.tar.gz: df4b8f3b605119ad2436f95bb938506541013c08940814926b9b6a2638dd4bef0936e14a6cd2fc80b88d769c4aadcc07598bd05fc3743f482b2539a40ae3de58

data/bin/iesd

@@ -7,7 +7,7 @@ require 'optparse'
 require 'iesd'
 
 begin
-  raise "This tool is only supported on OS X." unless Kernel.system('[ "$(/usr/bin/uname)" = "Darwin" ]')
+  raise "iESD is only supported on OS X." unless Kernel.system('[ "$(/usr/bin/uname)" = "Darwin" ]')
 rescue Exception => e
   opoo e.message
   abort
@@ -45,12 +45,7 @@ optparse = OptionParser.new do |opts|
 
   opts.on("-t", "--type type", [:BaseSystem, :InstallESD],
           "Specify type (BaseSystem, InstallESD)") do |type|
-    case type
-    when :BaseSystem
-      options[:type] = :root
-    when :InstallESD
-      options[:type] = :container
-    end
+    options[:type] = type
   end
 
   opts.on("--install-kexts x.kext,y.kext,z.kext", Array, "Specify list of kexts to install") do |list|
@@ -65,7 +60,7 @@ optparse = OptionParser.new do |opts|
     options[:extensions][:kextcache] = c
   end
 
-  opts.on("--[no-]postinstall-kexts", "Patch OSInstall.pkg for post install") do |p|
+  opts.on("--[no-]postinstall-kexts", "Patch OSInstall.pkg for postinstall kexts") do |p|
     options[:extensions][:postinstall] = p
   end
 
@@ -117,6 +112,11 @@ begin
     raise "invalid kext: #{kext}" unless File.exist? File.join(kext, *%w{ Contents MacOS }, File.basename(kext, ".kext"))
   }
   if (iesd = IESD.new options[:input])
+    iesd_type = iesd.class.name.split("::").last
+    types = [nil, :BaseSystem, :InstallESD, :InstallOSX]
+    if types.index(options[:type]) > types.index(iesd_type.to_sym)
+      raise "invalid output type #{options[:type].to_s} for input type #{iesd_type}"
+    end
     iesd.export options
     puts "\xF0\x9F\x8D\xBA  #{options[:output]}"
   else

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.1"
+  s.version               = "1.0.2"
   s.summary               = "Customize OS X InstallESD."
   s.description           = "Modify Extensions, Kextcache and Packages on InstallESD."
   s.authors               = "なつき"
@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.files                 = %w{
     README.md
     LICENSE.md
+    bin/iesd
     iesd.gemspec
-  } + Dir["lib/**/*.rb"] + Dir["bin/iesd"]
+  } + Dir["lib/**/*.rb"]
 end

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

@@ -5,7 +5,7 @@ module IESD
 
       def export options, add_sectors = 0
         case options[:type]
-        when :root, nil
+        when :BaseSystem, nil
           Dir.mktmpdir { |tmp|
             HDIUtil.write(@url, (tmpfile = File.join(tmp, File.basename(@url))), add_sectors) { |volume_root|
               options[:extensions][:up_to_date] = (options[:extensions][:remove].empty? and options[:extensions][:install].empty?)

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

@@ -5,7 +5,7 @@ module IESD
 
       def export options
         case options[:type]
-        when :root
+        when :BaseSystem
           resize_limits = `#{Utility::HDIUTIL} resize -limits "#{@url}"`.chomp.split.map { |s| s.to_i }
           show { |installesd|
             IESD::DMG::BaseSystem.new(File.join(installesd, "BaseSystem.dmg")).export(options, resize_limits[0]) { |basesystem|
@@ -26,7 +26,7 @@ module IESD
               end
             }
           }
-        when :container, nil
+        when :InstallESD, nil
           Dir.mktmpdir { |tmp|
             HDIUtil.write(@url, (tmpfile = File.join(tmp, File.basename(@url)))) { |installesd|
               options[:extensions][:up_to_date] = (options[:extensions][:remove].empty? and options[:extensions][:install].empty?)
@@ -58,14 +58,14 @@ module IESD
                   system(Utility::CHFLAGS, "hidden", kextcache)
                   puts "Updated: #{kextcache}"
                 }
-              else
-                raise "invalid output type"
               end
 
               post_update installesd, options
             }
             system(Utility::MV, tmpfile, options[:output])
           }
+        else
+          raise "invalid output type"
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iesd
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - "なつき"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies: []
 description: Modify Extensions, Kextcache and Packages on InstallESD.
 email: i@ntk.me
@@ -19,6 +19,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - LICENSE.md
+- bin/iesd
 - iesd.gemspec
 - lib/iesd/InstallESD/BaseSystem.dmg.rb
 - lib/iesd/InstallESD/Extensions.rb
@@ -47,7 +48,6 @@ files:
 - lib/iesd/utility/tty.rb
 - lib/iesd/utility.rb
 - lib/iesd.rb
-- bin/iesd
 homepage: https://github.com/ntkme/iesd
 licenses:
 - BSD-2-Clause