use common short_url method and revert back to tinyurl because of is.…

…gd usage limits

github-services.rb

@@ -24,7 +24,7 @@
 require 'rubyforge'
 
 module GitHub
-  def service(name, &block)
+  def service(name)
     Timeout.timeout(20) do
       post "/#{name}/" do
         data = JSON.parse(params[:data])
@@ -34,6 +34,14 @@ def service(name, &block)
     end
   rescue Timeout::Error
   end
+
+  def shorten_url(url)
+    Timeout::timeout(6) do
+      Net::HTTP.get "tinyurl.com", "/api-create.php?url=#{commit['url']}"
+    end
+  rescue Timeout::Error
+    url
+  end
 end
 include GitHub
 

services/cia.rb

@@ -2,21 +2,12 @@ def build_cia_commit(repository, branch, sha1, commit, size = 1)
   log = commit['message']
   log << " (+#{size} more commits...)" if size > 1
 
-  dt = DateTime.parse(commit['timestamp']).new_offset
-  timestamp = Time.send(:gm, dt.year, dt.month, dt.day, dt.hour, dt.min, dt.sec).to_i
+  dt         = DateTime.parse(commit['timestamp']).new_offset
+  timestamp  = Time.send(:gm, dt.year, dt.month, dt.day, dt.hour, dt.min, dt.sec).to_i
+  files      = commit['modified'] + commit['added'] + commit['removed']
+  tiny_url   = shorten_url(commit['url'])
 
-  files = commit['modified'] + commit['added'] + commit['removed']
-
-  isgd_url = nil
-  begin
-    Timeout::timeout(6) do
-      isgd_url = Net::HTTP.get "is.gd", "/api.php?longurl=#{commit['url']}"
-    end
-  rescue Timeout::Error
-    isgd_url = nil
-  end
-
-  log << " - #{isgd_url}" unless isgd_url.nil?
+  log << " - #{tiny_url}" unless tiny_url == commit['url']
 
   <<-MSG
     <message>

services/irc.rb

@@ -34,18 +34,11 @@
     payload['commits'].each do |commit|
       sha1 = commit['id']
 
-      isgd_url = nil
-      begin
-        Timeout::timeout(6) do
-          isgd_url = Net::HTTP.get "is.gd", "/api.php?longurl=#{commit['url']}"
-        end
-      rescue Timeout::Error
-        isgd_url = commit['url']
-      end
+      tiny_url = shorten_url(url)
 
       irc.puts "PRIVMSG #{room} :\002#{repository}:\002 \0033#{commit['author']['name']} \00307#{branch}\0030 SHA1-\002#{sha1[0..6]}\002"
       irc.puts "PRIVMSG #{room} :#{commit['message']}"
-      irc.puts "PRIVMSG #{room} :#{isgd_url}"
+      irc.puts "PRIVMSG #{room} :#{tiny_url}"
     end
     irc.puts "PART #{room}"
   end

services/twitter.rb

@@ -3,15 +3,8 @@
   url = URI.parse("http://twitter.com/statuses/update.xml")
 
   payload['commits'].each do |commit|
-    github_url = nil
-    begin
-      Timeout::timeout(6) do
-        github_url = Net::HTTP.get "is.gd", "/api.php?longurl=#{commit['url']}"
-      end
-    rescue Timeout::Error
-      github_url = commit['url']
-    end
-    status = "[#{repository}] #{github_url} #{commit['author']['name']} - #{commit['message']}"
+    tiny_url = shorten_url(commit['url'])
+    status   = "[#{repository}] #{tiny_url} #{commit['author']['name']} - #{commit['message']}"
 
     req = Net::HTTP::Post.new(url.path)
     req.basic_auth(data['username'], data['password'])