jbox-gitolite 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d651fbaf5d5db7cca96889a86d1accfc5b6b59d
-  data.tar.gz: 7600969d8420ebc9279f06b9e166041201ccaacf
+  metadata.gz: 714f2e33bc4c882682680b711ee0b0022f636868
+  data.tar.gz: 258f25b13f3d90650b5c4249ba1670e07696512c
 SHA512:
-  metadata.gz: 9f12c7a03c8e2457f9d9cb29996779457bd950b9630261d1cfba72fff30a321f03878a645f66bfe0c357a86488d82fea0eee236f1cf9cdf1b3b98aa7b0c5c4b0
-  data.tar.gz: 08e2ea510c5b81ef925bba172e2c978643a2dc854a219c6536143a6ebd364ba4cc5e46193d83b12860abc1df81e45143cc2a1d6b7eb5792c2ded41d8eb676346
+  metadata.gz: 07f630087ad97757d6915962f17cada1d53c674b562e065abe9277c463db8303f5f25bea0b70046e2f9c3a4c62ac85296f4910c8cfab3b84458bcb519a79ad1a
+  data.tar.gz: 73901f8a5198a0bcfbbb5ac58b42acb6c47f08fadfb11414772319003193f2e2f287ea67b065dcd4f0f2538ae6541ccbc05afa68b6f6ac97cbb0183ac64cd0e4

data/gitolite.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake", "~> 10.0.2"
 
   s.add_dependency "gitlab-grit", "~> 2.6.0"
-  s.add_dependency "hashery", "~> 1.5.0"
   s.add_dependency "gratr19", "~> 0.4.4.1"
 
   s.files         = `git ls-files`.split("\n")

data/lib/gitolite/config/repo.rb

@@ -11,7 +11,7 @@ module Gitolite
         #Store the perm hash in a lambda since we have to create a new one on every deny rule
         #The perm hash is stored as a 2D hash, with individual permissions being the first
         #degree and individual refexes being the second degree.  Both Hashes must respect order
-        @perm_hash_lambda = lambda { OrderedHash.new {|k,v| k[v] = OrderedHash.new{|k2, v2| k2[v2] = [] }} }
+        @perm_hash_lambda = lambda { Hash.new {|k,v| k[v] = Hash.new{|k2, v2| k2[v2] = [] }} }
         @permissions = Array.new.push(@perm_hash_lambda.call)
 
         @name = name

data/lib/gitolite/gitolite_admin.rb

@@ -62,7 +62,7 @@ module Gitolite
 
     #Writes all changed aspects out to the file system
     #will also stage all changes
-    def save
+    def save(commit_message)
       confdir = File.join(@gl_admin.working_dir, @confdir)
       keydir  = File.join(@gl_admin.working_dir, @keydir)
 
@@ -91,6 +91,8 @@ module Gitolite
           end
         end
       end
+
+      @gl_admin.commit_index(commit_message)
     end
 
     # This method will destroy all local tracked changes, resetting the local gitolite
@@ -111,20 +113,15 @@ module Gitolite
       @config = load_config
     end
 
-    #commits all staged changes and pushes back
-    #to origin
-    #
-    #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 = DEFAULT_COMMIT_MSG)
-      @gl_admin.commit_index(commit_message)
-      @gl_admin.git.push({}, "origin", "master")
+    # Push back to origin
+    def apply
+      @gl_admin.git.native(:push, {: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
-      self.apply(commit_message)
+      self.save(commit_message)
+      self.apply
     end
 
     # Updates the repo with changes from remote master
@@ -188,7 +185,7 @@ module Gitolite
         keys = Hash.new {|k,v| k[v] = DirtyProxy.new([])}
 
         list_keys(path).each do |key|
-          new_key = SSHKey.from_file(File.join(path, key))
+          new_key = SSHKey.from_file(key)
           owner = new_key.owner
 
           keys[owner] << new_key
@@ -205,7 +202,7 @@ module Gitolite
       end
 
       def list_keys(path)
-        keys = %x[ find #{path} -name "\*.pub" -type f -exec basename {} \\; ].chomp.split("\n")
+        keys = Dir.glob(path + '/**/*.pub')
         keys
       end
   end

data/lib/gitolite/version.rb

@@ -1,3 +1,3 @@
 module Gitolite
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbox-gitolite
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Nicolas Rodriguez
@@ -94,20 +94,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
-- !ruby/object:Gem::Dependency
-  name: hashery
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: gratr19
   requirement: !ruby/object:Gem::Requirement