filbunke 1.4.0 → 1.4.1

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

data/filbunke.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{filbunke}
-  s.version = "1.4.0"
+  s.version = "1.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wouter de Bie"]
-  s.date = %q{2010-11-22}
+  s.date = %q{2010-12-02}
   s.default_executable = %q{filbunked}
   s.description = %q{Filbunke client and library}
   s.email = %q{wouter@deltaprojects.se}

data/lib/filbunke/client.rb

@@ -31,20 +31,26 @@ module Filbunke
         file = File.new(raw_file)
 
         local_file_path = ::File.join(repository.local_path, file.path)
-        if file_needs_update?(file, local_file_path)
+        if file.state == "DELETED" then
+          delete_file!(local_file_path)
           
-          if update_file!(file, local_file_path) then
-            @callbacks.each do |callback|
-              callback.on_update(file)
+        else
+        
+          if file_needs_update?(file, local_file_path)
+          
+            if update_file!(file, local_file_path) then
+              @callbacks.each do |callback|
+                callback.on_update(file)
+              end
+              yield file
+            else
+              @logger.log "Unable to get file #{file.url} ==> #{file.path}!"
+              failure = true
             end
-            yield file
+
           else
-            @logger.log "Unable to get file #{file.url} ==> #{file.path}!"
-            failure = true
+            @logger.log "File exists with correct hash: #{local_file_path}"
           end
-
-        else
-          @logger.log "File exists with correct hash: #{local_file_path}"
         end
       end
       failure ? last_checkpoint : (new_checkpoint || last_checkpoint)
@@ -110,11 +116,6 @@ module Filbunke
 
     def update_file!(file, local_file_path)
         
-      if file.state == "DELETED" then
-        delete_file!(local_file_path)
-        return true
-      end
-      
       if file.url =~ /^http:\/\//
         update_http_file!(file, local_file_path)
       elsif file.url =~ /^hdfs:\/\//
@@ -186,7 +187,7 @@ module Filbunke
       begin
         ::FileUtils.mkdir_p(::File.dirname(local_file_path))
       
-        hdfs_cmd = "#{@repository.hadoop_binary} fs -copyToLocal #{file.url} #{local_file_path}.tmp &> /dev/null && mv #{local_file_path}.tmp #{local_file_path}"
+        hdfs_cmd = "rm -f #{local_file_path}.tmp; #{@repository.hadoop_binary} fs -copyToLocal #{file.url} #{local_file_path}.tmp &> /dev/null && mv #{local_file_path}.tmp #{local_file_path}"
         @logger.log "Trying to update #{local_file_path} with '#{hdfs_cmd}'"
         system hdfs_cmd
       

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Wouter de Bie
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-22 00:00:00 +01:00
+date: 2010-12-02 00:00:00 +01:00
 default_executable: filbunked
 dependencies: 
 - !ruby/object:Gem::Dependency