filbunke 1.6.0 → 1.7.0

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.7.0

data/bin/filbunked

@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
 $0=File.join(File.dirname(__FILE__), 'filbunked')
 require 'rubygems'
-require 'filbunke'
 require 'yaml'
 require 'getoptlong'
 
 raw_opts = GetoptLong.new(
         [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
-        [ '--config', '-c', GetoptLong::REQUIRED_ARGUMENT ]
+        [ '--config', '-c', GetoptLong::REQUIRED_ARGUMENT ],
+        [ '--dev', '-d', GetoptLong::NO_ARGUMENT]
 )
 
 opts = {}
@@ -15,21 +15,35 @@ raw_opts.each do |opt, arg|
   opts[opt] = arg
 end
 
-if Process.uid != 0 then
-  puts "Filbunke should be started as root!"
-  exit 1
-end
-
 if opts['--help'] || opts['--config'] == nil || opts['--config'] == ""
   puts "Usage: filbunked -c <config_file.yml>"
   exit 1
 else
-  child_process = fork {
+  if opts['--dev'] then
+    require 'lib/filbunke.rb'
+    
     config_file = File.read(opts['--config'])
     config = YAML.load(config_file)
-    daemon = Filbunke::Daemon.new(config)
-    Process::UID.change_privilege(Etc.getpwnam(config["user"]).uid)
-    daemon.run!
-  }
-  Process.detach(child_process)
+    daemon = Filbunke::Daemon.new(config, true)
+    
+    daemon.run!    
+  else
+    if Process.uid != 0 then
+      puts "Filbunke should be started as root!"
+      exit 1
+    end
+    
+    require 'filbunke'
+    child_process = fork {
+      config_file = File.read(opts['--config'])
+      config = YAML.load(config_file)
+      daemon = Filbunke::Daemon.new(config)
+      Process::UID.change_privilege(Etc.getpwnam(config["user"]).uid)
+      daemon.run!
+    }
+    Process.detach(child_process)
+    
+  end
+  
+
 end

data/doc/examples/http_evict_cache.rb

@@ -2,7 +2,7 @@ require 'net/http'
 
 class HttpEvictCache < Filbunke::Callbacks
 
-  def on_update(file)
+  def on_update(file, local_file_path)
     begin
       evict_http = Net::HTTP.new(@config["host"], @config["port"].to_i)
       evict_http.start do |http|

data/doc/examples/http_file_upload.rb

@@ -0,0 +1,27 @@
+class HttpFileUpload < Filbunke::Callbacks
+
+  def on_update(file, local_file_path)
+    begin
+      basename = ::File.basename(file.path).chomp(".json")
+      basename =~ /(.*)_(\d)/
+      classname = $1
+      id = $2
+      
+      upload_path = "/model/update/#{classname}/#{id}"
+      file_contents = ::File.read(local_file_path)
+      
+      uri = "http://#{@config['host']}:#{@config['port']}#{upload_path}"
+      response = ::Typhoeus::Request.post(uri, :body => file_contents)
+      
+      if response.code.to_i != 200
+        @logger.log "Failed to upload: #{file.path}. Server responded with #{response.code}"
+      end
+
+    rescue StandardError => e
+      @logger.log(e.message)
+      @logger.log("Failed to upload entry: #{file.path}")
+      @logger.log(e.backtrace.join("\n"))
+    end
+  end
+
+end

data/filbunke.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{filbunke}
-  s.version = "1.6.0"
+  s.version = "1.7.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-10}
+  s.date = %q{2011-02-14}
   s.default_executable = %q{filbunked}
   s.description = %q{Filbunke client and library}
   s.email = %q{wouter@deltaprojects.se}
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
      "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",

data/lib/filbunke/callbacks.rb

@@ -6,7 +6,7 @@ module Filbunke
       @logger = logger
     end
 
-    def on_update(file)
+    def on_update(file, local_file_path)
     end
 
   end

data/lib/filbunke/client.rb

@@ -61,8 +61,6 @@ module Filbunke
       failure ? last_checkpoint : (new_checkpoint || last_checkpoint)
     end
     
-
-
     def update_files!(last_checkpoint)
       with_updated_files(last_checkpoint) {}
     end
@@ -132,9 +130,9 @@ module Filbunke
       end
     end
 
-    def run_callbacks(file)
+    def run_callbacks(file, local_file_path)
       @callbacks.each do |callback|
-        callback.on_update(file)
+        callback.on_update(file, local_file_path)
       end
     end
 
@@ -191,7 +189,7 @@ module Filbunke
               @logger.log "Failed to update file #{file.url}, error code = #{response.code}"
               success = false
             end
-            run_callbacks(file) if success
+            run_callbacks(file, local_file_path) if success
           rescue StandardError => e
             @logger.log "Failed to update file #{file.url}: #{e.message}"
             success = false

data/lib/filbunke/daemon.rb

@@ -1,15 +1,15 @@
 module Filbunke
   class Daemon
 
-    def initialize(config)
+    def initialize(config, local = false)
       @config = config
       @clients = []
-      setup_clients!
-      write_pid!(config["pid_file"])
+      setup_clients!(local)
+      write_pid!(config["pid_file"]) unless local
     end
 
-    def setup_clients!
-      @logger = Logger.new(@config["log_file"])
+    def setup_clients!(local = false)
+      @logger = Logger.new(@config["log_file"], local)
       @logger.log("Initializing filbunked")
       @config["repositories"].each do |repository_name, repository_config|
         @logger.log("Initializing repository: #{repository_name}")
@@ -39,12 +39,10 @@ module Filbunke
       @logger.log("Starting filbunked version #{version}")
       while true
         begin
-          
-        @clients.each do |client|
-          new_checkpoint = client.update_files!(checkpoint_for_repository(client.repository))
-          update_checkpoint_for_repository(client.repository, new_checkpoint)
-        end
-        
+          @clients.each do |client|
+            new_checkpoint = client.update_files!(checkpoint_for_repository(client.repository))
+            update_checkpoint_for_repository(client.repository, new_checkpoint)
+          end
         rescue StandardError => e
           @logger.log("Died.. #{e.message}")
           exit 1

data/lib/filbunke/logger.rb

@@ -1,13 +1,18 @@
 module Filbunke
   class Logger
 
-    def initialize(log_file_name)
-      @log_file = ::File.open(log_file_name, "a")
+    def initialize(log_file_name, local)
+      @local = local
+      @log_file = ::File.open(log_file_name, "a") unless local
     end
 
     def log(msg)
-      @log_file.write("#{Time.now}: #{msg}\n")
-      @log_file.flush
+      if @local then
+        puts "#{Time.now}: #{msg}"
+      else
+        @log_file.write("#{Time.now}: #{msg}\n")
+        @log_file.flush
+      end
     end
 
   end

data/lib/filbunke.rb

@@ -6,9 +6,9 @@ require 'digest/md5'
 require 'typhoeus'
 require 'open4'
 
-require 'filbunke/client.rb'
-require 'filbunke/file.rb'
-require 'filbunke/repository.rb'
-require 'filbunke/callbacks.rb'
-require 'filbunke/daemon.rb'
-require 'filbunke/logger.rb'
+require File.expand_path(File.dirname(__FILE__) + '/filbunke/client.rb')
+require File.expand_path(File.dirname(__FILE__) + '/filbunke/file.rb')
+require File.expand_path(File.dirname(__FILE__) + '/filbunke/repository.rb')
+require File.expand_path(File.dirname(__FILE__) + '/filbunke/callbacks.rb')
+require File.expand_path(File.dirname(__FILE__) + '/filbunke/daemon.rb')
+require File.expand_path(File.dirname(__FILE__) + '/filbunke/logger.rb')

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 6
+  - 7
   - 0
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Wouter de Bie
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-10 00:00:00 +01:00
+date: 2011-02-14 00:00:00 +01:00
 default_executable: filbunked
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,6 +88,7 @@ files:
 - 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