ruby-macho 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6bf6b45bcf73b710246fe124075f4ca77c73070
-  data.tar.gz: 5713089fd72d423c6a25b90839e29a317072169b
+  metadata.gz: 6903e361104a718205c145e401ee484e38289217
+  data.tar.gz: 1bcea8a215a1e19b2cde870818206152582162be
 SHA512:
-  metadata.gz: a2aaa85277768159ee35ff7e44817afd1bad136884a2ced66dd471a39657e3827d4adbb7987fbca38c36aae25ef2ec3f8bfa5b9296d06013443f8f2e77db85fc
-  data.tar.gz: 20d89669d43b4fa964f878ade17d5130c58743a9bd742978e36cb485a32f4575d1d81957eb68719647340a9fc83120da611570e70da54a27ede7a4fe5adb02a2
+  metadata.gz: fc14af02958fa369eac1e5fe6a4cce3fff48d21797d601fe4d4778a80336253fae58864994504a2612989ab718bcdb0c475edb797792dbbdfb6d09eb1840657d
+  data.tar.gz: a0d438e785176bbc06556889440aaf013181898ceec4012a837c181c785d5a6be508fc830b0027e456107682cfd5845040a2c1bef6338e05cfdb4e6212c1f57a

data/lib/macho.rb

@@ -1,14 +1,23 @@
-require "cstruct"
-require "macho/headers"
-require "macho/structure"
-require "macho/load_commands"
-require "macho/sections"
-require "macho/macho_file"
-require "macho/fat_file"
-require "macho/exceptions"
-require "macho/utils"
-require "macho/tools"
+require "#{File.dirname(__FILE__)}/cstruct"
+require "#{File.dirname(__FILE__)}/macho/headers"
+require "#{File.dirname(__FILE__)}/macho/structure"
+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/exceptions"
+require "#{File.dirname(__FILE__)}/macho/utils"
+require "#{File.dirname(__FILE__)}/macho/tools"
 
 module MachO
-	# nothing to see here.
+	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/exceptions.rb

@@ -10,24 +10,28 @@ module MachO
 		end
 	end
 
+	# raised when a fat binary is loaded with MachOFile
 	class FatBinaryError < MachOError
 		def initialize
 			super "Fat binaries must be loaded with MachO::FatFile"
 		end
 	end
 
+	# raised when a mach-o is loaded with FatFile
 	class MachOBinaryError < MachOError
 		def initialize
 			super "Normal binaries must be loaded with MachO::MachOFile"
 		end
 	end
 
+	# raised when the CPU type is unknown
 	class CPUTypeError < MachOError
 		def initialize(num)
 			super "Unrecognized CPU type: 0x#{"%02x" % num}"
 		end
 	end
 
+	# raised when the CPU subtype is unknown
 	class CPUSubtypeError < MachOError
 		def initialize(num)
 			super "Unrecognized CPU sub-type: 0x#{"%02x" % num}"
@@ -56,4 +60,11 @@ module MachO
 			"-headerpad or -headerpad_max_install_names"
 		end
 	end
+
+	# raised when attempting to change a dylib name that doesn't exist
+	class DylibUnknownError < MachOError
+		def initialize(dylib)
+			super "No such dylib name: #{dylib}"
+		end
+	end
 end

data/lib/macho/fat_file.rb

@@ -67,11 +67,11 @@ module MachO
 		def get_fat_header
 			magic, nfat_arch = @raw_data[0..7].unpack("N2")
 
-			if !Utils.magic?(magic)
+			if !MachO.magic?(magic)
 				raise MagicError.new(magic)
 			end
 
-			if !Utils.fat_magic?(magic)
+			if !MachO.fat_magic?(magic)
 				raise MachOBinaryError.new
 			end
 

data/lib/macho/macho_file.rb

@@ -30,11 +30,11 @@ module MachO
 		end
 
 		def magic32?
-			Utils.magic32?(header[:magic])
+			MachO.magic32?(header[:magic])
 		end
 
 		def magic64?
-			Utils.magic64?(header[:magic])
+			MachO.magic64?(header[:magic])
 		end
 
 		# is the file executable?
@@ -144,8 +144,8 @@ module MachO
 			old_id = dylib_id
 			new_id = new_id.dup
 
-			new_pad = Utils.round(new_id.size, cmd_round) - new_id.size
-			old_pad = Utils.round(old_id.size, cmd_round) - old_id.size
+			new_pad = MachO.round(new_id.size, cmd_round) - new_id.size
+			old_pad = MachO.round(old_id.size, cmd_round) - old_id.size
 
 			# pad the old and new IDs with null bytes to meet command bounds
 			old_id << "\x00" * old_pad
@@ -217,6 +217,11 @@ module MachO
 			dylibs
 		end
 
+		# stub
+		def change_dylib!(old_path, new_path)
+			raise DylibUnknownError.new(old_path) unless linked_dylibs.include?(old_path)
+		end
+
 		# get all sections in a segment by name
 		def sections(segment)
 			sections = []
@@ -267,7 +272,7 @@ module MachO
 			sizeofcmds = get_sizeofcmds
 			flags = get_flags
 			
-			if Utils.magic32?(magic)
+			if MachO.magic32?(magic)
 				MachHeader.new(magic, cputype, cpusubtype, filetype, ncmds, sizeofcmds, flags)
 			else
 				# the reserved field is...reserved, so just fill it with 0
@@ -278,11 +283,11 @@ module MachO
 		def get_magic
 			magic = @raw_data[0..3].unpack("N").first
 
-			if !Utils.magic?(magic)
+			if !MachO.magic?(magic)
 				raise MagicError.new(magic)
 			end
 			
-			if Utils.fat_magic?(magic)
+			if MachO.fat_magic?(magic)
 				raise FatBinaryError.new
 			end
 

data/lib/macho/utils.rb

@@ -1,27 +1,25 @@
 module MachO
-	module Utils
-		# http://www.opensource.apple.com/source/cctools/cctools-870/libstuff/rnd.c
-		def self.round(value, round)
-			round -= 1
-			value += round
-			value &= ~round
-			value
-		end
+	# http://www.opensource.apple.com/source/cctools/cctools-870/libstuff/rnd.c
+	def self.round(value, round)
+		round -= 1
+		value += round
+		value &= ~round
+		value
+	end
 
-		def self.magic?(num)
-			MH_MAGICS.has_key?(num)
-		end
+	def self.magic?(num)
+		MH_MAGICS.has_key?(num)
+	end
 
-		def self.fat_magic?(num)
-			num == FAT_MAGIC || num == FAT_CIGAM
-		end
+	def self.fat_magic?(num)
+		num == FAT_MAGIC || num == FAT_CIGAM
+	end
 
-		def self.magic32?(num)
-			num == MH_MAGIC || num == MH_CIGAM
-		end
+	def self.magic32?(num)
+		num == MH_MAGIC || num == MH_CIGAM
+	end
 
-		def self.magic64?(num)
-			num == MH_MAGIC_64 || num == MH_CIGAM_64
-		end
+	def self.magic64?(num)
+		num == MH_MAGIC_64 || num == MH_CIGAM_64
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macho
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies: []
 description: A library for viewing and manipulating Mach-O files in Ruby.
 email: william@tuffbizz.com
@@ -46,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: ruby-macho - Mach-O file analyzer.