--- /dev/null
+++ b/app/models/cloner.rb
@@ -0,0 +1,3 @@
+class Cloner < ActiveRecord::Base
+  belongs_to :repository
+end

--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -9,6 +9,7 @@ class Repository < ActiveRecord::Base
     :order => "status, id desc", :dependent => :destroy
   has_many    :proposed_merge_requests, :foreign_key => 'source_repository_id', 
                 :class_name => 'MergeRequest', :order => "id desc", :dependent => :destroy
+  has_many    :cloners, :dependent => :destroy
   
   validates_presence_of :user_id, :project_id, :name
   validates_format_of :name, :with => /^[a-z0-9_\-]+$/i,
@@ -30,6 +31,7 @@ class Repository < ActiveRecord::Base
   
   def self.find_by_path(path)
     repo_name, project_name = (path.split('/') - GitoriousConfig['repository_base_path'].split('/')).reverse
+    
     project = Project.find_by_slug!(project_name)
     project.repositories.find_by_name(repo_name.sub(/\.git/, ""))
   end
@@ -227,6 +229,10 @@ class Repository < ActiveRecord::Base
     users_by_email = users.inject({}){|hash, user| hash[user.email] = user; hash }
     users_by_email
   end
+  
+  def cloned_from(ip, country_code = "--", country_name = nil)
+    cloners.create(:ip => ip, :date => Time.now.utc, :country_code => country_code, :country => country_name)
+  end
     
   protected
     def set_as_mainline_if_first

--- a/app/views/repositories/_infobox.html.erb
+++ b/app/views/repositories/_infobox.html.erb
@@ -41,4 +41,5 @@ git push
       </div>
     </li>
   <% end -%>
+  <li>The repository has been cloned <%= @repository.cloners.size %> times.</li>
 </ul>
\ No newline at end of file

Binary files /dev/null and b/data/GeoIP.dat differ

--- /dev/null
+++ b/db/migrate/600_create_cloners.rb
@@ -0,0 +1,16 @@
+class CreateCloners < ActiveRecord::Migration
+  def self.up
+    create_table :cloners do |t|
+      t.string :ip
+      t.string :country_code, :length => 2
+      t.string :country
+      t.datetime :date
+      t.integer :repository_id
+    end
+  end
+
+  def self.down
+    drop_table :cloners
+  end
+end
+

--- a/script/git-daemon
+++ b/script/git-daemon
@@ -2,10 +2,14 @@
 
 require 'rubygems'
 require 'daemons'
+require 'geoip'
 require 'socket'
 
+ENV["RAILS_ENV"] ||= "production"
 require File.dirname(__FILE__)+'/../config/environment'
 
+Rails.configuration.log_level = :info # Disable debug
+
 BASE_PATH = File.expand_path(GitoriousConfig['repository_base_path'])
 
 module Git
@@ -20,6 +24,7 @@ class Daemon
   def initialize
     daemonize(File.join(RAILS_ROOT, "log", "git-daemon.log"))
     
+    @geoip = GeoIP.new(File.join(RAILS_ROOT, "data", "GeoIP.dat"))
     trap "CLD" do
       pid = Process.wait
       log(pid, "Disconnected. (status=#{$?.exitstatus})")
@@ -27,8 +32,7 @@ class Daemon
     
     port = 9418
     server = TCPServer.new('localhost', port)
-    
-    service_regexp = /(\d{4})(git-[\w-]+)\s(.+)\x0host=([\w\.\-]+)/.freeze
+    service_regexp = /(\w{4})(git-[\w-]+)\s(.+)\x0host=([\w\.\-]+)/.freeze
     while session = server.accept
       line = session.recv(1000)
       timeout = 30
@@ -39,17 +43,27 @@ class Daemon
         host = $4
         
         path = "#{BASE_PATH}/#{path}"
-        
         if !File.directory?(path)
           log(Process.pid, "Invalid path: #{path}")
           session.close
           next
         end
         
+        if !File.exist?(File.join(path, "git-daemon-export-ok"))
+          session.close
+          next
+        end
+        
         Dir.chdir(path) do
           cmd = "git-upload-pack --strict --timeout=#{timeout} ."
           
           fork do
+            repository = nil
+            begin
+              ActiveRecord::Base.allow_concurrency = true
+              repository = ::Repository.find_by_path(path)
+            rescue Exception
+            end
             pid = Process.pid
             domain, port, name, ip = session.addr
             log(pid, "Connection from #{ip}")
@@ -58,10 +72,21 @@ class Daemon
             $stdin.reopen(session)
             session.close
             
+            if repository
+              localization = @geoip.country(ip)
+              repository.cloned_from(ip, localization[3], localization[5])
+            else
+              log(pid, "Cannot find repository: #{path}")
+            end
+            
             exec(cmd)
-            exit
+            
+            exit!
           end
         end
+      else
+        $stderr.puts "Invalid request: #{line}"
+        session.close
       end
     end
   end

--- /dev/null
+++ b/spec/fixtures/cloners.yml
@@ -0,0 +1,13 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+argentina:
+  ip: 200.45.34.21
+  country: Argentina
+  country_code: AR
+  date: 2008-04-13 23:40:30
+
+mexico:
+  ip: 200.53.12.21
+  country: Mexico
+  country_code: MX
+  date: 2008-04-13 23:40:30

--- /dev/null
+++ b/spec/models/cloner_spec.rb
@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'geoip'
+
+describe Cloner do
+  before(:all) do
+    @geoip = GeoIP.new(File.join(RAILS_ROOT, "data", "GeoIP.dat"))
+  end
+  
+  before(:each) do
+    @cloner = Cloner.new
+  end
+
+  it "should has a valid country" do
+    localization = @geoip.country(cloners(:argentina).ip)
+    localization[3].should == cloners(:argentina).country_code
+    localization[5].should == cloners(:argentina).country
+  end
+end