lib/ refactoring. Module Gitlabhq renamed to Gitlab

lib/gitlab/encode.rb

@@ -1,4 +1,4 @@
-module Gitlabhq
+module Gitlab
   module Encode 
     extend self
 

lib/gitlab/git_host.rb

@@ -1,9 +1,9 @@
-require File.join(Rails.root, "lib", "gitlabhq", "gitolite")
+require File.join(Rails.root, "lib", "gitlab", "gitolite")
 
-module Gitlabhq
+module Gitlab
   class GitHost
     def self.system
-      Gitlabhq::Gitolite
+      Gitlab::Gitolite
     end
 
     def self.admin_uri

lib/gitlab/gitolite.rb

@@ -2,7 +2,7 @@ require 'gitolite'
 require 'timeout'
 require 'fileutils'
 
-module Gitlabhq
+module Gitlab
   class Gitolite
     class AccessDenied < StandardError; end
 
@@ -46,7 +46,7 @@ module Gitlabhq
         end
       end
     rescue Exception => ex
-      Gitlabhq::Logger.error(ex.message)
+      Gitlab::Logger.error(ex.message)
       raise Gitolite::AccessDenied.new("gitolite timeout")
     end
 

lib/gitlab/logger.rb

@@ -1,4 +1,4 @@
-module Gitlabhq
+module Gitlab
   class Logger
     def self.error(message)
       @@logger ||= ::Logger.new(File.join(Rails.root, "log/githost.log"))

lib/gitlab/merge.rb

@@ -0,0 +1,60 @@
+module Gitlab
+  class Merge
+    attr_accessor :project, :merge_request, :user
+
+    def initialize(merge_request, user)
+      self.user = user
+      self.merge_request = merge_request
+      self.project = merge_request.project
+    end
+
+    def can_be_merged?
+      result = false
+      process do |repo, output|
+        result = !(output =~ /CONFLICT/)
+      end
+      result
+    end
+
+    def merge
+      process do |repo, output|
+        if output =~ /CONFLICT/
+          false  
+        else 
+          repo.git.push({}, "origin", merge_request.target_branch)
+          true
+        end
+      end
+    end
+
+    def process
+      Grit::Git.with_timeout(30.seconds) do
+        lock_file = File.join(Rails.root, "tmp", "merge_repo_#{project.path}.lock")
+
+        File.open(lock_file, "w+") do |f|
+          f.flock(File::LOCK_EX)
+
+          unless project.satellite.exists?
+            raise "You should run: rake gitlab:app:enable_automerge"
+          end
+
+          project.satellite.clear
+
+          Dir.chdir(project.satellite.path) do
+            merge_repo = Grit::Repo.new('.')
+            merge_repo.git.sh "git reset --hard"
+            merge_repo.git.sh "git fetch origin"
+            merge_repo.git.sh "git config user.name \"#{user.name}\""
+            merge_repo.git.sh "git config user.email \"#{user.email}\""
+            merge_repo.git.sh "git checkout -b #{merge_request.target_branch} origin/#{merge_request.target_branch}"
+            output = merge_repo.git.pull({}, "--no-ff", "origin", merge_request.source_branch)
+            yield(merge_repo, output)
+          end
+        end
+      end
+
+    rescue Grit::Git::GitTimeout
+      return false
+    end
+  end
+end

lib/gitlab/satellite.rb

@@ -1,4 +1,4 @@
-module Gitlabhq
+module Gitlab
   class Satellite
     
     PARKING_BRANCH = "__parking_branch"

lib/gitlab_merge.rb

@@ -1,58 +0,0 @@
-class GitlabMerge
-  attr_accessor :project, :merge_request, :user
-
-  def initialize(merge_request, user)
-    self.user = user
-    self.merge_request = merge_request
-    self.project = merge_request.project
-  end
-
-  def can_be_merged?
-    result = false
-    process do |repo, output|
-      result = !(output =~ /CONFLICT/)
-    end
-    result
-  end
-
-  def merge
-    process do |repo, output|
-      if output =~ /CONFLICT/
-        false  
-      else 
-        repo.git.push({}, "origin", merge_request.target_branch)
-        true
-      end
-    end
-  end
-
-  def process
-    Grit::Git.with_timeout(30.seconds) do
-      lock_file = File.join(Rails.root, "tmp", "merge_repo_#{project.path}.lock")
-
-      File.open(lock_file, "w+") do |f|
-        f.flock(File::LOCK_EX)
-        
-        unless project.satellite.exists?
-          raise "You should run: rake gitlab:app:enable_automerge"
-        end
-
-        project.satellite.clear
-
-        Dir.chdir(project.satellite.path) do
-          merge_repo = Grit::Repo.new('.')
-          merge_repo.git.sh "git reset --hard"
-          merge_repo.git.sh "git fetch origin"
-          merge_repo.git.sh "git config user.name \"#{user.name}\""
-          merge_repo.git.sh "git config user.email \"#{user.email}\""
-          merge_repo.git.sh "git checkout -b #{merge_request.target_branch} origin/#{merge_request.target_branch}"
-          output = merge_repo.git.pull({}, "--no-ff", "origin", merge_request.source_branch)
-          yield(merge_repo, output)
-        end
-      end
-    end
-
-  rescue Grit::Git::GitTimeout
-    return false
-  end
-end

lib/tasks/gitlab/enable_automerge.rake

@@ -2,7 +2,7 @@ namespace :gitlab do
   namespace :app do
     desc "GITLAB | Enable auto merge"
     task :enable_automerge => :environment  do
-      Gitlabhq::GitHost.system.new.configure do |git|
+      Gitlab::GitHost.system.new.configure do |git|
         git.admin_all_repo
       end