pyramid_scheme 0.2.8 → 0.3.0

data/Rakefile

@@ -14,6 +14,7 @@ begin
     gem.add_dependency "rake", ">= 0.8.7"
     gem.add_dependency "configatron"
     gem.add_dependency "aws-s3", ">= 0.6.2"
+    gem.add_dependency "rush", ">= 0.6.6"
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "yard", ">= 0"
     gem.add_development_dependency "mocha", "0.9.8"

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.3.0

data/lib/pyramid_scheme/index_client.rb

@@ -11,20 +11,8 @@ module PyramidScheme
       bounce_pids
     end
 
-    def searchd_pids
-      ps_output = `ps ax | grep searchd`
-      ps_output.split("\n").collect{|p| /^\s*(\d*)/.match(p)[1]}
-    end
-
     def bounce_pids
-      searchd_pids.each do |pid|
-        begin
-          Process.kill("HUP", pid.to_i) if pid != ""
-        rescue Exception => e
-          raise e unless e.message =~ /No such process/i
-        end
-      end
+      PyramidScheme::ProcessManager.bounce_searchd
     end
-
   end
 end

data/lib/pyramid_scheme/index_provider/s3.rb

@@ -36,11 +36,13 @@ module PyramidScheme
           AWS::S3::Bucket.objects(@configuration[:bucket], 
             :prefix => "#{@configuration[:prefix]}/").each do |obj|
               
-            new_filename = File.basename(obj.key.gsub("#{@configuration[:prefix]}/", '').gsub(/\./, ".new."))
-            destined_path = File.join(@configuration[:client_destination_path], new_filename)
-            File.open(destined_path, 'w') do |file|
-              AWS::S3::S3Object.stream(obj.key, @configuration[:bucket]) do |chunk|
-                file.write chunk
+            unless obj.key =~ /\.new\./
+              new_filename = File.basename(obj.key.gsub("#{@configuration[:prefix]}/", '').gsub(/\./, ".new."))
+              destined_path = File.join(@configuration[:client_destination_path], new_filename)
+              File.open(destined_path, 'w') do |file|
+                AWS::S3::S3Object.stream(obj.key, @configuration[:bucket]) do |chunk|
+                  file.write chunk
+                end
               end
             end
           end

data/lib/pyramid_scheme/index_server.rb

@@ -21,6 +21,7 @@ module PyramidScheme
       indexer.configure
       indexer.index
       destroy_lock_file
+      PyramidScheme::ProcessManager.bounce_searchd
       index_provider.process_index
     end
 

data/lib/pyramid_scheme/process_manager.rb

@@ -0,0 +1,18 @@
+module PyramidScheme
+  class ProcessManager
+    def self.searchd_pids
+      Rush.processes.filter(:cmdline => /searchd/)
+    end
+
+    def self.bounce_searchd
+      searchd_pids.each do |process|
+        begin
+          Process.kill("HUP", process.pid) 
+        rescue Exception => e
+          raise e unless e.message =~ /No such process/i
+        end
+      end
+    end
+
+  end
+end

data/lib/pyramid_scheme.rb

@@ -1,8 +1,10 @@
 require 'rubygems'
 require 'rake'
+require 'rake/tasklib'
 
 require 'configatron'
 require 'aws/s3'
+require 'rush'
 
 require 'pyramid_scheme/required_configuration_not_found'
 
@@ -10,6 +12,7 @@ require 'pyramid_scheme/indexer/base'
 require 'pyramid_scheme/indexer/thinking_sphinx'
 require 'pyramid_scheme/indexer/ultrasphinx'
 require 'pyramid_scheme/configuration'
+require 'pyramid_scheme/process_manager'
 
 require 'pyramid_scheme/index_provider/base'
 require 'pyramid_scheme/index_provider/file_system'

data/spec/pyramid_scheme/index_client_spec.rb

@@ -8,18 +8,14 @@ describe PyramidScheme::IndexClient do
   it 'should have an index provider' do
     @client.index_provider.should_not be_nil
   end
- 
-  it 'should send SIGHUP to active searchd processes' do
-    @client.expects(:searchd_pids).returns(["4345"])
-    Process.expects(:kill).with("HUP", 4345)
-    @client.bounce_pids
-  end
 
-  it 'should continue gracefully if no such process gets raise' do
-    @client.expects(:searchd_pids).returns(["4345"])
-    Process.expects(:kill).raises(Exception, "No Such Process").then.returns(1)
-    lambda { @client.bounce_pids }.should_not raise_error
+  it 'should bounce pids after indexing' do
+    @client.index_provider.stubs(:retrieve_index)
+
+    PyramidScheme::ProcessManager.expects(:bounce_searchd)
+    @client.retrieve_index
   end
+ 
 end
 
 

data/spec/pyramid_scheme/index_server_spec.rb

@@ -5,8 +5,8 @@ describe PyramidScheme::IndexServer do
 
   before(:each) do
     @server = PyramidScheme::IndexServer.new
-    @server.indexer.stub(:configure)
-    @server.indexer.stub(:index)
+    @server.indexer.stubs(:configure)
+    @server.indexer.stubs(:index)
     FileUtils.mkdir_p(PyramidScheme.configuration[:server_destination_path])
     FileUtils.mkdir_p(PyramidScheme.configuration[:client_source_path])
   end
@@ -37,12 +37,12 @@ describe PyramidScheme::IndexServer do
   end
 
   it 'should touch a lock file before indexing' do
-    FileUtils.should_receive(:touch)
+    FileUtils.expects(:touch)
     @server.index
   end
 
   it 'should remove the lock file after indexing' do
-    FileUtils.should_receive(:rm_f)
+    FileUtils.expects(:rm_f)
     @server.index
   end
 

data/spec/pyramid_scheme/process_manager_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe PyramidScheme::ProcessManager do
+  it 'should send SIGHUP to active searchd processes' do
+    stub_rush_process_list
+    Process.expects(:kill).with("HUP", @pid)
+    PyramidScheme::ProcessManager.bounce_searchd
+  end
+
+  it 'should continue gracefully if no such process gets raise' do
+    stub_rush_process_list
+    Process.expects(:kill).raises(Exception, "No Such Process").then.returns(1)
+    lambda { PyramidScheme::ProcessManager.bounce_searchd }.should_not raise_error
+  end
+
+  def stub_rush_process_list
+    processes = [mock]
+    @pid = 4345
+    processes[0].expects(:pid).returns(@pid)
+    Rush.stubs(:processes).returns(mock)
+    Rush.processes.expects(:filter).with(:cmdline => /searchd/).returns(processes)
+  end
+
+end

data/spec/spec_helper.rb

@@ -20,6 +20,8 @@ Spec::Runner.configure do |config|
       config.server_destination_path = '/some/server/destination'
     end
   end  
+
+  config.mock_with :mocha
 end
 
 module FakeFS

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 8
-  version: 0.2.8
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Dan Pickett
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 -04:00
+date: 2010-03-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,9 +58,23 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rush
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 6
+        version: 0.6.6
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -70,11 +84,11 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -82,11 +96,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -96,11 +110,11 @@ dependencies:
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: fakefs
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -110,7 +124,7 @@ dependencies:
         - 1
         version: 0.2.1
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 description: Sphinx index propagtion (currently via the filesystem)
 email: dpickett@enlightsolutions.com
 executables: []
@@ -140,6 +154,7 @@ files:
 - lib/pyramid_scheme/lock/base.rb
 - lib/pyramid_scheme/lock/file.rb
 - lib/pyramid_scheme/lock/s3.rb
+- lib/pyramid_scheme/process_manager.rb
 - lib/pyramid_scheme/required_configuration_not_found.rb
 - lib/pyramid_scheme/tasks.rb
 - lib/pyramid_scheme/thinking_sphinx_indexer.rb
@@ -155,6 +170,7 @@ files:
 - spec/pyramid_scheme/index_server_spec.rb
 - spec/pyramid_scheme/indexer/thinking_sphinx_spec.rb
 - spec/pyramid_scheme/indexer/ultrasphinx_spec.rb
+- spec/pyramid_scheme/process_manager_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks/pyramid_scheme.rake
@@ -197,5 +213,6 @@ test_files:
 - spec/pyramid_scheme/index_server_spec.rb
 - spec/pyramid_scheme/indexer/thinking_sphinx_spec.rb
 - spec/pyramid_scheme/indexer/ultrasphinx_spec.rb
+- spec/pyramid_scheme/process_manager_spec.rb
 - spec/pyramid_scheme.rb
 - spec/spec_helper.rb