releaseable 0.0.18 → 0.0.20

data/VERSION

@@ -1 +1 @@
-0.0.18
+0.0.20

data/lib/releaseable/extensions.rb

@@ -3,23 +3,7 @@ require 'logglier'
 require 'stringio'
 require 'timeout'
 require 'java'
-
-# Selectively silence verbose JRuby warnings
-def suppress_warnings
-  old_verbose = $VERBOSE
-  begin
-    $VERBOSE = nil
-    yield if block_given?
-  ensure
-    # always re-set to old value, even if block raises an exception
-    $VERBOSE = old_verbose
-  end
-end
-
-# Avoid OpenSSL failures
-suppress_warnings do
-  OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
-end
+require 'releaseable/http' # for OpenSSL settings
 
 # Logger extensions
 class Logger
@@ -49,6 +33,7 @@ class Logger
     # Something that should be interrupted if it takes too much time...
     Timeout::timeout(out) { yield }
   rescue Timeout::Error, Exception => e
+    @config[:failsafe].puts e
     nil
   end
 
@@ -68,10 +53,11 @@ class Logger
   def finalize
     if handler
       with_timeout do
-        trace :failsafe => @config[:failsafe].string if @config[:failsafe].respond_to? :string
-        sound_alarm
+        if @config[:failsafe].respond_to?(:string) && @config[:failsafe].string != ''
+          trace :failsafe => @config[:failsafe].string
+        end
         sleep 2
-        handler.logdev.dev.deliverer.kill
+        @handler.logdev.dev.deliverer.kill
       end
     end
     close
@@ -101,10 +87,10 @@ class Logger
 
   # Extended handler for fatal errors
   def handler
-    return @handler if @handler
+    return @handler if @handler && @handler.logdev.dev.deliverer.alive?
 
     @handle_init_timeout ||= Time.now
-    if @handle_fatal_errors && @handle_init_timeout < Time.now
+    if @handle_fatal_errors && @handle_init_timeout <= Time.now
       @handle_init_timeout = Time.now + 5 * 60 # Retry init in 5 minutes
 
       with_timeout do

data/lib/releaseable/github.rb

@@ -1,34 +1,8 @@
-#require 'httpclient'
-require 'net/http'
-require 'net/https'
-require 'xmlsimple'
-require 'json'
+require 'releaseable/http'
 
 module Releaseable
   module GitHub
 
-    OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
-
-    def self.post address, data
-      uri = URI(address)
-
-      server = Net::HTTP.new(uri.host, uri.port)
-      server.use_ssl = (uri.scheme == 'https')
-      server.verify_mode = OpenSSL::SSL::VERIFY_NONE if server.use_ssl?
-
-      server.start do |http|
-        req = Net::HTTP::Post.new(uri.path)
-        case data
-          when Hash
-            req.form_data = data
-          when Array
-            req.body = data
-            req.content_type = 'multipart/form-data'
-        end
-        http.request(req)
-      end
-    end
-
     def self.upload info = {}
       info[:login] ||= `git config github.user`.chomp
       info[:token] ||= `git config github.token`.chomp
@@ -49,14 +23,14 @@ module Releaseable
 
       info[:content_type] ||= 'application/octet-stream'
 
-      response = post "https://github.com/#{info[:repos]}/downloads",
-                      'file_size' => File.stat(info[:file]).size,
-                      'content_type' => info[:content_type],
-                      'file_name' => info[:name],
-                      'description' => info[:description] || '',
-                      'login' => info[:login],
-                      'token' => info[:token]
-      #p response.body
+      response = HTTP.post "https://github.com/#{info[:repos]}/downloads",
+                           'file_size' => File.stat(info[:file]).size,
+                           'content_type' => info[:content_type],
+                           'file_name' => info[:name],
+                           'description' => info[:description] || '',
+                           'login' => info[:login],
+                           'token' => info[:token]
+      p response.body
       raise "Failed to post file info" unless response.code.to_i == 200 #status == 200
 
       upload = JSON.parse(response.body)

data/lib/releaseable/http.rb

@@ -0,0 +1,64 @@
+#require 'httpclient'
+require 'net/http'
+require 'net/https'
+require 'xmlsimple'
+require 'json'
+
+# Selectively silence verbose JRuby warnings
+def suppress_warnings
+  old_verbose = $VERBOSE
+  begin
+    $VERBOSE = nil
+    yield if block_given?
+  ensure
+    # always re-set to old value, even if block raises an exception
+    $VERBOSE = old_verbose
+  end
+end
+
+# Avoid OpenSSL failures
+suppress_warnings { OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE }
+
+module Releaseable
+  module HTTP
+
+    def self.post address, data
+      uri = URI(address)
+      p uri.request_uri
+
+      server = Net::HTTP.new(uri.host, uri.port)
+      server.use_ssl = (uri.scheme == 'https')
+      server.verify_mode = OpenSSL::SSL::VERIFY_NONE if server.use_ssl?
+
+      server.start do |http|
+        req = Net::HTTP::Post.new(uri.path)
+        case data
+          when Hash
+            req.form_data = data
+          when Array
+            req.body = data
+            req.content_type = 'multipart/form-data'
+        end
+        http.request(req)
+      end
+    end
+
+    def self.get address, user, pass, query
+      uri = URI("#{address}?" + query.map { |k, v| "#{k}=#{URI.encode(v.to_s)}" }.join('&'))
+      p uri.request_uri
+
+      server = Net::HTTP.new(uri.host, uri.port)
+      #server.use_ssl = (uri.scheme == 'https')
+      #server.verify_mode = OpenSSL::SSL::VERIFY_NONE if server.use_ssl?
+
+      server.start do |http|
+        req = Net::HTTP::Get.new(uri.request_uri)
+        req.basic_auth user, pass
+
+        http.request(req)
+      end
+    end
+
+  end # module Loggly
+end # module Releaseable
+

data/lib/releaseable/loggly.rb

@@ -0,0 +1,24 @@
+require 'releaseable/http'
+
+module Releaseable
+  module Loggly
+
+    def self.search domain, user, pass, query
+
+      query = {:q => query} if query.is_a?(String)
+
+      response = HTTP.get "http://#{domain}.loggly.com/api/search", user, pass,
+                          query.is_a?(Hash) ? query : {:q => query}
+
+      parsed = JSON.parse(response.body)
+
+      if parsed['data']
+        parsed['data'].map { |entry| JSON.parse(entry.delete('text')).merge(entry) }
+      else
+        parsed
+      end
+    end
+
+  end # module Loggly
+end # module Releaseable
+

metadata

@@ -2,7 +2,7 @@
 name: releaseable
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.18
+  version: 0.0.20
 platform: ruby
 authors: 
   - arvicco
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-21 00:00:00 Z
+date: 2012-02-22 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: bundler
@@ -90,6 +90,8 @@ files:
   - lib/releaseable.rb
   - lib/releaseable/extensions.rb
   - lib/releaseable/github.rb
+  - lib/releaseable/http.rb
+  - lib/releaseable/loggly.rb
   - lib/releaseable/sound.rb
   - lib/releaseable/version.rb
   - VERSION