spec/repository_spec.rb in git_wrapper-1.0.3 vs spec/repository_spec.rb in git_wrapper-1.1.0

@@ -115,16 +115,16 @@
     repo.init
 
     repo.commit('comment').should be_false
   end
 
-  it 'Commt in name of another user' do
+  it 'Commit in name of another user' do
     repo = Repository.new(@file_helper.create_temp_folder)
     repo.init
     @file_helper.create_temp_file(repo.location, 'test')
     repo.add_all
-    repo.commit('first_commit', :author_name => 'another_author', :author_email => '[e-mail]').should be_true
+    repo.commit('first_commit', author_name: 'another_author', author_email: '[e-mail]').should be_true
 
     log = repo.log.first
     log.author_name.should eq 'another_author'
   end
 
@@ -253,11 +253,11 @@
     my_repo.show_base(File.basename(my_file)).should eq("version base\n")
     my_repo.show_mine(File.basename(my_file)).should eq("version mine\n")
     my_repo.show_theirs(File.basename(my_file)).should eq("version theirs\n")
   end
 
-  it 'Show file from differente versions' do
+  it 'Show file from different versions' do
     repo = Repository.new(@file_helper.create_temp_folder)
     repo.init
 
     file_name = @file_helper.create_temp_file(repo.location, 'version 1')
     repo.add_all
@@ -296,12 +296,12 @@
     File.open(file_name1, 'w') { |f| f.puts 'test 2' }
 
     repo.add_all
     repo.commit('second commit')
 
-    repo.log(:file_name => File.basename(file_name1)).should have(2).items
-    repo.log(:file_name => File.basename(file_name2)).should have(1).items
+    repo.log(files: [File.basename(file_name1)]).should have(2).items
+    repo.log(files: [File.basename(file_name2)]).should have(1).items
   end
 
   it 'Show merge logs' do
     repo = Repository.new(@file_helper.create_temp_folder)
     repo.init
@@ -331,10 +331,318 @@
     log.merge?.should be_true
     log.parents.first.should eq third_commit.commit_hash
     log.parents.last.should eq second_commit.commit_hash
   end
 
+  it 'Show logs by files' do
+    repo = Repository.new(@file_helper.create_temp_folder)
+    repo.init
+
+    file_name1 = @file_helper.create_temp_file(repo.location, 'test')
+    file_name2 = @file_helper.create_temp_file(repo.location, 'test')
+
+    repo.add_all
+    repo.commit('first commit')
+
+    file_name3 = @file_helper.create_temp_file(repo.location, 'test')
+    File.open(file_name1, 'w') { |f| f.puts 'test 2' }
+
+    repo.add_all
+    repo.commit('second commit')
+
+    File.open(file_name3, 'w') { |f| f.puts 'test 2' }
+
+    repo.add_all
+    repo.commit('third commit')
+
+    files = [file_name1, file_name2, file_name3].map { |f| File.basename(f) }
+
+    repo.log(files: files).should have(3).items
+
+    files = [file_name1, file_name2].map { |f| File.basename(f) }
+
+    repo.log(files: files).should have(2).items
+    repo.log(files: []).should have(3).items
+    repo.log(files: nil).should have(3).items
+
+    repo.log.should have(3).items
+
+    files = [file_name1, 'non_exist_file.txt'].map { |f| File.basename(f) }
+
+    repo.log(files: files).should be_nil
+  end
+
+  it 'Show commit logs by author' do
+    repo = Repository.new(@file_helper.create_temp_folder)
+    repo.init
+
+    @file_helper.create_temp_file(repo.location, 'test')
+    @file_helper.create_temp_file(repo.location, 'test')
+
+    repo.add_all
+
+    repo.commit('first_commit', author_name: 'author_name', author_email: '[e-mail]')
+
+    repo.log(author: 'another_name').should have(0).items
+    repo.log(author: 'Author_name').should have(1).items
+    repo.log(author: '[e-mail]').should have(1).items
+    repo.log(author: '').should have(1).items
+    repo.log(author: nil).should have(1).items
+  end
+
+  it 'Show commit logs by until' do
+    repo = Repository.new(@file_helper.create_temp_folder)
+    repo.init
+
+    @file_helper.create_temp_file(repo.location, 'test')
+    @file_helper.create_temp_file(repo.location, 'test')
+    repo.add_all
+    repo.commit 'first_commit'
+
+    repo.log(until: yesterday).should have(0).items
+    repo.log(until: today).should have(0).items
+    repo.log(until: now).should have(1).items
+    repo.log(until: tomorrow).should have(1).items
+    repo.log(until: '').should have(1).items
+    repo.log(until: nil).should have(1).items
+  end
+
+  it 'Show commit logs by since' do
+    repo = Repository.new(@file_helper.create_temp_folder)
+    repo.init
+
+    @file_helper.create_temp_file(repo.location, 'test')
+    @file_helper.create_temp_file(repo.location, 'test')
+    repo.add_all
+    repo.commit 'first_commit'
+
+    repo.log(since: next_hour).should have(0).items
+    repo.log(since: tomorrow).should have(0).items
+    repo.log(since: next_month).should have(0).items
+    repo.log(since: next_year).should have(0).items
+    repo.log(since: today).should have(1).items
+    repo.log(since: yesterday).should have(1).items
+    repo.log(since: '').should have(1).items
+    repo.log(since: nil).should have(1).items
+  end
+
+  it 'Show commit logs by grep' do
+    repo = Repository.new(@file_helper.create_temp_folder)
+    repo.init
+
+    @file_helper.create_temp_file(repo.location, 'test')
+    @file_helper.create_temp_file(repo.location, 'test')
+    repo.add_all
+    repo.commit 'first_commit'
+
+    repo.log(grep: 'second_commit').should have(0).items
+    repo.log(grep: 'FirsT_commit').should have(1).items
+    repo.log(grep: 'first').should have(1).items
+    repo.log(grep: '').should have(1).items
+    repo.log(grep: nil).should have(1).items
+  end
+
+  it 'Show commit logs by author, since, until, grep and files' do
+    repo = Repository.new(@file_helper.create_temp_folder)
+    repo.init
+
+    file_name1 = @file_helper.create_temp_file(repo.location, 'test')
+    file_name2 = @file_helper.create_temp_file(repo.location, 'test')
+    repo.add_all
+    repo.commit('first_commit', author_name: 'author_name', author_email: '[e-mail]')
+
+    files = [file_name1, file_name2].map { |f| File.basename(f) }
+
+    repo.log(author: 'author_name', since: yesterday, until: yesterday, grep: 'first_commit', files: files).should have(0).items
+    repo.log(author: 'author_name', since: yesterday, until: tomorrow, grep: 'first_commit', files: files).should have(1).items
+  end
+
+  it 'Show paginate logs' do
+    repo = Repository.new(@file_helper.create_temp_folder)
+    repo.init
+
+    20.times do |i|
+      @file_helper.create_temp_file(repo.location, 'test')
+      repo.add_all
+      repo.commit 'commit_' + i.to_s
+    end
+
+    repo.log.should have(20).items
+    repo.log(max_count: 5).map(&:subject).should eq (15..19).map{ |i| "commit_#{i}" }.reverse
+    repo.log(skip: 2).first.subject.should eq 'commit_17'
+    repo.log(skip: 2, max_count: 5).map(&:subject).should eq (13..17).map{ |i| "commit_#{i}" }.reverse
+  end
+
+  it 'Rev List' do
+    repo = Repository.new(@file_helper.create_temp_folder)
+    repo.init
+
+    2.times do |i|
+      @file_helper.create_temp_file(repo.location, 'test')
+      repo.add_all
+      repo.commit "Commit #{i}"
+    end
+
+    repo.rev_list.should have(2).items
+    2.times { |i| repo.rev_list[i].should eq repo.log[i].commit_hash }
+  end
+
+  it 'Rev List count' do
+    repo = Repository.new(@file_helper.create_temp_folder)
+    repo.init
+
+    2.times do |i|
+      @file_helper.create_temp_file(repo.location, 'test')
+      repo.add_all
+      repo.commit "Commit #{i}"
+
+      repo.rev_list_count.should eq i+1
+      repo.rev_list_count(grep: "Commit #{i}").should eq 1
+    end
+
+  end
+
+  it 'Rev List by author' do
+    repo = Repository.new(@file_helper.create_temp_folder)
+    repo.init
+
+    2.times do |i|
+      @file_helper.create_temp_file(repo.location, 'test')
+      repo.add_all
+      repo.commit( "Commit #{i}", author_name: 'author_name', author_email: '[e-mail]' )
+    end
+
+    repo.rev_list(author: 'author_name').should have(2).items
+    2.times { |i| repo.rev_list(author: 'author_name')[i].should eq repo.log[i].commit_hash }
+
+    repo.log(author: 'Author_name').should have(2).items
+    repo.log(author: '[e-mail]').should have(2).items
+    repo.log(author: '').should have(2).items
+    repo.log(author: nil).should have(2).items
+    repo.log(author: 'another_name').should have(0).items
+  end
+
+  it 'Rev List by since' do
+    repo = Repository.new(@file_helper.create_temp_folder)
+    repo.init
+
+    2.times do |i|
+      @file_helper.create_temp_file(repo.location, 'test')
+      repo.add_all
+      repo.commit "Commit #{i}"
+    end
+
+    repo.rev_list(since: today).should have(2).items
+    2.times { |i| repo.rev_list(since: today)[i].should eq repo.log(since: today)[i].commit_hash }
+
+    repo.log(since: next_hour).should have(0).items
+    repo.log(since: tomorrow).should have(0).items
+    repo.log(since: next_month).should have(0).items
+    repo.log(since: next_year).should have(0).items
+    repo.log(since: yesterday).should have(2).items
+    repo.log(since: '').should have(2).items
+    repo.log(since: nil).should have(2).items
+  end
+
+  it 'Rev List by until' do
+
+    repo = Repository.new(@file_helper.create_temp_folder)
+    repo.init
+
+    2.times do |i|
+      @file_helper.create_temp_file(repo.location, 'test')
+      repo.add_all
+      repo.commit "Commit #{i}"
+    end
+
+    repo.rev_list(until: now).should have(2).items
+    2.times { |i| repo.rev_list(until: now)[i].should eq repo.log(until: now)[i].commit_hash }
+
+    repo.log(until: yesterday).should have(0).items
+    repo.log(until: today).should have(0).items
+    repo.log(until: tomorrow).should have(2).items
+    repo.log(until: '').should have(2).items
+    repo.log(until: nil).should have(2).items
+  end
+
+  it 'Rev List by grep' do
+    repo = Repository.new(@file_helper.create_temp_folder)
+    repo.init
+
+    2.times do |i|
+      @file_helper.create_temp_file(repo.location, 'test')
+      repo.add_all
+      repo.commit "Commit #{i}"
+    end
+
+    commits = repo.rev_list(grep: 'Commit 1')
+    commits.should have(1).items
+    commits.first.should eq repo.log(grep: 'Commit 1').first.commit_hash
+
+    repo.rev_list(grep: 'CoMMiT 1').should have(1).items
+    repo.rev_list(grep: 'Commit 2').should have(0).items
+    repo.rev_list(grep: 'Comm').should have(2).items
+    repo.rev_list(grep: '').should have(2).items
+    repo.rev_list(grep: nil).should have(2).items
+
+  end
+
+  it 'Rev List by files' do
+    repo = Repository.new(@file_helper.create_temp_folder)
+    repo.init
+
+    file_name1 = @file_helper.create_temp_file(repo.location, 'test')
+    file_name2 = @file_helper.create_temp_file(repo.location, 'test')
+
+    repo.add_all
+    repo.commit('first commit')
+
+    file_name3 = @file_helper.create_temp_file(repo.location, 'test')
+    File.open(file_name1, 'w') { |f| f.puts 'test 2' }
+
+    repo.add_all
+    repo.commit('second commit')
+
+    File.open(file_name3, 'w') { |f| f.puts 'test 2' }
+
+    repo.add_all
+    repo.commit('third commit')
+
+    files = [file_name1, file_name2, file_name3].map { |f| File.basename(f) }
+
+    repo.rev_list(files: files).should have(3).items
+    3.times { |i| repo.rev_list(files: files)[i].should eq repo.log(files: files)[i].commit_hash }
+
+    files = [file_name1, file_name2].map { |f| File.basename(f) }
+
+    repo.rev_list(files: files).should have(2).items
+    repo.rev_list(files: []).should have(3).items
+    repo.rev_list(files: nil).should have(3).items
+
+    repo.rev_list.should have(3).items
+
+    files = [file_name1, 'non_exist_file.txt'].map { |f| File.basename(f) }
+
+    repo.rev_list(files: files).should be_nil
+  end
+
+  it 'Rev List bt author, since, until, grep and files' do
+    repo = Repository.new(@file_helper.create_temp_folder)
+    repo.init
+
+    file_name1 = @file_helper.create_temp_file(repo.location, 'test')
+    file_name2 = @file_helper.create_temp_file(repo.location, 'test')
+
+    repo.add_all
+    repo.commit('first_commit', author_name: 'author_name', author_email: '[e-mail]')
+
+    files = [file_name1, file_name2].map { |f| File.basename(f) }
+
+    repo.rev_list(author: 'author_name', since: yesterday, until: yesterday, grep: 'first_commit', files: files).should have(0).items
+    repo.rev_list(author: 'author_name', since: yesterday, until: tomorrow, grep: 'first_commit', files: files).should have(1).items
+  end
+
   it 'Show existent branches' do
     origin = Repository.new(@file_helper.create_temp_folder)
     origin.init_bare
 
     repo = Repository.new(@file_helper.create_temp_folder)
@@ -661,10 +969,51 @@
     diff_reverse.select { |d| d.file_name == File.basename(file2) }.first.status.should be(:modified)
     diff_reverse.select { |d| d.file_name == File.basename(file3) }.should be_empty
     diff_reverse.select { |d| d.file_name == File.basename(file4) }.first.status.should be(:new_file)
   end
 
+  it 'Diff tree file status for commits' do
+    repo = Repository.new(@file_helper.create_temp_folder)
+    repo.init
+
+    file_name1 = @file_helper.create_temp_file(repo.location, 'test')
+    file_name2 = @file_helper.create_temp_file(repo.location, 'test')
+
+    repo.add_all
+    repo.commit('first_commit', author_name: 'another_author', author_email: '[e-mail]')
+
+    File.open(file_name1, 'w') { |f| f.puts 'test 2' }
+    File.open(file_name2, 'w') { |f| f.puts 'test 2' }
+
+    repo.add_all
+    repo.commit('second commit', author_name: 'another_author', author_email: '[e-mail]')
+
+    File.open(file_name1, 'w') { |f| f.puts 'test 3' }
+    File.delete file_name2
+    file_name3 = @file_helper.create_temp_file(repo.location, 'test')
+
+    repo.add_all
+    repo.commit('third commit', author_name: 'another_author', author_email: '[e-mail]')
+
+    log = repo.log(author: 'another_author')
+
+    diff = repo.diff_tree log[0].commit_hash
+    diff.should have(3).items
+    diff.select { |d| d.file_name == File.basename(file_name1) }.first.status.should be :modified
+    diff.select { |d| d.file_name == File.basename(file_name2) }.first.status.should be :deleted
+    diff.select { |d| d.file_name == File.basename(file_name3) }.first.status.should be :new_file
+
+    diff = repo.diff_tree log[1].commit_hash
+    diff.should have(2).items
+    diff.select { |d| d.file_name == File.basename(file_name1) }.first.status.should be :modified
+    diff.select { |d| d.file_name == File.basename(file_name2) }.first.status.should be :modified
+    diff.select { |d| d.file_name == File.basename(file_name3) }.should be_empty
+
+    diff = repo.diff_tree log[2].commit_hash
+    diff.should have(0).items
+  end
+
   it 'Revert a specific commit' do
     repo = Repository.new(@file_helper.create_temp_folder)
     repo.init
 
     file1 = @file_helper.create_temp_file(repo.location, 'file_1')
@@ -777,11 +1126,11 @@
     File.exist?(file1).should be_true
     File.exist?(file2).should be_true
     repo.status.should have(1).items
     repo.status.first.should be_git_new_file(File.basename(file2))
 
-    repo.reset(:mode => :hard).should be_true
+    repo.reset(mode: :hard).should be_true
 
     File.exist?(file1).should be_true
     File.exist?(file2).should be_false
     repo.status.should be_empty
   end
@@ -809,11 +1158,11 @@
     repo.status.first.should be_git_new_file(File.basename(file3))
 
     repo.log.should have(2).items
     repo.log.first.subject.should eq 'second commit'
 
-    repo.reset(:commit => repo.log.last.commit_hash).should be_true
+    repo.reset(commit: repo.log.last.commit_hash).should be_true
 
     File.exist?(file1).should be_true
     File.exist?(file2).should be_true
     File.exist?(file3).should be_true
 
@@ -848,10 +1197,10 @@
     repo.status.first.should be_git_new_file(File.basename(file3))
 
     repo.log.should have(2).items
     repo.log.first.subject.should eq 'second commit'
 
-    repo.reset(:mode => :hard, :commit => repo.log.last.commit_hash).should be_true
+    repo.reset(mode: :hard, commit: repo.log.last.commit_hash).should be_true
 
     File.exist?(file1).should be_true
     File.exist?(file2).should be_false
     File.exist?(file3).should be_false
 
\ No newline at end of file