Notifo uses secrets

kneath · kneath · commit 10f4ea8a6a04 · 2010-06-14T14:15:44.000-07:00
diff --git a/docs/github_payload b/docs/github_payload
@@ -1,9 +1,8 @@
 # example params hash sinatra receives
 
-{ 
+{
   "data" => {
-    "apisecret" => "",
-	"subscribers" => "" #CSV list
+	  "subscribers" => "" #CSV list
   },
 
   "payload" => {
@@ -27,7 +26,7 @@
         "url"       => "http://github.com/mojombo/grit/commit/06f63b43050935962f84fe54473a7c5de7977325",
         "author"    => { "name" => "Tom Preston-Werner", "email" => "tom@mojombo.com" },
         "id"        => "06f63b43050935962f84fe54473a7c5de7977325"
-      }, 
+      },
       {
         "removed"   => [],
         "message"   => "clean up heads test",
diff --git a/docs/notifo b/docs/notifo
@@ -11,13 +11,12 @@ Install Notes
   3. Enjoy.
 
 Notifications are only sent after the service (GitHub) has been approved to send you notifications on Notifo. This happens after the first commit after this service is enabled. You will begin receiving commit notifications from then on.
- 
+
 
 Developer Notes
 ---------------
 
 data
-  - apisecret (hidden - add manually and do not list in source on github-services repo)
   - subscribers (csv list of up to 25 Notifo usernames)
 
 payload
diff --git a/services/notifo.rb b/services/notifo.rb
@@ -1,31 +1,33 @@
+secrets = YAML.load_file(File.join(File.dirname(__FILE__), '..', 'config', 'secrets.yml'))
+
 service :notifo do |data, payload|
-  
+
   subscribe_url = URI.parse('https://api.notifo.com/v1/subscribe_user')
   data['subscribers'].gsub(/\s/, '').split(',').each do |subscriber|
     req = Net::HTTP::Post.new(subscribe_url.path)
-    req.basic_auth('github', data['apisecret'])
+    req.basic_auth('github', secrets['notifo']['apikey'])
     req.set_form_data('username' => subscriber)
-    net = Net::HTTP.new(subscribe_url.host, 443) 
+    net = Net::HTTP.new(subscribe_url.host, 443)
     net.use_ssl = true
     net.verify_mode = OpenSSL::SSL::VERIFY_NONE
     net.start {|http| http.request(req)}
-    
+
     notification_url = URI.parse('https://api.notifo.com/v1/send_notification')
     payload['commits'].each do |commit|
        req = Net::HTTP::Post.new(notification_url.path)
-       req.basic_auth('github', data['apisecret'])
+       req.basic_auth('github', secrets['notifo']['apikey'])
        req.set_form_data(
          'to' => subscriber,
-         'msg' => URI.escape("#{commit['author']['name']}:  \"#{commit['message']}\"", Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")), 
-         'title' => URI.escape("#{payload['repository']['name']}/#{payload['ref_name']}", Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")), 
+         'msg' => URI.escape("#{commit['author']['name']}:  \"#{commit['message']}\"", Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")),
+         'title' => URI.escape("#{payload['repository']['name']}/#{payload['ref_name']}", Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")),
          'uri' => URI.escape(commit['url'], Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
        )
-       net = Net::HTTP.new(notification_url.host, 443) 
+       net = Net::HTTP.new(notification_url.host, 443)
        net.use_ssl = true
        net.verify_mode = OpenSSL::SSL::VERIFY_NONE
        net.start {|http| http.request(req)}
      end
-     
+
   end
 
 end
