ruby-filemagic 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de14d26ab48eb9a2a818ed8e264e3e5ef2b0f85f
-  data.tar.gz: 96efd9c81179201c442d1886424bf712bb9eed44
+  metadata.gz: 1403f497e908d066aeaeb6d235b1b947de376a3f
+  data.tar.gz: 546e5fa1ac73f1a69ebee0f9347ffc2171ebe65d
 SHA512:
-  metadata.gz: e369f3dec254577adfa08f49f80de64e3156e592669a60eb53006621b9c2914a5ac74136f5073f2821f47e3ec6109c25793f00c26692856e3e8859dab1330982
-  data.tar.gz: d4db029e182841f8f62b927143b8f149ddbb0bc81f849e5169078acb3c3fdf3092f3a31da352d693e21497daa95d14db684488b6280f2d27b7c572bac9220113
+  metadata.gz: 1ea4401b1fcc93e015d4e7049928bc95381013f4e915f0e3a02ca30476d5f3a0454408b8da9ac875bf62427e6237630ac4cd8db2025347a86dae7ae04a65f004
+  data.tar.gz: 616165278b30cd859741a4a76dc752b6a798f5ac93951e294e0f4a5aaf228648f977d98899f165ccf28dfcc275cf087e6a7353f90f0511db32cfe4a60a04cde5

data/ChangeLog

@@ -2,6 +2,18 @@
 
 = Revision history for ruby-filemagic
 
+== 0.6.0 [2014-05-16]
+
+* Required Ruby version >= 1.9.3.
+* New method FileMagic#list (+magic_list+).
+* New method FileMagic#load (+magic_load+).
+* New method FileMagic.path (+magic_getpath+).
+* New method FileMagic.magic_version.
+* New method FileMagic.flags.
+* New flag +no_check_builtin+.
+* Tests print libmagic version and path.
+* Internal refactoring.
+
 == 0.5.2 [2014-04-24]
 
 * Use MAGIC_VERSION if available.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to filemagic version 0.5.2
+This documentation refers to filemagic version 0.6.0
 
 
 == DESCRIPTION
@@ -43,9 +43,10 @@ Travis
 == LINKS
 
 Homepage::      http://www.darwinsys.com/file/
-Documentation:: https://blackwinter.github.io/ruby-filemagic/
+Documentation:: https://blackwinter.github.com/ruby-filemagic
 Source code::   https://github.com/blackwinter/ruby-filemagic
 RubyGem::       https://rubygems.org/gems/ruby-filemagic
+Travis CI::     https://travis-ci.org/blackwinter/ruby-filemagic
 
 
 == AUTHORS

data/Rakefile

@@ -4,21 +4,23 @@ begin
   require 'hen'
 
   Hen.lay! {{
-    :gem => {
-      :name         => %q{ruby-filemagic},
-      :version      => FileMagic::VERSION,
-      :summary      => 'Ruby bindings to the magic(4) library',
-      :authors      => ['Travis Whitton', 'Jens Wille'],
-      :email        => ['tinymountain@gmail.com', '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
-      }
+    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
+      },
+
+      required_ruby_version: '>= 1.9.3'
     }
   }}
 rescue LoadError => err

data/ext/filemagic/filemagic.c

@@ -1,28 +1,62 @@
-/*********************************************************
+#include "filemagic.h"
 
- filemagic.c
+/* Returns the magic path */
+static VALUE
+rb_magic_getpath(VALUE klass) {
+  return rb_str_new2(magic_getpath(NULL, 0));
+}
 
- a Ruby extension to bind Ruby to the libmagic library
- (ftp://ftp.astron.com/pub/file/)
+/* Converts flags to integer */
+static VALUE
+rb_magic_flags(VALUE klass, VALUE flags) {
+  VALUE map = rb_const_get(cFileMagic, rb_intern("FLAGS_BY_SYM")), f, g;
+  int i = MAGIC_NONE, j;
 
- patterned very closely off of audiofile.c by jaredj which
- is patterned very very closely off of gdbm.c by matz ;-)
+  if (TYPE(flags) != T_ARRAY) {
+    rb_raise(rb_eTypeError,
+      "wrong argument type %s (expected Array)",
+      rb_obj_classname(flags));
+  }
 
- $Author: twhitton $
- $Date: 2003/07/30 13:25:10 $
+  for (j = 0; j < RARRAY_LEN(flags); j++) {
+    f = rb_ary_entry(flags, j);
 
-*********************************************************/
+    switch (TYPE(f)) {
+      case T_SYMBOL:
+        if (RTEST(g = rb_hash_aref(map, f))) {
+          f = g;
+          /* fall through */
+        }
+        else {
+          f = rb_funcall(f, rb_intern("inspect"), 0);
+          rb_raise(rb_eArgError, "%s: %s",
+            NIL_P(g) ? "no such flag" : "flag not available",
+            StringValueCStr(f));
 
-#include "filemagic.h"
+          break;
+        }
+      case T_FIXNUM:
+        i |= NUM2INT(f);
+        break;
+      default:
+        rb_raise(rb_eTypeError,
+          "wrong argument type %s (expected Fixnum or Symbol)",
+          rb_obj_classname(f));
+    }
+  }
+
+  return INT2FIX(i);
+}
 
 /* FileMagic.new */
 static VALUE
-rb_magic_new(int argc, VALUE *argv, VALUE class) {
+rb_magic_new(int argc, VALUE *argv, VALUE klass) {
   VALUE obj, args[2];
-  magic_t cookie;
+  magic_t ms;
 
   if (rb_block_given_p()) {
-    rb_warn("FileMagic::new() does not take block; use FileMagic::open() instead");
+    rb_warn(
+      "FileMagic.new() does not take a block; use FileMagic.open() instead");
   }
 
   if (argc > 0 && TYPE(args[1] = argv[argc - 1]) == T_HASH) {
@@ -32,22 +66,29 @@ rb_magic_new(int argc, VALUE *argv, VALUE class) {
     args[1] = rb_hash_new();
   }
 
-  args[0] = rb_magic_flags_to_int(rb_ary_new4(argc, argv));
+  args[0] = rb_magic_flags(klass, rb_ary_new4(argc, argv));
 
-  if ((cookie = magic_open(NUM2INT(args[0]))) == NULL) {
-    rb_fatal("out of memory");
+  if ((ms = magic_open(NUM2INT(args[0]))) == NULL) {
+    rb_raise(rb_FileMagicError,
+      "failed to initialize magic cookie (%d)", errno || -1);
   }
 
-  if (magic_load(cookie, NULL) == -1) {
-    rb_fatal("%s", magic_error(cookie));
+  if (magic_load(ms, NULL) == -1) {
+    rb_raise(rb_FileMagicError,
+      "failed to load database: %s", magic_error(ms));
   }
 
-  obj = Data_Wrap_Struct(class, 0, rb_magic_free, cookie);
+  obj = Data_Wrap_Struct(klass, 0, rb_magic_free, ms);
   rb_obj_call_init(obj, 2, args);
 
   return obj;
 }
 
+static void
+rb_magic_free(magic_t ms) {
+  magic_close(ms);
+}
+
 static VALUE
 rb_magic_init(int argc, VALUE *argv, VALUE self) {
   VALUE flags, options, keys, k, m;
@@ -58,16 +99,14 @@ rb_magic_init(int argc, VALUE *argv, VALUE self) {
     options = rb_hash_new();
   }
 
-  rb_iv_set(self, "_flags", flags);
+  rb_iv_set(self, "iflags", flags);
   rb_iv_set(self, "closed", Qfalse);
 
   keys = rb_funcall(options, rb_intern("keys"), 0);
 
   for (i = 0; i < RARRAY_LEN(keys); i++) {
-    k = rb_funcall(keys, rb_intern("[]"), 1, INT2FIX(i));
-    m = rb_funcall(rb_funcall(k, rb_intern("to_s"), 0),
-      rb_intern("+"), 1, rb_str_new2("=")
-    );
+    k = rb_ary_entry(keys, i);
+    m = rb_str_plus(rb_obj_as_string(k), rb_str_new2("="));
 
     if (rb_respond_to(self, mid = rb_intern(StringValueCStr(m)))) {
       rb_funcall(self, mid, 1, rb_hash_aref(options, k));
@@ -84,17 +123,17 @@ rb_magic_init(int argc, VALUE *argv, VALUE self) {
 /* Frees resources allocated */
 static VALUE
 rb_magic_close(VALUE self) {
-  magic_t cookie;
+  magic_t ms;
 
   if (RTEST(rb_magic_closed_p(self))) {
     return Qnil;
   }
 
-  GetMagicCookie(self, cookie);
-  magic_close(cookie);
+  GetMagicSet(self, ms);
+  rb_magic_free(ms);
 
   /* This keeps rb_magic_free from trying to free closed objects */
-  RDATA(self)->data = NULL;
+  DATA_PTR(self) = NULL;
 
   rb_iv_set(self, "closed", Qtrue);
 
@@ -107,49 +146,17 @@ rb_magic_closed_p(VALUE self) {
 }
 
 /* Return a string describing file */
-static VALUE
-rb_magic_file(int argc, VALUE *argv, VALUE self) {
-  VALUE file, s;
-  const char *m;
-  magic_t cookie;
-
-  rb_scan_args(argc, argv, "11", &file, &s);
-
-  m = StringValuePtr(file);
-  GetMagicCookie(self, cookie);
-
-  if ((m = magic_file(cookie, m)) == NULL) {
-    rb_raise(rb_FileMagicError, "%s", magic_error(cookie));
-  }
-
-  return rb_magic_apply_simple(self, m, s);
-}
+RB_MAGIC_TYPE(file, FILE)
 
 /* Return a string describing the string buffer */
-static VALUE
-rb_magic_buffer(int argc, VALUE *argv, VALUE self) {
-  VALUE buffer, s;
-  const char *m;
-  magic_t cookie;
-
-  rb_scan_args(argc, argv, "11", &buffer, &s);
-
-  m = StringValuePtr(buffer);
-  GetMagicCookie(self, cookie);
-
-  if ((m = magic_buffer(cookie, m, RSTRING_LEN(buffer))) == NULL) {
-    rb_raise(rb_FileMagicError, "%s", magic_error(cookie));
-  }
-
-  return rb_magic_apply_simple(self, m, s);
-}
+RB_MAGIC_TYPE(buffer, BUFFER)
 
 /* Get the flags as array of symbols */
 static VALUE
 rb_magic_getflags(VALUE self) {
   VALUE ary = rb_ary_new();
   VALUE map = rb_const_get(cFileMagic, rb_intern("FLAGS_BY_INT"));
-  int i = NUM2INT(rb_attr_get(self, rb_intern("_flags"))), j = 0;
+  int i = NUM2INT(rb_attr_get(self, rb_intern("iflags"))), j = 0;
 
   while ((i -= j) > 0) {
     j = pow(2, (int)(log(i) / log(2)));
@@ -159,117 +166,30 @@ rb_magic_getflags(VALUE self) {
   return ary;
 }
 
-/* Set flags on the cookie object */
+/* Set flags on the ms object */
 static VALUE
 rb_magic_setflags(VALUE self, VALUE flags) {
-  int retval;
-  magic_t cookie;
+  magic_t ms;
 
-  flags = rb_Array(flags);
-  flags = rb_magic_flags_to_int(flags);
-  rb_iv_set(self, "_flags", flags);
+  GetMagicSet(self, ms);
 
-  GetMagicCookie(self, cookie);
-  retval = magic_setflags(cookie, NUM2INT(flags));
+  rb_iv_set(self, "iflags",
+    flags = rb_magic_flags(CLASS_OF(self), rb_Array(flags)));
 
-  return INT2FIX(retval);
+  return INT2FIX(magic_setflags(ms, NUM2INT(flags)));
 }
 
-/* Checks validity of a magic database file */
-static VALUE
-rb_magic_check(int argc, VALUE *argv, VALUE self) {
-  VALUE s;
-  const char *file;
-  int retval;
-  magic_t cookie;
+/* Lists a magic database file */
+RB_MAGIC_APPRENTICE(list)
 
-  file = rb_scan_args(argc, argv, "01", &s) == 1 ? StringValuePtr(s) : NULL;
+/* Loads a magic database file */
+RB_MAGIC_APPRENTICE(load)
 
-  GetMagicCookie(self, cookie);
-  retval = magic_check(cookie, file);
-
-  return INT2FIX(retval);
-}
+/* Checks validity of a magic database file */
+RB_MAGIC_APPRENTICE(check)
 
 /* Compiles a magic database file */
-static VALUE
-rb_magic_compile(VALUE self, VALUE file) {
-  int retval;
-  const char *m;
-  magic_t cookie;
-
-  GetMagicCookie(self, cookie);
-  m = StringValuePtr(file);
-  retval = magic_compile(cookie, m);
-
-  return INT2FIX(retval);
-}
-
-static VALUE
-rb_magic_flags_to_int(VALUE ary) {
-  VALUE map = rb_const_get(cFileMagic, rb_intern("FLAGS_BY_SYM"));
-  VALUE f, g;
-  int i = MAGIC_NONE, j;
-
-  for (j = 0; j < RARRAY_LEN(ary); j++) {
-    f = rb_ary_entry(ary, j);
-
-    switch (TYPE(f)) {
-      case T_SYMBOL:
-        if (RTEST(g = rb_hash_aref(map, f))) {
-          f = g;
-          /* fall through */
-        }
-        else {
-          f = rb_funcall(f, rb_intern("inspect"), 0);
-          rb_raise(rb_eArgError,
-            "%s: %s",
-            NIL_P(g) ? "no such flag" : "flag not available",
-            StringValueCStr(f)
-          );
-          break;
-        }
-      case T_FIXNUM:
-        i |= NUM2INT(f);
-        break;
-      default:
-        rb_raise(rb_eTypeError,
-          "wrong argument type %s (expected Fixnum or Symbol)",
-          rb_obj_classname(f)
-        );
-    }
-  }
-
-  return INT2FIX(i);
-}
-
-static VALUE
-rb_magic_apply_simple(VALUE self, const char *m, VALUE s) {
-  VALUE str = rb_str_new2(m);
-
-  if (RTEST(NIL_P(s) ? rb_attr_get(self, rb_intern("@simplified")) : s)) {
-    rb_funcall(str, rb_intern("downcase!"), 0);
-
-    return rb_funcall(str, rb_intern("slice"), 2,
-      rb_const_get(cFileMagic, rb_intern("SIMPLE_RE")),
-      INT2FIX(1)
-    );
-  }
-  else {
-    return str;
-  }
-}
-
-/*
- GC never seems to happen until the program terminates, but this is called
- on any unclosed objects
-*/
-static void
-rb_magic_free(magic_t cookie) {
-  magic_close(cookie);
-}
-
-#define RB_MAGIC_SET_VERSION(m, p) sprintf(version, "%d.%02d", m, p);
+RB_MAGIC_APPRENTICE(compile)
 
 void
 Init_ruby_filemagic() {
@@ -284,7 +204,9 @@ Init_ruby_filemagic() {
 
   rb_define_const(cFileMagic, "MAGIC_VERSION", rb_str_new2(version));
 
-  rb_define_singleton_method(cFileMagic, "new", rb_magic_new, -1);
+  rb_define_singleton_method(cFileMagic, "path",  rb_magic_getpath,  0);
+  rb_define_singleton_method(cFileMagic, "flags", rb_magic_flags,    1);
+  rb_define_singleton_method(cFileMagic, "new",   rb_magic_new,     -1);
 
   rb_define_method(cFileMagic, "initialize", rb_magic_init,     -1);
   rb_define_method(cFileMagic, "close",      rb_magic_close,     0);
@@ -293,8 +215,10 @@ Init_ruby_filemagic() {
   rb_define_method(cFileMagic, "buffer",     rb_magic_buffer,   -1);
   rb_define_method(cFileMagic, "flags",      rb_magic_getflags,  0);
   rb_define_method(cFileMagic, "flags=",     rb_magic_setflags,  1);
+  rb_define_method(cFileMagic, "list",       rb_magic_list,     -1);
+  rb_define_method(cFileMagic, "load",       rb_magic_load,     -1);
   rb_define_method(cFileMagic, "check",      rb_magic_check,    -1);
-  rb_define_method(cFileMagic, "compile",    rb_magic_compile,   1);
+  rb_define_method(cFileMagic, "compile",    rb_magic_compile,  -1);
 
   rb_alias(cFileMagic, rb_intern("valid?"), rb_intern("check"));
 
@@ -369,6 +293,10 @@ Init_ruby_filemagic() {
 #ifdef MAGIC_NO_CHECK_ENCODING
   rb_define_const(cFileMagic, "MAGIC_NO_CHECK_ENCODING", INT2FIX(MAGIC_NO_CHECK_ENCODING));
 #endif
+#if defined(MAGIC_NO_CHECK_BUILTIN) && MAGIC_VERSION > 514
+  /* defined in b5be901 (2010-01-28, 5.05), but broken until 38e0136 (2013-08-15, 5.15) */
+  rb_define_const(cFileMagic, "MAGIC_NO_CHECK_BUILTIN",  INT2FIX(MAGIC_NO_CHECK_BUILTIN));
+#endif
 #ifdef MAGIC_NO_CHECK_ASCII
   rb_define_const(cFileMagic, "MAGIC_NO_CHECK_ASCII",    INT2FIX(MAGIC_NO_CHECK_ASCII));
 #endif

data/ext/filemagic/filemagic.h

@@ -3,46 +3,96 @@
 
 #include "ruby.h"
 #include <math.h>
+#include <errno.h>
 #include <magic.h>
 #ifdef HAVE_FILE_PATCHLEVEL_H
 #include <file/patchlevel.h>
 #endif
 
-/* Ruby 1.8.5 compatibility */
-#ifndef RSTRING_LEN
-#define RSTRING_LEN(s) (RSTRING(s)->len)
-#endif
-#ifndef RARRAY_LEN
-#define RARRAY_LEN(s) (RARRAY(s)->len)
-#endif
-
-#define GetMagicCookie(obj, cookie) {\
+#define GetMagicSet(obj, ms) {\
   if (RTEST(rb_magic_closed_p(obj))) {\
     rb_raise(rb_eRuntimeError, "closed stream");\
   }\
   else {\
-    Data_Get_Struct((obj), struct magic_set, (cookie));\
+    Data_Get_Struct((obj), struct magic_set, (ms));\
+  }\
+}
+
+#define RB_MAGIC_TYPE_FILE   magic_file(ms, str)
+#define RB_MAGIC_TYPE_BUFFER magic_buffer(ms, str, RSTRING_LEN(arg))
+
+#define RB_MAGIC_TYPE(what, WHAT) \
+static VALUE \
+rb_magic_##what(int argc, VALUE *argv, VALUE self) {\
+  VALUE arg, simple, res;\
+  const char *str, *type;\
+  magic_t ms;\
+\
+  rb_scan_args(argc, argv, "11", &arg, &simple);\
+\
+  str = StringValuePtr(arg);\
+  GetMagicSet(self, ms);\
+\
+  if ((type = RB_MAGIC_TYPE_##WHAT) == NULL) {\
+    rb_raise(rb_FileMagicError, "failed lookup: %s", magic_error(ms));\
+  }\
+\
+  res = rb_str_new2(type);\
+\
+  if (NIL_P(simple)) {\
+    simple = rb_attr_get(self, rb_intern("@simplified"));\
+  }\
+\
+  if (RTEST(simple)) {\
+    rb_funcall(res, rb_intern("downcase!"), 0);\
+\
+    return rb_funcall(res, rb_intern("slice"), 2,\
+      rb_const_get(cFileMagic, rb_intern("SIMPLE_RE")), INT2FIX(1));\
+  }\
+  else {\
+    return res;\
   }\
 }
 
+#define RB_MAGIC_APPRENTICE(what) \
+static VALUE \
+rb_magic_##what(int argc, VALUE *argv, VALUE self) {\
+  VALUE str;\
+  const char *file;\
+  magic_t ms;\
+\
+  file = rb_scan_args(argc, argv, "01", &str) == 1 ? StringValuePtr(str) : NULL;\
+\
+  GetMagicSet(self, ms);\
+\
+  return magic_##what(ms, file) ? Qfalse : Qtrue;\
+}
+
+#define RB_MAGIC_SET_VERSION(m, p) sprintf(version, "%d.%02d", m, p);
+
 static VALUE cFileMagic, rb_FileMagicError;
 
+static VALUE rb_magic_getpath(VALUE);
+static VALUE rb_magic_flags(VALUE, VALUE);
+
 static VALUE rb_magic_new(int, VALUE*, VALUE);
+static void rb_magic_free(magic_t);
 static VALUE rb_magic_init(int, VALUE*, VALUE);
 
 static VALUE rb_magic_close(VALUE);
 static VALUE rb_magic_closed_p(VALUE);
+
 static VALUE rb_magic_file(int, VALUE*, VALUE);
 static VALUE rb_magic_buffer(int, VALUE*, VALUE);
+
 static VALUE rb_magic_getflags(VALUE);
 static VALUE rb_magic_setflags(VALUE, VALUE);
-static VALUE rb_magic_check(int, VALUE*, VALUE);
-static VALUE rb_magic_compile(VALUE, VALUE);
 
-static VALUE rb_magic_flags_to_int(VALUE);
-static VALUE rb_magic_apply_simple(VALUE, const char*, VALUE);
+static VALUE rb_magic_list(int, VALUE*, VALUE);
+static VALUE rb_magic_load(int, VALUE*, VALUE);
+static VALUE rb_magic_check(int, VALUE*, VALUE);
+static VALUE rb_magic_compile(int, VALUE*, VALUE);
 
-static void rb_magic_free(magic_t);
 void Init_ruby_filemagic(void);
 
 #endif /* FILEMAGIC_H */

data/lib/filemagic.rb

@@ -28,7 +28,12 @@ class FileMagic
     :no_check_cdf,       # Don't check for cdf files
     :no_check_tokens,    # Don't check ascii/tokens
     :no_check_encoding,  # Don't check text encodings
+    :no_check_builtin,   # No built-in tests; only consult the magic file
+
+    # Defined for backwards compatibility (renamed)
     :no_check_ascii,     # MAGIC_NO_CHECK_TEXT
+
+    # Defined for backwards compatibility; do nothing
     :no_check_fortran,   # Don't check ascii/fortran
     :no_check_troff      # Don't check ascii/troff
   ].inject({}) { |flags, flag|
@@ -42,22 +47,22 @@ class FileMagic
   # Extract "simple" MIME type.
   SIMPLE_RE = %r{([.\w\/-]+)}
 
-  @fm = Hash.new { |fm, flags|
-    fm.key?(key = flags.to_s) ? fm[key] : fm[key] = new(*flags)
-  }
+  @fm = {}
 
   class << self
 
     # Provide a "magic singleton".
     def fm(*flags)
-      @fm.delete(flags.to_s) if @fm[flags].closed?
-      @fm[flags]
+      if fm = @fm[flags = flags(flags)]
+        return fm unless fm.closed?
+      end
+
+      @fm[flags] = new(flags)
     end
 
     # Clear our instance cache.
     def clear!
-      @fm.each_value { |fm| fm.close }
-      @fm.clear
+      @fm.each_value(&:close).clear
     end
 
     # Just like #new, but takes an optional block, in which case #close
@@ -81,6 +86,31 @@ class FileMagic
       open(:mime, *flags, &block)
     end
 
+    def magic_version(default = MAGIC_VERSION)
+      default != '0' ? default :
+        user_magic_version ||
+        auto_magic_version ||
+        [default, 'unknown']
+    end
+
+    private
+
+    def user_magic_version(key = 'MAGIC_VERSION')
+      [ENV[key], 'user-specified'] if ENV[key]
+    end
+
+    def auto_magic_version
+      require 'nuggets/file/which'
+
+      if cmd = File.which_command([
+        'dpkg-query -f \'${Version}\' -W libmagic-dev',
+        'file -v'
+      ])
+        [%x{#{cmd}}[/\d+\.\d+/], 'auto-detected']
+      end
+    rescue LoadError
+    end
+
   end
 
   attr_writer :simplified

data/lib/filemagic/version.rb

@@ -3,8 +3,8 @@ class FileMagic
   module Version
 
     MAJOR = 0
-    MINOR = 5
-    TINY  = 2
+    MINOR = 6
+    TINY  = 0
 
     class << self
 

data/test/filemagic_test.rb

@@ -3,15 +3,16 @@ require 'filemagic'
 
 class TestFileMagic < Test::Unit::TestCase
 
-  magic_version = FileMagic::MAGIC_VERSION != '0' ? FileMagic::MAGIC_VERSION :
-    ENV['MAGIC_VERSION'] || begin
-    require 'nuggets/file/which'
-    %x{dpkg-query -f '${Version}' -W libmagic-dev} if File.which('dpkg-query')
-  rescue LoadError
-  end
-
+  magic_version, origin = FileMagic.magic_version
   MAGIC_VERSION = magic_version.to_f
 
+  warn <<-EOT
+
+libmagic version: #{MAGIC_VERSION}#{" (#{origin})" if origin}
+magic file from #{FileMagic.path}
+
+  EOT
+
   def test_file
     fm = FileMagic.new(FileMagic::MAGIC_NONE)
 
@@ -25,7 +26,7 @@ class TestFileMagic < Test::Unit::TestCase
 
     if File.symlink?(path_to('pylink'))
       res = fm.file(path_to('pylink'))
-      assert_equal("symbolic link to `pyfile'", res)
+      assert_equal("symbolic link to `pyfile'", res.strip)
     end
 
     fm.close
@@ -60,7 +61,7 @@ class TestFileMagic < Test::Unit::TestCase
     fm = FileMagic.new(FileMagic::MAGIC_NONE)
     res = silence_stderr { fm.check(path_to('perl')) }
     fm.close
-    assert_equal(0, res)
+    assert(res)
   end
 
   def test_compile
@@ -68,7 +69,7 @@ class TestFileMagic < Test::Unit::TestCase
     fm = FileMagic.new(FileMagic::MAGIC_NONE)
     res = fm.compile(path_to('perl'))
     fm.close
-    assert_equal(0, res)
+    assert(res)
     File.unlink(path_to('perl.mgc', '.'))
   end
 
@@ -85,6 +86,14 @@ class TestFileMagic < Test::Unit::TestCase
     assert block_fm.closed?
   end
 
+  def test_flags_to_int
+    assert_raise(TypeError) { FileMagic.flags(0) }
+    assert_equal(0, FileMagic.flags([FileMagic::MAGIC_NONE]))
+    assert_equal(0, FileMagic.flags([:none]))
+    assert_equal(0, FileMagic.flags([]))
+    assert_equal(1072, FileMagic.flags([:mime, :continue]))
+  end
+
   def test_setflags
     fm = FileMagic.new(FileMagic::MAGIC_NONE)
     assert_equal([], fm.flags)
@@ -95,7 +104,7 @@ class TestFileMagic < Test::Unit::TestCase
 
   def test_abbr
     fm = FileMagic.new(:mime, :continue)
-    assert_equal([:mime_type, :continue, :mime_encoding] , fm.flags)
+    assert_equal([:mime_type, :continue, :mime_encoding], fm.flags)
     fm.flags = :symlink
     assert_equal([:symlink], fm.flags)
     fm.close
@@ -159,7 +168,8 @@ class TestFileMagic < Test::Unit::TestCase
     assert_equal('text/plain', fm.file(path_to('perl')))
     assert_equal(match_version(
       0    => 'application/vnd.ms-office',
-      5.11 => 'application/msword'
+      5.11 => 'application/msword',
+      5.14 => 'application/vnd.ms-office'
     ), fm.file(path_to('excel-example.xls')))
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-filemagic
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Travis Whitton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hen
@@ -39,6 +39,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -54,9 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby bindings to the magic(4) library
-email:
-- tinymountain@gmail.com
-- jens.wille@gmail.com
+email: jens.wille@gmail.com
 executables: []
 extensions:
 - ext/filemagic/extconf.rb
@@ -92,14 +104,21 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  ruby-filemagic-0.5.2 [2014-04-24]:
+  ruby-filemagic-0.6.0 [2014-05-16]:
 
-  * Use MAGIC_VERSION if available.
-  * Made tests more robust.
+  * Required Ruby version >= 1.9.3.
+  * New method FileMagic#list (+magic_list+).
+  * New method FileMagic#load (+magic_load+).
+  * New method FileMagic.path (+magic_getpath+).
+  * New method FileMagic.magic_version.
+  * New method FileMagic.flags.
+  * New flag +no_check_builtin+.
+  * Tests print libmagic version and path.
+  * Internal refactoring.
 
 rdoc_options:
 - "--title"
-- ruby-filemagic Application documentation (v0.5.2)
+- ruby-filemagic Application documentation (v0.6.0)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -112,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="