ruby-macho 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 804e6a31dedb8f86966c6e53366730c1ac87c2c2
-  data.tar.gz: 3a4f11ddc1807e34f158f22f446b561cbc5e9e07
+  metadata.gz: 16240f8ca67e156531a460441d739de7d63fbe9e
+  data.tar.gz: 9a4baa19c7d468ea968a1d0eac8f12941053fcf4
 SHA512:
-  metadata.gz: 99c430de85ed1154fe02a70a0443535fdc5fd3e4a5b3a4d16e857dad770784977d0dfe73f6a75879408877b44ba86c73b4d1755ae782420f2364a1dd4acc3eb0
-  data.tar.gz: d4877cb5eea705217b930175167a7f2330ef255e51cf403d12f13f174b61ad6e91f57bfdf554f379a0a8cb7651093128456a639f77fad874b66fdcb6f788cde1
+  metadata.gz: cbf7d99140e66376e18dfae8efc2e0b1d9d921e4f5ba3813a6cf09f478ec5a6de2a777b6b4b582afcf8427a005d3807c6b72f13862b4d7c0d30c476a8711d547
+  data.tar.gz: f2a8064e9246c8b1d5f671edc830a902023f754458a2cc6a4abed62dde247e698d1b955eff5c9e91f8951e66fe6d095fd6677f8a9a7e45f0c34acb435f2b2ed5

data/lib/macho.rb

@@ -4,24 +4,13 @@ require "#{File.dirname(__FILE__)}/macho/load_commands"
 require "#{File.dirname(__FILE__)}/macho/sections"
 require "#{File.dirname(__FILE__)}/macho/macho_file"
 require "#{File.dirname(__FILE__)}/macho/fat_file"
+require "#{File.dirname(__FILE__)}/macho/open"
 require "#{File.dirname(__FILE__)}/macho/exceptions"
 require "#{File.dirname(__FILE__)}/macho/utils"
 require "#{File.dirname(__FILE__)}/macho/tools"
 
 # The primary namespace for ruby-macho.
 module MachO
-	# Opens the given filename as a MachOFile or FatFile, depending on its magic.
-	# @param filename [String] the file being opened
-	# @return [MachO::MachOFile] if the file is a Mach-O
-	# @return [MachO::FatFile] if the file is a Fat file
-	def self.open(filename)
-		# open file and test magic instead of using exceptions for control?
-		begin
-			file = MachOFile.new(filename)
-		rescue FatBinaryError
-			file = FatFile.new(filename)
-		end
-
-		file
-	end
+	# release version
+	VERSION = "0.1.8".freeze
 end

data/lib/macho/fat_file.rb

@@ -32,6 +32,64 @@ module MachO
 			@raw_data
 		end
 
+		# @return [Boolean] true if the Mach-O is of type `MH_OBJECT`, false otherwise
+		def object?
+			machos.first.object?
+		end
+
+		# @return [Boolean] true if the Mach-O is of type `MH_EXECUTE`, false otherwise
+		def executable?
+			machos.first.executable?
+		end
+
+		# @return [Boolean] true if the Mach-O is of type `MH_FVMLIB`, false otherwise
+		def fvmlib?
+			machos.first.fvmlib?
+		end
+
+		# @return [Boolean] true if the Mach-O is of type `MH_CORE`, false otherwise
+		def core?
+			machos.first.core?
+		end
+
+		# @return [Boolean] true if the Mach-O is of type `MH_PRELOAD`, false otherwise
+		def preload?
+			machos.first.preload?
+		end
+
+		# @return [Boolean] true if the Mach-O is of type `MH_DYLIB`, false otherwise
+		def dylib?
+			machos.first.dylib?
+		end
+
+		# @return [Boolean] true if the Mach-O is of type `MH_DYLINKER`, false otherwise
+		def dylinker?
+			machos.first.dylinker?
+		end
+
+		# @return [Boolean] true if the Mach-O is of type `MH_BUNDLE`, false otherwise
+		def bundle?
+			machos.first.bundle?
+		end
+
+		# @return [Boolean] true if the Mach-O is of type `MH_DSYM`, false otherwise
+		def dsym?
+			machos.first.dsym?
+		end
+
+		# @return [Boolean] true if the Mach-O is of type `MH_KEXT_BUNDLE`, false otherwise
+		def kext?
+			machos.first.kext?
+		end
+
+		def magic
+			header.magic
+		end
+
+		def magic_string
+			MH_MAGICS[magic]
+		end
+
 		# The file's type. Assumed to be the same for every Mach-O within.
 		# @return [String] the filetype
 		def filetype

data/lib/macho/load_commands.rb

@@ -3,247 +3,107 @@ module MachO
 	# LC_REQ_DYLD to be recognized by the dynamic linder (dyld)
 	LC_REQ_DYLD = 0x80000000
 
-	# segment of this file to be mapped
-	LC_SEGMENT = 0x1
-
-	# link-edit stab symbol table info
-	LC_SYMTAB = 0x2
-
-	# link-edit gdb symbol table info (obsolete)
-	LC_SYMSEG = 0x3
-
-	# thread
-	LC_THREAD = 0x4
-
-	# unix thread (includes a stack)
-	LC_UNIXTHREAD = 0x5
-
-	# load a specified fixed VM shared library
-	LC_LOADFVMLIB = 0x6
-
-	# fixed VM shared library identification
-	LC_IDFVMLIB = 0x7
-
-	# object identification info (obsolete)
-	LC_IDENT = 0x8
-
-	# fixed VM file inclusion (internal use)
-	LC_FVMFILE = 0x9
-
-	# prepage command (internal use) 
-	LC_PREPAGE = 0xa
-
-	# dynamic link-edit symbol table info
-	LC_DYSYMTAB = 0xb
-
-	# load a dynamically linked shared library
-	LC_LOAD_DYLIB = 0xc
-
-	# dynamically linked shared lib ident
-	LC_ID_DYLIB = 0xd
-
-	# load a dynamic linker
-	LC_LOAD_DYLINKER = 0xe
-
-	# dynamic linker identification
-	LC_ID_DYLINKER = 0xf
-
-	# modules prebound for a dynamically linked shared library
-	LC_PREBOUND_DYLIB = 0x10
-
-	# image routines
-	LC_ROUTINES = 0x11
-
-	# sub framework
-	LC_SUB_FRAMEWORK = 0x12
-
-	# sub umbrella
-	LC_SUB_UMBRELLA = 0x13
-
-	# sub umbrella
-	LC_SUB_CLIENT = 0x14
-
-	# sub umbrella
-	LC_SUB_LIBRARY = 0x15
-
-	# two-level namespace lookup hints
-	LC_TWOLEVEL_HINTS = 0x16
-
-	# prebind checksum 
-	LC_PREBIND_CKSUM = 0x17
-
-	# load a dynamically linked shared library that is allowed to be missing (all symbols are weak imported).
-	LC_LOAD_WEAK_DYLIB = (0x18 | LC_REQ_DYLD)
-
-	# 64-bit segment of this file to be mapped
-	LC_SEGMENT_64 = 0x19
-
-	# 64-bit image routines
-	LC_ROUTINES_64 = 0x1a
-
-	# the uuid
-	LC_UUID = 0x1b
-
-	# runpath additions
-	LC_RPATH = (0x1c | LC_REQ_DYLD)
-
-	# local of code signature
-	LC_CODE_SIGNATURE = 0x1d
-
-	# local of info to split segments
-	LC_SEGMENT_SPLIT_INFO = 0x1e
-
-	# load and re-export dylib
-	LC_REEXPORT_DYLIB = (0x1f | LC_REQ_DYLD)
-
-	# delay load of dylib until first use
-	LC_LAZY_LOAD_DYLIB = 0x20
-
-	# encrypted segment information
-	LC_ENCRYPTION_INFO = 0x21
-
-	# compressed dyld information
-	LC_DYLD_INFO = 0x22
-
-	# compressed dyld information only
-	LC_DYLD_INFO_ONLY = (0x22 | LC_REQ_DYLD)
-
-	# load upward dylib
-	LC_LOAD_UPWARD_DYLIB = (0x23 | LC_REQ_DYLD)
-
-	# build for MacOSX min OS version
-	LC_VERSION_MIN_MACOSX = 0x24
-
-	# build for iPhoneOS min OS version
-	LC_VERSION_MIN_IPHONEOS = 0x25
-
-	# compressed table of function start addresses
-	LC_FUNCTION_STARTS = 0x26
-
-	# string for dyld to treat like environment variable
-	LC_DYLD_ENVIRONMENT = 0x27
-
-	# replacement for LC_UNIXTHREAD
-	LC_MAIN = (0x28 | LC_REQ_DYLD)
-
-	# table of non-instructions in __text
-	LC_DATA_IN_CODE = 0x29
-
-	# source version used to build binary
-	LC_SOURCE_VERSION = 0x2a
-
-	# Code signing DRs copied from linked dylibs
-	LC_DYLIB_CODE_SIGN_DRS = 0x2b
-
-	# 64-bit encrypted segment information
-	LC_ENCRYPTION_INFO_64 = 0x2c
-
-	# linker options in MH_OBJECT files
-	LC_LINKER_OPTION = 0x2d
-
-	# linker options in MH_OBJECT files
-	LC_LINKER_OPTIMIZATION_HINT = 0x2e
-
 	# association of load commands to string representations
+	# @api private
 	LOAD_COMMANDS = {
-		LC_SEGMENT => "LC_SEGMENT",
-		LC_SYMTAB => "LC_SYMTAB",
-		LC_SYMSEG => "LC_SYMSEG",
-		LC_THREAD => "LC_THREAD",
-		LC_UNIXTHREAD => "LC_UNIXTHREAD",
-		LC_LOADFVMLIB => "LC_LOADFVMLIB",
-		LC_IDFVMLIB => "LC_IDFVMLIB",
-		LC_IDENT => "LC_IDENT",
-		LC_FVMFILE => "LC_FVMFILE",
-		LC_PREPAGE => "LC_PREPAGE",
-		LC_DYSYMTAB => "LC_DYSYMTAB",
-		LC_LOAD_DYLIB => "LC_LOAD_DYLIB",
-		LC_ID_DYLIB => "LC_ID_DYLIB",
-		LC_LOAD_DYLINKER => "LC_LOAD_DYLINKER",
-		LC_ID_DYLINKER => "LC_ID_DYLINKER",
-		LC_PREBOUND_DYLIB => "LC_PREBOUND_DYLIB",
-		LC_ROUTINES => "LC_ROUTINES",
-		LC_SUB_FRAMEWORK => "LC_SUB_FRAMEWORK",
-		LC_SUB_UMBRELLA => "LC_SUB_UMBRELLA",
-		LC_SUB_CLIENT => "LC_SUB_CLIENT",
-		LC_SUB_LIBRARY => "LC_SUB_LIBRARY",
-		LC_TWOLEVEL_HINTS => "LC_TWOLEVEL_HINTS",
-		LC_PREBIND_CKSUM => "LC_PREBIND_CKSUM",
-		LC_LOAD_WEAK_DYLIB => "LC_LOAD_WEAK_DYLIB",
-		LC_SEGMENT_64 => "LC_SEGMENT_64",
-		LC_ROUTINES_64 => "LC_ROUTINES_64",
-		LC_UUID => "LC_UUID",
-		LC_RPATH => "LC_RPATH",
-		LC_CODE_SIGNATURE => "LC_CODE_SIGNATURE",
-		LC_SEGMENT_SPLIT_INFO => "LC_SEGMENT_SPLIT_INFO",
-		LC_REEXPORT_DYLIB => "LC_REEXPORT_DYLIB",
-		LC_LAZY_LOAD_DYLIB => "LC_LAZY_LOAD_DYLIB",
-		LC_ENCRYPTION_INFO => "LC_ENCRYPTION_INFO",
-		LC_DYLD_INFO => "LC_DYLD_INFO",
-		LC_DYLD_INFO_ONLY => "LC_DYLD_INFO_ONLY",
-		LC_LOAD_UPWARD_DYLIB => "LC_LOAD_UPWARD_DYLIB",
-		LC_VERSION_MIN_MACOSX => "LC_VERSION_MIN_MACOSX",
-		LC_VERSION_MIN_IPHONEOS => "LC_VERSION_MIN_IPHONEOS",
-		LC_FUNCTION_STARTS => "LC_FUNCTION_STARTS",
-		LC_DYLD_ENVIRONMENT => "LC_DYLD_ENVIRONMENT",
-		LC_MAIN => "LC_MAIN",
-		LC_DATA_IN_CODE => "LC_DATA_IN_CODE",
-		LC_SOURCE_VERSION => "LC_SOURCE_VERSION",
-		LC_DYLIB_CODE_SIGN_DRS => "LC_DYLIB_CODE_SIGN_DRS",
-		LC_ENCRYPTION_INFO_64 => "LC_ENCRYPTION_INFO_64",
-		LC_LINKER_OPTION => "LC_LINKER_OPTION",
-		LC_LINKER_OPTIMIZATION_HINT => "LC_LINKER_OPTIMIZATION_HINT"
+		0x1 => :LC_SEGMENT,
+		0x2 => :LC_SYMTAB,
+		0x3 => :LC_SYMSEG,
+		0x4 => :LC_THREAD,
+		0x5 => :LC_UNIXTHREAD,
+		0x6 => :LC_LOADFVMLIB,
+		0x7 => :LC_IDFVMLIB,
+		0x8 => :LC_IDENT,
+		0x9 => :LC_FVMFILE,
+		0xa => :LC_PREPAGE,
+		0xb => :LC_DYSYMTAB,
+		0xc => :LC_LOAD_DYLIB,
+		0xd => :LC_ID_DYLIB,
+		0xe => :LC_LOAD_DYLINKER,
+		0xf => :LC_ID_DYLINKER,
+		0x10 => :LC_PREBOUND_DYLIB,
+		0x11 => :LC_ROUTINES,
+		0x12 => :LC_SUB_FRAMEWORK,
+		0x13 => :LC_SUB_UMBRELLA,
+		0x14 => :LC_SUB_CLIENT,
+		0x15 => :LC_SUB_LIBRARY,
+		0x16 => :LC_TWOLEVEL_HINTS,
+		0x17 => :LC_PREBIND_CKSUM,
+		(0x18 | LC_REQ_DYLD) => :LC_LOAD_WEAK_DYLIB,
+		0x19 => :LC_SEGMENT_64,
+		0x1a => :LC_ROUTINES_64,
+		0x1b => :LC_UUID,
+		(0x1c | LC_REQ_DYLD) => :LC_RPATH,
+		0x1d => :LC_CODE_SIGNATURE,
+		0x1e => :LC_SEGMENT_SPLIT_INFO,
+		(0x1f | LC_REQ_DYLD) => :LC_REEXPORT_DYLIB,
+		0x20 => :LC_LAZY_LOAD_DYLIB,
+		0x21 => :LC_ENCRYPTION_INFO,
+		0x22 => :LC_DYLD_INFO,
+		(0x22 | LC_REQ_DYLD) => :LC_DYLD_INFO_ONLY,
+		(0x23 | LC_REQ_DYLD) => :LC_LOAD_UPWARD_DYLIB,
+		0x24 => :LC_VERSION_MIN_MACOSX,
+		0x25 => :LC_VERSION_MIN_IPHONEOS,
+		0x26 => :LC_FUNCTION_STARTS,
+		0x27 => :LC_DYLD_ENVIRONMENT,
+		(0x28 | LC_REQ_DYLD) => :LC_MAIN,
+		0x29 => :LC_DATA_IN_CODE,
+		0x2a => :LC_SOURCE_VERSION,
+		0x2b => :LC_DYLIB_CODE_SIGN_DRS,
+		0x2c => :LC_ENCRYPTION_INFO_64,
+		0x2d => :LC_LINKER_OPTION,
+		0x2e => :LC_LINKER_OPTIMIZATION_HINT
 	}
 
 	# association of load commands to string representations of class names
 	LC_STRUCTURES = {
-		LC_SEGMENT => "SegmentCommand",
-		LC_SYMTAB => "SymtabCommand",
-		LC_SYMSEG => "LoadCommand", # obsolete
-		LC_THREAD => "ThreadCommand",
-		LC_UNIXTHREAD => "ThreadCommand",
-		LC_LOADFVMLIB => "LoadCommand", # obsolete
-		LC_IDFVMLIB => "LoadCommand", # obsolete
-		LC_IDENT => "LoadCommand", # obsolete
-		LC_FVMFILE => "LoadCommand", # reserved for internal use only
-		LC_PREPAGE => "LoadCommand", # reserved for internal use only
-		LC_DYSYMTAB => "DysymtabCommand",
-		LC_LOAD_DYLIB => "DylibCommand",
-		LC_ID_DYLIB => "DylibCommand",
-		LC_LOAD_DYLINKER => "DylinkerCommand",
-		LC_ID_DYLINKER => "DylinkerCommand",
-		LC_PREBOUND_DYLIB => "PreboundDylibCommand",
-		LC_ROUTINES => "RoutinesCommand",
-		LC_SUB_FRAMEWORK => "SubFrameworkCommand",
-		LC_SUB_UMBRELLA => "SubUmbrellaCommand",
-		LC_SUB_CLIENT => "SubClientCommand",
-		LC_SUB_LIBRARY => "SubLibraryCommand",
-		LC_TWOLEVEL_HINTS => "TwolevelHintsCommand",
-		LC_PREBIND_CKSUM => "PrebindCksumCommand",
-		LC_LOAD_WEAK_DYLIB => "DylibCommand",
-		LC_SEGMENT_64 => "SegmentCommand64",
-		LC_ROUTINES_64 => "RoutinesCommand64",
-		LC_UUID => "UUIDCommand",
-		LC_RPATH => "RpathCommand",
-		LC_CODE_SIGNATURE => "LinkeditDataCommand",
-		LC_SEGMENT_SPLIT_INFO => "LinkeditDataCommand",
-		LC_REEXPORT_DYLIB => "DylibCommand",
-		LC_LAZY_LOAD_DYLIB => "LoadCommand", # undoc, maybe DylibCommand?
-		LC_ENCRYPTION_INFO => "EncryptionInfoCommand",
-		LC_DYLD_INFO => "DyldInfoCommand",
-		LC_DYLD_INFO_ONLY => "DyldInfoCommand",
-		LC_LOAD_UPWARD_DYLIB => "LoadCommand", # undoc, maybe DylibCommand?
-		LC_VERSION_MIN_MACOSX => "VersionMinCommand",
-		LC_VERSION_MIN_IPHONEOS => "VersionMinCommand",
-		LC_FUNCTION_STARTS => "LinkeditDataCommand",
-		LC_DYLD_ENVIRONMENT => "DylinkerCommand",
-		LC_MAIN => "EntryPointCommand",
-		LC_DATA_IN_CODE => "LinkeditDataCommand",
-		LC_SOURCE_VERSION => "SourceVersionCommand",
-		LC_DYLIB_CODE_SIGN_DRS => "LinkeditDataCommand",
-		LC_ENCRYPTION_INFO_64 => "EncryptionInfoCommand64",
-		LC_LINKER_OPTION => "LinkerOptionCommand",
-		LC_LINKER_OPTIMIZATION_HINT => "LinkeditDataCommand"
+		:LC_SEGMENT => "SegmentCommand",
+		:LC_SYMTAB => "SymtabCommand",
+		:LC_SYMSEG => "LoadCommand", # obsolete
+		:LC_THREAD => "ThreadCommand",
+		:LC_UNIXTHREAD => "ThreadCommand",
+		:LC_LOADFVMLIB => "LoadCommand", # obsolete
+		:LC_IDFVMLIB => "LoadCommand", # obsolete
+		:LC_IDENT => "LoadCommand", # obsolete
+		:LC_FVMFILE => "LoadCommand", # reserved for internal use only
+		:LC_PREPAGE => "LoadCommand", # reserved for internal use only
+		:LC_DYSYMTAB => "DysymtabCommand",
+		:LC_LOAD_DYLIB => "DylibCommand",
+		:LC_ID_DYLIB => "DylibCommand",
+		:LC_LOAD_DYLINKER => "DylinkerCommand",
+		:LC_ID_DYLINKER => "DylinkerCommand",
+		:LC_PREBOUND_DYLIB => "PreboundDylibCommand",
+		:LC_ROUTINES => "RoutinesCommand",
+		:LC_SUB_FRAMEWORK => "SubFrameworkCommand",
+		:LC_SUB_UMBRELLA => "SubUmbrellaCommand",
+		:LC_SUB_CLIENT => "SubClientCommand",
+		:LC_SUB_LIBRARY => "SubLibraryCommand",
+		:LC_TWOLEVEL_HINTS => "TwolevelHintsCommand",
+		:LC_PREBIND_CKSUM => "PrebindCksumCommand",
+		:LC_LOAD_WEAK_DYLIB => "DylibCommand",
+		:LC_SEGMENT_64 => "SegmentCommand64",
+		:LC_ROUTINES_64 => "RoutinesCommand64",
+		:LC_UUID => "UUIDCommand",
+		:LC_RPATH => "RpathCommand",
+		:LC_CODE_SIGNATURE => "LinkeditDataCommand",
+		:LC_SEGMENT_SPLIT_INFO => "LinkeditDataCommand",
+		:LC_REEXPORT_DYLIB => "DylibCommand",
+		:LC_LAZY_LOAD_DYLIB => "LoadCommand", # undoc, maybe DylibCommand?
+		:LC_ENCRYPTION_INFO => "EncryptionInfoCommand",
+		:LC_DYLD_INFO => "DyldInfoCommand",
+		:LC_DYLD_INFO_ONLY => "DyldInfoCommand",
+		:LC_LOAD_UPWARD_DYLIB => "LoadCommand", # undoc, maybe DylibCommand?
+		:LC_VERSION_MIN_MACOSX => "VersionMinCommand",
+		:LC_VERSION_MIN_IPHONEOS => "VersionMinCommand",
+		:LC_FUNCTION_STARTS => "LinkeditDataCommand",
+		:LC_DYLD_ENVIRONMENT => "DylinkerCommand",
+		:LC_MAIN => "EntryPointCommand",
+		:LC_DATA_IN_CODE => "LinkeditDataCommand",
+		:LC_SOURCE_VERSION => "SourceVersionCommand",
+		:LC_DYLIB_CODE_SIGN_DRS => "LinkeditDataCommand",
+		:LC_ENCRYPTION_INFO_64 => "EncryptionInfoCommand64",
+		:LC_LINKER_OPTION => "LinkerOptionCommand",
+		:LC_LINKER_OPTIMIZATION_HINT => "LinkeditDataCommand"
 	}
 
 	# pagezero segment name
@@ -319,9 +179,16 @@ module MachO
 			@cmdsize = cmdsize
 		end
 
+		# @return [Symbol] a symbol representation of the load command's identifying number
+		def type
+			LOAD_COMMANDS[cmd]
+		end
+
+		alias :to_sym :type
+
 		# @return [String] a string representation of the load command's identifying number
 		def to_s
-			LOAD_COMMANDS[cmd]
+			type.to_s
 		end
 
 		# Represents a Load Command string. A rough analogue to the lc_str
@@ -382,7 +249,7 @@ module MachO
 	# A load command indicating that part of this file is to be mapped into
 	# the task's address space. Corresponds to LC_SEGMENT.
 	class SegmentCommand < LoadCommand
-		# @return [String] the name of the segment, including null padding bytes
+		# @return [String] the name of the segment
 		attr_reader :segname
 
 		# @return [Fixnum] the memory address of the segment
@@ -416,7 +283,7 @@ module MachO
 		def initialize(raw_data, offset, cmd, cmdsize, segname, vmaddr, vmsize, fileoff,
 				filesize, maxprot, initprot, nsects, flags)
 			super(raw_data, offset, cmd, cmdsize)
-			@segname = segname
+			@segname = segname.delete("\x00")
 			@vmaddr = vmaddr
 			@vmsize = vmsize
 			@fileoff = fileoff
@@ -426,17 +293,12 @@ module MachO
 			@nsects = nsects
 			@flags = flags
 		end
-
-		# @return [String] the segment's name, with any trailing NULL characters removed
-		def segment_name
-			@segname.delete("\x00")
-		end
 	end
 
 	# A load command indicating that part of this file is to be mapped into
 	# the task's address space. Corresponds to LC_SEGMENT_64.
 	class SegmentCommand64 < LoadCommand
-		# @return [String] the name of the segment, including null padding bytes
+		# @return [String] the name of the segment
 		attr_reader :segname
 
 		# @return [Fixnum] the memory address of the segment
@@ -470,7 +332,7 @@ module MachO
 		def initialize(raw_data, offset, cmd, cmdsize, segname, vmaddr, vmsize, fileoff,
 				filesize, maxprot, initprot, nsects, flags)
 			super(raw_data, offset, cmd, cmdsize)
-			@segname = segname
+			@segname = segname.delete("\x00")
 			@vmaddr = vmaddr
 			@vmsize = vmsize
 			@fileoff = fileoff
@@ -480,11 +342,6 @@ module MachO
 			@nsects = nsects
 			@flags = flags
 		end
-
-		# @return [String] the segment's name, with any trailing NULL characters removed
-		def segment_name
-			@segname.delete("\x00")
-		end
 	end
 
 	# A load command representing some aspect of shared libraries, depending

data/lib/macho/macho_file.rb

@@ -58,21 +58,56 @@ module MachO
 			MachO.magic64?(header.magic)
 		end
 
+		# @return [Boolean] true if the Mach-O is of type `MH_OBJECT`, false otherwise
+		def object?
+			header.filetype == MH_OBJECT
+		end
+
 		# @return [Boolean] true if the Mach-O is of type `MH_EXECUTE`, false otherwise
 		def executable?
 			header.filetype == MH_EXECUTE
 		end
 
+		# @return [Boolean] true if the Mach-O is of type `MH_FVMLIB`, false otherwise
+		def fvmlib?
+			header.filetype == MH_FVMLIB
+		end
+
+		# @return [Boolean] true if the Mach-O is of type `MH_CORE`, false otherwise
+		def core?
+			header.filetype == MH_CORE
+		end
+
+		# @return [Boolean] true if the Mach-O is of type `MH_PRELOAD`, false otherwise
+		def preload?
+			header.filetype == MH_PRELOAD
+		end
+
 		# @return [Boolean] true if the Mach-O is of type `MH_DYLIB`, false otherwise
 		def dylib?
 			header.filetype == MH_DYLIB
 		end
 
+		# @return [Boolean] true if the Mach-O is of type `MH_DYLINKER`, false otherwise
+		def dylinker?
+			header.filetype == MH_DYLINKER
+		end
+
 		# @return [Boolean] true if the Mach-O is of type `MH_BUNDLE`, false otherwise
 		def bundle?
 			header.filetype == MH_BUNDLE
 		end
 
+		# @return [Boolean] true if the Mach-O is of type `MH_DSYM`, false otherwise
+		def dsym?
+			header.filetype == MH_DSYM
+		end
+
+		# @return [Boolean] true if the Mach-O is of type `MH_KEXT_BUNDLE`, false otherwise
+		def kext?
+			header.filetype == MH_KEXT_BUNDLE
+		end
+
 		# @return [Fixnum] the Mach-O's magic number
 		def magic
 			header.magic
@@ -80,7 +115,7 @@ module MachO
 
 		# @return [String] a string representation of the Mach-O's magic number
 		def magic_string
-			MH_MAGICS[header.magic]
+			MH_MAGICS[magic]
 		end
 
 		# @return [String] a string representation of the Mach-O's filetype
@@ -116,10 +151,11 @@ module MachO
 		# All load commands of a given name.
 		# @example
 		#  file.command("LC_LOAD_DYLIB")
-		#  file["LC_LOAD_DYLIB"]
+		#  file[:LC_LOAD_DYLIB]
+		# @param [String, Symbol] name the load command ID
 		# @return [Array<MachO::LoadCommand>] an array of LoadCommands corresponding to `name`
 		def command(name)
-			load_commands.select { |lc| lc.to_s == name }
+			load_commands.select { |lc| lc.type == name.to_sym }
 		end
 
 		alias :[] :command
@@ -129,9 +165,9 @@ module MachO
 		# @return [Array<MachO::SegmentCommand64>] if the Mach-O is 64-bit
 		def segments
 			if magic32?
-				command("LC_SEGMENT")
+				command(:LC_SEGMENT)
 			else
-				command("LC_SEGMENT_64")
+				command(:LC_SEGMENT_64)
 			end
 		end
 
@@ -144,7 +180,7 @@ module MachO
 				return nil
 			end
 
-			dylib_id_cmd = command("LC_ID_DYLIB").first
+			dylib_id_cmd = command(:LC_ID_DYLIB).first
 
 			dylib_id_cmd.name.to_s
 		end
@@ -164,7 +200,7 @@ module MachO
 				return nil
 			end
 
-			dylib_cmd = command("LC_ID_DYLIB").first
+			dylib_cmd = command(:LC_ID_DYLIB).first
 			old_id = dylib_id
 
 			set_name_in_dylib(dylib_cmd, old_id, new_id)
@@ -173,7 +209,7 @@ module MachO
 		# All shared libraries linked to the Mach-O.
 		# @return [Array<String>] an array of all shared libraries
 		def linked_dylibs
-			command("LC_LOAD_DYLIB").map(&:name).map(&:to_s)
+			command(:LC_LOAD_DYLIB).map(&:name).map(&:to_s)
 		end
 
 		# Changes the shared library `old_name` to `new_name`
@@ -184,7 +220,7 @@ module MachO
 		# @return [void]
 		# @raise [MachO::DylibUnknownError] if no shared library has the old name
 		def change_install_name(old_name, new_name)
-			dylib_cmd = command("LC_LOAD_DYLIB").find { |d| d.name.to_s == old_name }
+			dylib_cmd = command(:LC_LOAD_DYLIB).find { |d| d.name.to_s == old_name }
 			raise DylibUnknownError.new(old_name) if dylib_cmd.nil?
 
 			set_name_in_dylib(dylib_cmd, old_name, new_name)
@@ -256,7 +292,7 @@ module MachO
 			ncmds = get_ncmds
 			sizeofcmds = get_sizeofcmds
 			flags = get_flags
-			
+
 			if MachO.magic32?(magic)
 				MachHeader.new(magic, cputype, cpusubtype, filetype, ncmds, sizeofcmds, flags)
 			else
@@ -347,12 +383,13 @@ module MachO
 
 			header.ncmds.times do
 				cmd = @raw_data.slice(offset, 4).unpack("V").first
+				cmd_sym = LOAD_COMMANDS[cmd]
 
-				raise LoadCommandError.new(cmd) unless LC_STRUCTURES.key?(cmd)
+				raise LoadCommandError.new(cmd) if cmd_sym.nil?
 
 				# why do I do this? i don't like declaring constants below
 				# classes, and i need them to resolve...
-				klass = MachO.const_get "#{LC_STRUCTURES[cmd]}"
+				klass = MachO.const_get "#{LC_STRUCTURES[cmd_sym]}"
 				command = klass.new_from_bin(@raw_data, offset, @raw_data.slice(offset, klass.bytesize))
 
 				load_commands << command

data/lib/macho/open.rb

@@ -0,0 +1,16 @@
+module MachO
+	# Opens the given filename as a MachOFile or FatFile, depending on its magic.
+	# @param filename [String] the file being opened
+	# @return [MachO::MachOFile] if the file is a Mach-O
+	# @return [MachO::FatFile] if the file is a Fat file
+	def self.open(filename)
+		# open file and test magic instead of using exceptions for control?
+		begin
+			file = MachOFile.new(filename)
+		rescue FatBinaryError
+			file = FatFile.new(filename)
+		end
+
+		file
+	end
+end

data/lib/macho/sections.rb

@@ -1,44 +1,110 @@
 module MachO
-	# the flags field of a section has two parts: a type and attributes
-	SECTION_TYPE = 0x000000ff # type mask
-	SECTION_ATTRIBUTES = 0xffffff00 # attributes mask
-	SECTION_ATTRIBUTES_USR = 0xff000000 # user settable attributes mask
-	SECTION_ATTRIBUTES_SYS = 0x00ffff00 # system settable attributes mask
+	# type mask
+	SECTION_TYPE = 0x000000ff
 
-	# section types for the flags field
+	# attributes mask
+	SECTION_ATTRIBUTES = 0xffffff00
+
+	# user settable attributes mask
+	SECTION_ATTRIBUTES_USR = 0xff000000
+
+	# system settable attributes mask
+	SECTION_ATTRIBUTES_SYS = 0x00ffff00
+
+	# a regular section
 	S_REGULAR = 0x0
+
+	# a zero fill on demand section
 	S_ZEROFILL = 0x1
+
+	# a section with only literal C strings
 	S_CSTRING_LITERALS = 0x2
+
+	# a section with only 4 byte literals
 	S_4BYTE_LITERALS = 0x3
+
+	# a section with only 8 byte literals
 	S_8BYTE_LITERALS = 0x4
+
+	# a section with only pointers to literals
 	S_LITERAL_POINTERS = 0x5
+
+	# a section with only non-lazy symbol pointers
 	S_NON_LAZY_SYMBOL_POINTERS = 0x6
+
+	# a section with only lazy symbol pointers
 	S_LAZY_SYMBOL_POINTERS = 0x7
+
+	# a section with only symbol stubs (byte size of stub in reserved2 field)
 	S_SYMBOL_STUBS = 0x8
+
+	# a section with only function pointers for initialization
 	S_MOD_INIT_FUNC_POINTERS = 0x9
+
+	# a section with only function pointers for termination
 	S_MOD_TERM_FUNC_POINTERS = 0xa
+
+	# a section with only symbols that are to be coalesced
 	S_COALESCED = 0xb
+
+	# a zero fill on demand section that can be larger than 4GB
 	S_GB_ZEROFILE = 0xc
+
+	# a section with only pairs of function pointers for interposing
 	S_INTERPOSING = 0xd
+
+	# a section with only 16 byte literals
 	S_16BYTE_LITERALS = 0xe
+
+	# a section containing DTrace Object Format
 	S_DTRACE_DOF = 0xf
+
+	# a section with only lazy symbol pointers to lazy loaded dylibs
 	S_LAZY_DYLIB_SYMBOL_POINTERS = 0x10
+
+	# a template of initial values for thread local variables
 	S_THREAD_LOCAL_REGULAR = 0x11
+
+	# a template of initial values for thread local variables
 	S_THREAD_LOCAL_ZEROFILL = 0x12
+
+	# thread local variable descriptors
 	S_THREAD_LOCAL_VARIABLES = 0x13
+
+	# pointers to thread local variable descriptors
 	S_THREAD_LOCAL_VARIABLE_POINTERS = 0x14
+
+	# functions to call to initialize thread local variable values
 	S_THREAD_LOCAL_INIT_FUNCTION_POINTERS = 0x15
 
-	# section attributes for the flags field
+	# a section with only true machine instructions
 	S_ATTR_PURE_INSTRUCTIONS = 0x80000000
+
+	# a section with coalesced symbols that are not to be in a ranlib table of contents
 	S_ATTR_NO_TOC = 0x40000000
+
+	# static symbols in this section can be stripped in files with the MH_DYLDLINK flag
 	S_ATTR_STRIP_STATIC_SYMS = 0x20000000
+
+	# no dead stripping
 	S_ATTR_NO_DEAD_STRIP = 0x10000000
+
+	# blocks are live if they reference live blocks
 	S_ATTR_LIVE_SUPPORT = 0x08000000
+
+	# used with i386 code stubs written on by dyld
 	S_ATTR_SELF_MODIFYING_CODE = 0x04000000
+
+	# a debug section
 	S_ATTR_DEBUG = 0x02000000
+
+	# a section containing some machine instructions
 	S_ATTR_SOME_INSTRUCTIONS = 0x00000400
+
+	# a section containing external relocation entries
 	S_ATTR_EXT_RELOC = 0x00000200
+
+	# a section containing local relocation entries
 	S_ATTR_LOC_RELOC = 0x00000100
 
 	# currently known section names

data/lib/macho/tools.rb

@@ -13,6 +13,7 @@ module MachO
 		# @param filename [String] the Mach-O or Fat binary being modified
 		# @param new_id [String] the new dylib ID for the binary
 		# @return [void]
+		# @todo unstub for fat files
 		def self.change_dylib_id(filename, new_id)
 			file = MachO.open(filename)
 
@@ -29,6 +30,7 @@ module MachO
 		# @param old_name [String] the old shared library name
 		# @param new_name [String] the new shared library name
 		# @return [void]
+		# @todo unstub for fat files
 		def self.change_install_name(filename, old_name, new_name)
 			file = MachO.open(filename)
 
@@ -38,5 +40,33 @@ module MachO
 				raise MachOError.new("changing install names for fat binaries is incomplete")
 			end
 		end
+
+		# Changes a runtime path in a Mach-O or Fat binary, overwriting the source file.
+		# @param filename [String] the Mach-O or Fat binary being modified
+		# @param old_path [String] the old runtime path
+		# @param new_path [String] the new runtime path
+		# @return [void]
+		# @todo unstub
+		def self.change_rpath(filename, old_path, new_path)
+			raise "stub"
+		end
+
+		# Add a runtime path to a Mach-O or Fat binary, overwriting the source file.
+		# @param filename [String] the Mach-O or Fat binary being modified
+		# @param new_path [String] the new runtime path
+		# @return [void]
+		# @todo unstub
+		def self.add_rpath(filename, new_path)
+			raise "stub"
+		end
+
+		# Delete a runtime path from a Mach-O or Fat binary, overwriting the source file.
+		# @param filename [String] the Mach-O or Fat binary being modified
+		# @param old_path [String] the old runtime path
+		# @return [void]
+		# @todo unstub
+		def self.delete_rpath(filename, old_path)
+			raise "stub"
+		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macho
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies: []
 description: A library for viewing and manipulating Mach-O files in Ruby.
 email: william@tuffbizz.com
@@ -25,6 +25,7 @@ files:
 - lib/macho/headers.rb
 - lib/macho/load_commands.rb
 - lib/macho/macho_file.rb
+- lib/macho/open.rb
 - lib/macho/sections.rb
 - lib/macho/structure.rb
 - lib/macho/tools.rb