file-watcher 1.0.6 → 1.0.7

data/bin/watcher

@@ -4,6 +4,7 @@ require 'base_app'
 require 'rb-inotify'
 require 'json'
 require 'file_watcher/watch_job'
+require 'file_watcher/log_helper'
 
 
 #
@@ -17,6 +18,7 @@ require 'file_watcher/watch_job'
 
 
 class Watcher < BaseApp
+  include LogHelper
 
   def command_line_arguments
     super.concat [["w","watch-job-dir=","Directory of watch jobs.", true],
@@ -64,7 +66,7 @@ class Watcher < BaseApp
 
     WatchJob.registered_jobs.each do |job|
       @notifier.watch(job.watch_criteria[:target_dir], *job.watch_criteria[:events]) do |event|
-        puts "got event: #{event}"
+        log "got event: #{event}"
         job.event_handler event
       end
     end
@@ -73,9 +75,9 @@ class Watcher < BaseApp
       handle_event event, make_flags_map(event.flags)
     end
 
-    puts "Entering run loop."
+    log "Entering run loop."
     @notifier.run
-    puts "Exited run loop."
+    log "Exited run loop."
   end
 end
 

data/lib/file_watcher/log_helper.rb

@@ -0,0 +1,8 @@
+require 'logger'
+$Logger = Logger.new(STDOUT)
+
+module LogHelper
+  def log msg, level='info'
+      $Logger.send( level, msg )    
+  end
+end

data/lib/file_watcher/watch_job.rb

@@ -3,9 +3,11 @@ require 'cgi'
 require 'net/http'
 require 'net/https'
 require 'uri'
+require File.join( File.dirname(__FILE__), 'log_helper')
 
 class WatchJob
   include WatchConfig
+  include LogHelper
   attr_accessor :watch_criteria, :watch_action
 
   @@registered_jobs = []
@@ -14,7 +16,6 @@ class WatchJob
     @@registered_jobs 
   end
 
-
   def do_post event
     if watch_action[:http][:ssl] 
       protocol = 'https'
@@ -33,37 +34,37 @@ class WatchJob
 
     body = watch_action[:http][:body].merge({ :args => watch_action[:http][:args].call().push(event.name) } )
 
-    puts "URL: #{url}"
-    puts "body: #{body.to_json}"
+    log "URL: #{url}"
+    log "body: #{body.to_json}"
 
-    puts "Path: #{uri.path}"
-    puts "URI: #{uri.inspect}"
-    puts "Port: #{uri.port}"
+    log "Path: #{uri.path}"
+    log "URI: #{uri.inspect}"
+    log "Port: #{uri.port}"
 
     req = Net::HTTP::Post.new(uri.path)
     if watch_action[:http][:auth_user]
-      puts "Setting auth..."
+      log "Setting auth..."
       req.basic_auth watch_action[:http][:auth_user], watch_action[:http][:auth_pass]
     end
 
     req.set_form_data({'body' => body.to_json })
-    puts "SENDING: #{req.inspect}"
+    log "SENDING: #{req.inspect}"
     res = http.request(req)
-    puts "Res: #{res.inspect}"
+    log "Res: #{res.inspect}"
     case res
     when Net::HTTPSuccess, Net::HTTPRedirection
       # OK
-      puts "Req was ok"
+      log "Req was ok"
     else
       res.error!
     end
 
-    puts "Response: #{res}"
+    log "Response: #{res}"
   end
 
   def event_handler event
-    return unless event.name =~ watch_criteria[:file_glob]
-       
+    return if watch_criteria[:file_glob] && !event.name =~ watch_criteria[:file_glob]
+      
     if watch_action.keys.first == :http && watch_action[:http][:method] == :post
       return do_post event
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Paul Santa Clara
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 -04:00
+date: 2011-05-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,6 +75,7 @@ files:
 - bin/watcher
 - lib/file_watcher/watch_config.rb
 - lib/file_watcher/watch_job.rb
+- lib/file_watcher/log_helper.rb
 - README.textile
 has_rdoc: true
 homepage: https://github.com/relaynetwork/file-watcher