tasks.rb in ts-resque-delta-1.2.0

- old
+ new
@@ -1,68 +1,26 @@
 require 'thinking_sphinx/deltas/resque_delta'
 
 namespace :thinking_sphinx do
-
-  # Return a list of index prefixes (i.e. without "_core"/"_delta").
-  def sphinx_indices
-    unless @sphinx_indices
-      @ts_config ||= ThinkingSphinx::Configuration.instance
-      @ts_config.generate
-      @sphinx_indices = @ts_config.configuration.indices.collect { |i| i.name }
-      # The collected indices look like:
-      # ["foo_core", "foo_delta", "foo", "bar_core", "bar_delta", "bar"]
-      @sphinx_indices.reject! { |i| i =~ /_(core|delta)$/}
-      # Now we have:
-      # ["foo", "bar"]
-    end
-    @sphinx_indices
-  end
-
-  def lock_delta(index_name)
-    ThinkingSphinx::Deltas::ResqueDelta.lock("#{index_name}_delta")
-  end
-
-  def unlock_delta(index_name)
-    ThinkingSphinx::Deltas::ResqueDelta.unlock("#{index_name}_delta")
-  end
-
   desc 'Lock all delta indices (Resque will not run indexer or place new jobs on the :ts_delta queue).'
   task :lock_deltas do
-    sphinx_indices.each { |index_name| lock_delta(index_name) }
+    ThinkingSphinx::Deltas::ResqueDelta::CoreIndex.new.lock_deltas
   end
 
   desc 'Unlock all delta indices.'
   task :unlock_deltas do
-    sphinx_indices.each { |index_name| unlock_delta(index_name) }
+    ThinkingSphinx::Deltas::ResqueDelta::CoreIndex.new.unlock_deltas
   end
 
   desc 'Like `rake thinking_sphinx:index`, but locks one index at a time.'
   task :smart_index => :app_env do
-    # Load config like ts:in.
-    @ts_config = ThinkingSphinx::Configuration.instance
-    unless ENV['INDEX_ONLY'] == 'true'
-      puts "Generating Configuration to #{@ts_config.config_file}"
-      @ts_config.build
-    end
-    FileUtils.mkdir_p(@ts_config.searchd_file_path)
+    ret = ThinkingSphinx::Deltas::ResqueDelta::CoreIndex.new.smart_index
 
-    # Index each core, one at a time. Wrap with delta locking logic.
-    sphinx_indices.each do |index_name|
-      lock_delta(index_name)
-      @ts_config.controller.index("#{index_name}_core", :verbose => true)
-      ret = $?
-      unlock_delta(index_name)
-      exit(-1) if ret.to_i != 0
-      Resque.enqueue(
-        ThinkingSphinx::Deltas::ResqueDelta::DeltaJob,
-        ["#{index_name}_delta"]
-      )
-    end
+    abort("Indexing failed.") if ret != true
   end
 end
 
 namespace :ts do
-
   desc 'Like `rake thinking_sphinx:index`, but locks one index at a time.'
   task :si => 'thinking_sphinx:smart_index'
 end
 
 unless Rake::Task.task_defined?('thinking_sphinx:index')