ferret 0.1.2 → 0.1.3

data/README

@@ -12,7 +12,11 @@ search for things in them later.
 
 == Installation
 
-De-compress the archive and enter its top directory.
+If you have gems installed you can simple do;
+
+  gem install ferret
+
+Otherwise, de-compress the archive and enter its top directory.
 
   tar zxpvf ferret-0.1.tar.gz
   cd ferret-0.1
@@ -20,14 +24,7 @@ De-compress the archive and enter its top directory.
 Run the setup config;
 
   $ ruby setup.rb config
-
-Then to compile the C extension (optional) type:
-
   $ ruby setup.rb setup
-
-If you don't have a C compiler, never mind. Just go straight to the next step.
-On *nix you'll need to run this with root privalages. Type;
-
   # ruby setup.rb install
   
 These simple steps install ferret in the default location of Ruby libraries.

data/Rakefile

@@ -196,7 +196,7 @@ end
 
 desc "Make a new release"
 task :prerelease => [:clobber, :all_tests, :parsers]
-task :package => [:prerelease]
+#task :package => [:prerelease]
 task :tag => [:prerelease]
 task :update_version => [:prerelease]
 task :release => [:tag, :update_version, :package] do

data/ext/extconf.rb

@@ -1,3 +1,15 @@
 # extconf.rb for Ferret extensions
-require 'mkmf'
-create_makefile("ferret_ext")
+if (/mswin/ =~ RUBY_PLATFORM) and ENV['make'].nil?
+  File.open('Makefile', "w") {}
+  begin
+    `nmake`
+    require 'mkmf'
+    create_makefile("ferret_ext")
+  rescue => error
+    require 'fileutils'
+    FileUtils.copy('dummy.exe', 'nmake.exe')
+  end
+else
+  require 'mkmf'
+  create_makefile("ferret_ext")
+end

data/lib/ferret.rb

@@ -22,7 +22,7 @@
 #++
 # :include: ../TUTORIAL
 module Ferret
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end
 
 require 'ferret/utils'

data/lib/ferret/search/index_searcher.rb

@@ -17,7 +17,7 @@ module Ferret::Search
       elsif arg.is_a?(Ferret::Store::Directory)
         @reader = IndexReader.open(arg)
       elsif arg.is_a?(String)
-        @dir = Ferret::Store::FSDirectory.open(arg)
+        @dir = Ferret::Store::FSDirectory.new(arg, true)
         @reader = IndexReader.open(@dir, true)
       else
         raise ArgumentError, "Unknown argument passed to initialize IndexReader"

data/setup.rb

@@ -663,6 +663,8 @@ module FileOperations
   
   def make(task = nil)
     command(*[config('makeprog'), task].compact)
+  rescue => e
+    puts "The C extensions were not installed. But don't worry. Everything should work fine"
   end
 
   def extdir?(dir)
@@ -1235,6 +1237,8 @@ class Installer
 
   def extconf
     ruby "#{curr_srcdir()}/extconf.rb", *@config.config_opt
+  rescue => e
+    puts "The C extensions could not be installed"
   end
 
   def config_dir_data(rel)
@@ -1344,7 +1348,7 @@ class Installer
   def rubyextentions(dir)
     ents = glob_select("*.#{@config.dllext}", targetfiles())
     if ents.empty?
-      setup_rb_error "no ruby extention exists: 'ruby #{$0} setup' first"
+      puts "no ruby extention exists: 'ruby #{$0} setup' first"
     end
     ents
   end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ferret
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 date: 2005-10-25 00:00:00 +09:00
 summary: Ruby indexing library.
 require_paths: 
@@ -47,6 +47,7 @@ files:
   - ext/ferret.h
   - ext/util.c
   - ext/tags
+  - ext/dummy.exe
   - lib/ferret.rb
   - lib/ferret/analysis.rb
   - lib/ferret/document.rb