Permalink
Browse files

Better TS install instructions - newer gem versions.

  • Loading branch information...
1 parent 9e37528 commit fbd4dd929a3a16d876512cfe0e364025cdc79f55 @pat pat committed Dec 27, 2011
Showing with 8 additions and 6 deletions.
  1. +4 −2 ts/en/installing_thinking_sphinx.textile
  2. +4 −4 ts/en/rails3.textile
@@ -27,7 +27,7 @@ For Rails users, you'll need to add the gem to your configuration setup in @envi
{% highlight ruby %}
config.gem(
- 'thinking-sphinx', :version => '1.4.4'
+ 'thinking-sphinx', :version => '1.4.10'
)
{% endhighlight %}
@@ -60,6 +60,8 @@ If you've got @git@, but using one of the older versions of Rails, then things a
git clone \
git://github.com/freelancing-god/thinking-sphinx.git \
vendor/plugins/thinking_sphinx
+cd vendor/plugins/thinking_sphinx
+git checkout v1
{% endhighlight %}
And if you want to make sure it all gets committed to git as part of your main repository, don't forget to remove the plugin's .git directory.
@@ -74,7 +76,7 @@ If you don't have @git@ installed, all is not lost. You can either manually down
{% highlight sh %}
curl -L \
- http://github.com/freelancing-god/thinking-sphinx/tarball/master \
+ http://github.com/freelancing-god/thinking-sphinx/tarball/v1 \
-o thinking-sphinx.tar.gz
tar -xvf thinking-sphinx.tar.gz -C vendor/plugins
mv vendor/plugins/freelancing-god-thinking-sphinx* \
View
@@ -14,15 +14,15 @@ The 2.x releases of Thinking Sphinx will only support Rails 3 - not Rails 2 or e
In your Gemfile, you'll need to add the following:
{% highlight ruby %}
-gem 'thinking-sphinx', '2.0.5'
+gem 'thinking-sphinx', '2.0.10'
{% endhighlight %}
-Of course, you can point directly to the Git repository if you so desire - just make sure you're referencing the rails3 branch:
+Of course, you can point directly to the Git repository if you so desire - just make sure you're referencing a commit (probably the most recent) from the master branch:
{% highlight ruby %}
gem 'thinking-sphinx',
- :git => 'git://github.com/freelancing-god/thinking-sphinx.git',
- :branch => 'rails3'
+ :git => 'git://github.com/freelancing-god/thinking-sphinx.git',
+ :ref => '8f0e34b4a68494738d8dd5a1cb6bcf379adbf640'
{% endhighlight %}
You do _not_ need to put the extra @require@ statement in your Rakefile - Rails 3 can determine this automatically (well, when Thinking Sphinx tells it to).

0 comments on commit fbd4dd9

Please sign in to comment.