graytoad 0.0.5 → 0.0.7

data/Rakefile

@@ -10,40 +10,13 @@ begin
     gem.homepage = "http://github.com/AlekSi/graytoad"
     gem.authors = ["Alexey Palazhchenko"]
     gem.add_dependency "hoptoad_notifier", "~> 2.3.0"
-    gem.add_dependency "gelf", "~> 0.9.2"
-    gem.add_development_dependency "shoulda", "~> 2.11.0"
-    gem.add_development_dependency "mocha", "~> 0.9.9"
+    gem.add_dependency "aleksi-gelf", "~> 0.9.780"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-    test.rcov_opts << '--exclude gem'
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: gem install rcov"
-  end
-end
-
-task :test => :check_dependencies
-
-task :default => :test
-
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.7

data/graytoad.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{graytoad}
-  s.version = "0.0.5"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Palazhchenko"]
@@ -23,19 +23,13 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "graytoad.gemspec",
-     "lib/graytoad.rb",
-     "test/helper.rb",
-     "test/test_graytoad.rb"
+     "lib/graytoad.rb"
   ]
   s.homepage = %q{http://github.com/AlekSi/graytoad}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Graylog2 + Hoptoad}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_graytoad.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -43,20 +37,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<hoptoad_notifier>, ["~> 2.3.0"])
-      s.add_runtime_dependency(%q<gelf>, ["~> 0.9.2"])
-      s.add_development_dependency(%q<shoulda>, ["~> 2.11.0"])
-      s.add_development_dependency(%q<mocha>, ["~> 0.9.9"])
+      s.add_runtime_dependency(%q<aleksi-gelf>, ["~> 0.9.780"])
     else
       s.add_dependency(%q<hoptoad_notifier>, ["~> 2.3.0"])
-      s.add_dependency(%q<gelf>, ["~> 0.9.2"])
-      s.add_dependency(%q<shoulda>, ["~> 2.11.0"])
-      s.add_dependency(%q<mocha>, ["~> 0.9.9"])
+      s.add_dependency(%q<aleksi-gelf>, ["~> 0.9.780"])
     end
   else
     s.add_dependency(%q<hoptoad_notifier>, ["~> 2.3.0"])
-    s.add_dependency(%q<gelf>, ["~> 0.9.2"])
-    s.add_dependency(%q<shoulda>, ["~> 2.11.0"])
-    s.add_dependency(%q<mocha>, ["~> 0.9.9"])
+    s.add_dependency(%q<aleksi-gelf>, ["~> 0.9.780"])
   end
 end
 

data/lib/graytoad.rb

@@ -3,42 +3,13 @@ require "hoptoad_notifier"
 
 class Graytoad
   class << self
-    attr_accessor :gelf_host, :gelf_port, :this_host
+    attr_accessor :gelf_host, :gelf_port
 
-    def notify(e, opts={})
-      detect_this_host if this_host.nil?
+    def notify(*args)
+      HoptoadNotifier.notify(args)
 
-      if e.is_a?(Hash)
-        opts, e = e, nil
-      end
-
-      g = Gelf.new(gelf_host, gelf_port)
-      g.host = this_host
-
-      if e.nil?
-        g.short_message, g.full_message = "#{opts[:error_class]}: #{opts[:error_message]}", backtrace_to_message(caller)
-        opts.each_pair { |key, value| g.add_additional(key.to_s, value) }
-        HoptoadNotifier.notify(opts)
-      else
-        g.short_message, g.full_message = e.message, "Backtrace:\n" + backtrace_to_message(e.backtrace)
-        HoptoadNotifier.notify(e, opts)
-      end
-
-      g.send
-    end
-
-  private
-    def backtrace_to_message(bt)
-      if bt.nil?
-        "No backtrace."
-      else
-        "Backtrace:\n" + bt.join("\n")
-      end
-    end
-
-    def detect_this_host
-      require 'socket'
-      self.this_host = Socket.gethostname
+      @notifier ||= GELF::Notifier.new(@gelf_host, @gelf_port)
+      @notifier.notify(args)
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: graytoad
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Alexey Palazhchenko
@@ -35,53 +35,21 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: gelf
+  name: aleksi-gelf
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 1571
         segments: 
         - 0
         - 9
-        - 2
-        version: 0.9.2
+        - 780
+        version: 0.9.780
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 2
-        - 11
-        - 0
-        version: 2.11.0
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 9
-        - 9
-        version: 0.9.9
-  type: :development
-  version_requirements: *id004
 description: Notify both Graylog2 and Hoptoad with this wrapper.
 email: 
 executables: []
@@ -100,8 +68,6 @@ files:
 - VERSION
 - graytoad.gemspec
 - lib/graytoad.rb
-- test/helper.rb
-- test/test_graytoad.rb
 has_rdoc: true
 homepage: http://github.com/AlekSi/graytoad
 licenses: []
@@ -136,6 +102,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Graylog2 + Hoptoad
-test_files: 
-- test/helper.rb
-- test/test_graytoad.rb
+test_files: []
+

data/test/helper.rb

@@ -1,11 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-require 'mocha'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'graytoad'
-
-class Test::Unit::TestCase
-end

data/test/test_graytoad.rb

@@ -1,39 +0,0 @@
-require 'helper'
-require 'socket'
-
-HOST = Socket.gethostname
-
-class TestGraytoad < Test::Unit::TestCase
-  context "with exception" do
-    setup do
-      @e = RuntimeError.new("Short message")
-      Gelf.any_instance.expects(:short_message=)
-      Gelf.any_instance.expects(:full_message=)
-      Gelf.any_instance.expects(:host=).with(HOST)
-    end
-
-    should "notify with exception" do
-      Gelf.any_instance.expects(:send)
-
-      HoptoadNotifier.expects(:notify).with(@e, {})
-
-      Graytoad.notify(@e)
-    end
-
-    should "notify with exception and params" do
-      Gelf.any_instance.expects(:send)
-
-      HoptoadNotifier.expects(:notify).with(@e, :user => 'user')
-
-      Graytoad.notify(@e, :user => 'user')
-    end
-
-    should "notify with params" do
-      Gelf.any_instance.expects(:send)
-
-      HoptoadNotifier.expects(:notify).with(:error_class => @e.class.to_s, :error_message => @e.message.to_s, :other_param => 'Param')
-
-      Graytoad.notify(:error_class => @e.class.to_s, :error_message => @e.message.to_s, :other_param => 'Param')
-    end
-  end
-end