ruby-filemagic 0.7.1-x86-mswin32-60 → 0.7.2-x86-mswin32-60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 498431626772026317ebb090f420a0ef353459b8
-  data.tar.gz: 80d113af890a76aa5bf8e85a5fed42d74a10ecc1
+  metadata.gz: 2cef574160acd109563220ed3a88f1ef9425cf44
+  data.tar.gz: 534f06010567b2aa0b05066f44f8cbbf1bbad9f3
 SHA512:
-  metadata.gz: f9909d32739c020f4b1370fe716f8f7d383350f2674b9552755337dac7797c9c47025149d59adf611745b52f8581038bdd2387731bdb11c598253e06c22ce7eb
-  data.tar.gz: 09006527863a70969686a40134aa87a8edddef43e348404ee2d4b8c1292f2061d693ae551457f88f661edf17cce8c656444ff8973ceaf4c4a26011687af243b8
+  metadata.gz: 2e5d593039930dc1064b00bca6f41bff6bf5d57a615c0e1fb9a28a6166fa3568875986842e75cc93cb3fb49af896cd022428f204174d7b7a3f7651ae7549b52f
+  data.tar.gz: bd97e03d99176a9f33f6927e2a46a2bc438764342a96d1c4af3cf6781ff113b129eedf20bdcaa9f1616f4c98f04f6b7b741a0c5171ec5b7d10444bd6f2d5ee95

data/ChangeLog

@@ -2,6 +2,15 @@
 
 = Revision history for ruby-filemagic
 
+== 0.7.3 [unreleased]
+
+* Dockerfile to build native extension (pull request #26 by Pavel Lobashov).
+
+== 0.7.2 [2017-07-02]
+
+* Fix segfault on <tt>buffer(nil)</tt> when compiled with GCC (pull request
+  #24 by Yuya Tanaka).
+
 == 0.7.1 [2015-10-27]
 
 * List default lib and header directories (pull request #18 by Adam Wróbel).

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.1
+This documentation refers to filemagic version 0.7.2
 
 
 == DESCRIPTION
@@ -38,24 +38,33 @@ FileMagic extension module. See also libmagic(3), file(1) and magic(4).
   require 'filemagic'
 
   p FileMagic::VERSION
+  # => "0.7.2"
   p FileMagic::MAGIC_VERSION
+  # => "5.28"
 
   p FileMagic.new.flags
+  # => []
 
   FileMagic.open(:mime) { |fm|
     p fm.flags
+    # => [:mime_type, :mime_encoding]
     p fm.file(__FILE__)
+    # => "text/plain; charset=us-ascii"
     p fm.file(__FILE__, true)
+    # => "text/plain"
 
     fm.flags = [:raw, :continue]
     p fm.flags
+    # => [:continue, :raw]
   }
 
   fm = FileMagic.new
   p fm.flags
+  # => []
 
   mime = FileMagic.mime
   p mime.flags
+  # => [:mime_type, :mime_encoding]
 
 === Environment
 
@@ -74,6 +83,11 @@ 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
 
@@ -95,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

@@ -32,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/filemagic.c

@@ -112,6 +112,7 @@ rb_magic_init(int argc, VALUE *argv, VALUE self) {
 
   rb_iv_set(self, "iflags", flags);
   rb_iv_set(self, "closed", Qfalse);
+  rb_iv_set(self, "@simplified", Qfalse);
 
   keys = rb_funcall(options, rb_intern("keys"), 0);
 

data/ext/filemagic/filemagic.h

@@ -18,9 +18,9 @@
   }\
 }
 
-#define RB_MAGIC_TYPE_FILE       magic_file(ms, StringValuePtr(arg))
-#define RB_MAGIC_TYPE_BUFFER     magic_buffer(ms, StringValuePtr(arg), RSTRING_LEN(arg))
-#define RB_MAGIC_TYPE_DESCRIPTOR magic_descriptor(ms, NUM2INT(arg))
+#define RB_MAGIC_TYPE_FILE       type = magic_file(ms, StringValuePtr(arg));
+#define RB_MAGIC_TYPE_BUFFER     { char *arg_str = StringValuePtr(arg); type = magic_buffer(ms, arg_str, RSTRING_LEN(arg)); }
+#define RB_MAGIC_TYPE_DESCRIPTOR type = magic_descriptor(ms, NUM2INT(arg));
 
 #define RB_MAGIC_TYPE(what, WHAT) \
 static VALUE \
@@ -32,7 +32,8 @@ rb_magic_##what(int argc, VALUE *argv, VALUE self) {\
   rb_scan_args(argc, argv, "11", &arg, &simple);\
   GetMagicSet(self, ms);\
 \
-  if ((type = RB_MAGIC_TYPE_##WHAT) == NULL) {\
+  RB_MAGIC_TYPE_##WHAT\
+  if (type == NULL) {\
     rb_raise(rb_FileMagicError, "failed lookup: %s", magic_error(ms));\
   }\
 \

data/lib/filemagic/version.rb

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

data/test/filemagic_test.rb

@@ -62,6 +62,12 @@ magic file from #{FileMagic.path}
     assert_equal('POSIX shell script, ASCII text executable', res)
   end
 
+  def test_nil_buffer
+    fm = FileMagic.new(FileMagic::MAGIC_NONE)
+    assert_raise(TypeError) { fm.buffer(nil) }
+    fm.close
+  end
+
   def test_descriptor
     fm = FileMagic.new(FileMagic::MAGIC_NONE)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-filemagic
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: x86-mswin32-60
 authors:
 - Travis Whitton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hen
@@ -20,7 +20,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +84,7 @@ extra_rdoc_files:
 files:
 - CONTRIBUTING.md
 - ChangeLog
+- Dockerfile
 - README
 - Rakefile
 - TODO
@@ -91,10 +92,8 @@ files:
 - ext/filemagic/filemagic.c
 - ext/filemagic/filemagic.h
 - lib/filemagic.rb
-- lib/filemagic/1.9/ruby_filemagic.so
-- lib/filemagic/2.0/ruby_filemagic.so
-- lib/filemagic/2.1/ruby_filemagic.so
-- lib/filemagic/2.2/ruby_filemagic.so
+- lib/filemagic/2.3/ruby_filemagic.so
+- lib/filemagic/2.4/ruby_filemagic.so
 - lib/filemagic/ext.rb
 - lib/filemagic/magic.mgc
 - lib/filemagic/version.rb
@@ -114,13 +113,14 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  ruby-filemagic-0.7.1 [2015-10-27]:
+  ruby-filemagic-0.7.2 [2017-07-02]:
 
-  * List default lib and header directories (pull request #18 by Adam Wróbel).
+  * Fix segfault on <tt>buffer(nil)</tt> when compiled with GCC (pull request
+    #24 by Yuya Tanaka).
 
 rdoc_options:
 - "--title"
-- ruby-filemagic Application documentation (v0.7.1)
+- ruby-filemagic Application documentation (v0.7.2)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -133,7 +133,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.3'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -141,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Ruby bindings to the magic(4) library