charlock_holmes 0.6.6 → 0.6.7

data/Gemfile.lock

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

data/README.md

@@ -70,7 +70,7 @@ Being able to detect the encoding of some arbitrary content is nice, but what yo
 ``` ruby
 content = File.read('test2.txt')
 detection = CharlockHolmes::EncodingDetector.detect(content)
-utf8_encoded_content CharlockHolmes::Converter.convert content, detection[:encoding], 'UTF-8'
+utf8_encoded_content = CharlockHolmes::Converter.convert content, detection[:encoding], 'UTF-8'
 ```
 
 The first parameter is the content to transcode, the second is the source encoding (the encoding the content is assumed to be in), and the third parameter is the destination encoding.

data/ext/charlock_holmes/extconf.rb

@@ -17,6 +17,38 @@ if `which make`.strip.empty?
   exit(1)
 end
 
+##
+# ICU dependency
+#
+
+dir_config 'icu'
+
+# detect homebrew installs
+if !have_library 'icui18n'
+  base = if !`which brew`.empty?
+    `brew --prefix`.strip
+  elsif File.exists?("/usr/local/Cellar/icu4c")
+    '/usr/local/Cellar'
+  end
+
+  if base and icu4c = Dir[File.join(base, 'Cellar/icu4c/*')].sort.last
+    $INCFLAGS << " -I#{icu4c}/include "
+    $LDFLAGS  << " -L#{icu4c}/lib "
+  end
+end
+
+unless have_library 'icui18n' and have_header 'unicode/ucnv.h'
+  STDERR.puts "\n\n"
+  STDERR.puts "***************************************************************************************"
+  STDERR.puts "*********** icu required (brew install icu4c or apt-get install libicu-dev) ***********"
+  STDERR.puts "***************************************************************************************"
+  exit(1)
+end
+
+##
+# libmagic dependency
+#
+
 src = File.basename('file-5.08.tar.gz')
 dir = File.basename(src, '.tar.gz')
 
@@ -33,18 +65,19 @@ end
 
 FileUtils.cp "#{CWD}/dst/lib/libmagic.a", "#{CWD}/libmagic_ext.a"
 
-$INCFLAGS[0,0] = "-I#{CWD}/dst/include "
-$LDFLAGS << " -L#{CWD}"
+$INCFLAGS[0,0] = " -I#{CWD}/dst/include "
+$LDFLAGS << " -L#{CWD} "
+
+dir_config 'magic'
+unless have_library 'magic_ext' and have_header 'magic.h'
+  STDERR.puts "\n\n"
+  STDERR.puts "***************************************************************************************"
+  STDERR.puts "********* error compiling and linking libmagic. please report issue on github *********"
+  STDERR.puts "***************************************************************************************"
+  exit(1)
+end
 
 $CFLAGS << ' -Wall -funroll-loops'
 $CFLAGS << ' -Wextra -O0 -ggdb3' if ENV['DEBUG']
 
-dir_config 'icu'
-$CFLAGS  << ' -I/usr/local/Cellar/icu4c/4.4.1/include'
-$LDFLAGS << ' -L/usr/local/Cellar/icu4c/4.4.1/lib'
-have_library 'icui18n'
-
-dir_config 'magic'
-have_library 'magic_ext'
-
 create_makefile 'charlock_holmes'

data/lib/charlock_holmes/version.rb

@@ -1,3 +1,3 @@
 module CharlockHolmes
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: charlock_holmes
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 6
-  - 6
-  version: 0.6.6
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - Brian Lopez
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-01 00:00:00 -07:00
+date: 2011-09-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency