acts_as_ferret 0.4.6 → 0.4.7

data/README

@@ -13,45 +13,32 @@ http://j-k.lighthouseapp.com/projects/45560-acts-as-ferret
 
 == Installation
 
-Aaf is available via git from rubyforge.org and github.com. Github also offers
-tarball downloads, check out http://github.com/jkraemer/acts_as_ferret/tree/master .
+Aaf is available as a gem (gem install acts_as_ferret), or via git from github.com.
+Github also offers tarball downloads, check out
+http://github.com/jkraemer/acts_as_ferret/tree/master .
 
-=== Installation inside your Rails > 2.1 project via gem management
+=== Set up your Rails > 2.1 project to use the acts_as_ferret gem.
 
-Add this to your projects config/environment.rb:
+Add this to your project's config/environment.rb:
 
-<tt>config.gem 'acts_as_ferret', :version => '~> 0.4.4'</tt>
+<tt>config.gem 'acts_as_ferret', :version => '~> 0.4.7'</tt>
 
-Or, use github:
+With Rails 3 of course instead you have to update your Gemfile, but I guess you already knew that ;-) 
+With the gem installed, change into your RAILS_ROOT and run the supplied aaf_install script.
+This will copy rake tasks, capistrano recipes and the ferret server config and startup script
+into your project.
 
-<tt>config.gem 'jkraemer-acts_as_ferret', :version => '~> 0.4.4', :lib => 'acts_as_ferret', :source => 'http://gems.github.com'"</tt>
+In order to have the capistrano recipe loaded you'll have to patch your Capfile a bit. I use to have
+a line like that in my Capfiles, loading everything found below RAILS_ROOT/lib/recipes:
 
-=== Installation inside your Rails project via script/plugin
-
-script/plugin install git://github.com/jkraemer/acts_as_ferret.git
-
-The rubyforge repository is located at git://rubyforge.org/actsasferret.git
-
-=== Old SVN repository
+<tt>Dir['lib/recipes/**/*.rb'].each { |plugin| load(plugin) }</tt>
 
-In november 2008 I stopped updating the svn repository that has been the main
-repository for aaf for several years. In case you want to retrieve any of the
-older versions of the plugin, it's still there at
 
-svn://code.jkraemer.net/acts_as_ferret/
-
-=== System-wide installation with Rubygems
-
-<tt>sudo gem install acts_as_ferret</tt>
-
-To use acts_as_ferret in your project, add the following line to the end of your
-project's config/environment.rb:
+=== Installation inside your Rails project via script/plugin
 
-<tt>require 'acts_as_ferret'</tt>
+script/plugin install git://github.com/jkraemer/acts_as_ferret.git
 
-Call the aaf_install script that came with the gem inside your project
-directory to install the sample config file and the drb server start/stop
-script.
+No additional setup needed.
 
 
 == Usage

data/acts_as_ferret.gemspec

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 6
-  version: 0.4.6
+  - 7
+  version: 0.4.7
 platform: ruby
 authors: 
 - Jens Kraemer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-29 00:00:00 +02:00
+date: 2010-07-06 13:50:00 +02:00
 default_executable: aaf_install
 dependencies: 
 - !ruby/object:Gem::Dependency 

data/bin/aaf_install

@@ -5,20 +5,25 @@ require 'fileutils'
 
 @basedir = File.join(File.dirname(__FILE__), '..')
 
-def install(dir, file, executable=false)
-  puts "Installing: #{file}"
-  target = File.join('.', dir, file)
+def install(src, target_dir, executable=false)
+  puts "Installing: #{src}"
+  src = File.join(@basedir, src)
+  fname = File.basename(src)
+  target = File.join(target_dir, fname)
   if File.exists?(target)
     puts "#{target} already exists, skipping"
   else
-    FileUtils.cp File.join(@basedir, dir, file), target
+    FileUtils.mkdir_p target_dir
+    FileUtils.cp src, target
     FileUtils.chmod 0755, target if executable
   end
 end
 
 
-install 'script', 'ferret_server', true
-install 'config', 'ferret_server.yml'
+install 'script/ferret_server', 'script', true
+install 'config/ferret_server.yml', 'config'
+install 'tasks/ferret.rake', 'lib/tasks'
+install 'recipes/aaf_recipes.rb', 'lib/recipes'
 
 puts IO.read(File.join(@basedir, 'README'))
 

data/lib/instance_methods.rb

@@ -103,7 +103,7 @@ module ActsAsFerret #:nodoc:
       end
       true # signal success to AR
     end
-    alias :ferret_update :ferret_create
+    def ferret_update; ferret_create end
     
 
     # remove from index

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 6
-  version: 0.4.6
+  - 7
+  version: 0.4.7
 platform: ruby
 authors: 
 - Jens Kraemer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-29 00:00:00 +02:00
+date: 2010-07-06 13:50:00 +02:00
 default_executable: aaf_install
 dependencies: 
 - !ruby/object:Gem::Dependency