lib/gitolite/gitolite_admin.rb in gitolite-0.0.2.alpha vs lib/gitolite/gitolite_admin.rb in gitolite-0.0.3.alpha

@@ -4,12 +4,12 @@
 
     CONF = "gitolite.conf"
     CONFDIR = "conf"
     KEYDIR = "keydir"
 
-    #Intialize with the path to
-    #the gitolite-admin repository
+    # Intialize with the path to
+    # the gitolite-admin repository
     def initialize(path, options = {})
       @gl_admin = Grit::Repo.new(path)
 
       @conf = options[:conf] || CONF
       @confdir = options[:confdir] || CONFDIR
@@ -17,42 +17,82 @@
 
       @ssh_keys = load_keys(File.join(path, @keydir))
       @config = Config.new(File.join(path, @confdir, @conf))
     end
 
+    # This method will bootstrap a gitolite-admin repo
+    # at the given path.  A typical gitolite-admin
+    # repo will have the following tree:
+    #
+    # gitolite-admin
+    #   conf
+    #     gitolite.conf
+    #   keydir
+    def self.bootstrap(path, options = {})
+      if self.is_gitolite_admin_repo?(path)
+        if options[:overwrite]
+          FileUtils.rm_rf(File.join(path, '*'))
+        else
+          return self.new(path)
+        end
+      end
+
+      FileUtils.mkdir_p([File.join(path,"conf"), File.join(path,"keydir")])
+
+      options[:perm] ||= "RW+"
+      options[:refex] ||= ""
+      options[:user] ||= "git"
+
+      c = Config.init
+      r = Config::Repo.new(options[:repo] || "gitolite-admin")
+      r.add_permission(options[:perm], options[:refex], options[:user])
+      c.add_repo(r)
+      config = c.to_file(File.join(path, "conf"))
+
+      repo = Grit::Repo.init(path)
+      Dir.chdir(path) do
+        repo.add(config)
+        repo.commit_index(options[:message] || "Config bootstrapped by the gitolite gem")
+      end
+
+      self.new(path)
+    end
+
     #Writes all aspects out to the file system
     #will also stage all changes
     def save
-      Dir.chdir(@gl_admin.working_dir)
+      Dir.chdir(@gl_admin.working_dir) do
+        #Process config file
+        new_conf = @config.to_file(@confdir)
+        @gl_admin.add(new_conf)
 
-      #Process config file
-      new_conf = @config.to_file(@confdir)
-      @gl_admin.add(new_conf)
+        #Process ssh keys
+        files = list_keys(@keydir).map{|f| File.basename f}
+        keys = @ssh_keys.values.map{|f| f.map {|t| t.filename}}.flatten
 
-      #Process ssh keys
-      files = list_keys(@keydir).map{|f| File.basename f}
-      keys = @ssh_keys.values.map{|f| f.map {|t| t.filename}}.flatten
+        to_remove = (files - keys).map { |f| File.join(@keydir, f)}
+        @gl_admin.remove(to_remove)
 
-      to_remove = (files - keys).map { |f| File.join(@keydir, f)}
-      @gl_admin.remove(to_remove)
-
-      @ssh_keys.each_value do |key|
-        key.each do |k|
-          @gl_admin.add(k.to_file(@keydir))
+        @ssh_keys.each_value do |key|
+          key.each do |k|
+            @gl_admin.add(k.to_file(@keydir))
+          end
         end
       end
     end
 
     #commits all staged changes and pushes back
     #to origin
-    def apply
-      #TODO: generate a better commit message
-      @gl_admin.commit_index("Commit by gitolite gem")
+    #
+    #TODO: generate a better commit message
+    #TODO: add the ability to specify the remote and branch
+    #TODO: detect existance of origin instead of just dying
+    def apply(commit_message = "Commit by gitolite gem")
+      @gl_admin.commit_index(commit_message)
       @gl_admin.git.push({}, "origin", "master")
     end
 
-    #Calls save and apply in order
     def save_and_apply
       self.save
       self.apply
     end
 
@@ -63,10 +103,28 @@
 
     def rm_key(key)
       @ssh_keys[key.owner].delete key
     end
 
+    #Checks to see if the given path is a gitolite-admin repository
+    #A valid repository contains a conf folder, keydir folder,
+    #and a configuration file within the conf folder
+    def self.is_gitolite_admin_repo?(dir)
+      # First check if it is a git repository
+      begin
+        Grit::Repo.new(dir)
+      rescue Grit::InvalidGitRepositoryError
+        return false
+      end
+
+      # If we got here it is a valid git repo,
+      # now check directory structure
+      File.exists?(File.join(dir, 'conf')) &&
+        File.exists?(File.join(dir, 'keydir')) &&
+        !Dir.glob(File.join(dir, 'conf', '*.conf')).empty?
+    end
+
     private
       #Loads all .pub files in the gitolite-admin
       #keydir directory
       def load_keys(path)
         keys = Hash.new {|k,v| k[v] = []}
@@ -80,13 +138,12 @@
 
         keys
       end
 
       def list_keys(path)
-        old_path = Dir.pwd
-        Dir.chdir(path)
-        keys = Dir.glob("**/*.pub")
-        Dir.chdir(old_path)
-        keys
+        Dir.chdir(path) do
+          keys = Dir.glob("**/*.pub")
+          keys
+        end
       end
   end
 end