git_hook-pre_receive 0.0.2 → 0.1.0

data/lib/git_hook-pre_receive/command.rb

@@ -31,6 +31,11 @@ module Git
       runner.result
     end
 
+    def self.rm_r(file)
+      runner = Git::Runner.new("git rm -r \"#{file}\"")
+      runner.result
+    end
+
     def self.show(sha = nil)
       cmd = ['git show']
       cmd << " #{sha}" if sha

data/lib/git_hook-pre_receive/pre_receive_hook_parser.rb

@@ -15,10 +15,10 @@ module Git
       if old_sha1 == '0' * 40
         result = Git::Command.diff_tree(new_sha1)
         result.delete_at(0)
-        result.collect { |l| File.new(l) }
+        result.delete_if { |l| l['0000000... D'] != nil }.collect { |l| File.new(l) }
       else
         result = Git::Command.diff(old_sha1, new_sha1)
-        result.collect { |l| File.new(l) }
+        result.delete_if { |l| l['0000000... D'] != nil }.collect { |l| File.new(l) }
       end
     end
   end

data/lib/git_hook-pre_receive/version.rb

@@ -1,4 +1,4 @@
 #main Git
 module Git
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

data/spec/command_spec.rb

@@ -79,6 +79,20 @@ describe Command do
     end
   end
 
+  context '#rm_r' do
+    it 'deletes files' do
+      git_init(git_repo)
+
+      create_file(File.join(git_repo, 'file.txt'))
+      git_add(git_repo, 'file.txt')
+      git_commit(git_repo)
+
+      Dir.chdir(::File.join(working_directory, git_repo)) do
+        expect(Command.rm_r('file.txt').last).to include('file.txt')
+      end
+    end
+  end
+
   context '#diff' do
     it 'diff values' do
       git_init(git_repo)

data/spec/pre_receive_hook_parser_spec.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require 'spec_helper'
+
 describe PreReceiveHookParser do
   let(:git_repo) { 'git_repo' }
 
@@ -60,5 +62,27 @@ describe PreReceiveHookParser do
         expect(parser.files.collect { |f| f.name }).to eq(%w{dir/file.txt})
       end
     end
+
+    it 'handles deleted directories as well' do
+      git_init(git_repo)
+
+      create_file(File.join(git_repo, 'dir/file.txt'), 'file to delete')
+      git_add(git_repo, 'dir/file.txt')
+      git_commit(git_repo)
+
+      git_rm_r(git_repo, 'dir/file.txt')
+
+      create_file(File.join(git_repo, 'file1.txt'), 'new file')
+      git_add(git_repo, 'file1.txt')
+
+      git_commit(git_repo, 'deleted objects')
+
+      commit = git_show(git_repo, nil).first.split(" ")[1]
+
+      Dir.chdir(::File.join(working_directory, git_repo)) do
+        parser = PreReceiveHookParser.new("#{commit}^ #{commit} /ref/asdf/asdf")
+        expect(parser.files.collect { |f| f.name }).to eq(%w{file1.txt})
+      end
+    end
   end
 end

data/spec/support/git.rb

@@ -44,6 +44,12 @@ module Git
           Git::Command.diff_tree(new)
         end
       end
+
+      def git_rm_r(repo, file)
+        Dir.chdir(::File.join(working_directory, repo)) do
+          Git::Command.rm_r(file)
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_hook-pre_receive
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors: