glongman-ffiruby-filemagic 0.3.4 → 0.4.0

data/README

@@ -24,6 +24,7 @@ Make sure you have the magic(4) library installed.
 
 After Install:
 
+> sudo ffi_file_magic_setup
 > irb
 >> require 'ffi_file_magic'
 => true
@@ -35,19 +36,18 @@ After Install:
 
 Install Problems?
  
-If the gem complains that it can't find the magic library you can run the setup.rb file
-in the root of the gem
+If the gem complains that it can't find the magic library you can run this tool:
 
-> sudo ruby /path/to/ffiruby-filemagic/setup.rb    (where is the gem? 'gem contents ffiruby-filemagic')
+> sudo ffi_file_magic_setup
 
-Without any arguments setup.rb will look around the filesystem for a magic library and test to see if
+Without any arguments the tool will look around the filesystem for a magic library and test to see if
 that library is compatible. If so a small modification will be made so the gem will work.
 
-You can run setup.rb more than once. 
+You can run the tool more than once. 
 
-you can also tell setup.rb exactly where to look for the magic libary
+you can also tell it exactly where to look for the magic libary
 
-> sudo ruby /path/to/ffiruby-filemagic/setup.rb --with-magic-lib=/opt/local/lib
+> sudo ffi_file_magic_setup --with-magic-lib=/opt/local/lib
 
 This gem has been tested with the magic library shipped with File 4.26 from ftp://ftp.astron.com/pub/file
 
@@ -55,7 +55,7 @@ On OSX, and at the time of writing this, you can get file using macports (http:/
 
 > sudo port install file
 
-On other Unix variants, download the source, build and install. then run setup.rb
+On other Unix variants, download the source, build and install. then run the tool again
 
 COPYRIGHT
 =========

data/Rakefile

@@ -13,7 +13,9 @@ begin
     s.description = %Q{new implementation of the ancient ruby-filemagic gem. Uses FFI to talk to native library}
     s.authors = ["Geoff Longman"]
     s.add_dependency 'ffi'
-    s.files =  FileList["setup.rb", "[A-Z]*", "{lib,test}/**/*"]
+    s.executables = ["ffi_file_magic_setup"]
+    s.files =  FileList["setup.rb", "[A-Z]*", "{lib,bin,test}/**/*"]
+    s.post_install_message = "\n\nrun ffi_file_magic_setup to complete the install\n\n\n"
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 4
+:patch: 0
 :major: 0
-:minor: 3
+:minor: 4

data/{setup.rb → bin/ffi_file_magic_setup}

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'optparse'
 require "rubygems"
 require "ffi"
@@ -90,6 +91,12 @@ unless dylib
 |     > port install file                                                    |
 |                                                                            |
 | Others - build file from source - ftp://ftp.astron.com/pub/file/           |
+|                                                                            |
+| Or:                                                                        |
+| you can run this tool with an option to force the location of the library: |
+|                                                                            |
+| > ffi_file_magic_setup --with-magic-lib=/opt/local/lib                     |
+|                                                                            |
 +----------------------------------------------------------------------------+
 END_FAIL
 end
@@ -100,8 +107,19 @@ class FFIFileMagic
     module LoadLibrary
       def self.included(base)
         base.class_eval do
-          # setup.rb found this library as suitable
-          ffi_lib '#{dylib.name}'
+          begin
+            # the ffi_file_magic_setup tool once found this library as suitable
+            ffi_lib '#{dylib.name}'
+          rescue LoadError
+              puts <<END_LOAD_ERROR
++--------------------------------------------+
+| I was unable to load the magic library.    |
+|                                            |
+| Try running the ffi_file_magic_setup tool  |
++--------------------------------------------+            
+END_LOAD_ERROR
+            raise
+          end
         end
       end
     end
@@ -111,7 +129,7 @@ END_TEMPLATE
 
 if dylib
   print "writing path #{dylib.name} into lib/ffi_file_magic/load_library.rb ...."
-  load_library = File.expand_path(File.dirname(__FILE__) + '/lib/ffi_file_magic/load_library.rb')
+  load_library = File.expand_path(File.dirname(__FILE__) + '/../lib/ffi_file_magic/load_library.rb')
   File.open(load_library, 'w') do |file|
     file.write template
   end

data/lib/ffi_file_magic/load_library.rb

@@ -3,8 +3,18 @@ class FFIFileMagic
     module LoadLibrary
       def self.included(base)
         base.class_eval do
-          # setup.rb found this library as suitable
-          ffi_lib '/opt/local/lib/libmagic.dylib'
+          begin
+            ffi_lib 'magic'
+          rescue LoadError
+            puts <<END_LOAD_ERROR
++--------------------------------------------+
+| I was unable to load the magic library.    |
+|                                            |
+| Try running the ffi_file_magic_setup tool  |
++--------------------------------------------+            
+END_LOAD_ERROR
+            raise
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: glongman-ffiruby-filemagic
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors: 
 - Geoff Longman
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-21 00:00:00 -08:00
-default_executable: 
+date: 2009-02-23 00:00:00 -08:00
+default_executable: ffi_file_magic_setup
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
@@ -24,8 +24,8 @@ dependencies:
     version: 
 description: new implementation of the ancient ruby-filemagic gem. Uses FFI to talk to native library
 email: glongman@overlay.tv
-executables: []
-
+executables: 
+- ffi_file_magic_setup
 extensions: []
 
 extra_rdoc_files: []
@@ -40,6 +40,7 @@ files:
 - lib/ffi_file_magic/ffi_file_magic.rb
 - lib/ffi_file_magic/load_library.rb
 - lib/ffi_file_magic.rb
+- bin/ffi_file_magic_setup
 - test/ffiruby_filemagic_test.rb
 - test/leaktest.rb
 - test/perl
@@ -48,7 +49,12 @@ files:
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/glongman/ffiruby-filemagic
-post_install_message: 
+post_install_message: |+
+  
+  
+  run ffi_file_magic_setup to complete the install
+  
+  
 rdoc_options: 
 - --inline-source
 - --charset=UTF-8