jbox-gitolite 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f37bb126327d01abd1e3fb270b1da512d823c68f
-  data.tar.gz: 0d8485bf1ac13abebfeba9329cb2a31829941d69
+  metadata.gz: a5373d0735ecddbde38ff701ac4e7d8d22abb4eb
+  data.tar.gz: 2666968db7834b8baca9ccf4ed3d5b7968d08ffa
 SHA512:
-  metadata.gz: 6beb1f436fabad483f7e88c0a9633a7d24c1cf2393fa61046b32c2fd678da7c2f0abde8200624aa48f52aac9235e962df0dc037afde248df562493da437dba41
-  data.tar.gz: dee2cb5e1f9c97988cb9ccea6ad0b63e1eecb45a08a19c16365450228ce3f310016a277027dacc1edcfecddaddc71c79baa1226539f472390b7ab17fdc22174c
+  metadata.gz: 0aca10595c306a81bbe36b8cce66b0ce7a8189617248c0f22d2d97d6003a3a5d7d82a25986141d223ef2577aac6d0ec343074d073ac514e288e7266bf5fd37de
+  data.tar.gz: 6bf8e50d3c55910fde08b42d587a879509a63d52e92e1aae109a11f351516504e17d211bba18e134c40fb8c52fb0433d3c58645f195a0dc3579e13f03ac116f5

data/lib/gitolite/config.rb

@@ -67,6 +67,8 @@ module Gitolite
 
       new_conf = File.join(path, filename)
       File.open(new_conf, "w") do |f|
+        f.sync = true
+
         #Output groups
         dep_order = build_groups_depgraph
         dep_order.each {|group| f.write group.to_s }

data/lib/gitolite/gitolite_admin.rb

@@ -63,27 +63,31 @@ module Gitolite
     #Writes all changed aspects out to the file system
     #will also stage all changes
     def save
-      Dir.chdir(@gl_admin.working_dir) do
-        #Process config file (if loaded, i.e. may be modified)
-        if @config
-          new_conf = @config.to_file(@confdir)
-          @gl_admin.add(new_conf)
-        end
+      confdir = File.join(@gl_admin.working_dir, @confdir)
+      keydir  = File.join(@gl_admin.working_dir, @keydir)
 
-        #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
+      #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)
+      end
 
-          to_remove = (files - keys).map { |f| File.join(@keydir, f)}
-          @gl_admin.remove(to_remove)
+      #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
+
+        to_remove = (files - keys).map { |f| File.join(@keydir, f) }
+        to_remove.each do |key|
+          @gl_admin.git.native(:rm, {:chdir => @gl_admin.working_dir}, key)
+        end
 
-          @ssh_keys.each_value do |key|
-            #Write only keys from sets that has been modified
-            next if key.respond_to?(:dirty?) && !key.dirty?
-            key.each do |k|
-              @gl_admin.add(k.to_file(@keydir))
-            end
+        @ssh_keys.each_value do |key|
+          #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)
           end
         end
       end
@@ -172,6 +176,10 @@ module Gitolite
       @config ||= load_config
     end
 
+    def config=(config)
+      @config = config
+    end
+
     private
       #Loads all .pub files in the gitolite-admin
       #keydir directory
@@ -197,10 +205,8 @@ module Gitolite
       end
 
       def list_keys(path)
-        Dir.chdir(path) do
-          keys = Dir.glob("**/*.pub")
-          keys
-        end
+        keys = %x[ find #{path} -name "\*.pub" -type f -exec basename {} \\; ].chomp.split("\n")
+        keys
       end
   end
 end

data/lib/gitolite/ssh_key.rb

@@ -61,6 +61,7 @@ module Gitolite
     def to_file(path)
       key_file = File.join(path, self.filename)
       File.open(key_file, "w") do |f|
+        f.sync = true
         f.write(self.to_s)
       end
       key_file

data/lib/gitolite/version.rb

@@ -1,3 +1,3 @@
 module Gitolite
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbox-gitolite
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Nicolas Rodriguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec