flying-sphinx 0.7.1 → 0.8.0

data/HISTORY

@@ -1,5 +1,7 @@
-0.7.1 - 10th December 2012
-* Daemon actions (start/stop) are now asynchronous.
+0.8.0 - 25th August 2012
+* Making the executable the main command entry point.
+* Adding a 'flying-sphinx' executable to match Python and Node.js clients.
+* Removing support for accessing Heroku's shared databases through an SSH tunnel.
 
 0.7.0 - 16th July 2012
 * Print the indexing log.

data/README.textile

@@ -11,7 +11,7 @@ This is all covered pretty well on "the Flying Sphinx site":http://flying-sphinx
 
 h2. Compatibility and Limitations
 
-Flying Sphinx is built with support for Rails 2.3.6 and beyond. Sadly, earlier versions of Rails aren't supported due to a requirement of a recent version of Rack deep in the dependency tree. It's not tested against Rails 3.1 at this time, but in theory should work fine. Let me know if I'm wrong!
+Flying Sphinx is built with support for Rails 2.3.6 and beyond. Sadly, earlier versions of Rails aren't supported due to a requirement of a recent version of Rack deep in the dependency tree.
 
 It works with Rails 1.8.7 and 1.9.2, and on both Heroku's Bamboo and Cedar stacks. You _do_ need to use it with Heroku at this point - allowing others hosting elsewhere to use Flying Sphinx is something I'm considering, but it's not possible right now.
 
@@ -36,4 +36,4 @@ h2. Contributors
 
 h2. Licence
 
-Copyright © 2011 Pat Allan, released under an MIT licence.
+Copyright © 2011-2012 Pat Allan, released under an MIT licence.

data/bin/flying-sphinx

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+# -*- mode: ruby -*-
+
+require 'flying_sphinx'
+FlyingSphinx::CLI.new(ARGV.first, ARGV[1..-1]).run

data/flying-sphinx.gemspec

@@ -15,12 +15,10 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ['lib']
-
-  s.rubygems_version = %q{1.3.7}
+  s.executables   = ['flying-sphinx']
 
   s.add_runtime_dependency 'thinking-sphinx',    ['>= 0']
   s.add_runtime_dependency 'riddle',             ['>= 1.5.0']
-  s.add_runtime_dependency 'net-ssh',            ['>= 2.0.23']
   s.add_runtime_dependency 'multi_json',         ['>= 1.0.1']
   s.add_runtime_dependency 'faraday_middleware', ['~> 0.7']
   s.add_runtime_dependency 'rash',               ['~> 0.3.0']

data/lib/flying_sphinx/cli.rb

@@ -0,0 +1,67 @@
+class FlyingSphinx::CLI
+  COMMANDS = {
+    'configure' => [:configure],
+    'index'     => [:index],
+    'setup'     => [:configure, :index],
+    'start'     => [:start],
+    'stop'      => [:stop],
+    'restart'   => [:stop, :start],
+    'rebuild'   => [:stop, :index, :start]
+  }
+
+  def initialize(command, arguments = [])
+    @command, @arguments = command, arguments
+  end
+
+  def run
+    methods = COMMANDS[@command]
+    raise "Unknown command #{@command}" if methods.nil?
+
+    methods.all? { |method| send method }
+  end
+
+  private
+
+  def configuration
+    @configuration ||= FlyingSphinx::Configuration.new
+  end
+
+  def configure
+    if @arguments.empty?
+      FlyingSphinx::SphinxConfiguration.new.upload_to configuration.api
+      FlyingSphinx::SettingFiles.new.upload_to configuration.api
+    else
+      FlyingSphinx::SphinxConfiguration.new.upload_file_to configuration.api,
+        @arguments.first
+    end
+
+    puts "Sent configuration to Sphinx"
+    true
+  end
+
+  def index
+    FlyingSphinx::IndexRequest.cancel_jobs
+
+    request = FlyingSphinx::IndexRequest.new @arguments
+    request.index
+    puts request.status_message
+
+    true
+  end
+
+  def start
+    if configuration.start_sphinx
+      puts "Started Sphinx"
+      true
+    else
+      puts "Sphinx failed to start... have you indexed first?"
+      false
+    end
+  end
+
+  def stop
+    configuration.stop_sphinx
+    puts "Stopped Sphinx"
+    true
+  end
+end

data/lib/flying_sphinx/configuration.rb

@@ -13,11 +13,11 @@ class FlyingSphinx::Configuration
   end
 
   def start_sphinx
-    change 'starting', 'started'
+    api.post('start').success?
   end
 
   def stop_sphinx
-    change 'stopping', 'stopped'
+    api.post('stop').success?
   end
 
   def client_key
@@ -33,18 +33,6 @@ class FlyingSphinx::Configuration
   private
 
   attr_reader :identifier, :api_key
-  
-  def change(initial, expected)
-    api.post(initial)
-
-    response = api.get('daemon')
-    while response.body.status == initial
-      sleep 0.5
-      response = api.get('daemon')
-    end
-
-    response.body.status == expected
-  end
 
   def set_from_server
     response = api.get '/'

data/lib/flying_sphinx/index_request.rb

@@ -28,11 +28,11 @@ class FlyingSphinx::IndexRequest
     "#{self.class.name} for #{indices.join(', ')}"
   end
 
-  def update_and_index
-    FlyingSphinx::SphinxConfiguration.new.upload_to api, tunnel?
-    FlyingSphinx::SettingFiles.new.upload_to api
-
-    index
+  def index
+    begin_request
+    while !request_complete?
+      sleep 3
+    end
   end
 
   def status_message
@@ -67,35 +67,6 @@ class FlyingSphinx::IndexRequest
     @configuration ||= FlyingSphinx::Configuration.new
   end
 
-  def index
-    if tunnel?
-      tunnelled_index
-    else
-      direct_index
-    end
-  rescue Net::SSH::Exception => err
-    # Server closed the connection on us. That's (hopefully) expected, nothing
-    # to worry about.
-    puts "SSH/Indexing Error: #{err.message}" if log?
-  rescue RuntimeError => err
-    puts err.message
-  end
-
-  def tunnelled_index
-    FlyingSphinx::Tunnel.connect(configuration) do
-      begin_request unless request_begun?
-
-      true
-    end
-  end
-
-  def direct_index
-    begin_request
-    while !request_complete?
-      sleep 3
-    end
-  end
-
   def begin_request
     response = api.post 'indices', :indices => indices.join(',')
 
@@ -129,24 +100,7 @@ class FlyingSphinx::IndexRequest
     @request.status
   end
 
-  def tunnel?
-    FlyingSphinx::Tunnel.required?
-  end
-
-  def cancel_request
-    return if index_id.nil?
-
-    puts "Connecting Flying Sphinx to the Database failed"
-    puts "Cancelling Index Request..."
-
-    api.put("indices/#{index_id}", :status => 'CANCELLED')
-  end
-
   def api
     configuration.api
   end
-
-  def log?
-    ENV['VERBOSE_LOGGING'] && ENV['VERBOSE_LOGGING'].length > 0
-  end
 end

data/lib/flying_sphinx/sphinx_configuration.rb

@@ -3,11 +3,16 @@ class FlyingSphinx::SphinxConfiguration
     @thinking_sphinx = thinking_sphinx
   end
 
-  def upload_to(api, tunnel = false)
+  def upload_to(api)
     api.put '/',
       :configuration  => content,
-      :sphinx_version => thinking_sphinx.version,
-      :tunnel         => tunnel.to_s
+      :sphinx_version => thinking_sphinx.version
+  end
+
+  def upload_file_to(api, path)
+    api.put '/',
+      :configuration  => File.read(path),
+      :sphinx_version => '2.0.4'
   end
 
   private

data/lib/flying_sphinx/tasks.rb

@@ -1,30 +1,23 @@
 namespace :fs do
   task :index => :environment do
-    puts "Starting Index Request"
-    FlyingSphinx::IndexRequest.cancel_jobs
-    request = FlyingSphinx::IndexRequest.new
-    request.update_and_index
-    puts request.status_message
+    FlyingSphinx::CLI.new('setup').run
   end
 
   task :start => :environment do
-    puts "Starting Sphinx..."
-
-    if FlyingSphinx::Configuration.new.start_sphinx
-      puts "Started Sphinx"
-    else
-      puts "Sphinx failed to start... have you indexed first?"
-    end
+    FlyingSphinx::CLI.new('start').run
   end
 
   task :stop  => :environment do
-    puts "Stopping Sphinx..."
-    FlyingSphinx::Configuration.new.stop_sphinx
-    puts "Stopped Sphinx"
+    FlyingSphinx::CLI.new('stop').run
+  end
+
+  task :restart => :environment do
+    FlyingSphinx::CLI.new('restart').run
   end
 
-  task :restart => [:environment, :stop, :start]
-  task :rebuild => [:environment, :stop, :index, :start]
+  task :rebuild => :environment do
+    FlyingSphinx::CLI.new('rebuild').run
+  end
 
   task :index_log => :environment do
     FlyingSphinx::IndexRequest.output_last_index

data/lib/flying_sphinx/version.rb

@@ -1,3 +1,3 @@
 module FlyingSphinx
-  Version = '0.7.1'
+  Version = '0.8.0'
 end

data/lib/flying_sphinx.rb

@@ -4,20 +4,23 @@ end
 
 require 'faraday'
 require 'faraday_middleware'
-require 'net/ssh'
+require 'riddle'
 require 'riddle/0.9.9'
 
 require 'flying_sphinx/api'
+require 'flying_sphinx/cli'
 require 'flying_sphinx/configuration'
-require 'flying_sphinx/delayed_delta'
 require 'flying_sphinx/flag_as_deleted_job'
-require 'flying_sphinx/heroku_shared_adapter'
 require 'flying_sphinx/index_request'
 require 'flying_sphinx/setting_files'
 require 'flying_sphinx/sphinx_configuration'
-require 'flying_sphinx/tunnel'
 require 'flying_sphinx/version'
 
+if defined?(ThinkingSphinx)
+  require 'flying_sphinx/delayed_delta'
+  require 'flying_sphinx/heroku_shared_adapter'
+end
+
 if defined?(Rails) && defined?(Rails::Railtie)
   require 'flying_sphinx/railtie'
 elsif defined?(Rails)

data/spec/light_spec_helper.rb

@@ -1,6 +1,8 @@
 require 'bundler/setup'
 require 'rspec/fire'
 
+module FlyingSphinx; end
+
 RSpec.configure do |config|
   config.mock_with :rspec
   config.include(RSpec::Fire)

data/spec/specs/index_request_spec.rb

@@ -1,13 +1,10 @@
 require 'light_spec_helper'
-require 'net/ssh/errors'
 require 'timeout'
 require 'flying_sphinx/index_request'
 
 describe FlyingSphinx::IndexRequest do
   let(:api)           { fire_double('FlyingSphinx::API') }
   let(:configuration) { stub(:configuration, :api => api) }
-  let(:tunnel_class)  { fire_class_double('FlyingSphinx::Tunnel').
-    as_replaced_constant }
 
   let(:index_response)    {
     stub(:response, :body => stub(:body, :id => 42, :status => 'OK'))
@@ -18,7 +15,6 @@ describe FlyingSphinx::IndexRequest do
 
   before :each do
     stub_const 'FlyingSphinx::Configuration', double(:new => configuration)
-
     stub_const 'FlyingSphinx::IndexRequest::INDEX_COMPLETE_CHECKING_INTERVAL',
       0
   end
@@ -57,107 +53,37 @@ describe FlyingSphinx::IndexRequest do
     end
   end
 
-  describe '#update_and_index' do
+  describe '#index' do
     let(:index_request) { FlyingSphinx::IndexRequest.new }
-    let(:conf_params)   { { :configuration => 'foo {}',
-      :sphinx_version => '2.1.0-dev' } }
     let(:index_params)  { { :indices => '' } }
-    let(:sphinx)        { fire_double('FlyingSphinx::SphinxConfiguration',
-      :upload_to => true)}
-    let(:setting_files) { fire_double('FlyingSphinx::SettingFiles',
-      :upload_to => true) }
+    let(:status_response) { stub(:response,
+      :body => stub(:body, :status => 'FINISHED')) }
 
     before :each do
-      stub_const 'FlyingSphinx::SettingFiles', double(:new => setting_files)
-      stub_const 'FlyingSphinx::SphinxConfiguration', double(:new => sphinx)
-
-      api.stub :post => index_response
-
-      tunnel_class.stub :required? => true
-      tunnel_class.stub(:connect).and_yield
-    end
-
-    it "uploads the configuration file" do
-      sphinx.should_receive(:upload_to).with(api, true)
-
-      begin
-        Timeout::timeout(0.2) {
-          index_request.update_and_index
-        }
-      rescue Timeout::Error
-      end
-    end
-
-    it "uploads setting files" do
-      setting_files.should_receive(:upload_to).with(api)
-
-      begin
-        Timeout::timeout(0.2) {
-          index_request.update_and_index
-        }
-      rescue Timeout::Error
-      end
+      api.stub :post => index_response, :get => status_response
     end
 
     it "makes a new request" do
       api.should_receive(:post).
         with('indices', index_params).and_return(index_response)
 
-      begin
-        Timeout::timeout(0.2) {
-          index_request.update_and_index
-        }
-      rescue Timeout::Error
-      end
+      index_request.index
     end
 
-    context 'delta request without delta support' do
-      it "should explain why the request failed" do
-        api.should_receive(:post).
-          with('indices', index_params).and_return(blocked_response)
-        index_request.should_receive(:puts).
-          with('Your account does not support delta indexing. Upgrading plans is probably the best way around this.')
+    it "checks the status of the request" do
+      api.should_receive(:get).with('indices/42').and_return(status_response)
 
-        index_request.update_and_index
-      end
+      index_request.index
     end
 
-    context 'request for a MySQL database' do
-      before :each do
-        tunnel_class.stub :required? => false
-      end
-
-      it "should not establish an SSH connection" do
-        FlyingSphinx::Tunnel.should_not_receive(:connect)
-
+    context 'delta request without delta support' do
+      it "should explain why the request failed" do
         api.should_receive(:post).
-          with('indices', index_params).and_return(index_response)
-        api.should_receive(:get).with('indices/42').
-          and_return(stub(:response, :body => stub(:body, :status => 'FINISHED')))
-
-        index_request.update_and_index
-      end
-    end
-  end
-
-  describe '#perform' do
-    let(:index_request) { FlyingSphinx::IndexRequest.new ['foo_delta'] }
-    let(:index_params)  { { :indices => 'foo_delta' } }
-
-    before :each do
-      tunnel_class.stub :required? => true
-      tunnel_class.stub(:connect).and_yield
-    end
-
-    it "makes a new request" do
-      api.should_receive(:post).
-        with('indices', index_params).and_return(index_response)
+          with('indices', index_params).and_return(blocked_response)
 
-      begin
-        Timeout::timeout(0.2) {
-          index_request.perform
-        }
-      rescue Timeout::Error
+        lambda {
+          index_request.index
+        }.should raise_error(RuntimeError, 'Your account does not support delta indexing. Upgrading plans is probably the best way around this.')
       end
     end
   end

data/spec/specs/sphinx_configuration_spec.rb

@@ -20,16 +20,9 @@ describe FlyingSphinx::SphinxConfiguration do
 
     it "sends the configuration to the API" do
       api.should_receive(:put).with('/', :configuration => 'foo {}',
-        :sphinx_version => '2.1.0-dev', :tunnel => 'false')
+        :sphinx_version => '2.1.0-dev')
 
       configuration.upload_to api
     end
-
-    it "informs the API when tunnelling will be required" do
-      api.should_receive(:put).with('/', :configuration => 'foo {}',
-        :sphinx_version => '2.1.0-dev', :tunnel => 'true')
-
-      configuration.upload_to api, true
-    end
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flying-sphinx
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 63
+  prerelease: 
   segments: 
   - 0
-  - 7
-  - 1
-  version: 0.7.1
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Pat Allan
@@ -14,16 +15,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-10 00:00:00 +11:00
-default_executable: 
+date: 2012-08-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thinking-sphinx
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +35,11 @@ dependencies:
   name: riddle
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 5
@@ -43,162 +47,168 @@ dependencies:
         version: 1.5.0
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: net-ssh
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 23
-        version: 2.0.23
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: multi_json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 0
         - 1
         version: 1.0.1
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: faraday_middleware
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 0
         - 7
         version: "0.7"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rash
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 0
         - 3
         - 0
         version: 0.3.0
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 63
         segments: 
         - 0
         - 9
         - 2
         version: 0.9.2
   type: :development
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 2
         - 11
         version: "2.11"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rspec-fire
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
         - 0
         version: 1.1.0
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 59
         segments: 
         - 0
         - 8
         - 2
         version: 0.8.2
   type: :development
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: fakeweb
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id011
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: fakeweb-matcher
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 2
         - 2
         version: 1.2.2
   type: :development
-  version_requirements: *id012
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: delayed_job
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 1
         - 4
         version: 2.1.4
   type: :development
-  version_requirements: *id013
+  version_requirements: *id012
 description: Hooks Thinking Sphinx into the Flying Sphinx service
 email: pat@freelancing-gods.com
-executables: []
-
+executables: 
+- flying-sphinx
 extensions: []
 
 extra_rdoc_files: 
@@ -211,11 +221,13 @@ files:
 - LICENCE
 - README.textile
 - Rakefile
+- bin/flying-sphinx
 - flying-sphinx.gemspec
 - keys/key
 - lib/flying-sphinx.rb
 - lib/flying_sphinx.rb
 - lib/flying_sphinx/api.rb
+- lib/flying_sphinx/cli.rb
 - lib/flying_sphinx/configuration.rb
 - lib/flying_sphinx/delayed_delta.rb
 - lib/flying_sphinx/flag_as_deleted_job.rb
@@ -227,7 +239,6 @@ files:
 - lib/flying_sphinx/sinatra.rb
 - lib/flying_sphinx/sphinx_configuration.rb
 - lib/flying_sphinx/tasks.rb
-- lib/flying_sphinx/tunnel.rb
 - lib/flying_sphinx/version.rb
 - spec/light_spec_helper.rb
 - spec/spec_helper.rb
@@ -238,7 +249,6 @@ files:
 - spec/specs/index_request_spec.rb
 - spec/specs/setting_files_spec.rb
 - spec/specs/sphinx_configuration_spec.rb
-has_rdoc: true
 homepage: https://flying-sphinx.com
 licenses: []
 
@@ -252,23 +262,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Sphinx in the Cloud
@@ -282,3 +296,4 @@ test_files:
 - spec/specs/index_request_spec.rb
 - spec/specs/setting_files_spec.rb
 - spec/specs/sphinx_configuration_spec.rb
+has_rdoc: 

data/lib/flying_sphinx/tunnel.rb

@@ -1,59 +0,0 @@
-class FlyingSphinx::Tunnel
-  def self.connect(configuration, &block)
-    tunnel = new configuration
-    tunnel.open do |session|
-      session.loop do
-        block.call
-      end
-    end
-  end
-
-  def self.required?
-    ENV['FLYING_SPHINX_INGRESS'].blank? &&
-    ThinkingSphinx.database_adapter == FlyingSphinx::HerokuSharedAdapter
-  end
-
-  def initialize(configuration)
-    @configuration = configuration
-  end
-
-  def open(&block)
-    session = Net::SSH.start(@configuration.ssh_server, 'sphinx', ssh_options)
-    session.forward.remote(
-      db_port, db_host, @configuration.database_port, '0.0.0.0'
-    )
-
-    session.loop { !remote_exists?(session) }
-
-    yield session
-  rescue IOError
-    # Server closed the connection on us. That's (hopefully) expected, nothing
-    # to worry about.
-  end
-
-  private
-
-  def db_host
-    db_config[:host]
-  end
-
-  def db_port
-    db_config[:port] || 5432
-  end
-
-  def db_config
-    @db_config ||= ActiveRecord::Base.connection.instance_variable_get(:@config)
-  end
-
-  def ssh_options
-    {:keys => [
-      File.expand_path('../../../keys/key', __FILE__)
-    ]}
-  end
-
-  def remote_exists?(session)
-    session.forward.active_remotes.include?(
-      [@configuration.database_port, '0.0.0.0']
-    )
-  end
-end