pyramid_scheme 0.2.5 → 0.2.7

data/.gitignore

@@ -20,4 +20,6 @@ pkg
 
 ## PROJECT::SPECIFIC
 *.gemspec
-spec/integrations/s3.yml
+spec/integrations/s3.yml
+spec/integrations/destination/*
+spec/integrations/source/*

data/Rakefile

@@ -13,7 +13,7 @@ begin
     gem.authors = ["Dan Pickett"]
     gem.add_dependency "rake", ">= 0.8.7"
     gem.add_dependency "configatron"
-    gem.add_dependency "aws-s3", ">= 0.5.1"
+    gem.add_dependency "aws-s3", ">= 0.6.2"
     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.5
+0.2.7

data/lib/pyramid_scheme.rb

@@ -30,6 +30,10 @@ module PyramidScheme
     PyramidScheme::Configuration.set(&block)
   end
 
+  def self.configure_with_yml(path)
+    PyramidScheme::Configuration.set_from_yml(path)
+  end
+
   def self.configuration
     PyramidScheme::Configuration.new
   end

data/lib/pyramid_scheme/configuration.rb

@@ -25,6 +25,15 @@ module PyramidScheme
       end
     end
 
+    def self.set_from_yml(path)
+      config_hash = YAML::load(File.open(path))
+      set do |config|
+        config_hash.each do |key, value|
+          config.send("#{key}=", value)
+        end
+      end
+    end
+
     def self.defaults
       { 
         :lock_file_name       => 'pyramid_scheme_index_in_progress.txt',

data/lib/pyramid_scheme/index_provider/base.rb

@@ -46,7 +46,7 @@ module PyramidScheme
       protected
       def ensure_required_options_are_present
         self.class.required_options.each do |opt|
-          if @configuration[opt].nil?
+          if @configuration[opt].nil? || @configuration[opt] == ''
             raise PyramidScheme::RequiredConfigurationNotFound, 
               "the #{opt} setting was not found"
           end

data/spec/configuration.example.yml

@@ -0,0 +1,6 @@
+access_key: access_key
+secret_access_key: secret_access_key
+bucket: some_bucket
+prefix: some_prefix
+server_source_path: "/some/server/source"
+client_destination_path: "/some/client/destination"

data/spec/integrations/s3_spec.rb

@@ -20,11 +20,16 @@ describe "S3 index provider" do
 
   describe "populating index files" do
     before(:each) do
+      FakeFS.deactivate!
+      clear_source
+    end
 
+    after(:each) do
+      FakeFS.activate!
     end
+    
     it 'should copy all the relevant index files to s3 on processing' do
       FileUtils.mkdir_p(PyramidScheme.configuration[:server_source_path])   
-      FileUtils.mkdir_p(PyramidScheme.configuration[:server_destination_path])
       @filenames = [
         '.spi',
         '.spd',
@@ -36,7 +41,9 @@ describe "S3 index provider" do
       ].collect{|s| "some_index#{s}" }
 
       @filenames.each do |f|
-        FileUtils.touch(File.join(PyramidScheme.configuration[:server_source_path], f))
+        File.open(File.join(PyramidScheme.configuration[:server_source_path], f), 'w') do |file|
+          file << 'contents'
+        end
         File.exists?(File.join(PyramidScheme.configuration[:server_source_path], f)).should be_true
       end
 
@@ -50,6 +57,15 @@ describe "S3 index provider" do
   end
 
   describe "providing index files" do
+    before(:each) do
+      FakeFS.deactivate!
+      clear_destination
+    end
+    
+    after(:each) do
+      FakeFS.activate!
+    end
+    
     it 'should download all the relevant index files to s3 on providing' do
       FileUtils.mkdir_p(PyramidScheme.configuration[:client_destination_path])
       @provider.retrieve_index
@@ -63,28 +79,36 @@ describe "S3 index provider" do
         '.spp',
         '.spk'
       ].collect{|s| "some_index#{s}" }.each do |f|
-        File.exists?(File.join(PyramidScheme.configuration[:client_destination_path], 
-          f.gsub(/\./, '.new.'))).should be_true
+        filename = File.join(PyramidScheme.configuration[:client_destination_path], 
+          f.gsub(/\./, '.new.'))
+        File.exists?(filename).should be_true
+        File.size(filename).should > 0
       end
 
     end
   end
 
+  def clear_destination
+    clear_directory(PyramidScheme.configuration[:client_destination_path])
+  end
+  
+  def clear_source
+    clear_directory(PyramidScheme.configuration[:server_source_path])
+  end
+  
+  def clear_directory(path)
+    FileUtils.rm_f("#{path}/*")
+  end
+  
   def load_configuration_from_yaml
     FakeFS.deactivate!
-    yml_config = YAML.load_file(File.join(File.dirname(__FILE__), 's3.yml'))
-    
     PyramidScheme.configure do |config|
       config.index_provider_class = PyramidScheme::IndexProvider::S3
-      config.access_key = yml_config["access_key"]
-      config.secret_access_key = yml_config["secret_access_key"]
-      config.bucket = yml_config["bucket"]
-      config.prefix = yml_config["prefix"]
-      config.server_source_path = "/some/server/source"
-      config.client_destination_path = "/some/client/destination"
-    end
+      config.client_destination_path = File.join(File.dirname(__FILE__), 'destination')
+      config.server_source_path      = File.join(File.dirname(__FILE__), 'source')
+    end 
 
+    PyramidScheme.configure_with_yml(File.join(File.dirname(__FILE__), 's3.yml'))
     FakeFS.activate!
-
   end
 end

data/spec/pyramid_scheme/configuration_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe PyramidScheme::Configuration do
+  describe "from yml" do
+    before(:each) do
+      FakeFS.deactivate!
+    end
+
+    after(:each) do
+      FakeFS.activate!
+    end
+
+    it 'should have a method that allows configuration from a yml file' do
+      PyramidScheme.configure_with_yml(
+        File.join(File.dirname(__FILE__), '../configuration.example.yml'))
+        PyramidScheme.configuration[:secret_access_key].should_not be_nil
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Dan Pickett
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 -04:00
+date: 2010-03-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,9 +52,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 5
-        - 1
-        version: 0.5.1
+        - 6
+        - 2
+        version: 0.6.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -145,9 +145,11 @@ files:
 - lib/pyramid_scheme/tasks/rake_tasks.rake
 - lib/pyramid_scheme/thinking_sphinx_indexer.rb
 - lib/pyramid_scheme/ultrasphinx_indexer.rb
+- spec/configuration.example.yml
 - spec/integrations/s3.example.yml
 - spec/integrations/s3_spec.rb
 - spec/pyramid_scheme.rb
+- spec/pyramid_scheme/configuration_spec.rb
 - spec/pyramid_scheme/index_client_spec.rb
 - spec/pyramid_scheme/index_provider/file_system_spec.rb
 - spec/pyramid_scheme/index_provider_configuration_spec.rb
@@ -189,6 +191,7 @@ specification_version: 3
 summary: Sphinx index propagation
 test_files: 
 - spec/integrations/s3_spec.rb
+- spec/pyramid_scheme/configuration_spec.rb
 - spec/pyramid_scheme/index_client_spec.rb
 - spec/pyramid_scheme/index_provider/file_system_spec.rb
 - spec/pyramid_scheme/index_provider_configuration_spec.rb