ruby-filemagic 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8defa2096e9b64ff01af2cb0cdfebfbf25fd8177
-  data.tar.gz: 6f3018740cf798e2fa4d54d343e8b4942e71f695
+  metadata.gz: 6d1d279fb547f7aa623c1e88e7f2f47f6e4e1861
+  data.tar.gz: 88e3fbc28fd2ce43f1f7b7669e1ee2655359a619
 SHA512:
-  metadata.gz: 8b9ed685e46ac3c6516e95a96cc0ce9eeb1cc07053fa8a697853a6f963cee69e561492cd6e34d1d78b2b310f8eb0d02ea89c523e4da464f80544a21f461169ce
-  data.tar.gz: 30f8367ed63c08a609119d6fa0d69fcb904de20210cf1eb3fa598ec8d95dcd8c1916fbca6655e663b530ea4ce45e225bb202ee152c7810e78c1e2cb0e0e9704d
+  metadata.gz: 3143dd206af80d9e962ce5907cc9b9d24a5ddbee25783f9621970f065b2dcf31427135261c2b09f3c734738a7e0b2f2912d39a400d528d5e12a4e6e1076c4071
+  data.tar.gz: 0eb00059e40fd6db78d26a194f1e101b7526e194a0550d2161f90540a7bde0bcae61e3ced9db6e37b59b5226802ee092ca71022f2e7ccf36bdae6f1b7e04bac3

data/ChangeLog

@@ -2,10 +2,14 @@
 
 = Revision history for ruby-filemagic
 
+== 0.6.2 [2015-02-06]
+
+* Improved Windows support (issue #10 by Matt Hoyle).
+* Fixed FileMagic.path to account for missing magic file.
+
 == 0.6.1 [2014-08-19]
 
-* Account for options passed to FileMagic.fm (issue #7 reported by Adam
-  Wróbel).
+* Account for options passed to FileMagic.fm (issue #7 by Adam Wróbel).
 
 == 0.6.0 [2014-05-16]
 

data/README

@@ -2,42 +2,67 @@
 
 == VERSION
 
-This documentation refers to filemagic version 0.6.1
+This documentation refers to filemagic version 0.6.2
 
 
 == DESCRIPTION
 
-=== Revised version
+FileMagic extension module. See also libmagic(3), file(1) and magic(4).
 
-September 12, 2008 Jens Wille <jens.wille@gmail.com>
+=== Constants
 
-Similar to Ricardo[http://github.com/ricardochimal/ruby-filemagic]
-I wanted this project to make some progress. My needs went a bit
-farther than his, though ;-) Enjoy anyway!
+<tt>MAGIC_NONE</tt>::     No flags
+<tt>MAGIC_DEBUG</tt>::    Turn on debugging
+<tt>MAGIC_SYMLINK</tt>::  Follow symlinks
+<tt>MAGIC_COMPRESS</tt>:: Check inside compressed files
+<tt>MAGIC_DEVICES</tt>::  Look at the contents of devices
+<tt>MAGIC_MIME</tt>::     Return a mime string
+<tt>MAGIC_CONTINUE</tt>:: Return all matches, not just the first
+<tt>MAGIC_CHECK</tt>::    Print warnings to stderr
 
-Install the gem:
+=== Methods
 
-  sudo gem install ruby-filemagic
+<tt>file(filename)</tt>::    Returns a textual description of the contents
+                             of the filename argument
+<tt>buffer(string)</tt>::    Returns a textual description of the contents
+                             of the string argument
+<tt>check(filename)</tt>::   Checks the validity of entries in the database
+                             file passed in as filename
+<tt>compile(filename)</tt>:: Compiles the database file passed in as filename
+<tt>close()</tt>::           Closes the magic database and frees any memory
+                             allocated
+
+=== Synospis
+
+  require 'filemagic'
+
+  p FileMagic::VERSION
+  p FileMagic::MAGIC_VERSION
 
-=== Original package
+  p FileMagic.new.flags
 
-July 28, 2003 Travis Whitton <tinymountain@gmail.com>
+  FileMagic.open(:mime) { |fm|
+    p fm.flags
+    p fm.file(__FILE__)
+    p fm.file(__FILE__, true)
 
-This is one of my first ruby bindings, so suggestions are welcome. See
-filemagic.rd and test.rb for usage.
+    fm.flags = [:raw, :continue]
+    p fm.flags
+  }
 
-to install, run these commands:
+  fm = FileMagic.new
+  p fm.flags
 
-  ruby extconf.rb
-  make
-  su
-  make install
+  mime = FileMagic.mime
+  p mime.flags
 
-the file(1) library and headers are required.
-I have file 0.4.3.
+=== Installation
+
+Install the gem:
+
+  sudo gem install ruby-filemagic
 
-Enjoy!
-Travis
+The file(1) library and headers are required.
 
 
 == LINKS

data/Rakefile

@@ -1,28 +1,34 @@
-require File.expand_path(%q{../lib/filemagic/version}, __FILE__)
+require_relative 'lib/filemagic/version'
 
 begin
   require 'hen'
 
+  file mgc = 'lib/filemagic/magic.mgc' do
+    dir = ENV['WITH_CROSS_MAGIC']
+
+    dir && File.exist?(src = File.join(dir, 'magic', File.basename(mgc))) ?
+      cp(src, mgc) : File.binwrite(mgc, "\x1C\x04\x1E\xF1\x0C".ljust(248, "\0"))
+  end
+
   Hen.lay! {{
     gem: {
-      name:         %q{ruby-filemagic},
-      version:      FileMagic::VERSION,
-      summary:      'Ruby bindings to the magic(4) library',
-      authors:      ['Travis Whitton', 'Jens Wille'],
-      email:        'jens.wille@gmail.com',
-      license:      %q{Ruby},
-      homepage:     :blackwinter,
-      extra_files:  FileList['info/*'].to_a,
-      dependencies: %w[],
-      extension:    {
-        name:          'ruby_filemagic',
-        ext_name:      'filemagic',
-        cross_compile: false
+      name:        %q{ruby-filemagic},
+      version:     FileMagic::VERSION,
+      summary:     'Ruby bindings to the magic(4) library',
+      authors:     ['Travis Whitton', 'Jens Wille'],
+      email:       'jens.wille@gmail.com',
+      license:     %q{Ruby},
+      homepage:    :blackwinter,
+      local_files: [mgc],
+      extension:   {
+        with_cross_gnurx: lambda { |dir| [dir] },
+        with_cross_magic: lambda { |dir| [src =
+          File.join(dir, 'src'), File.join(src, '.libs')] }
       },
 
       required_ruby_version: '>= 1.9.3'
     }
   }}
 rescue LoadError => err
-  warn "Please install the `hen' gem first. (#{err})"
+  warn "Please install the `hen' gem. (#{err})"
 end

data/ext/filemagic/extconf.rb

@@ -1,7 +1,12 @@
 require 'mkmf'
 
 $CFLAGS << ' -Wall' if ENV['WALL']
+$LDFLAGS << ' -static-libgcc'
+
 dir_config('magic')
+dir_config('gnurx')
+
+have_library('gnurx')
 
 if have_library('magic', 'magic_open') && have_header('magic.h')
   have_header('file/patchlevel.h')

data/ext/filemagic/filemagic.c

@@ -3,7 +3,8 @@
 /* Returns the magic path */
 static VALUE
 rb_magic_getpath(VALUE klass) {
-  return rb_str_new2(magic_getpath(NULL, 0));
+  const char *path = magic_getpath(NULL, 0);
+  return path != NULL ? rb_str_new2(path) : Qnil;
 }
 
 /* Converts flags to integer */

data/lib/filemagic.rb

@@ -1,8 +1,18 @@
-require 'filemagic/ruby_filemagic'
+begin
+  require "filemagic/#{RUBY_VERSION[/\d+.\d+/]}/ruby_filemagic"
+rescue LoadError => err
+  raise if err.respond_to?(:path) && !err.path
+  require 'filemagic/ruby_filemagic'
+end
+
 require 'filemagic/version'
 
 class FileMagic
 
+  DEFAULT_MAGIC = __FILE__.sub(/\.rb\z/, '/magic.mgc')
+
+  ENV['MAGIC'] ||= DEFAULT_MAGIC unless path
+
   # Map flag names to their values (:name => Integer).
   FLAGS_BY_SYM = [
     :none,               # No flags

data/lib/filemagic/version.rb

@@ -4,7 +4,7 @@ class FileMagic
 
     MAJOR = 0
     MINOR = 6
-    TINY  = 1
+    TINY  = 2
 
     class << self
 

data/test/filemagic_test.rb

@@ -45,7 +45,9 @@ magic file from #{FileMagic.path}
     fm = FileMagic.new(FileMagic::MAGIC_COMPRESS)
 
     res = fm.file(path_to('pyfile-compressed.gz'))
-    assert_match(/^#{python_script} \(gzip compressed data, was "pyfile-compressed", from Unix/, res)
+    gzip_compressed = 'gzip compressed data, was "pyfile-compressed"'
+    assert_match(Gem.win_platform? ? /^#{gzip_compressed}/ :
+                 /^#{python_script} \(#{gzip_compressed}/, res)
 
     fm.close
   end
@@ -58,12 +60,21 @@ magic file from #{FileMagic.path}
   end
 
   def test_check
+    return if Gem.win_platform?
     fm = FileMagic.new(FileMagic::MAGIC_NONE)
     res = silence_stderr { fm.check(path_to('perl')) }
     fm.close
     assert(res)
   end
 
+  def test_check_compiled
+    return if MAGIC_VERSION <= 5.09
+    fm = FileMagic.new(FileMagic::MAGIC_NONE)
+    res = silence_stderr { fm.check(path_to('perl.mgc')) }
+    fm.close
+    assert(res)
+  end
+
   def test_compile
     assert(File.writable?('.'), "can't write to current directory")
     fm = FileMagic.new(FileMagic::MAGIC_NONE)

metadata

@@ -1,51 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: ruby-filemagic
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Travis Whitton
 - Jens Wille
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDMDCCAhigAwIBAgIBADANBgkqhkiG9w0BAQUFADA+MQswCQYDVQQDDAJ3dzEb
-  MBkGCgmSJomT8ixkARkWC2JsYWNrd2ludGVyMRIwEAYKCZImiZPyLGQBGRYCZGUw
-  HhcNMTMwMTMxMDkyMjIyWhcNMTQwMTMxMDkyMjIyWjA+MQswCQYDVQQDDAJ3dzEb
-  MBkGCgmSJomT8ixkARkWC2JsYWNrd2ludGVyMRIwEAYKCZImiZPyLGQBGRYCZGUw
-  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVXmfa6rbTwKOvtuGoROc1
-  I4qZjgLX0BA4WecYB97PjwLJmJ1hRvf9JulVCJYYmt5ZEPPXbgi9xLbcp6ofGmnC
-  i68/kbhcz20/fRUtIJ2phU3ypQTEd2pFddpL7SR2FxLkzvvg5E6nslGn7o2erDpO
-  8sm610A3xsgT/eNIr9QA7k4pHh18X1KvZKmmQR4/AjVyKmKawzauKUoHHepjvjVs
-  s0pVoM7UmOmrS4SafQ3OwUo37f19CVdN2/FW7z3e5+iYhKxdIFdhniX9iDWtA3Jn
-  7oUOtiolhCRK4P/c30UjTCDkRkOldsWciFUasROJ5VAV2SVv7FtGHoQLDZ/++tRr
-  AgMBAAGjOTA3MAkGA1UdEwQCMAAwHQYDVR0OBBYEFIAPWU4BEoYUe82hY/0EkoGd
-  Oo/WMAsGA1UdDwQEAwIEsDANBgkqhkiG9w0BAQUFAAOCAQEAf2YnB0mj42of22dA
-  MimgJCAEgB3H5aHbZ6B5WVnFvrC2UUnhP+/kLj/6UgOfqcasy4Xh62NVGuNrf7rF
-  7NMN87XwexGuU2GCpIMUd6VCTA7zMP2OWuXEcba7jT5OtiI55buO0J4CRtyeX1XF
-  qwlGgx4ItcGhMTlDFXj3IkpeVtjD8O7yWE21bHf9lLURmqK/r9KjoxrrVi7+cESJ
-  H19TDW3R9p594jCl1ykPs3dz/0Bk+r1HTd35Yw+yBbyprSJb4S7OcRRHCryuo09l
-  NBGyZvOBuqUp0xostWSk0dfxyn/YQ7eqvQRGBhK1VGa7Tg/KYqnemDE57+VOXrua
-  59wzaA==
-  -----END CERTIFICATE-----
-date: 2014-08-19 00:00:00.000000000 Z
+cert_chain: []
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hen
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -105,10 +90,9 @@ files:
 - ext/filemagic/extconf.rb
 - ext/filemagic/filemagic.c
 - ext/filemagic/filemagic.h
-- info/example.rb
-- info/filemagic.rd
 - lib/filemagic.rb
 - lib/filemagic/ext.rb
+- lib/filemagic/magic.mgc
 - lib/filemagic/version.rb
 - lib/ruby-filemagic.rb
 - test/excel-example.xls
@@ -116,6 +100,7 @@ files:
 - test/leaktest.rb
 - test/mahoro.c
 - test/perl
+- test/perl.mgc
 - test/pyfile
 - test/pyfile-compressed.gz
 - test/pylink
@@ -125,14 +110,14 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  ruby-filemagic-0.6.1 [2014-08-19]:
+  ruby-filemagic-0.6.2 [2015-02-06]:
 
-  * Account for options passed to FileMagic.fm (issue #7 reported by Adam
-    Wróbel).
+  * Improved Windows support (issue #10 by Matt Hoyle).
+  * Fixed FileMagic.path to account for missing magic file.
 
 rdoc_options:
 - "--title"
-- ruby-filemagic Application documentation (v0.6.1)
+- ruby-filemagic Application documentation (v0.6.2)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -153,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby bindings to the magic(4) library

data/info/example.rb

@@ -1,31 +0,0 @@
-#! /usr/bin/ruby
-
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'filemagic'
-
-p FileMagic::VERSION
-p FileMagic::MAGIC_VERSION
-
-p FileMagic.new.flags
-
-FileMagic.open(:mime) { |fm|
-  p fm.flags
-  p fm.file(__FILE__)
-
-  fm.flags = [:raw, :continue]
-  p fm.flags
-}
-
-fm = FileMagic.new
-p fm.flags
-
-mime = FileMagic.mime
-p mime.flags
-
-ARGV.each { |file|
-  p fm.file(file)
-  p fm.file(file, true)
-
-  p mime.file(file)
-  p mime.file(file, true)
-}

data/info/filemagic.rd

@@ -1,36 +0,0 @@
-=begin
-
-= FileMagic extension module SEE ALSO libmagic(3), file(1) and magic(4)
-== FileMagic
-=== Constants
-: MAGIC_NONE
-     No flags
-: MAGIC_DEBUG
-     Turn on debuggin
-: MAGIC_SYMLINK
-     Follow symlinks
-: MAGIC_COMPRESS
-     Check inside compressed files
-: MAGIC_DEVICES
-     Look at the contents of devices
-: MAGIC_MIME
-     Return a mime string
-: MAGIC_CONTINUE
-     Return all matches, not just the first
-: MAGIC_CHECK
-     Print warnings to stderr
-
-=== Methods
-: file(filename)
-    returns a textual description of the contents of the filename argument
-: buffer(string)
-    returns a textual description of the contents of the string argument
-: check(filename)
-    checks the validity of entries in the colon separated database files
-    passed in as filename
-: compile(filename)
-    compile the the colon separated list of database files passed in as
-    filename
-: close()
-    closes the magic database and frees any memory allocated. if memory
-    is a concern, use this.