jbox-gitolite 1.1.10 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b2c9b563847ffc8bdca2044d65da8a8a8efcd2a
-  data.tar.gz: 9c7e61206ac0aeae49440f6c41e0f5b776c1f453
+  metadata.gz: b8d77c8feb647bdec7c1f02c7fe17d0f784d2b65
+  data.tar.gz: 846058e42798a4a2e9d63216e40b4a91ede877ef
 SHA512:
-  metadata.gz: 57785aa12ad576d43f83cda8d89ba37c064533d0265a4c476ac31853f0022bea6d8f291bc96ff43164d403cfd15d814249a047d3cb01c31e4b06660ec08cc5bb
-  data.tar.gz: 1d7e3a63fdf86ab86da9d32addfcd4b9756124011f8c9343fbc592c91565991c3f2bcf55eab7c98960ef0b06d943c589aa9b236bb5a37d2d9b7a466dff120214
+  metadata.gz: 047899d17bb0346ee7f0f833e1ba04800ba96e1eb5c50e7aa536b388db7d7f4bf1114d28ba84e0ef4370df6e1adf19dc63f58a110967e67bf8b2b97792f5d6ba
+  data.tar.gz: e16d359aad89f8343ae2f0b472fcb688ddf9f8075c5a2ab41eb4ce274529c6d412c023024d61a8044f6a09a1f77b609b29c72694cbea6ba0b782abd5e8a44bcd

data/lib/gitolite/gitolite_admin.rb

@@ -2,208 +2,240 @@ require File.join(File.dirname(__FILE__), "dirty_proxy")
 
 module Gitolite
   class GitoliteAdmin
+
     attr_accessor :gl_admin
 
-    CONF = "gitolite.conf"
-    CONFDIR = "conf"
-    KEYDIR = "keydir"
-    DEBUG = false
+    CONFIG_FILE = "gitolite.conf"
+    CONF_DIR    = "conf"
+    KEY_DIR     = "keydir"
+    DEBUG       = false
+    TIMEOUT     = 10
 
-    #Gitolite gem's default git commit message
+    # Gitolite gem's default commit message
     DEFAULT_COMMIT_MSG = "Committed by the gitolite gem"
 
+    class << self
+
+      # 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 is_gitolite_admin_repo?(dir)
+        # First check if it is a git repository
+        begin
+          Grit::Repo.new(dir)
+        rescue Grit::NoSuchPathError, 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
+
+
+      # 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 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"))
+
+        gl_admin = Grit::Repo.init(path)
+        gl_admin.git.native(:add, {:chdir => gl_admin.working_dir}, config)
+        gl_admin.git.native(:commit, {:chdir => gl_admin.working_dir}, '-a', '-m', options[:message] || "Config bootstrapped by the gitolite gem")
+
+        self.new(path)
+      end
+
+    end
+
+
     # Intialize with the path to
     # the gitolite-admin repository
     def initialize(path, options = {})
       @path = path
-      @gl_admin = Grit::Repo.new(path)
 
-      @conf = options[:conf] || CONF
-      @confdir = options[:confdir] || CONFDIR
-      @keydir = options[:keydir] || KEYDIR
+      @config_file = options[:config_file] || CONFIG_FILE
+      @conf_dir    = options[:conf_dir] || CONF_DIR
+      @key_dir     = options[:key_dir] || KEY_DIR
+      @env         = options[:env] || {}
+
+      @config_file_path = File.join(@path, @conf_dir, @config_file)
+      @conf_dir_path    = File.join(@path, @conf_dir)
+      @key_dir_path     = File.join(@path, @key_dir)
+
+      Grit::Git.git_timeout = options[:timeout] || TIMEOUT
       Grit.debug = options[:debug] || DEBUG
+      @gl_admin  = Grit::Repo.new(path)
+
+      reload!
     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")])
+    def config
+      @config ||= load_config
+    end
 
-      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"))
+    def config=(config)
+      @config = config
+    end
 
-      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)
+    def ssh_keys
+      @ssh_keys ||= load_keys
+    end
+
+
+    def add_key(key)
+      raise "Key must be of type Gitolite::SSHKey!" unless key.instance_of? Gitolite::SSHKey
+      ssh_keys[key.owner] << key
+    end
+
+
+    def rm_key(key)
+      raise "Key must be of type Gitolite::SSHKey!" unless key.instance_of? Gitolite::SSHKey
+      ssh_keys[key.owner].delete key
+    end
+
+
+    # This method will destroy all local tracked changes, resetting the local gitolite
+    # git repo to HEAD and reloading the entire repository
+    # Note that this will also delete all untracked files
+    def reset!
+      @gl_admin.git.native(:reset, {:env => @env, :chdir => @gl_admin.working_dir, :hard => true}, 'HEAD')
+      @gl_admin.git.native(:clean, {:env => @env, :chdir => @gl_admin.working_dir, :d => true, :q => true, :f => true})
+      reload!
+    end
+
+
+    # This method will destroy the in-memory data structures and reload everything
+    # from the file system
+    def reload!
+      @ssh_keys = load_keys
+      @config = load_config
     end
 
-    #Writes all changed aspects out to the file system
-    #will also stage all changes
-    def save(commit_message = DEFAULT_COMMIT_MSG)
-      confdir = File.join(@gl_admin.working_dir, @confdir)
-      keydir  = File.join(@gl_admin.working_dir, @keydir)
+
+    # Writes all changed aspects out to the file system
+    # will also stage all changes then commit
+    def save(commit_message = DEFAULT_COMMIT_MSG, options = {})
 
       #Process config file (if loaded, i.e. may be modified)
       if @config
-        new_conf = @config.to_file(confdir).gsub(@gl_admin.working_dir + '/', '')
-        @gl_admin.git.native(:add, {:chdir => @gl_admin.working_dir}, new_conf)
+        new_conf = @config.to_file(@conf_dir_path)
+        @gl_admin.git.native(:add, {:env => @env, :chdir => @gl_admin.working_dir}, new_conf)
       end
 
       #Process ssh keys (if loaded, i.e. may be modified)
       if @ssh_keys
-        files = list_keys(keydir).map{|f| File.basename f}
-        keys = @ssh_keys.values.map{|f| f.map {|t| t.filename}}.flatten
+        files = list_keys.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) }
+        to_remove = (files - keys).map { |f| File.join(@key_dir, f) }
         to_remove.each do |key|
-          @gl_admin.git.native(:rm, {:chdir => @gl_admin.working_dir}, key)
+          @gl_admin.git.native(:rm, {:env => @env, :chdir => @gl_admin.working_dir}, key)
         end
 
         @ssh_keys.each_value do |key|
-          #Write only keys from sets that has been modified
+          # Write only keys from sets that has been modified
           next if key.respond_to?(:dirty?) && !key.dirty?
           key.each do |k|
-            new_key = k.to_file(keydir).gsub(@gl_admin.working_dir + '/', '')
-            @gl_admin.git.native(:add, {:chdir => @gl_admin.working_dir}, new_key)
+            new_key = k.to_file(@key_dir_path)
+            @gl_admin.git.native(:add, {:env => @env, :chdir => @gl_admin.working_dir}, new_key)
           end
         end
       end
 
-      @gl_admin.git.native(:commit, {:chdir => @gl_admin.working_dir}, '-a', '-m', commit_message)
-    end
+      args = []
 
-    # This method will destroy all local tracked changes, resetting the local gitolite
-    # git repo to HEAD and reloading the entire repository
-    # Note that this will also delete all untracked files
-    def reset!
-      Dir.chdir(@gl_admin.working_dir) do
-        @gl_admin.git.reset({:hard => true}, 'HEAD')
-        @gl_admin.git.clean({:d => true, :q => true, :f => true})
+      if options.has_key?(:author) && !options[:author].empty?
+        args << "--author='#{options[:author]}'"
       end
-      reload!
-    end
 
-    # This method will destroy the in-memory data structures and reload everything
-    # from the file system
-    def reload!
-      @ssh_keys = load_keys
-      @config = load_config
+      @gl_admin.git.native(:commit, {:env => @env, :chdir => @gl_admin.working_dir}, '-a', '-m', commit_message, args.join(' '))
     end
 
+
     # Push back to origin
     def apply
-      @gl_admin.git.native(:push, {:chdir => @gl_admin.working_dir}, "origin", "master")
+      @gl_admin.git.native(:push, {:env => @env, :chdir => @gl_admin.working_dir}, "origin", "master")
     end
 
+
     # Commits all staged changes and pushes back to origin
     def save_and_apply(commit_message = DEFAULT_COMMIT_MSG)
-      self.save(commit_message)
-      self.apply
+      save(commit_message)
+      apply
     end
 
+
     # Updates the repo with changes from remote master
     def update(options = {})
       options = {:reset => true, :rebase => false}.merge(options)
 
       reset! if options[:reset]
 
-      @gl_admin.git.native(:pull, {:chdir => @gl_admin.working_dir, :rebase => options[:rebase]}, "origin", "master")
+      @gl_admin.git.native(:pull, {:env => @env, :chdir => @gl_admin.working_dir, :rebase => options[:rebase]}, "origin", "master")
 
       reload!
     end
 
-    def add_key(key)
-      raise "Key must be of type Gitolite::SSHKey!" unless key.instance_of? Gitolite::SSHKey
-      ssh_keys[key.owner] << key
-    end
 
-    def rm_key(key)
-      raise "Key must be of type Gitolite::SSHKey!" unless key.instance_of? Gitolite::SSHKey
-      ssh_keys[key.owner].delete key
-    end
+    private
 
-    #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?
+    def load_config
+      Config.new(@config_file_path)
     end
 
-    def ssh_keys
-      @ssh_keys ||= load_keys
-    end
 
-    def config
-      @config ||= load_config
-    end
-
-    def config=(config)
-      @config = config
+    def list_keys
+      Dir.glob(@key_dir_path + '/**/*.pub')
     end
 
-    private
-      #Loads all .pub files in the gitolite-admin
-      #keydir directory
-      def load_keys(path = nil)
-        path ||= File.join(@path, @keydir)
-        keys = Hash.new {|k,v| k[v] = DirtyProxy.new([])}
 
-        list_keys(path).each do |key|
-          new_key = SSHKey.from_file(key)
-          owner = new_key.owner
+    # Loads all .pub files in the gitolite-admin
+    # keydir directory
+    def load_keys
+      keys = Hash.new {|k,v| k[v] = DirtyProxy.new([])}
 
-          keys[owner] << new_key
-        end
-        #Mark key sets as unmodified (for dirty checking)
-        keys.values.each{|set| set.clean_up!}
+      list_keys.each do |key|
+        new_key = SSHKey.from_file(key)
+        owner = new_key.owner
 
-        keys
+        keys[owner] << new_key
       end
 
-      def load_config(path = nil)
-        path ||= File.join(@path, @confdir, @conf)
-        Config.new(path)
-      end
+      # Mark key sets as unmodified (for dirty checking)
+      keys.values.each{|set| set.clean_up!}
+
+      keys
+    end
 
-      def list_keys(path)
-        keys = Dir.glob(path + '/**/*.pub')
-        keys
-      end
   end
 end

data/lib/gitolite/version.rb

@@ -1,3 +1,3 @@
 module Gitolite
-  VERSION = "1.1.10"
+  VERSION = "1.1.11"
 end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: jbox-gitolite
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors:
 - Nicolas Rodriguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: forgery
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.2
 - !ruby/object:Gem::Dependency
   name: gitlab-grit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: gratr19
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.4.1
 description: This gem is designed to provide a Ruby interface to the gitolite git
@@ -145,12 +145,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gemtest"
-- ".gitignore"
-- ".travis.yml"
+- .gemtest
+- .gitignore
+- .travis.yml
 - Gemfile
-- LICENSE
-- README.markdown
+- LICENSE.txt
+- README.md
 - Rakefile
 - gitolite.gemspec
 - lib/gitolite.rb
@@ -193,12 +193,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []