file-watcher 1.0.3 → 1.0.4

data/bin/watcher

@@ -64,6 +64,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}"
         job.event_handler event
       end
     end

data/lib/file_watcher/watch_job.rb

@@ -1,6 +1,7 @@
 require File.join( File.dirname(__FILE__), 'watch_config')
 require 'cgi'
 require 'net/http'
+require 'net/https'
 require 'uri'
 
 class WatchJob
@@ -15,24 +16,49 @@ class WatchJob
 
 
   def do_post event
-    Net::HTTP.start(watch_action[:http][:hostname]) do |http|
-      if watch_action[:http][:ssl] 
-        protocol = 'https'
-      else
-        protocol = 'http'
-      end
+    if watch_action[:http][:ssl] 
+      protocol = 'https'
+    else
+      protocol = 'http'
+    end
+
+    url = "#{protocol}://#{watch_action[:http][:hostname]}:#{watch_action[:http][:port]}#{watch_action[:http][:uri]}"
+    uri = URI.parse(url)
+
+    http = Net::HTTP.new(uri.host, uri.port)
+    if watch_action[:http][:ssl] 
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
 
-      url = "#{protocol}://#{watch_action[:http][:auth_user]}:#{watch_action[:http][:auth_pass]}@#{watch_action[:http][:hostname]}:#{watch_action[:http][:port]}#{watch_action[:http][:uri]}"
+    body = watch_action[:http][:body].merge({ :args => watch_action[:http][:body][:args].dup.push(event.name) } )
 
+    puts "URL: #{url}"
+    puts "body: #{body.to_json}"
 
-      body = watch_action[:http][:body].merge({ :args => watch_action[:http][:body][:args].dup.push(event.name) } )
+    puts "Path: #{uri.path}"
+    puts "URI: #{uri.inspect}"
+    puts "Port: #{uri.port}"
 
-      puts "URL: #{url}"
-      puts "body: #{body}"
+    req = Net::HTTP::Post.new(uri.path)
+    if watch_action[:http][:auth_user]
+      puts "Setting auth..."
+      req.basic_auth watch_action[:http][:auth_user], watch_action[:http][:auth_pass]
+    end
 
-      res = Net::HTTP.post_form(URI.parse(url), {'body' => body.to_json } ) 
-      puts "Response: #{res}"
+    req.set_form_data({'body' => body.to_json })
+    puts "SENDING: #{req.inspect}"
+    res = http.request(req)
+    puts "Res: #{res.inspect}"
+    case res
+    when Net::HTTPSuccess, Net::HTTPRedirection
+      # OK
+      puts "Req was ok"
+    else
+      res.error!
     end
+
+    puts "Response: #{res}"
   end
 
   def event_handler event

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Paul Santa Clara