comsat 0.0.2 → 0.0.4

data/comsat.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["ops@heroku.com"]
   gem.description   = "Notifications as a Gem"
   gem.summary       = "Notifications as a Gem"
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/heroku/comsat"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
@@ -17,7 +17,6 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency('rest-client')
   gem.add_runtime_dependency('scrolls')
-  gem.add_runtime_dependency('tinder')
 
   gem.add_development_dependency('rake')
   gem.add_development_dependency('rspec')

data/lib/comsat/services/campfire.rb

@@ -15,19 +15,28 @@ module Comsat
       unless room = find_room
         raise "Unable to find room"
       end
-      Array(msgs).each {|line| room.speak line }
+      Array(msgs).each {|line| speak(room["id"], line) }
     end
 
     def campfire
-      @campfire = ::Tinder::Campfire.new(
-        @credentials.host.split('.')[0],
-        :ssl => true,
-        :token => @credentials.api_key
+      @campfire = RestClient::Resource.new(
+        "https://#{@credentials.api_key}:X@#{@credentials.host}",
+        :headers => {:content_type => :json}
       )
     end
 
     def find_room
-      campfire.find_room_by_name(@credentials.scope)
+      if @credentials.scope.to_i > 0
+        @room = {"id" => @credentials.scope.to_i}
+      else
+        rooms = JSON.parse(campfire['/rooms.json'].get)
+        @room = rooms["rooms"].select {|r| r["name"] == @credentials.scope }
+        @room.first
+      end
+    end
+
+    def speak(room, message)
+      campfire["/room/#{room}/speak.json"].post(JSON.dump({:message => message}))
     end
   end
 end

data/lib/comsat/services/pagerduty.rb

@@ -1,7 +1,5 @@
 module Comsat
-  class PagerDuty < Service::Base
-    PAGERDUTY_ENDPOINT = 'https://events.pagerduty.com/generic/2010-04-15/create_event.json'
-
+  class Pagerduty < Service::Base
     def send_notice(data)
       contact_pagerduty(:trigger, data)
     end
@@ -14,18 +12,19 @@ module Comsat
     private
 
     def contact_pagerduty(event_type, data)
-      id         = data[:message_id] || SecureRandom.uuid
+      id         = data[:message_id] || rand(10_000)
       message    = data[:message]
       source     = data[:source]
-      message = "#{source}: #{message}"
+      message = "[#{source}] #{message}"
 
+      pagerduty_url = "https://#{@credentials.host}/#{@credentials.scope}"
       data = {
         :service_key => @credentials.api_key,
         :incident_key => id,
         :event_type => event_type,
         :description => message
       }
-      RestClient.post PAGERDUTY_ENDPOINT, data.to_json, :content_type => :json
+      RestClient.post pagerduty_url, data.to_json, :content_type => :json
     end
   end
 end

data/lib/comsat/version.rb

@@ -1,3 +1,3 @@
 module Comsat
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/lib/comsat.rb

@@ -2,10 +2,6 @@ require "cgi"
 require "json"
 require "rest_client"
 require "scrolls"
-require "securerandom"
-
-# Service includes
-require "tinder"
 
 require "comsat/log"
 require "comsat/route"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comsat
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70287816065340 !ruby/object:Gem::Requirement
+  requirement: &70177295796840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287816065340
+  version_requirements: *70177295796840
 - !ruby/object:Gem::Dependency
   name: scrolls
-  requirement: &70287816064720 !ruby/object:Gem::Requirement
+  requirement: &70177295796100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,21 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287816064720
-- !ruby/object:Gem::Dependency
-  name: tinder
-  requirement: &70287816064080 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70287816064080
+  version_requirements: *70177295796100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70287816063540 !ruby/object:Gem::Requirement
+  requirement: &70177295795660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287816063540
+  version_requirements: *70177295795660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70287816063020 !ruby/object:Gem::Requirement
+  requirement: &70177295795180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287816063020
+  version_requirements: *70177295795180
 description: Notifications as a Gem
 email:
 - ops@heroku.com
@@ -91,7 +80,7 @@ files:
 - spec/client_spec.rb
 - spec/service_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/heroku/comsat
 licenses: []
 post_install_message: 
 rdoc_options: []