comsat 0.0.6 → 0.0.7

data/README.md

@@ -36,6 +36,7 @@ Messages are datum's that contain three pieces of information:
 * message
 * source
 * message_id
+* message_type
 
 The 'source' is where this message originates, for example, "nagios". The
 'message_id' should be a unique identifier for this message, and for certain
@@ -78,6 +79,20 @@ client.notify("notify_on_exception", {
 })
 ```
 
+Or you can specify routes without an 'event_type', instead specifying it in
+the payload:
+
+```ruby
+client = Comsat::Client.new
+client.create_route("notify_on_exception", ["campfire://<api_key>:X@blossom.campfirenow.com/Test%20Room"])
+client.notify("notify_on_exception", {
+  :message => "Exception reached in #function",
+  :source => "my_app",
+  :message_id => "exception-#{rand(1_000)}",
+  :message_type => "notice"
+})
+```
+
 You can also instrument Comsat with your favorite logger (which should be
 Scrolls by now :)):
 

data/lib/comsat/client.rb

@@ -10,7 +10,7 @@ module Comsat
       @@routes
     end
 
-    def create_route(route, event_type, services)
+    def create_route(route, event_type=nil, services)
       start = Time.now
       Comsat.log(:fn => :create_route, :route => "#{route}", :at => :start)
       unless routes.detect {|r| r.name == route }
@@ -19,41 +19,24 @@ module Comsat
       Comsat.log(:fn => :create_route, :route => "#{route}", :at => :finish, :elapsed => Time.now - start)
     end
 
-    def notify(route, message={})
+    def notify(route, msg={})
+      message = msg.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+      if notify_route.event_type
+        event = notify_route
+      elsif message[:message_type]
+        event = message[:message_type]
+      else
+        event = "notice"
+      end
+
       start = Time.now
       Comsat.log(:fn => :notify, :route => "#{route}", :at => :start)
       notify_route = @@routes.detect {|r| r.name == route } if message
-      event = notify_route.event_type
       notify_route.services.each do |svc|
         Comsat.log(:fn => :notify, :service => "#{svc.class.to_s.downcase}", :event => event)
         svc.send("send_#{event}".to_sym, message)
       end
       Comsat.log(:fn => :notify, :route => "#{route}", :at => :finish, :elapsed => Time.now - start)
     end
-
-    def send_notice(data)
-      send_event(:notice, data)
-    end
-
-    def send_alert(data)
-      send_event(:alert, data)
-    end
-
-    def send_resolve(data)
-      send_event(:resolve, data)
-    end
-
-    private
-
-    def send_event(event_type, data)
-      @urls.each do |url|
-        service = ServiceFactory.create(url)
-        if service.respond_to?("send_#{event_type}")
-          service.send("send_#{event_type}".to_sym, data)
-        else
-          next
-        end
-      end
-    end
   end
 end

data/lib/comsat/route.rb

@@ -2,16 +2,23 @@ module Comsat
   class Route
     attr_accessor :name, :services, :event_type
 
-    def initialize(route, et, urls)
+    def initialize(route, et=nil, urls)
       @name = route
-      @event_type = et if %w(alert notice resolve).include?(et)
-      @services = []
+      @event_type = et
+
+      @services = {
+        "notice" => [],
+        "alert" => [],
+        "resolve" => [],
+        "all" => []
+      }
+
       urls.each do |url|
         svc = ServiceFactory.create(url)
         if svc.respond_to?("send_#{@event_type}")
-          @services << svc
+          @services[@event_type] << svc
         else
-          next
+          @services["all"] << svc
         end
       end
     end

data/lib/comsat/service.rb

@@ -10,6 +10,15 @@ module Comsat
       def to_s
         "#<#{self.class} @host='#{@credentials.host}', @scope='#{@credentials.scope}'>"
       end
+
+      def http_post
+      end
+
+      def http_get
+      end
+
+      def http_put
+      end
     end
   end
 

data/lib/comsat/services/pagerduty.rb

@@ -17,7 +17,7 @@ module Comsat
       source     = data[:source]
       message = "[#{source}] #{message}"
 
-      pagerduty_url = "https://#{@credentials.host}/#{@credentials.scope}"
+      pagerduty_url = "https://#{@credentials.host}/generic/2010-04-15/create_event.json"
       data = {
         :service_key => @credentials.api_key,
         :incident_key => id,

data/lib/comsat/version.rb

@@ -1,3 +1,3 @@
 module Comsat
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/client_spec.rb

@@ -12,28 +12,49 @@ describe Comsat::Client do
   end
 
   describe "#create_route" do
-    before do
-      subject.create_route("test_route", "notice", [undefined_svc, defined_svc])
-    end
 
-    it "should register a route with base class" do
-      subject.routes.should_not be_empty
-    end
+    describe "specify event_types" do
+      before do
+        subject.create_route("test_route", "notice", [undefined_svc, defined_svc])
+      end
 
-    it "should create a route" do
-      subject.routes.first.name.should == "test_route"
-    end
+      it "should register a route with base class" do
+        subject.routes.should_not be_empty
+      end
 
-    it "should have one service initiated" do
-      subject.routes.first.services.length.should == 1
-    end
+      it "should create a route" do
+        subject.routes.first.name.should == "test_route"
+      end
+
+      it "should have one service initiated on the event_type 'notice'" do
+        subject.routes.first.services["notice"].length.should == 1
+      end
 
-    it "should have a campfire service initiated" do
-      subject.routes.first.services.first.class.should == Comsat::Campfire
+      it "should have a campfire service initiated" do
+        subject.routes.first.services["notice"].first.class.should == Comsat::Campfire
+      end
+
+      it "should provide an event type" do
+        subject.routes.first.event_type == "notice"
+      end
     end
 
-    it "should provide an event type" do
-      subject.routes.first.event_type == "notice"
+    describe "no event_type specified" do
+      before do
+        subject.create_route("test_route2", [defined_svc])
+      end
+
+      it "should register a route with base class" do
+        subject.routes.should_not be_empty
+      end
+
+      it "should create a route" do
+        subject.routes.first.name.should == "test_route2"
+      end
+
+      it "should have one service initiated on all event_types" do
+        subject.routes.first.services["all"].length.should == 1
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comsat
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000 Z
+date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70218924303220 !ruby/object:Gem::Requirement
+  requirement: &70239639975100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70218924303220
+  version_requirements: *70239639975100
 - !ruby/object:Gem::Dependency
   name: scrolls
-  requirement: &70218924301180 !ruby/object:Gem::Requirement
+  requirement: &70239639974440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70218924301180
+  version_requirements: *70239639974440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70218924300220 !ruby/object:Gem::Requirement
+  requirement: &70239639972620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70218924300220
+  version_requirements: *70239639972620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70218924299080 !ruby/object:Gem::Requirement
+  requirement: &70239639971220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70218924299080
+  version_requirements: *70239639971220
 description: Notifications as a Gem
 email:
 - ops@heroku.com