filbunke 1.1.2 → 1.1.4

data/Rakefile

@@ -12,7 +12,6 @@ begin
     gem.authors = ["Wouter de Bie"]
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     gem.files.exclude 'pkg'
-    gem.add_dependency 'activesupport', '>= 2.1.0'
     gem.executables = ['filbunked']  
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.4

data/bin/filbunked

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-
+$0=File.join(File.dirname(__FILE__), 'filbunked')
 require 'rubygems'
 require 'filbunke'
 require 'yaml'
@@ -15,7 +15,12 @@ raw_opts.each do |opt, arg|
   opts[opt] = arg
 end
 
-if opts['--help'] || opts['--config'].blank?
+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

data/doc/examples/filbunke_config.yml

@@ -1,10 +1,10 @@
 ---
 pid_file: '/var/run/filbunked.pid'
-user: 'daemon_user'
+user: 'wouter'
 log_file: '/tmp/filbunke.log'
 checkpoint_path: '/var/tmp/filbunke_checkpoints/'
 run_every: 5
-callback_path: '/path/to/filebunke/config.yml'
+callback_path: '/Users/wouter/prjs/filbunke-cdn/client/doc/examples'
 repositories:
     cache:
         local_path: '/v5/cachetest'

data/doc/examples/init_script

@@ -0,0 +1,75 @@
+### BEGIN INIT INFO
+# Provides:          filbunked
+# Required-Start:    $all
+# Required-Stop:     $all
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: starts the trinidad server
+# Description:       starts trinidad using start-stop-daemon
+### END INIT INFO
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON="/var/lib/gems/1.8/bin/filbunked"
+DAEMON_OPTS="-c /etc/filbunke/filbunke_config.yml"
+NAME=filbunked
+DESC=filbunked
+
+test -x $DAEMON || exit 0
+
+set -e
+
+. /lib/lsb/init-functions
+
+start(){
+  start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
+                --exec $DAEMON -- $DAEMON_OPTS || true
+}
+
+stop(){
+        start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid || true
+}
+
+force_stop(){
+        stop
+}
+
+force_restart(){
+  force_stop
+  sleep 2
+  start
+}
+
+case "$1" in
+  start)
+        echo -n "Starting $DESC: "
+  start
+        echo "$NAME."
+        ;;
+  stop)
+        echo -n "Stopping $DESC: "
+        stop
+        echo "$NAME."
+        ;;
+  force-stop)
+        echo -n "Stopping $DESC: "
+        force_stop
+        echo "$NAME."
+        ;;
+  restart|reload)
+        echo -n "Restarting $DESC: "
+  force_restart
+        echo "$NAME."
+  force-restart)
+        echo -n "Restarting $DESC: "
+        force_restart
+        echo "$NAME."
+        ;;
+  status)
+        status_of_proc -p /var/run/$NAME.pid "$DAEMON" $NAME && exit 0 || exit $?
+        ;;
+  *)
+        echo "Usage: $NAME {start|stop|restart|reload|force-restart|force-stop|status}" >&2
+        exit 1
+        ;;
+esac
+
+exit 0

data/filbunke.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{filbunke}
-  s.version = "1.1.2"
+  s.version = "1.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wouter de Bie"]
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
      "bin/filbunked",
      "doc/examples/filbunke_config.yml",
      "doc/examples/http_evict_cache.rb",
+     "doc/examples/init_script",
      "filbunke.gemspec",
      "lib/filbunke.rb",
      "lib/filbunke/callbacks.rb",
@@ -46,14 +47,11 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.1.0"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 2.1.0"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 2.1.0"])
   end
 end
 

data/lib/filbunke/client.rb

@@ -1,5 +1,3 @@
-require 'active_support'
-require 'active_support/all' rescue nil
 require 'json'
 require 'net/http'
 require 'fileutils'
@@ -27,7 +25,7 @@ module Filbunke
       failure = false
       updated_files.each do |raw_file|
         file = File.new(raw_file)
-        if file.url.start_with?("http://")
+        if file.url =~ /^http:\/\//
           local_file_path = ::File.join(repository.local_path, file.path)
           if update_http_file!(file, local_file_path) then
             @callbacks.each do |callback|
@@ -77,22 +75,27 @@ module Filbunke
     private
 
     def get_updated_file_list(last_checkpoint)
-      updates_http = Net::HTTP.new(@repository.host, @repository.port)
-      updates_http.start do |http|
-        begin
-        updates_path = "/#{UPDATES_ACTION}/#{@repository.name}?#{FROM_CHECKPOINT_KEY}=#{last_checkpoint}"
-        request = Net::HTTP::Get.new(updates_path)
-        response = http.request(request)
-        if response.code.to_i == 200
-          JSON.parse(response.body)
-        else
-          @logger.log "Failed to download updates for #{@repository.name}, error code = #{response.code}"
-        end
-        rescue StandardError => e
-          @logger.log "Error getting file list: #{e.message}! Retrying later.."
-          {}
+      begin
+        updates_http = Net::HTTP.new(@repository.host, @repository.port)
+        updates_http.start do |http|
+          begin
+          updates_path = "/#{UPDATES_ACTION}/#{@repository.name}?#{FROM_CHECKPOINT_KEY}=#{last_checkpoint}"
+          request = Net::HTTP::Get.new(updates_path)
+          response = http.request(request)
+          if response.code.to_i == 200
+            JSON.parse(response.body)
+          else
+            @logger.log "Failed to download updates for #{@repository.name}, error code = #{response.code}"
+          end
+          rescue StandardError => e
+            @logger.log "Error getting file list: #{e.message}! Retrying later.."
+            {}
+          end
         end
-      end
+      rescue StandardError => e
+        @logger.log "Unable to create HTTP connection to #{@repository.host}:#{@repository.port} (#{e.message})!"
+        return {}
+      end        
     end
 
     def update_http_file!(file, local_file_path)

data/lib/filbunke/daemon.rb

@@ -25,7 +25,7 @@ module Filbunke
           callbacks = []
           repository_config["callbacks"].each do |callback_name, callback_config|
             require ::File.join(@config["callback_path"], callback_name.to_s)
-            callback_class = callback_name.to_s.camelize.constantize
+            callback_class =  Module.const_get(callback_name.split("_").map(&:capitalize).join)
             callbacks << callback_class.new(@logger, callback_config)
           end
           Client.new(repository, @logger, callbacks)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Wouter de Bie
@@ -29,20 +29,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
-  type: :runtime
-  version_requirements: *id002
 description: Filbunke client and library
 email: wouter@deltaprojects.se
 executables: 
@@ -60,6 +46,7 @@ files:
 - bin/filbunked
 - doc/examples/filbunke_config.yml
 - doc/examples/http_evict_cache.rb
+- doc/examples/init_script
 - filbunke.gemspec
 - lib/filbunke.rb
 - lib/filbunke/callbacks.rb