dtk-common 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac283e634584cbbf812ed55d2e3521207b44a33e
-  data.tar.gz: 5afc7b21c31129b787592a191f11fa4a058b45a1
+  metadata.gz: a6ee215bd281a690d770c8ec9d33717d836c84c8
+  data.tar.gz: 00aa11973259a8c7de948e8576a34622358dc2a7
 SHA512:
-  metadata.gz: bf69b913746a9575b8750e3f3559c0dfa132a9e279f6d2c9b2ed92b1c0e6be3facd8853ff8200dced8289e67902ec11fe220446b20c5e5f8437ff1a845347524
-  data.tar.gz: f062839abbcaf447e6e7b20198a0cb1762139ea477dac2b0702ecc79fc1643559693d93ebd8d3098e971b169f21854307a5e4d4b802a7defc2179f57f17ff223
+  metadata.gz: c1c512a8f08bfe36e5903f5befe69ac2b6c871ef19453ef8e980b430347526d03414da95c8650575251589fd62739e4b6d6c0903c1c7e762914564cce108fb86
+  data.tar.gz: f013a8a42b497211bb91f608b05197fd0d8a6ed05dc4538fa5dc5ba02a51ab2891da77670b9f484cc1f5c4f6da137f5b56be95c2804bfe1b730884d8651909a4

data/dtk-common.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |gem|
   gem.version       = DtkCommon::VERSION
 
   gem.add_dependency 'rugged','~> 0.17.0.b7'
-  gem.add_dependency 'dtk-common-core','0.11.0'
+  gem.add_dependency 'dtk-common-core', '0.12.0'
   gem.add_dependency 'colorize','~> 0.5.8'
-  gem.add_dependency 'grit', '~> 2.5'
+  gem.add_dependency 'gitlab-grit', '~> 2.8'
   gem.add_dependency 'erubis', '~> 2.7'
   # gem.add_dependency 'sequel','~> 3.40.0'
   # gem.add_dependency 'rdoc','~> 3.12'

data/lib/dtk-common/version.rb

@@ -1,20 +1,20 @@
-#
-# Copyright (C) 2010-2016 dtk contributors
-#
-# This file is part of the dtk project.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 module DtkCommon
-  VERSION="0.11.0"
+  VERSION="0.12.0"
 end

data/lib/gitolite/configuration.rb

@@ -15,38 +15,38 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-module Gitolite
-  class Configuration
-
-    attr_reader :repositories_path, :user_group_path, :keydir_path, :home_dir
-
-    def initialize(
-        repo_path_        = 'conf/repo-configs', 
-        user_group_path_  = 'conf/group-defs', 
-        keydir_path_      = 'keydir',
-        home_dir_         = nil
-      )
-    
-      @repositories_path = repo_path_
-      @user_group_path = user_group_path_
-      @keydir_path = keydir_path_
-      @home_dir = home_dir_
-    end
-
-    def user_key_path(username)
-      "#{@keydir_path}/#{username}.pub"
-    end
-
-    def user_group_path(group_name)
-      "#{@user_group_path}/#{group_name}.conf"
-    end
-
-    def repo_path(repo_name)
-      "#{@repositories_path}/#{repo_name}.conf"
-    end
-
-    def bare_repo_path(repo_name)
-      "#{@home_dir}/repositories/#{repo_name}.git"
-    end 
-  end
-end
+module Gitolite
+  class Configuration
+
+    attr_reader :repositories_path, :user_group_path, :keydir_path, :home_dir
+
+    def initialize(
+        repo_path_        = 'conf/repo-configs', 
+        user_group_path_  = 'conf/group-defs', 
+        keydir_path_      = 'keydir',
+        home_dir_         = nil
+      )
+    
+      @repositories_path = repo_path_
+      @user_group_path = user_group_path_
+      @keydir_path = keydir_path_
+      @home_dir = home_dir_
+    end
+
+    def user_key_path(username)
+      "#{@keydir_path}/#{username}.pub"
+    end
+
+    def user_group_path(group_name)
+      "#{@user_group_path}/#{group_name}.conf"
+    end
+
+    def repo_path(repo_name)
+      "#{@repositories_path}/#{repo_name}.conf"
+    end
+
+    def bare_repo_path(repo_name)
+      "#{@home_dir}/repositories/#{repo_name}.git"
+    end 
+  end
+end

data/lib/gitolite/grit/adapter.rb

@@ -15,110 +15,110 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require 'grit'
-
-module Gitolite
-  module Git
-    class Adapter
-
-      DEFAULT_BRANCH = 'master'
-
-      def initialize(repo_dir,branch=DEFAULT_BRANCH)
-        @repo_dir = repo_dir
-        @branch = branch
-        @grit_repo = nil
-        begin
-          @grit_repo = ::Grit::Repo.new(repo_dir)
-         rescue ::Grit::NoSuchPathError
-          repo_name = repo_dir.split("/").last.gsub("\.git","")
-          #TODO: change to usage error
-          raise ::Gitolite::NotFound, "Repo (#{repo_name}) - path '#{repo_dir}' does not exist"
-         rescue => e
-          raise e
-        end
-      end
-
-      def branches()
-        @grit_repo.branches.map{|h|h.name}
-      end
-
-      def ls_r(depth=nil,opts={})
-        tree_contents = tree.contents
-        ls_r_aux(depth,tree_contents,opts)
-      end
-
-      def path_exists?(path)
-        not (tree/path).nil?
-      end
-
-      def file_content(path)
-        tree_or_blob = tree/path
-        tree_or_blob && tree_or_blob.kind_of?(::Grit::Blob) && tree_or_blob.data
-      end
-
-      def file_content_and_size(path)
-        tree_or_blob = tree/path
-        return nil unless tree_or_blob
-        { :data => tree_or_blob.data, :size => tree_or_blob.size }
-      end
-
-      def push()
-        Git_command__push_mutex.synchronize do
-          git_command(:push,"origin", "#{@branch}:refs/heads/#{@branch}")
-        end
-      end
-
-      def push_to_mirror_repo(mirror_repo)
-        git_command(:push,"--mirror",mirror_repo)
-      end
-
-      Git_command__push_mutex = Mutex.new
-
-      def pull()
-        git_command(:pull,"origin",@branch)
-      end
-
-     private
-      def tree()
-        @grit_repo.tree(@branch)
-      end
-
-      def ls_r_aux(depth,tree_contents,opts={})
-        ret = Array.new
-        return ret if tree_contents.empty?
-        if depth == 1
-          ret = tree_contents.map do |tc|
-            if opts[:file_only]
-              tc.kind_of?(::Grit::Blob) && tc.name
-            elsif opts[:directory_only]
-              tc.kind_of?(::Grit::Tree) && tc.name
-            else
-              tc.name
-            end
-          end.compact
-          return ret
-        end
-
-        tree_contents.each do |tc|
-          if tc.kind_of?(::Grit::Blob)
-            unless opts[:directory_only]
-              ret << tc.name
-            end
-          else
-            dir_name = tc.name
-            ret += ls_r_aux(depth && depth-1,tc.contents).map{|r|"#{dir_name}/#{r}"}
-          end
-        end
-        ret
-      end
-
-      def git_command(cmd,*args)
-        @grit_repo.git.send(cmd, cmd_opts(),*args)
-      end
-      def cmd_opts()
-        {:raise => true, :timeout => 60}
-      end
-
-    end
-  end
-end
+require 'grit'
+
+module Gitolite
+  module Git
+    class Adapter
+
+      DEFAULT_BRANCH = 'master'
+
+      def initialize(repo_dir,branch=DEFAULT_BRANCH)
+        @repo_dir = repo_dir
+        @branch = branch
+        @grit_repo = nil
+        begin
+          @grit_repo = ::Grit::Repo.new(repo_dir)
+         rescue ::Grit::NoSuchPathError
+          repo_name = repo_dir.split("/").last.gsub("\.git","")
+          #TODO: change to usage error
+          raise ::Gitolite::NotFound, "Repo (#{repo_name}) - path '#{repo_dir}' does not exist"
+         rescue => e
+          raise e
+        end
+      end
+
+      def branches()
+        @grit_repo.branches.map{|h|h.name}
+      end
+
+      def ls_r(depth=nil,opts={})
+        tree_contents = tree.contents
+        ls_r_aux(depth,tree_contents,opts)
+      end
+
+      def path_exists?(path)
+        not (tree/path).nil?
+      end
+
+      def file_content(path)
+        tree_or_blob = tree/path
+        tree_or_blob && tree_or_blob.kind_of?(::Grit::Blob) && tree_or_blob.data
+      end
+
+      def file_content_and_size(path)
+        tree_or_blob = tree/path
+        return nil unless tree_or_blob
+        { :data => tree_or_blob.data, :size => tree_or_blob.size }
+      end
+
+      def push()
+        Git_command__push_mutex.synchronize do
+          git_command(:push,"origin", "#{@branch}:refs/heads/#{@branch}")
+        end
+      end
+
+      def push_to_mirror_repo(mirror_repo)
+        git_command(:push,"--mirror",mirror_repo)
+      end
+
+      Git_command__push_mutex = Mutex.new
+
+      def pull()
+        git_command(:pull,"origin",@branch)
+      end
+
+     private
+      def tree()
+        @grit_repo.tree(@branch)
+      end
+
+      def ls_r_aux(depth,tree_contents,opts={})
+        ret = Array.new
+        return ret if tree_contents.empty?
+        if depth == 1
+          ret = tree_contents.map do |tc|
+            if opts[:file_only]
+              tc.kind_of?(::Grit::Blob) && tc.name
+            elsif opts[:directory_only]
+              tc.kind_of?(::Grit::Tree) && tc.name
+            else
+              tc.name
+            end
+          end.compact
+          return ret
+        end
+
+        tree_contents.each do |tc|
+          if tc.kind_of?(::Grit::Blob)
+            unless opts[:directory_only]
+              ret << tc.name
+            end
+          else
+            dir_name = tc.name
+            ret += ls_r_aux(depth && depth-1,tc.contents).map{|r|"#{dir_name}/#{r}"}
+          end
+        end
+        ret
+      end
+
+      def git_command(cmd,*args)
+        @grit_repo.git.send(cmd, cmd_opts(),*args)
+      end
+      def cmd_opts()
+        {:raise => true, :timeout => 60}
+      end
+
+    end
+  end
+end

data/lib/gitolite/repo.rb

@@ -15,194 +15,194 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-  # This class is used to read gitolite repo config file. File is loaded and paramters are accessible via
-  # class members. After needed manipulation class will be saved as gitolite conf file.
-
-module Gitolite
-  class Repo
-
-    include Utils
-
-    attr_accessor :repo_name, :rights_hash, :commit_messages, :user_groups, :logger
-    attr_reader   :repo_dir_path
-
-    GIOLITE_ALL_GROUP = '@all'
-
-    #
-    # We check if there are users in addition to tenant with line,
-    # (repo_conf.rights_hash.values.flatten.size > 1)
-    # In case no, we do not give permission to tenant even
-    #
-
-    RepoConfTemplate = ::Erubis::Eruby.new <<-eos
-    include "groups-defs/*.conf"
-    repo    <%= repo_conf.repo_name %>
-      <% if repo_conf.rights_hash.values.flatten.size > 1 %>
-        <% repo_conf.rights_hash.each do |k, v| %>
-          <% unless v.empty? %>
-            <%=k%> = <%=v.join(' ') %>
-          <% end %>
-        <% end %>
-      <% end %>
-    eos
-
-    class << self
-
-      def get_repo_type(repo_name)
-        repo_name.match(/\-\-cm\-\-/) ? 'component' : 'service'
-      end
-
-    end
-
-    def initialize(repo_name, configuration_, logger_, gitolite_path, gitolite_branch = 'master')
-      @rights_hash = { 'R' => [], 'W' => [], 'RW' => [], 'RW+' => []}
-      @repo_name = repo_name
-      @user_groups = []
-      @commit_messages = []
-      @repo_conf_file_path = configuration_.repo_path(repo_name)
-      @repo_dir_path       = configuration_.bare_repo_path(repo_name)
-      @gitolite_admin_repo ||= Git::FileAccess.new(gitolite_path, gitolite_branch)
-      @logger = logger_
-
-      if exists?
-        load_repo()
-      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)
-          v.delete(username)
-          @commit_messages << "Removed access rights ('#{k}') for user/group '#{username}'"
-        end
-      end
-    end
-
-    def remove_group(group_name)
-      remove_username("@#{group_name}")
-    end
-
-    def add_username_with_rights(username, access_rights)
-      # if we get nil that means that we have to delete user from its permission stack
-      if access_rights.nil?
-        return remove_username(username)
-      end
-
-      # Only make changes if this is new user/group
-      unless @rights_hash[access_rights.upcase].include?(username)
-        remove_username(username)
-
-        @rights_hash[access_rights.upcase] << username
-        @commit_messages << "Added access rights ('#{access_rights}') for user/group '#{username}', in repo '#{@repo_name}'"
-
-        # add to user groups if user group is added
-        if username.match(/^@/)
-          @user_groups << username
-        end
-      end
-    end
-
-    def add_user_group_with_rights(group_name, access_rights)
-      add_username_with_rights("@#{group_name}", access_rights)
-    end
-
-    def add_all_with_rights(access_rights)
-      add_username_with_rights(GIOLITE_ALL_GROUP, access_rights)
-    end
-
-    def branches
-      Git::FileAccess.new(@repo_dir_path).branches()
-    end
-
-    def exists?
-      !@gitolite_admin_repo.file_content(@repo_conf_file_path).nil?
-    end
-
-    def any_changes?
-      !@commit_messages.empty?
-    end
-
-    def commit_changes(override_commit_message = nil)
-      unless @commit_messages.empty?
-        content = configuration_content()
-        validate_gitolite_conf_file(content)
-
-        commit_msg = override_commit_message || @commit_messages.join(', ')
-
-        @gitolite_admin_repo.add_file(@repo_conf_file_path,content)
-        @gitolite_admin_repo.commit(commit_msg)
-
-        @logger.info(commit_msg)
-      else
-        @logger.info("There has been no changes on repo '#{@repo_name}' skipping gitolite commit.")
-      end
-    end
-
-    def file_content(path, branch=Git::Adapter::DEFAULT_BRANCH)
-      Git::FileAccess.new(@repo_dir_path, branch).file_content(path)
-    end
-
-    def file_content_and_size(path, branch=Git::Adapter::DEFAULT_BRANCH)
-      Git::FileAccess.new(@repo_dir_path, branch).file_content_and_size(path)
-    end
-
-    def file_list(depth=nil, branch=Git::Adapter::DEFAULT_BRANCH)
-      Git::FileAccess.new(@repo_dir_path, branch).ls_r(depth)
-    end
-
-  private
-
-    def configuration_content()
-      RepoConfTemplate.result(:repo_conf => self)
-    end
-
-    def load_repo()
-      raw_content = @gitolite_admin_repo.file_content(@repo_conf_file_path)
-
-      unless raw_content
-        raise ::Error::NotFound, "Configuration file for repo (#{repo_name}) does not exist"
-      end
-
-      raw_content.each_line do |l|
-        l.chomp!()
-        if l =~ /^[ ]*repo[ ]+([^ ]+)/
-          unless $1 == repo_name
-            raise Error::GitoliteParsing, "Parsing error: expected repo to be (${repo_name} in (#{l})"
-          end
-        elsif l =~ /[ ]*([^ ]+)[ ]*=[ ]*(.+)$/
-          access_rights = $1
-          users = $2
-          users.scan(/[^ ]+/) do |user|
-            unless access_rights.match(/R|W|RW|RW+/)
-              raise  Error::GitoliteParsing, "Unexpected access rights while parsing file '#{access_rights}'"
-            end
-
-            @rights_hash[access_rights.to_s] << user unless @rights_hash[access_rights.to_s].include?(user)
-
-            # add to user groups if present
-            if user.match(/^@/)
-              @user_groups << user
-            end
-          end
-        elsif l.strip.empty? || l.strip().match(/^include/)
-          #no op
-        else
-          raise ::Error::GitoliteParsing, "Parsing repo error: (#{l})"
-        end
-      end
-    end
-
-
-  end
-
-end
+  # This class is used to read gitolite repo config file. File is loaded and paramters are accessible via
+  # class members. After needed manipulation class will be saved as gitolite conf file.
+
+module Gitolite
+  class Repo
+
+    include Utils
+
+    attr_accessor :repo_name, :rights_hash, :commit_messages, :user_groups, :logger
+    attr_reader   :repo_dir_path
+
+    GIOLITE_ALL_GROUP = '@all'
+
+    #
+    # We check if there are users in addition to tenant with line,
+    # (repo_conf.rights_hash.values.flatten.size > 1)
+    # In case no, we do not give permission to tenant even
+    #
+
+    RepoConfTemplate = ::Erubis::Eruby.new <<-eos
+    include "groups-defs/*.conf"
+    repo    <%= repo_conf.repo_name %>
+      <% if repo_conf.rights_hash.values.flatten.size > 1 %>
+        <% repo_conf.rights_hash.each do |k, v| %>
+          <% unless v.empty? %>
+            <%=k%> = <%=v.join(' ') %>
+          <% end %>
+        <% end %>
+      <% end %>
+    eos
+
+    class << self
+
+      def get_repo_type(repo_name)
+        repo_name.match(/\-\-cm\-\-/) ? 'component' : 'service'
+      end
+
+    end
+
+    def initialize(repo_name, configuration_, logger_, gitolite_path, gitolite_branch = 'master')
+      @rights_hash = { 'R' => [], 'W' => [], 'RW' => [], 'RW+' => []}
+      @repo_name = repo_name
+      @user_groups = []
+      @commit_messages = []
+      @repo_conf_file_path = configuration_.repo_path(repo_name)
+      @repo_dir_path       = configuration_.bare_repo_path(repo_name)
+      @gitolite_admin_repo ||= Git::FileAccess.new(gitolite_path, gitolite_branch)
+      @logger = logger_
+
+      if exists?
+        load_repo()
+      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)
+          v.delete(username)
+          @commit_messages << "Removed access rights ('#{k}') for user/group '#{username}'"
+        end
+      end
+    end
+
+    def remove_group(group_name)
+      remove_username("@#{group_name}")
+    end
+
+    def add_username_with_rights(username, access_rights)
+      # if we get nil that means that we have to delete user from its permission stack
+      if access_rights.nil?
+        return remove_username(username)
+      end
+
+      # Only make changes if this is new user/group
+      unless @rights_hash[access_rights.upcase].include?(username)
+        remove_username(username)
+
+        @rights_hash[access_rights.upcase] << username
+        @commit_messages << "Added access rights ('#{access_rights}') for user/group '#{username}', in repo '#{@repo_name}'"
+
+        # add to user groups if user group is added
+        if username.match(/^@/)
+          @user_groups << username
+        end
+      end
+    end
+
+    def add_user_group_with_rights(group_name, access_rights)
+      add_username_with_rights("@#{group_name}", access_rights)
+    end
+
+    def add_all_with_rights(access_rights)
+      add_username_with_rights(GIOLITE_ALL_GROUP, access_rights)
+    end
+
+    def branches
+      Git::FileAccess.new(@repo_dir_path).branches()
+    end
+
+    def exists?
+      !@gitolite_admin_repo.file_content(@repo_conf_file_path).nil?
+    end
+
+    def any_changes?
+      !@commit_messages.empty?
+    end
+
+    def commit_changes(override_commit_message = nil)
+      unless @commit_messages.empty?
+        content = configuration_content()
+        validate_gitolite_conf_file(content)
+
+        commit_msg = override_commit_message || @commit_messages.join(', ')
+
+        @gitolite_admin_repo.add_file(@repo_conf_file_path,content)
+        @gitolite_admin_repo.commit(commit_msg)
+
+        @logger.info(commit_msg)
+      else
+        @logger.info("There has been no changes on repo '#{@repo_name}' skipping gitolite commit.")
+      end
+    end
+
+    def file_content(path, branch=Git::Adapter::DEFAULT_BRANCH)
+      Git::FileAccess.new(@repo_dir_path, branch).file_content(path)
+    end
+
+    def file_content_and_size(path, branch=Git::Adapter::DEFAULT_BRANCH)
+      Git::FileAccess.new(@repo_dir_path, branch).file_content_and_size(path)
+    end
+
+    def file_list(depth=nil, branch=Git::Adapter::DEFAULT_BRANCH)
+      Git::FileAccess.new(@repo_dir_path, branch).ls_r(depth)
+    end
+
+  private
+
+    def configuration_content()
+      RepoConfTemplate.result(:repo_conf => self)
+    end
+
+    def load_repo()
+      raw_content = @gitolite_admin_repo.file_content(@repo_conf_file_path)
+
+      unless raw_content
+        raise ::Error::NotFound, "Configuration file for repo (#{repo_name}) does not exist"
+      end
+
+      raw_content.each_line do |l|
+        l.chomp!()
+        if l =~ /^[ ]*repo[ ]+([^ ]+)/
+          unless $1 == repo_name
+            raise Error::GitoliteParsing, "Parsing error: expected repo to be (${repo_name} in (#{l})"
+          end
+        elsif l =~ /[ ]*([^ ]+)[ ]*=[ ]*(.+)$/
+          access_rights = $1
+          users = $2
+          users.scan(/[^ ]+/) do |user|
+            unless access_rights.match(/R|W|RW|RW+/)
+              raise  Error::GitoliteParsing, "Unexpected access rights while parsing file '#{access_rights}'"
+            end
+
+            @rights_hash[access_rights.to_s] << user unless @rights_hash[access_rights.to_s].include?(user)
+
+            # add to user groups if present
+            if user.match(/^@/)
+              @user_groups << user
+            end
+          end
+        elsif l.strip.empty? || l.strip().match(/^include/)
+          #no op
+        else
+          raise ::Error::GitoliteParsing, "Parsing repo error: (#{l})"
+        end
+      end
+    end
+
+
+  end
+
+end

data/lib/grit_adapter/file_access/diff.rb

@@ -15,85 +15,85 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-class DTK::Common::GritAdapter::FileAccess
-  module DiffMixin
-    def diff(*args)
-      diff_comamnd_args = 
-        case args.size
-         when 1 then [@branch,args[0]]
-         when 2 then args
-          else raise Error.new("diff must have 1 or 2 arguments")
-        end
-      grit_diffs = @grit_repo.diff(*diff_comamnd_args)
-      array_diff_hashes = grit_diffs.map do |diff|
-        Diff::Attributes.inject(Hash.new) do |h,a|
-          val = diff.send(a)
-          val ?  h.merge(a => val) : h
-        end
-      end
-      Diffs.new(array_diff_hashes)
-    end
-
-    class Diffs < Array
-      
-      class Summary < ::DTK::Common::SimpleHashObject
-        def any_diffs?()
-          !keys().empty?
-        end
-        def any_added_or_deleted_files?()
-          !!(self[:files_renamed] or self[:files_added] or self[:files_deleted])
-        end
-        
-        def meta_file_changed?()
-          self[:files_modified] and !!self[:files_modified].find{|r|r[:path] =~ /^r8meta/}
-        end
-
-        #note: in paths_to_add and paths_to_delete rename appears both since rename can be accomplsihed by a add + a delete 
-        def paths_to_add()
-          (self[:files_added]||[]).map{|r|r[:path]} + (self[:files_renamed]||[]).map{|r|r[:new_path]}
-        end
-        def paths_to_delete()
-          (self[:files_deleted]||[]).map{|r|r[:path]} + (self[:files_renamed]||[]).map{|r|r[:old_path]}
-        end
-      end
-      
-      def initialize(array_diff_hashes)
-        super(array_diff_hashes.map{|hash|Diff.new(hash)})
-      end
-
-      #returns a hash with keys :file_renamed, :file_added, :file_deleted, :file_modified
-      def ret_summary()
-        [:renamed,:added,:deleted,:modified].inject(Summary.new) do |h,cnd|
-          res = map{|diff|diff.send("file_#{cnd}".to_sym)}.compact
-          res.empty? ? h : h.merge("files_#{cnd}".to_sym => res)
-        end
-      end
-    end
-
-    class Diff
-      Attributes = [:new_file,:renamed_file,:deleted_file,:a_path,:b_path,:diff]
-      AttributeAssignFn = Attributes.inject(Hash.new){|h,a|h.merge(a => "#{a}=".to_sym)}
-      def initialize(hash_input)
-        hash_input.each{|a,v|send(AttributeAssignFn[a],v)}
-      end
-      
-      def file_added()
-        @new_file && {:path => @a_path}
-      end
-
-      def file_renamed()
-        @renamed_file && {:old_path => @b_path, :new_path => @a_path}
-      end
-
-      def file_deleted()
-        @deleted_file && {:path => @a_path}
-      end
-
-      def file_modified()
-        ((@new_file or @deleted_file or @renamed_file) ? nil : true) && {:path => @a_path} 
-      end
-     private
-      attr_writer(*Attributes) 
-    end
-  end
-end
+class DTK::Common::GritAdapter::FileAccess
+  module DiffMixin
+    def diff(*args)
+      diff_comamnd_args = 
+        case args.size
+         when 1 then [@branch,args[0]]
+         when 2 then args
+          else raise Error.new("diff must have 1 or 2 arguments")
+        end
+      grit_diffs = @grit_repo.diff(*diff_comamnd_args)
+      array_diff_hashes = grit_diffs.map do |diff|
+        Diff::Attributes.inject(Hash.new) do |h,a|
+          val = diff.send(a)
+          val ?  h.merge(a => val) : h
+        end
+      end
+      Diffs.new(array_diff_hashes)
+    end
+
+    class Diffs < Array
+      
+      class Summary < ::DTK::Common::SimpleHashObject
+        def any_diffs?()
+          !keys().empty?
+        end
+        def any_added_or_deleted_files?()
+          !!(self[:files_renamed] or self[:files_added] or self[:files_deleted])
+        end
+        
+        def meta_file_changed?()
+          self[:files_modified] and !!self[:files_modified].find{|r|r[:path] =~ /^r8meta/}
+        end
+
+        #note: in paths_to_add and paths_to_delete rename appears both since rename can be accomplsihed by a add + a delete 
+        def paths_to_add()
+          (self[:files_added]||[]).map{|r|r[:path]} + (self[:files_renamed]||[]).map{|r|r[:new_path]}
+        end
+        def paths_to_delete()
+          (self[:files_deleted]||[]).map{|r|r[:path]} + (self[:files_renamed]||[]).map{|r|r[:old_path]}
+        end
+      end
+      
+      def initialize(array_diff_hashes)
+        super(array_diff_hashes.map{|hash|Diff.new(hash)})
+      end
+
+      #returns a hash with keys :file_renamed, :file_added, :file_deleted, :file_modified
+      def ret_summary()
+        [:renamed,:added,:deleted,:modified].inject(Summary.new) do |h,cnd|
+          res = map{|diff|diff.send("file_#{cnd}".to_sym)}.compact
+          res.empty? ? h : h.merge("files_#{cnd}".to_sym => res)
+        end
+      end
+    end
+
+    class Diff
+      Attributes = [:new_file,:renamed_file,:deleted_file,:a_path,:b_path,:diff]
+      AttributeAssignFn = Attributes.inject(Hash.new){|h,a|h.merge(a => "#{a}=".to_sym)}
+      def initialize(hash_input)
+        hash_input.each{|a,v|send(AttributeAssignFn[a],v)}
+      end
+      
+      def file_added()
+        @new_file && {:path => @a_path}
+      end
+
+      def file_renamed()
+        @renamed_file && {:old_path => @b_path, :new_path => @a_path}
+      end
+
+      def file_deleted()
+        @deleted_file && {:path => @a_path}
+      end
+
+      def file_modified()
+        ((@new_file or @deleted_file or @renamed_file) ? nil : true) && {:path => @a_path} 
+      end
+     private
+      attr_writer(*Attributes) 
+    end
+  end
+end

data/lib/require_first.rb

@@ -15,21 +15,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-module DTK
-  module Common
-    def self.r8_require_common(path)
-      require File.expand_path(path, File.dirname(__FILE__))
-    end
-
-    def self.is_gem_installed?(gem_name)
-      begin
-        # if no exception gem is found
-        gem gem_name
-        return true
-      rescue Gem::LoadError
-        return false
-      end
-    end
-  end
-end
-
+module DTK
+  module Common
+    def self.r8_require_common(path)
+      require File.expand_path(path, File.dirname(__FILE__))
+    end
+
+    def self.is_gem_installed?(gem_name)
+      begin
+        # if no exception gem is found
+        gem gem_name
+        return true
+      rescue Gem::LoadError
+        return false
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-common
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.8
 - !ruby/object:Gem::Dependency
-  name: grit
+  name: gitlab-grit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement