charlock_holmes 0.6.2 → 0.6.3

data/.gitignore

@@ -1,4 +1,8 @@
 .bundle/
 tmp/
 vendor/
-*.bundle
+*.bundle
+ext/charlock_holmes/dst
+*.a
+ext/charlock_holmes/src/file-*
+ext/charlock_holmes/src/mkmf.log

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    charlock_holmes (0.6.2)
+    charlock_holmes (0.6.3)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -77,12 +77,12 @@ The first parameter is the content to transcode, the second is the source encodi
 
 ## Installing
 
-If the traditional `gem install charlock_holmes` doesn't work, you may need to specify the path to your installation of ICU and libmagic using the `--with-icu-dir` and/or `--with-magic-dir` option during the gem install.
+If the traditional `gem install charlock_holmes` doesn't work, you may need to specify the path to your installation of ICU using the `--with-icu-dir` option during the gem install.
 
-At the time of writing, Homebrew for OSX installs ICU (icu4c is the package name) and libmagic as keg-only installs so you'll have to specify the location during the gem install:
+At the time of writing, Homebrew for OSX installs ICU (icu4c is the package name) as a keg-only install so you'll have to specify the location during the gem install:
 
-`gem install charlock_holmes -- --with-icu-dir=/usr/local/Cellar/icu4c/4.4.1 --with-magic-dir=/usr/local/Cellar/libmagic/5.04`
+`gem install charlock_holmes -- --with-icu-dir=/usr/local/Cellar/icu4c/4.4.1`
 
 If you're using Bundler and need to specify a custom path(s), you can do so with the `bundle config` command:
 
-`bundle config build.charlock_holmes --with-icu-dir=/usr/local/Cellar/icu4c/4.4.1 --with-magic-dir=/usr/local/Cellar/libmagic/5.04`
+`bundle config build.charlock_holmes --with-icu-dir=/usr/local/Cellar/icu4c/4.4.1`

data/ext/charlock_holmes/extconf.rb

@@ -1,7 +1,45 @@
 require 'mkmf'
 
+CWD = File.expand_path(File.dirname(__FILE__))
+def sys(cmd)
+  puts "  -- #{cmd}"
+  unless ret = xsystem(cmd)
+    raise "#{cmd} failed, please report issue on http://github.com/brianmario/charlock_holmes"
+  end
+  ret
+end
+
+if `which make`.strip.empty?
+  STDERR.puts "\n\n"
+  STDERR.puts "***************************************************************************************"
+  STDERR.puts "*************** make required (apt-get install make build-essential) =( ***************"
+  STDERR.puts "***************************************************************************************"
+  exit(1)
+end
+
+unless File.exists?(CWD + '/libmagic_ext.a')
+  src = File.basename('file-5.08.tar.gz')
+  dir = File.basename(src, '.tar.gz')
+
+  Dir.chdir("#{CWD}/src") do
+    FileUtils.rm_rf(dir) if File.exists?(dir)
+
+    sys("tar zxvf #{src}")
+    Dir.chdir(dir) do
+      sys("./configure --prefix=#{CWD}/dst/ --disable-shared --enable-static")
+      sys("make")
+      sys("make install")
+    end
+  end
+
+  FileUtils.cp "#{CWD}/dst/lib/libmagic.a", "#{CWD}/libmagic_ext.a"
+end
+
+$INCFLAGS[0,0] = "-I#{CWD}/dst/include "
+$LDFLAGS << " -L#{CWD}"
+
 $CFLAGS << ' -Wall -funroll-loops'
-$CFLAGS << ' -Wextra -O0 -ggdb3' #if ENV['DEBUG']
+$CFLAGS << ' -Wextra -O0 -ggdb3' if ENV['DEBUG']
 
 dir_config 'icu'
 $CFLAGS  << ' -I/usr/local/Cellar/icu4c/4.4.1/include'
@@ -9,8 +47,6 @@ $LDFLAGS << ' -L/usr/local/Cellar/icu4c/4.4.1/lib'
 have_library 'icui18n'
 
 dir_config 'magic'
-$LDFLAGS << ' -L/usr/local/Cellar/libmagic/5.04/lib'
-$CFLAGS  << ' -I/usr/local/Cellar/libmagic/5.04/include'
-have_library 'magic'
+have_library 'magic_ext'
 
 create_makefile 'charlock_holmes'

data/lib/charlock_holmes/version.rb

@@ -1,3 +1,3 @@
 module CharlockHolmes
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: charlock_holmes
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Brian Lopez
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-30 00:00:00 -07:00
+date: 2011-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,6 +89,7 @@ files:
 - ext/charlock_holmes/encoding_detector.c
 - ext/charlock_holmes/ext.c
 - ext/charlock_holmes/extconf.rb
+- ext/charlock_holmes/src/file-5.08.tar.gz
 - lib/charlock_holmes.rb
 - lib/charlock_holmes/encoding_detector.rb
 - lib/charlock_holmes/string.rb