ruby-filemagic 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc404160b6bdf763a0a5545a8dcc3494dca9c875
-  data.tar.gz: 2d3998f17942cc9a98f88dfb86a9ceaf563139a4
+  metadata.gz: de14d26ab48eb9a2a818ed8e264e3e5ef2b0f85f
+  data.tar.gz: 96efd9c81179201c442d1886424bf712bb9eed44
 SHA512:
-  metadata.gz: 16897fa6cf7f428b2873fe1e1386ddcfd743dfd466d4e46dbd1278ba4c817a7428516b55a3822ccd6cdfd09194f3bb3314e0c3ccb36945bd8ecfd99279fdf4c9
-  data.tar.gz: 276914ae240cd3412b2d7361b061a8d010cd5f552ef1c08d26f55b9e2d097b8b5f265e8699bef19ddf920bb6c15bbc1d0b519f03f1429c09fb61427078ac3bb8
+  metadata.gz: e369f3dec254577adfa08f49f80de64e3156e592669a60eb53006621b9c2914a5ac74136f5073f2821f47e3ec6109c25793f00c26692856e3e8859dab1330982
+  data.tar.gz: d4db029e182841f8f62b927143b8f149ddbb0bc81f849e5169078acb3c3fdf3092f3a31da352d693e21497daa95d14db684488b6280f2d27b7c572bac9220113

data/ChangeLog

@@ -2,6 +2,11 @@
 
 = Revision history for ruby-filemagic
 
+== 0.5.2 [2014-04-24]
+
+* Use MAGIC_VERSION if available.
+* Made tests more robust.
+
 == 0.5.1 [2014-04-15]
 
 * New method FileMagic#io.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to filemagic version 0.5.1
+This documentation refers to filemagic version 0.5.2
 
 
 == DESCRIPTION
@@ -42,10 +42,10 @@ Travis
 
 == LINKS
 
-Homepage (defunct):: http://grub.ath.cx/filemagic/
-Documentation::      https://blackwinter.github.io/ruby-filemagic/
-Source code::        https://github.com/blackwinter/ruby-filemagic
-RubyGem::            https://rubygems.org/gems/ruby-filemagic
+Homepage::      http://www.darwinsys.com/file/
+Documentation:: https://blackwinter.github.io/ruby-filemagic/
+Source code::   https://github.com/blackwinter/ruby-filemagic
+RubyGem::       https://rubygems.org/gems/ruby-filemagic
 
 
 == AUTHORS

data/ext/filemagic/filemagic.c

@@ -269,14 +269,19 @@ rb_magic_free(magic_t cookie) {
   magic_close(cookie);
 }
 
+#define RB_MAGIC_SET_VERSION(m, p) sprintf(version, "%d.%02d", m, p);
+
 void
 Init_ruby_filemagic() {
   char version[8] = "0";
   cFileMagic = rb_define_class("FileMagic", rb_cObject);
 
-#ifdef FILE_VERSION_MAJOR
-  sprintf(version, "%d.%02d", FILE_VERSION_MAJOR, patchlevel);
+#if defined(FILE_VERSION_MAJOR)
+  RB_MAGIC_SET_VERSION(FILE_VERSION_MAJOR, patchlevel)
+#elif defined(MAGIC_VERSION)
+  RB_MAGIC_SET_VERSION(MAGIC_VERSION / 100, MAGIC_VERSION % 100)
 #endif
+
   rb_define_const(cFileMagic, "MAGIC_VERSION", rb_str_new2(version));
 
   rb_define_singleton_method(cFileMagic, "new", rb_magic_new, -1);

data/lib/filemagic/version.rb

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

data/test/filemagic_test.rb

@@ -3,11 +3,25 @@ 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 = magic_version.to_f
+
   def test_file
     fm = FileMagic.new(FileMagic::MAGIC_NONE)
 
+    python_script = match_version(
+      0    => 'a python script, ASCII text executable',
+      5.11 => 'Python script, ASCII text executable'
+    )
+
     res = fm.file(path_to('pyfile'))
-    assert_equal('Python script, ASCII text executable', res)
+    assert_equal(python_script, res)
 
     if File.symlink?(path_to('pylink'))
       res = fm.file(path_to('pylink'))
@@ -18,7 +32,7 @@ class TestFileMagic < Test::Unit::TestCase
     fm = FileMagic.new(FileMagic::MAGIC_SYMLINK)
 
     res = fm.file(path_to('pylink'))
-    assert_equal('Python script, ASCII text executable', res)
+    assert_equal(python_script, res)
 
     fm.close
     fm = FileMagic.new(FileMagic::MAGIC_SYMLINK | FileMagic::MAGIC_MIME)
@@ -30,7 +44,7 @@ class TestFileMagic < Test::Unit::TestCase
     fm = FileMagic.new(FileMagic::MAGIC_COMPRESS)
 
     res = fm.file(path_to('pyfile-compressed.gz'))
-    assert_match(/^Python script, ASCII text executable \(gzip compressed data, was "pyfile-compressed", from Unix/, res)
+    assert_match(/^#{python_script} \(gzip compressed data, was "pyfile-compressed", from Unix/, res)
 
     fm.close
   end
@@ -64,7 +78,10 @@ class TestFileMagic < Test::Unit::TestCase
       block_fm = fm
       fm.file(path_to('pyfile'))
     }
-    assert_equal('Python script, ASCII text executable', res)
+    assert_equal(match_version(
+      0    => 'a python script, ASCII text executable',
+      5.11 => 'Python script, ASCII text executable'
+    ), res)
     assert block_fm.closed?
   end
 
@@ -97,7 +114,10 @@ class TestFileMagic < Test::Unit::TestCase
   def test_mahoro_file
     fm = FileMagic.new
     fm.flags = FileMagic::MAGIC_NONE
-    assert_equal('C source, ASCII text', fm.file(path_to('mahoro.c')))
+    assert_equal(match_version(
+      0    => 'ASCII C program text',
+      5.11 => 'C source, ASCII text'
+    ), fm.file(path_to('mahoro.c')))
   end
 
   def test_mahoro_mime_file
@@ -109,7 +129,10 @@ class TestFileMagic < Test::Unit::TestCase
   def test_mahoro_buffer
     fm = FileMagic.new
     fm.flags = FileMagic::MAGIC_NONE
-    assert_equal('C source, ASCII text', fm.buffer(File.read(path_to('mahoro.c'))))
+    assert_equal(match_version(
+      0    => 'ASCII C program text',
+      5.11 => 'C source, ASCII text'
+    ), fm.buffer(File.read(path_to('mahoro.c'))))
   end
 
   def test_mahoro_mime_buffer
@@ -134,7 +157,10 @@ class TestFileMagic < Test::Unit::TestCase
     fm.simplified = true
     assert fm.simplified?
     assert_equal('text/plain', fm.file(path_to('perl')))
-    assert_equal('application/msword', fm.file(path_to('excel-example.xls')))
+    assert_equal(match_version(
+      0    => 'application/vnd.ms-office',
+      5.11 => 'application/msword'
+    ), fm.file(path_to('excel-example.xls')))
   end
 
   # utility methods:
@@ -150,4 +176,8 @@ class TestFileMagic < Test::Unit::TestCase
     yield
   end
 
+  def match_version(versions)
+    versions.sort_by { |k,| -k }.find { |k,| k <= MAGIC_VERSION }.last
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-filemagic
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Travis Whitton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hen
@@ -92,14 +92,14 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  ruby-filemagic-0.5.1 [2014-04-15]:
+  ruby-filemagic-0.5.2 [2014-04-24]:
 
-  * New method FileMagic#io.
-  * Housekeeping.
+  * Use MAGIC_VERSION if available.
+  * Made tests more robust.
 
 rdoc_options:
 - "--title"
-- ruby-filemagic Application documentation (v0.5.1)
+- ruby-filemagic Application documentation (v0.5.2)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.2.x
 signing_key: 
 specification_version: 4
 summary: Ruby bindings to the magic(4) library