Revert "DRY'd up the dependencies"

mislav · mislav · commit d3ee73c20dc0 · 2008-10-06T21:10:14.000+02:00
This reverts commit ad0c106. I like to keep the dependencies specified in the files that need tham. That is a sort of documentation by itself.
diff --git a/lib/contacts.rb b/lib/contacts.rb
@@ -1,9 +1,3 @@
-require 'md5'
-require 'net/http'
-require 'net/https'
-require 'rubygems'
-require 'hpricot'
-
 module Contacts
   class Contact
     attr_reader :name, :username, :emails
diff --git a/lib/contacts/flickr.rb b/lib/contacts/flickr.rb
@@ -1,7 +1,14 @@
-contacts_path = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-$:.unshift(contacts_path) unless $:.include?(contacts_path)
 require 'contacts'
 
+require 'rubygems'
+require 'hpricot'
+require 'md5'
+require 'cgi'
+require 'time'
+require 'zlib'
+require 'stringio'
+require 'net/http'
+
 module Contacts
   
   class Flickr
diff --git a/lib/contacts/google.rb b/lib/contacts/google.rb
@@ -1,10 +1,13 @@
-contacts_path = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-$:.unshift(contacts_path) unless $:.include?(contacts_path)
 require 'contacts'
+
+require 'rubygems'
+require 'hpricot'
 require 'cgi'
 require 'time'
-require 'stringio'
 require 'zlib'
+require 'stringio'
+require 'net/http'
+require 'net/https'
 
 module Contacts
   # == Fetching Google Contacts
diff --git a/lib/contacts/windows_live.rb b/lib/contacts/windows_live.rb
@@ -1,7 +1,8 @@
-contacts_path = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-$:.unshift(contacts_path) unless $:.include?(contacts_path)
 require 'contacts'
 require File.join(File.dirname(__FILE__), %w{.. .. vendor windowslivelogin})
+
+require 'rubygems'
+require 'hpricot'
 require 'uri'
 require 'yaml'
 
diff --git a/lib/contacts/yahoo.rb b/lib/contacts/yahoo.rb
@@ -1,9 +1,12 @@
-contacts_path = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-$:.unshift(contacts_path) unless $:.include?(contacts_path)
 require 'contacts'
+
+require 'rubygems'
+require 'hpricot'
+require 'md5'
+require 'net/https'
 require 'uri'
-require 'yaml'
 require 'json'
+require 'yaml'
 
 module Contacts
   # = How I can fetch Yahoo Contacts?
