ruby-filemagic 0.4.1 → 0.4.2

data/ChangeLog

@@ -1,6 +1,10 @@
 = Revision history for ruby-filemagic
 
-== 0.4.1
+== 0.4.2 [2010-09-16]
+
+* Not all versions/distributions have file/patchlevel.h
+
+== 0.4.1 [2010-09-15]
 
 * Added MAGIC_VERSION
 * Fixed example script

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to filemagic version 0.4.1
+This documentation refers to filemagic version 0.4.2
 
 
 == DESCRIPTION

data/ext/extconf.rb

@@ -1,9 +1,11 @@
 require 'mkmf'
 
+$CFLAGS << ' -Wall' if ENV['WALL']
 dir_config('magic')
 
-if have_library('magic', 'magic_open') and have_header('magic.h')
+if have_library('magic', 'magic_open') && have_header('magic.h')
+  have_header('file/patchlevel.h')
   create_makefile('filemagic')
 else
-  print "***  ERROR: missing required library to compile this module\n"
+  abort '*** ERROR: missing required library to compile this module'
 end

data/ext/filemagic.c

@@ -271,8 +271,10 @@ void
 Init_filemagic() {
   cFileMagic = rb_define_class("FileMagic", rb_cObject);
 
-  char version[16];
+  char version[8] = "0";
+#ifdef FILE_VERSION_MAJOR
   sprintf(version, "%d.%02d", FILE_VERSION_MAJOR, patchlevel);
+#endif
   rb_define_const(cFileMagic, "MAGIC_VERSION", rb_str_new2(version));
 
   rb_define_singleton_method(cFileMagic, "new", rb_magic_new, -1);

data/ext/filemagic.h

@@ -1,10 +1,12 @@
-#ifndef __FILEMAGIC_H_
-#define __FILEMAGIC_H_
+#ifndef FILEMAGIC_H
+#define FILEMAGIC_H
 
 #include "ruby.h"
 #include <math.h>
 #include <magic.h>
+#ifdef HAVE_FILE_PATCHLEVEL_H
 #include <file/patchlevel.h>
+#endif
 
 /* Ruby 1.8.5 compatibility */
 #ifndef RSTRING_LEN
@@ -46,4 +48,4 @@ static VALUE rb_magic_apply_simple(VALUE, const char*, VALUE);
 static void rb_magic_free(magic_t);
 void Init_filemagic(void);
 
-#endif /* __FILEMAGIC_H_ */
+#endif /* FILEMAGIC_H */

data/lib/filemagic/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-filemagic
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Travis Whitton
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 +02:00
+date: 2010-09-16 00:00:00 +02:00
 default_executable: 
 dependencies: []