jbox-gitolite 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f75c8c516f589f46bd632bca406db19dcd203b0
-  data.tar.gz: f82ec5ddd831a347a618ea5ca3485e7d9c64967b
+  metadata.gz: b4253d62c4de6da94cf98aaf8256530f1220ed4b
+  data.tar.gz: d49c94d508240a776dd40e7a340689c619312efa
 SHA512:
-  metadata.gz: 7a57407c0b06c0aa6ccd885a6a3732923fa030edd28fcd920e6d246fa5873d03b4456893df3da25cbeeba06d758ee4d73be7fdf8334efeaf55889e529227eb8f
-  data.tar.gz: 95f921301d318b4e7f103da5a0cf79e191de48821478637b2900f54f5b2ea4534a9f6d9ccdb6755af2e9d5dd7250eb1c1a8b4072fc004cdcb5afe8db4002e420
+  metadata.gz: 7e245a4c9dfdc7555c34456f80b0603aa1c20df05ec822e4809a782f2a4a000f23622d6348cca1e9c374067cbe6bc67d462af6ec7d151aff7847fb0d81ce589e
+  data.tar.gz: 67e90dbb7cd7834c1c287555eeecfcf39c60689ee76f60cd899946b929e43554bf7fb88b2b494091bce330b39fe54d1eb7770eec5f3e78e8440309c5726d729d

data/README.md

@@ -4,6 +4,8 @@
 
 This gem is designed to provide a Ruby interface to the [Gitolite](https://github.com/sitaramc/gitolite) Git backend system.
 
+It is based on [gitlab-grit](https://github.com/gitlabhq/grit) to manage the repository.
+
 It provides these functionalities :
 
 * [SSH Public Keys Management](https://github.com/jbox-web/gitolite/wiki/Features#wiki-ssh-public-keys-management)
@@ -12,6 +14,11 @@ It provides these functionalities :
 
 You can follow announcements [here](https://github.com/jbox-web/gitolite/wiki/Announcements) or take a look at the [roadmap](https://github.com/jbox-web/gitolite/wiki/Roadmap).
 
+You'll find a new implementation of this library here : https://github.com/oliverguenther/gitolite-rugged.
+
+The new one is based on https://github.com/libgit2/rugged and provide the same functionalities.
+
+
 ## Code status
 
 * [![Gem Version](https://badge.fury.io/rb/jbox-gitolite.svg)](http://badge.fury.io/rb/jbox-gitolite)

data/lib/gitolite/gitolite_admin.rb

@@ -9,6 +9,9 @@ module Gitolite
     DEBUG       = false
     TIMEOUT     = 10
 
+    # See here form mode details :https://github.com/gitlabhq/grit/blob/master/lib/grit/git.rb#L283
+    RAISE_ERROR = true
+
     # Gitolite gem's default commit message
     DEFAULT_COMMIT_MSG = "Committed by the gitolite gem"
 
@@ -80,7 +83,10 @@ module Gitolite
       @config_file = options[:config_file] || CONFIG_FILE
       @conf_dir    = options[:conf_dir] || CONF_DIR
       @key_dir     = options[:key_dir] || KEY_DIR
-      @env         = options[:env] || {}
+      git_env      = options[:env] || {}
+      git_raise    = options[:raise] || RAISE_ERROR
+
+      @git_options = {:env => git_env, :raise => git_raise}
 
       @config_file_path = File.join(@path, @conf_dir, @config_file)
       @conf_dir_path    = File.join(@path, @conf_dir)
@@ -125,8 +131,8 @@ module 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, :hard => true}, 'HEAD')
-      @gl_admin.git.native(:clean, {:env => @env, :d => true, :q => true, :f => true})
+      @gl_admin.git.native(:reset, @git_options.merge(:hard => true), 'HEAD')
+      @gl_admin.git.native(:clean, @git_options.merge(:d => true, :q => true, :f => true))
       reload!
     end
 
@@ -146,7 +152,7 @@ module Gitolite
       #Process config file (if loaded, i.e. may be modified)
       if @config
         new_conf = @config.to_file(@conf_dir_path)
-        @gl_admin.git.native(:add, {:env => @env}, new_conf)
+        @gl_admin.git.native(:add, @git_options, new_conf)
       end
 
       #Process ssh keys (if loaded, i.e. may be modified)
@@ -156,7 +162,7 @@ module Gitolite
 
         to_remove = (files - keys).map { |f| File.join(@key_dir, f) }
         to_remove.each do |key|
-          @gl_admin.git.native(:rm, {:env => @env}, key)
+          @gl_admin.git.native(:rm, @git_options, key)
         end
 
         @ssh_keys.each_value do |key|
@@ -164,7 +170,7 @@ module Gitolite
           next if key.respond_to?(:dirty?) && !key.dirty?
           key.each do |k|
             new_key = k.to_file(@key_dir_path)
-            @gl_admin.git.native(:add, {:env => @env}, new_key)
+            @gl_admin.git.native(:add, @git_options, new_key)
           end
         end
       end
@@ -179,13 +185,13 @@ module Gitolite
         args << "--author='#{options[:author]}'"
       end
 
-      @gl_admin.git.native(:commit, {:env => @env}, *args)
+      @gl_admin.git.native(:commit, @git_options, *args)
     end
 
 
     # Push back to origin
     def apply
-      @gl_admin.git.native(:push, {:env => @env}, "origin", "master")
+      @gl_admin.git.native(:push, @git_options, "origin", "master")
     end
 
 
@@ -202,7 +208,7 @@ module Gitolite
 
       reset! if options[:reset]
 
-      @gl_admin.git.native(:pull, {:env => @env, :rebase => options[:rebase]}, "origin", "master")
+      @gl_admin.git.native(:pull, @git_options.merge(:rebase => options[:rebase]), "origin", "master")
 
       reload!
     end

data/lib/gitolite/version.rb

@@ -1,3 +1,3 @@
 module Gitolite
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbox-gitolite
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Nicolas Rodriguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake