filbunke 1.5.3 → 1.6.0

data/Rakefile

@@ -15,6 +15,7 @@ begin
     gem.executables = ['filbunked']
     gem.add_dependency 'json', '>= 1.1.7'
     gem.add_dependency 'typhoeus', '>= 0.2.0'
+    gem.add_dependency 'open4', '>= 1.0.1'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.5.3
+1.6.0

data/filbunke.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{filbunke}
-  s.version = "1.5.3"
+  s.version = "1.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wouter de Bie"]
-  s.date = %q{2010-12-07}
+  s.date = %q{2010-12-10}
   s.default_executable = %q{filbunked}
   s.description = %q{Filbunke client and library}
   s.email = %q{wouter@deltaprojects.se}
@@ -49,15 +49,18 @@ Gem::Specification.new do |s|
       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"])
+      s.add_runtime_dependency(%q<open4>, [">= 1.0.1"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_dependency(%q<json>, [">= 1.1.7"])
       s.add_dependency(%q<typhoeus>, [">= 0.2.0"])
+      s.add_dependency(%q<open4>, [">= 1.0.1"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     s.add_dependency(%q<json>, [">= 1.1.7"])
     s.add_dependency(%q<typhoeus>, [">= 0.2.0"])
+    s.add_dependency(%q<open4>, [">= 1.0.1"])
   end
 end
 

data/lib/filbunke/client.rb

@@ -210,19 +210,27 @@ module Filbunke
     def update_hdfs_file!(file, local_file_path)
       begin
         ::FileUtils.mkdir_p(::File.dirname(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}"
+        ::FileUtils.rm_f("#{local_file_path}.tmp")
+        hdfs_cmd = "#{@repository.hadoop_binary} fs -copyToLocal #{file.url} #{local_file_path}.tmp"
         @logger.log "Trying to update #{local_file_path} with '#{hdfs_cmd}'"
-        system hdfs_cmd
-      
-        if $?.exitstatus == 0 then
-          return true
+        
+        pid, stdin, stdout, stderr = Open4::popen4 hdfs_cmd
+        ignored, status = Process::waitpid2 pid
+              
+        if status.exitstatus == 0 then
+          begin
+            ::FileUtils.mv "#{local_file_path}.tmp", local_file_path
+            return true
+          rescue StandardError => e
+            @logger.log "Failed to move hdfs file #{file.url}: #{e.message}"
+            return false
+          end  
         else
-          @logger.log "Failed to update file #{file.url}!"
+          @logger.log "Failed to update hdfs file #{file.url}! Unable to execute #{hfds_cmd}"
           return false
         end
       rescue StandardError => e
-        @logger.log "Failed to update file #{file.url}: #{e.message}"
+        @logger.log "Failed to update hdfs file #{file.url}: #{e.message}"
         return false
       end
     end

data/lib/filbunke/daemon.rb

@@ -35,7 +35,8 @@ module Filbunke
     end
 
     def run!
-      @logger.log("Starting filbunked")
+      version = ::File.read(::File.expand_path(::File.join(::File.dirname(__FILE__), "../../VERSION"))).chomp
+      @logger.log("Starting filbunked version #{version}")
       while true
         begin
           

data/lib/filbunke.rb

@@ -4,6 +4,7 @@ require 'net/http'
 require 'fileutils'
 require 'digest/md5'
 require 'typhoeus'
+require 'open4'
 
 require 'filbunke/client.rb'
 require 'filbunke/file.rb'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 5
-  - 3
-  version: 1.5.3
+  - 6
+  - 0
+  version: 1.6.0
 platform: ruby
 authors: 
 - Wouter de Bie
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 +01:00
+date: 2010-12-10 00:00:00 +01:00
 default_executable: filbunked
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,6 +57,20 @@ dependencies:
         version: 0.2.0
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: open4
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  type: :runtime
+  version_requirements: *id004
 description: Filbunke client and library
 email: wouter@deltaprojects.se
 executables: