ruby-filemagic 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3eb3ecc3b55441028fac03c58ce23b94b4535489
-  data.tar.gz: fe98ff3cc87c0bcc11aec60b4e4e1297dd296a4a
+SHA256:
+  metadata.gz: 072a4b2682df79e50b62c7cf1c0b42db262bac212f90ec741fdf5b82b89a661f
+  data.tar.gz: ccce9e4086fd53a704ff20d5ed0fdeeec384f21e346ac0e228505f8802337b02
 SHA512:
-  metadata.gz: b68a7914cf407d134b75e230b7fa61f2a07bcc9c4d1811203265e4a05c675f69e0f65b02b5453174943c9fe824fcc661467399af81477e87c2daa4d17333fce6
-  data.tar.gz: e7e784821698c04c53a3d04fa011fbea772549c6d10fa92487e245711ed7e20def7cb1c9d07c5913a82c92aff9d1e81c2d29140c19f22ad8e15b6f34b7f4293d
+  metadata.gz: 42f6d02a666eefcfa9647cabe589ade5b7b2bae7e37cf9613b20cfe5190ab722543659028bf601b3b196a58c911596eed30cc9413544f3cdeaa5b335aa09c576
+  data.tar.gz: acf53f89c934e944917b80cfa62150da43b6b430bf4bce8798ad17b93dc54546a5092c42bdd0facf8eb35a0e12c56415a3b48409075e6262aadc93dcaae77be9

data/CONTRIBUTING.md

@@ -1 +1 @@
-Please note that this project is in **maintenance mode**. Bug reports and pull requests are welcome, but only [file](http://www.darwinsys.com/file/) **5.11 or higher** is actually supported.
+Please note that this project is **no longer maintained**. I'm happy to hand over ownership to anyone who shows serious interest.

data/ChangeLog

@@ -2,6 +2,12 @@
 
 = Revision history for ruby-filemagic
 
+== 0.7.3 [2022-01-07]
+
+* Dockerfile to build native extension (pull request #26 by Pavel Lobashov).
+* Include paths for ARM-based Apple Macs (Apple Silicon) (pull request #35 by
+  @545ch4).
+
 == 0.7.2 [2017-07-02]
 
 * Fix segfault on <tt>buffer(nil)</tt> when compiled with GCC (pull request

data/Dockerfile

@@ -0,0 +1,37 @@
+FROM ruby:2.4
+
+RUN apt-get update && apt-get install -y mingw-w64 && gem install rake-compiler
+ENV HOST_ARCH i686-w64-mingw32
+
+ENV GNURX_VERSION 2.5.1
+ENV GNURX_SOURCE /mingw-libgnurx-$GNURX_VERSION
+RUN curl https://vorboss.dl.sourceforge.net/project/mingw/Other/UserContributed/regex/mingw-regex-$GNURX_VERSION/mingw-libgnurx-$GNURX_VERSION-src.tar.gz | \
+    tar xzvf - && \
+    cd $GNURX_SOURCE && \
+    ./configure --host=$HOST_ARCH --enable-static --disable-shared && \
+    make
+
+ENV MAGIC_VERSION 5.31
+ENV MAGIC_SOURCE /file-$MAGIC_VERSION
+RUN curl ftp://ftp.astron.com/pub/file/file-$MAGIC_VERSION.tar.gz | \
+    tar xzvf - && \
+    cd $MAGIC_SOURCE && \
+    ./configure --disable-silent-rules --enable-fsect-man5 && \
+    make && \
+    make clean && \
+    LDFLAGS=-L$GNURX_SOURCE CFLAGS=-I$GNURX_SOURCE ./configure --disable-silent-rules --enable-fsect-man5 --host=$HOST_ARCH && \
+    make || true
+
+ENV CROSS_RUBIES 2.3.4 2.4.1
+RUN for i in $CROSS_RUBIES; do rake-compiler cross-ruby VERSION=$i; done
+
+ENV APP_SOURCE /ruby-filemagic
+RUN mkdir $APP_SOURCE
+WORKDIR $APP_SOURCE
+
+RUN echo "source 'https://rubygems.org'\ngemspec\n" > Gemfile
+COPY *.gemspec .
+RUN bundle install
+
+COPY . .
+ENTRYPOINT rake gem:native WITH_CROSS_GNURX=$GNURX_SOURCE WITH_CROSS_MAGIC=$MAGIC_SOURCE

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to filemagic version 0.7.2
+This documentation refers to filemagic version 0.7.3
 
 
 == DESCRIPTION
@@ -38,9 +38,9 @@ FileMagic extension module. See also libmagic(3), file(1) and magic(4).
   require 'filemagic'
 
   p FileMagic::VERSION
-  # => "0.7.2"
+  # => "0.7.3"
   p FileMagic::MAGIC_VERSION
-  # => "5.28"
+  # => "5.39"
 
   p FileMagic.new.flags
   # => []
@@ -83,11 +83,16 @@ Fedora/SuSE::   +file-devel+
 Gentoo::        +sys-libs/libmagic+
 OS X::          <tt>brew install libmagic</tt>
 
+=== Build native extension
+
+  rake docker:gem:native
+
+Requires Docker[https://docker.com] to be installed.
 
 == LINKS
 
-Homepage::      http://www.darwinsys.com/file/
-Documentation:: https://blackwinter.github.com/ruby-filemagic
+Homepage::      https://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
 Travis CI::     https://travis-ci.org/blackwinter/ruby-filemagic
@@ -104,6 +109,9 @@ Travis CI::     https://travis-ci.org/blackwinter/ruby-filemagic
 * Martin Carpenter <mailto:mcarpenter@free.fr> for Ruby 1.9.2 compatibility
   and other improvements.
 
+* Pavel Lobashov (@ShockwaveNN) for Dockerfile to build cross-compiled Windows
+  extension (pull request #26).
+
 
 == COPYING
 

data/Rakefile

@@ -21,7 +21,6 @@ begin
       homepage:    :blackwinter,
       local_files: [mgc],
       extension:   {
-        cross_compile: false,
         with_cross_gnurx: lambda { |dir| [dir] },
         with_cross_magic: lambda { |dir| [src =
           File.join(dir, 'src'), File.join(src, '.libs')] }
@@ -33,3 +32,20 @@ begin
 rescue LoadError => err
   warn "Please install the `hen' gem. (#{err})"
 end
+
+namespace :docker do
+
+  name = "ruby-filemagic-gem-native:#{FileMagic::VERSION}"
+
+  task :build do
+    sh *%W[docker build -t #{name} .]
+  end
+
+  task :run do
+    sh *%W[docker run -it --rm -v #{Dir.pwd}/pkg:/ruby-filemagic/pkg #{name}]
+  end
+
+  desc "Build native gems using docker image #{name}"
+  task 'gem:native' => %w[build run]
+
+end

data/ext/filemagic/extconf.rb

@@ -3,12 +3,14 @@ require 'mkmf'
 HEADER_DIRS = [
   '/opt/local/include', # MacPorts
   '/usr/local/include', # compiled from source and Homebrew
+  '/opt/homebrew/include', # compiled from source and Homebrew (ARM based Macs)
   '/usr/include',       # system
 ]
 
 LIB_DIRS = [
   '/opt/local/lib', # MacPorts
   '/usr/local/lib', # compiled from source and Homebrew
+  '/opt/homebrew/lib', # compiled from source and Homebrew (ARM based Macs)
   '/usr/lib',       # system
 ]
 

data/lib/filemagic/version.rb

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

data/test/filemagic_test.rb

@@ -130,7 +130,10 @@ magic file from #{FileMagic.path}
     fm = FileMagic.new(FileMagic::MAGIC_NONE)
     res = silence_stderr { fm.check(path_to('perl.mgc')) }
     fm.close
-    assert(res)
+    assert(match_version(
+      0    => res,
+      5.39 => !res
+    ))
   end
 
   def test_compile
@@ -238,7 +241,8 @@ magic file from #{FileMagic.path}
     assert_equal(match_version(
       0    => 'application/vnd.ms-office',
       5.11 => 'application/msword',
-      5.14 => 'application/vnd.ms-office'
+      5.14 => 'application/vnd.ms-office',
+      5.39 => 'application/vnd.ms-excel'
     ), fm.file(path_to('excel-example.xls')))
   end
 

metadata

@@ -1,36 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ruby-filemagic
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Travis Whitton
 - Jens Wille
-autorequire: 
+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: 2017-07-02 00:00:00.000000000 Z
+cert_chain: []
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hen
@@ -38,20 +17,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +85,7 @@ extra_rdoc_files:
 files:
 - CONTRIBUTING.md
 - ChangeLog
+- Dockerfile
 - README
 - Rakefile
 - TODO
@@ -132,14 +112,15 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  ruby-filemagic-0.7.2 [2017-07-02]:
+  ruby-filemagic-0.7.3 [2022-01-07]:
 
-  * Fix segfault on <tt>buffer(nil)</tt> when compiled with GCC (pull request
-    #24 by Yuya Tanaka).
+  * Dockerfile to build native extension (pull request #26 by Pavel Lobashov).
+  * Include paths for ARM-based Apple Macs (Apple Silicon) (pull request #35 by
+    @545ch4).
 
 rdoc_options:
 - "--title"
-- ruby-filemagic Application documentation (v0.7.2)
+- ruby-filemagic Application documentation (v0.7.3)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -159,9 +140,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.2.5
+signing_key:
 specification_version: 4
 summary: Ruby bindings to the magic(4) library
 test_files: []
+...