diff --git a/app/models/site/repository.rb b/app/models/site/repository.rb index 7cc64352..a72c64cf 100644 --- a/app/models/site/repository.rb +++ b/app/models/site/repository.rb @@ -8,6 +8,7 @@ class Site class Repository attr_reader :rugged, :changes, :path + # @param [String] la ruta del repositorio def initialize(path) @path = path @rugged = Rugged::Repository.new(path) @@ -41,6 +42,8 @@ class Site # # XXX: Prestar atenciĆ³n a la velocidad de respuesta cuando tengamos # repositorios remotos. + # + # @return [Integer] def fetch if origin.check_connection :fetch @changes = rugged.fetch(origin)[:received_objects] @@ -51,6 +54,7 @@ class Site # Incorpora los cambios en el repositorio actual # + # @return [Rugged::Commit] def merge(usuarie) merge = rugged.merge_commits(head_commit, remote_head_commit)