filbunke 1.7.3 → 1.8.0

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.description = %Q{Filbunke client and library}
     gem.email = "wouter@deltaprojects.se"
     gem.homepage = "http://github.com/deltaprojects/filbunke"
-    gem.authors = ["Wouter de Bie"]
+    gem.authors = ["Wouter de Bie", "Björn Sperber"]
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     gem.files.exclude 'pkg'
     gem.executables = ['filbunked']

data/VERSION

@@ -1 +1 @@
-1.7.3
+1.8.0

data/filbunke.gemspec

@@ -1,52 +1,51 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{filbunke}
-  s.version = "1.7.3"
+  s.version = "1.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Wouter de Bie"]
-  s.date = %q{2011-03-16}
+  s.authors = ["Wouter de Bie", "Bj\303\266rn Sperber"]
+  s.date = %q{2012-05-15}
   s.default_executable = %q{filbunked}
   s.description = %q{Filbunke client and library}
   s.email = %q{wouter@deltaprojects.se}
   s.executables = ["filbunked"]
   s.files = [
     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/.gitignore",
-     "bin/filbunked",
-     "doc/examples/filbunke_config.yml",
-     "doc/examples/http_evict_cache.rb",
-     "doc/examples/http_file_upload.rb",
-     "doc/examples/init_script",
-     "filbunke.gemspec",
-     "lib/filbunke.rb",
-     "lib/filbunke/callbacks.rb",
-     "lib/filbunke/client.rb",
-     "lib/filbunke/daemon.rb",
-     "lib/filbunke/file.rb",
-     "lib/filbunke/logger.rb",
-     "lib/filbunke/repository.rb",
-     "test/helper.rb",
-     "test/test_filbunke.rb"
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/.gitignore",
+    "bin/filbunked",
+    "doc/examples/filbunke_config.yml",
+    "doc/examples/http_evict_cache.rb",
+    "doc/examples/http_file_upload.rb",
+    "doc/examples/init_script",
+    "filbunke.gemspec",
+    "lib/filbunke.rb",
+    "lib/filbunke/callbacks.rb",
+    "lib/filbunke/client.rb",
+    "lib/filbunke/daemon.rb",
+    "lib/filbunke/file.rb",
+    "lib/filbunke/logger.rb",
+    "lib/filbunke/repository.rb",
+    "test/helper.rb",
+    "test/test_filbunke.rb"
   ]
   s.homepage = %q{http://github.com/deltaprojects/filbunke}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Filbunke client}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 1.1.7"])
       s.add_runtime_dependency(%q<typhoeus>, [">= 0.2.0"])

data/lib/filbunke/client.rb

@@ -12,10 +12,11 @@ module Filbunke
     HASH_KEY = 'hash'
 
 
-    def initialize(repository, logger, callbacks = [])
+    def initialize(repository, logger, callbacks = [], failed_request_log_file_name = nil)
       @repository = repository
       @logger = logger
       @callbacks = callbacks
+      @failed_request_log_file_name = failed_request_log_file_name
     end
 
     def with_updated_files(last_checkpoint)
@@ -66,27 +67,37 @@ module Filbunke
     end
 
     def register_updated_file!(path, url, hash = nil)
-      register_http = Net::HTTP.new(@repository.host, @repository.port)
-      register_http.start do |http|
-        register_path = "/#{FILES_ACTION}/#{@repository.name}/#{path}?#{URL_KEY}=#{url}"
-        register_path += "&#{HASH_KEY}=#{hash}" if hash
-        request = Net::HTTP::Put.new(register_path)
-        response = http.request(request)
-        if response.code.to_i != 204
-          raise "Failed to register updated file: #{path}"
+      register_path = "/#{FILES_ACTION}/#{@repository.name}/#{path}?#{URL_KEY}=#{url}"
+      register_path += "&#{HASH_KEY}=#{hash}" if hash
+      begin
+        register_http = Net::HTTP.new(@repository.host, @repository.port)
+        register_http.start do |http|
+          request = Net::HTTP::Put.new(register_path)
+          response = http.request(request)
+          if response.code.to_i != 204
+            raise "Failed to register updated file: #{path}"
+          end
         end
+      rescue Exception => e
+        log_failed_request(%Q{curl -XPUT "http://#{@repository.host}:#{@repository.port}#{register_path}"}, e)
+        raise e
       end
     end
 
     def register_deleted_file!(path)
-      register_http = Net::HTTP.new(@repository.host, @repository.port)
-      register_http.start do |http|
-        register_path = "/#{FILES_ACTION}/#{@repository.name}/#{path}"
-        request = Net::HTTP::Delete.new(register_path)
-        response = http.request(request)
-        if response.code.to_i != 204
-          raise "Failed to register deleted file: #{path}"
+      register_path = "/#{FILES_ACTION}/#{@repository.name}/#{path}"
+      begin
+        register_http = Net::HTTP.new(@repository.host, @repository.port)
+        register_http.start do |http|
+          request = Net::HTTP::Delete.new(register_path)
+          response = http.request(request)
+          if response.code.to_i != 204
+            raise "Failed to register deleted file: #{path}"
+          end
         end
+      rescue Exception => e
+        log_failed_request(%Q{curl -XDELETE "http://#{@repository.host}:#{@repository.port}#{register_path}"}, e)
+        raise e
       end
     end
 
@@ -117,6 +128,14 @@ module Filbunke
     
     private
 
+    def log_failed_request(failed_request_command, e)
+      return unless @failed_request_log_file_name
+      ::File.open(@failed_request_log_file_name, 'a+') do |f|
+        f.puts("# #{Time.now}: #{e.message if e}")
+        f.puts(failed_request_command)
+      end
+    end
+
     def update_file!(file, local_file_path)
         
       if file.url =~ /^http:\/\//

metadata

@@ -1,29 +1,33 @@
 --- !ruby/object:Gem::Specification 
 name: filbunke
 version: !ruby/object:Gem::Version 
+  hash: 55
   prerelease: false
   segments: 
   - 1
-  - 7
-  - 3
-  version: 1.7.3
+  - 8
+  - 0
+  version: 1.8.0
 platform: ruby
 authors: 
 - Wouter de Bie
+- "Bj\xC3\xB6rn Sperber"
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 +01:00
+date: 2012-05-15 00:00:00 +02:00
 default_executable: filbunked
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +37,11 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 1
@@ -47,9 +53,11 @@ dependencies:
   name: typhoeus
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
         - 2
@@ -61,9 +69,11 @@ dependencies:
   name: open4
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 0
@@ -105,28 +115,32 @@ homepage: http://github.com/deltaprojects/filbunke
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+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.3.7
 signing_key: 
 specification_version: 3
 summary: Filbunke client