dtk-common 0.5.12 → 0.5.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGU3ZDY1NjdiMmQ2ZGY0ZGQ4NDIxMWJmZGUwNGRlODMxMTcwMzBmNw==
+    OWEwN2NmNjgzMDljMTg5NmY0NmRjMmVmZDUzYzU5NmYwOWFiMDlkZQ==
   data.tar.gz: !binary |-
-    MTI5OTVkZDM5YWRlNTcxMjViODA0NzdiN2FhOWNlNTdmMTRmMmY3MQ==
+    YjljN2ExMDlhNmM4NDM5ZjBiNDQ3OTdlZDMwZjZjMTc4N2M3ZDA2ZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTMyNzJmNjE5ZTUzMWFhY2IwMTQ2YzZhMDBhNGM4N2Q3NzU4NWY5MGUzMTRj
-    ZGYyM2E2Y2VkZTM4MDYyNjIyMmI5Y2QwZWM3MWRhOWQxOTQyMGEyYjU4ZjMy
-    MGFjZDQ0ZWEzNWEwMDQ0ZTJlYjdmNGVhODVhMzEzNWMzMDM5NGY=
+    OGE1YWM0ZGFiMGM4ZDAxZTdkYmJlMjlmYjJmZGNlZGVhMTgwMTA5Mzg5YzMz
+    NDhiZmUzYWYyZTgyZmU3M2RmMjQ3OWMwYzcyYmUxZGJmNzY1M2ExNDgxNmMw
+    ZWU4OGU4NDBlNzllNzJiNDdhYjY3NjNkNDcwMTE4NWM1NmRhZjg=
   data.tar.gz: !binary |-
-    OTJlNmY0Y2Q3YzFmOGE1Zjc0MTczMWQ2YTdkOTQxNTRkNDU3M2IzNDUzNzQ2
-    N2IwYmMxMGE2MmY2OTg4YzEwNzAyYjVhMzE0YzZiZjQ5ZGQyZjhmNmZjNGIy
-    NTEyNjI3ZjUzYWRiZWIwOTY5YzNhMjYzZmY1YjQzNzcxMTM5NzA=
+    NmFlNmFmZTQ0YzA3NmQ2OGIzYjdiYzg2NTE5MDg2MDM3NjNhMzI1MWMyN2Y1
+    Njg5Nzk3MTU5MWUzNjcxMDFiZGJhOWQ5NTBiNWIyMjljZjA0MmZiMGExMjk4
+    MjllNDJkOTliMWQwYjRlNDE5ZmIwMjA0Mjc0YTlmYmM5MmYyNWM=

data/lib/dtk-common/version.rb

@@ -1,3 +1,3 @@
 module DtkCommon
-  VERSION = "0.5.12"
+  VERSION = "0.5.13"
 end

data/lib/gitolite/grit/adapter.rb

@@ -6,7 +6,7 @@ module Gitolite
     
       DEFAULT_BRANCH = 'master'
     
-      def initialize(repo_dir,branch='master')
+      def initialize(repo_dir,branch=DEFAULT_BRANCH)
         @repo_dir = repo_dir
         @branch = branch
         @grit_repo = nil

data/lib/gitolite/grit/file_access.rb

@@ -2,6 +2,8 @@ module Gitolite
   module Git
     class FileAccess < Adapter
 
+      
+
       def add_file(file_rel_path,content)
         content ||= String.new
         file_path = qualified_path(file_rel_path)
@@ -33,15 +35,19 @@ module Gitolite
         "#{@repo_dir}/#{file_rel_path}"
       end
 
+      Change_dir_mutex = Mutex.new
+
       def chdir_and_checkout(branch=nil,&block)
-        branch ||= @branch
-        Dir.chdir(@repo_dir) do 
-          current_head = @grit_repo.head.name
-          git_command(:checkout,branch) unless current_head == branch
-          return unless block
-          yield
-          unless current_head == branch
-            git_command(:checkout,current_head)
+        Change_dir_mutex.synchronize do
+          branch ||= @branch
+          Dir.chdir(@repo_dir) do 
+            current_head = @grit_repo.head.name
+            git_command(:checkout,branch) unless current_head == branch
+            return unless block
+            yield
+            unless current_head == branch
+              git_command(:checkout,current_head)
+            end
           end
         end
       end

data/lib/gitolite/manager.rb

@@ -51,6 +51,10 @@ module Gitolite
       key_path
     end
 
+    def create_user_depracated(username, rsa_pub_key)
+      create_user(username, rsa_pub_key, 'default')
+    end
+
     def delete_user(username)
       key_path = @configuration.user_key_path(username)
 
@@ -87,6 +91,17 @@ module Gitolite
       true
     end
 
+    def rename_pub_key!(old_username, new_username, rsa_pub_key_name, rsa_pub_key_value)
+      file_name     = "#{old_username}@#{rsa_pub_key_name}"
+      new_file_name = "#{new_username}@#{rsa_pub_key_name}"
+
+      key_path     = @configuration.user_key_path(file_name)
+      new_key_path = @configuration.user_key_path(new_file_name)
+
+      remove_file(key_path, "Rename public key (#{rsa_pub_key_name}) from old user (#{old_username}) to new (#{new_username}) - REMOVE")
+      add_commit_file(new_key_path, rsa_pub_key_value, "Rename public key (#{rsa_pub_key_name}) from old user (#{old_username}) to new (#{new_username}) - ADD")
+    end
+
     def delete_user_group!(group_name)
       group_path = @configuration.user_group_path(group_name)
 
@@ -122,6 +137,7 @@ module Gitolite
     end
 
     # only to help with migration, to be deleted later TODO: Delete
+    # Depracated: To be removed 
     def migrate_to_multiple_pub_keys()
       all_pub_keys = users_public_keys()
       base_path    = @configuration.keydir_path
@@ -137,7 +153,7 @@ module Gitolite
           remove_file(pub_key_path, "Migrating user ('#{file_name}') to new annotation, temporary removing user")
 
           # create user
-          create_user(file_name, pub_content)
+          create_user_depracated(file_name, pub_content)
         end
       end
       puts "End migration of pub keys"
@@ -180,6 +196,10 @@ module Gitolite
       @commit_messages << commit_msg
     end
 
+    def file_content(file_path)
+      gitolite_admin_repo().file_content(file_path)
+    end
+
     def extract_file_name(full_path_name, file_path, file_extension)
       if full_path_name =~ Regexp.new("^#{file_path}/(.+)\.#{file_extension}")
         $1

data/lib/gitolite/repo.rb

@@ -10,7 +10,6 @@ module Gitolite
 
     GIOLITE_ALL_GROUP = '@all' 
 
-
     #
     # We check if there are users in addition to tenant with line,
     # (repo_conf.rights_hash.values.flatten.size > 1)
@@ -54,6 +53,16 @@ module Gitolite
       end       
     end
 
+    def rights_for_username(username)
+      @rights_hash.each do |k,v|
+        if v.include?(username)
+          return k
+        end
+      end
+
+      return nil
+    end
+
     def remove_username(username)
       @rights_hash.each do |k,v|
         if v.include?(username)

data/lib/gitolite/utils.rb

@@ -51,7 +51,7 @@ module Gitolite
       elsif permission.match(/^R/)
         return 'R'
       else
-        raise ::Error::NotSupported, "Not supported permission '#{permission}'!"
+        return nil
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-common
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged