pyramid_scheme 0.3.0 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.2

data/lib/pyramid_scheme/configuration.rb

@@ -19,10 +19,12 @@ module PyramidScheme
     end 
 
     def self.set(&block)
-      yield(configatron.pyramid_scheme)
-      defaults.each do |key, value|
-        configatron.pyramid_scheme.send("#{key}=", value) unless configatron.pyramid_scheme.to_hash[key]
+      self.defaults.each do |key, value|
+        if configatron.pyramid_scheme.send("#{key}").nil? || configatron.pyramid_scheme.send("#{key}") == ""
+          configatron.pyramid_scheme.send("#{key}=", value)
+        end
       end
+      yield(configatron.pyramid_scheme)
     end
 
     def self.set_from_yml(path)
@@ -42,7 +44,8 @@ module PyramidScheme
       { 
         :lock_file_name       => 'pyramid_scheme_index_in_progress.txt',
         :index_provider_class => PyramidScheme::IndexProvider::FileSystem, 
-        :indexer_class        => PyramidScheme::Indexer::ThinkingSphinx
+        :indexer_class        => PyramidScheme::Indexer::ThinkingSphinx,
+        :permit_server_daemon => true
       } 
     end
 

data/lib/pyramid_scheme/index_provider/s3.rb

@@ -32,17 +32,15 @@ module PyramidScheme
       end
 
       def provide_client_with_index
-        Configuration::INDEX_FILE_EXTENSIONS.each do |ext|
-          AWS::S3::Bucket.objects(@configuration[:bucket], 
-            :prefix => "#{@configuration[:prefix]}/").each do |obj|
-              
-            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
+        AWS::S3::Bucket.objects(@configuration[:bucket], 
+          :prefix => "#{@configuration[:prefix]}/").each do |obj|
+            
+          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

data/lib/pyramid_scheme/index_server.rb

@@ -17,15 +17,23 @@ module PyramidScheme
 
     # run the index
     def index
+      kill_searchd unless @configuration[:permit_server_daemon]
       create_lock_file
       indexer.configure
       indexer.index
       destroy_lock_file
-      PyramidScheme::ProcessManager.bounce_searchd
+      bounce_searchd
       index_provider.process_index
     end
 
     private
+      def kill_searchd
+        PyramidScheme::ProcessManager.kill_searchd
+      end
+      
+      def bounce_searchd
+        PyramidScheme::ProcessManager.bounce_searchd
+      end
       def create_lock_file
         @index_provider.lock.create
       end

data/lib/pyramid_scheme/process_manager.rb

@@ -5,14 +5,22 @@ module PyramidScheme
     end
 
     def self.bounce_searchd
+      kill_searchd_with_signal("HUP")
+    end
+    
+    def self.kill_searchd
+      kill_searchd_with_signal("KILL")
+    end
+    
+    protected
+    def self.kill_searchd_with_signal(signal)
       searchd_pids.each do |process|
         begin
-          Process.kill("HUP", process.pid) 
+          Process.kill(signal, process.pid) 
         rescue Exception => e
           raise e unless e.message =~ /No such process/i
         end
       end
     end
-
   end
 end

data/spec/configuration.example.yml

@@ -5,3 +5,4 @@ prefix: some_prefix
 index_provider_class: PyramidScheme::IndexProvider::S3
 server_source_path: "/some/server/source"
 client_destination_path: "/some/client/destination"
+permit_server_daemon: false

data/spec/pyramid_scheme/configuration_spec.rb

@@ -19,5 +19,10 @@ describe PyramidScheme::Configuration do
     it 'should cast a string to a class if suffix of the configuraiton is class' do
       PyramidScheme.configuration[:index_provider_class].should eql(PyramidScheme::IndexProvider::S3)
     end
+    
+    it 'should cast a string to boolean off of a yml file' do
+      #this is redundantly checking YML's functionality but we want to be sure
+      PyramidScheme.configuration[:permit_server_daemon].should be_false
+    end
   end
 end

data/spec/pyramid_scheme/index_server_spec.rb

@@ -50,4 +50,35 @@ describe PyramidScheme::IndexServer do
     @server.index_provider.expects(:process_index)
     @server.index
   end
+  
+  it 'should kill searchd if the daemon is disallowed' do
+    PyramidScheme.configure do |config|
+      config.permit_server_daemon = false
+    end
+    
+    stub_server
+
+    PyramidScheme::ProcessManager.expects(:kill_searchd).once
+    
+    @server.index
+  end
+  
+  it 'should not kill searchd if the daemon is allowed' do
+    PyramidScheme.configure do |config|
+      config.permit_server_daemon = true
+    end
+    
+    stub_server
+    
+    PyramidScheme::ProcessManager.expects(:kill_searchd).never
+    
+    @server.index
+  end
+  
+  def stub_server
+    @server = PyramidScheme::IndexServer.new
+    @server.indexer.stubs(:configure)
+    @server.indexer.stubs(:index)
+  end
+    
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Dan Pickett
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 -04:00
+date: 2010-04-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency