ruby-macho 0.2.6 → 1.0.0

data/lib/macho/utils.rb

@@ -55,42 +55,42 @@ module MachO
     # @param num [Fixnum] the number being checked
     # @return [Boolean] true if `num` is a valid Mach-O magic number, false otherwise
     def self.magic?(num)
-      MH_MAGICS.key?(num)
+      Headers::MH_MAGICS.key?(num)
     end
 
     # Compares the given number to valid Fat magic numbers.
     # @param num [Fixnum] the number being checked
     # @return [Boolean] true if `num` is a valid Fat magic number, false otherwise
     def self.fat_magic?(num)
-      num == FAT_MAGIC
+      num == Headers::FAT_MAGIC
     end
 
     # Compares the given number to valid 32-bit Mach-O magic numbers.
     # @param num [Fixnum] the number being checked
     # @return [Boolean] true if `num` is a valid 32-bit magic number, false otherwise
     def self.magic32?(num)
-      num == MH_MAGIC || num == MH_CIGAM
+      num == Headers::MH_MAGIC || num == Headers::MH_CIGAM
     end
 
     # Compares the given number to valid 64-bit Mach-O magic numbers.
     # @param num [Fixnum] the number being checked
     # @return [Boolean] true if `num` is a valid 64-bit magic number, false otherwise
     def self.magic64?(num)
-      num == MH_MAGIC_64 || num == MH_CIGAM_64
+      num == Headers::MH_MAGIC_64 || num == Headers::MH_CIGAM_64
     end
 
     # Compares the given number to valid little-endian magic numbers.
     # @param num [Fixnum] the number being checked
     # @return [Boolean] true if `num` is a valid little-endian magic number, false otherwise
     def self.little_magic?(num)
-      num == MH_CIGAM || num == MH_CIGAM_64
+      num == Headers::MH_CIGAM || num == Headers::MH_CIGAM_64
     end
 
     # Compares the given number to valid big-endian magic numbers.
     # @param num [Fixnum] the number being checked
     # @return [Boolean] true if `num` is a valid big-endian magic number, false otherwise
     def self.big_magic?(num)
-      num == MH_CIGAM || num == MH_CIGAM_64
+      num == Headers::MH_CIGAM || num == Headers::MH_CIGAM_64
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macho
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 1.0.0
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies: []
 description: A library for viewing and manipulating Mach-O files in Ruby.
 email: william@tuffbizz.com
@@ -25,7 +25,6 @@ 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
@@ -43,7 +42,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/macho/open.rb

@@ -1,25 +0,0 @@
-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
-  # @raise [ArgumentError] if the given file does not exist
-  # @raise [MachO::TruncatedFileError] if the file is too small to have a valid header
-  # @raise [MachO::MagicError] if the file's magic is not valid Mach-O magic
-  def self.open(filename)
-    raise ArgumentError, "#{filename}: no such file" unless File.file?(filename)
-    raise TruncatedFileError unless File.stat(filename).size >= 4
-
-    magic = File.open(filename, "rb") { |f| f.read(4) }.unpack("N").first
-
-    if Utils.fat_magic?(magic)
-      file = FatFile.new(filename)
-    elsif Utils.magic?(magic)
-      file = MachOFile.new(filename)
-    else
-      raise MagicError, magic
-    end
-
-    file
-  end
-end