git_wrapper 1.0.3 → 1.1.0

data/.coveralls.yml

@@ -0,0 +1,2 @@
+service_name: travis-ci
+repo_token: DuFQczMz4oKxkdQZy7XcgYO8aol5vxML3

data/.gitignore

@@ -3,3 +3,5 @@
 Gemfile.lock
 pkg/*
 .idea
+coverage
+tmp

data/.travis.yml

@@ -0,0 +1,8 @@
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - 2.0
+  - jruby
+before_script:
+  - git config --global user.name "User Name"
+  - git config --global user.email "user@mail.com"

data/Gemfile

@@ -2,3 +2,5 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in git_wrapper.gemspec
 gemspec
+
+gem 'coveralls', require: false

data/README.md

@@ -1,6 +1,12 @@
 # GitWrapper
 
-OO git command line wrapper
+[![Gem Version](https://badge.fury.io/rb/git_wrapper.png)](https://rubygems.org/gems/git_wrapper)
+[![Build Status](https://travis-ci.org/gabynaiman/git_wrapper.png?branch=master)](https://travis-ci.org/gabynaiman/git_wrapper)
+[![Coverage Status](https://coveralls.io/repos/gabynaiman/git_wrapper/badge.png?branch=master)](https://coveralls.io/r/gabynaiman/git_wrapper?branch=master)
+[![Code Climate](https://codeclimate.com/github/gabynaiman/git_wrapper.png)](https://codeclimate.com/github/gabynaiman/git_wrapper)
+[![Dependency Status](https://gemnasium.com/gabynaiman/git_wrapper.png)](https://gemnasium.com/gabynaiman/git_wrapper)
+
+Object Oriented git command line wrapper
 
 ## Installation
 

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new do |task|
+    task.pattern = 'spec/**/*_spec.rb'
+    task.rspec_opts = '--tty --color -f documentation'
+    task.verbose = false
+end
+
+task default: :spec

data/git_wrapper.gemspec

@@ -17,5 +17,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency 'nokogiri'
+
+  s.add_development_dependency "bundler", "~> 1.3"
+  s.add_development_dependency "rake"
   s.add_development_dependency 'rspec'
+  s.add_development_dependency "simplecov"
 end

data/lib/git_wrapper/commands/diff_tree.rb

@@ -0,0 +1,23 @@
+module GitWrapper
+  module Commands
+    class DiffTree < Git
+
+      def commit(commit)
+        @commit = commit
+        self
+      end
+
+      def command
+        "diff-tree #{@commit} -r --name-status"
+      end
+
+      def result
+        files = output.split(/\n/)[1..-1] || []
+        files.map do |line|
+          Results::DiffNameStatus.parse(line)
+        end
+      end
+
+    end
+  end
+end

data/lib/git_wrapper/commands/git.rb

@@ -30,10 +30,16 @@ module GitWrapper
         end
       end
 
+      def success?
+        @success
+      end
+
       def result
         @success
       end
 
+      private
+
       def to_relative_path(file_name)
         base_folder = location_folder.gsub("\\", "/")
         file_name.gsub("\\", "/").gsub(base_folder + "/", "")

data/lib/git_wrapper/commands/log.rb

@@ -1,6 +1,7 @@
 module GitWrapper
   module Commands
     class Log < Git
+
       ATTRIBUTES = {
           :commit_hash => 'H',
           :abbreviated_commit_hash => 'h',
@@ -38,8 +39,8 @@ module GitWrapper
           :reflog_subject => 'gs'
       }
 
-      def file(file_name)
-        @file = to_relative_path(file_name)
+      def files(files)
+        @files = files.map{|f|to_relative_path(f)}
         self
       end
 
@@ -48,25 +49,59 @@ module GitWrapper
         self
       end
 
+      def author(author)
+        @author = author
+        self
+      end
+
+      def grep(grep)
+        @grep = grep
+        self
+      end
+
+      def since(date)
+        @since = date
+        self
+      end
+
+      def until(date)
+        @until = date
+        self
+      end
+
+      def skip(skip)
+        @skip = skip
+        self
+      end
+
+      def max_count(max_count)
+        @max_count = max_count
+        self
+      end
+
       def command
-        command = "log --format=\"<log>#{xml_structure}</log>\""
+        command = "log -i --format=\"<log>#{xml_structure}</log>\""
         command += " #{@commit}" if @commit
-        command += " \"#{@file}\"" if @file
+        command += " --author \"#{@author}\"" if @author
+        command += " --since \"#{@since}\"" if @since
+        command += " --until \"#{@until}\"" if @until
+        command += " --grep \"#{@grep}\"" if @grep
+        command += " --skip #{@skip}" if @skip
+        command += " --max-count \"#{@max_count}\"" if @max_count
+        command += " #{@files.map{|f| "\"#{f}\"" }.join(' ')}" if @files
         command
       end
 
       def result
-        if output.nil?
-          return nil if @commit
-          return []
-        end
+        return nil unless success?
 
-        results = Nokogiri::XML("<logs>#{output}</logs>").xpath('logs/log').map do |element|
-          Results::LogInfo.new(Hash[*element.children.map { |node| [node.name.to_sym, node.text] }.flatten])
+        results = []
+        if output
+          results = Nokogiri::XML("<logs>#{output}</logs>").xpath('logs/log').map do |element|
+            Results::LogInfo.new(Hash[*element.children.flat_map { |node| [node.name.to_sym, node.text] }])
+          end
         end
-
-        return results.first if @commit
-        results
+        @commit ? results.first : results
       end
 
       private

data/lib/git_wrapper/commands/rev_list.rb

@@ -0,0 +1,52 @@
+module GitWrapper
+  module Commands
+    class RevList < Git
+
+      def author(author)
+        @author = author
+        self
+      end
+
+      def grep(grep)
+        @grep = grep
+        self
+      end
+
+      def since(date)
+        @since = date
+        self
+      end
+
+      def until(date)
+        @until = date
+        self
+      end
+
+      def count
+        @count = true
+        self
+      end
+
+      def files(files)
+        @files = files.map { |f| to_relative_path(f) }
+        self
+      end
+
+      def command
+        command = "rev-list HEAD -i #{@count ? ' --count ' : ''}"
+        command += " --author \"#{@author}\"" if @author
+        command += " --since \"#{@since}\"" if @since
+        command += " --until \"#{@until}\"" if @until
+        command += " --grep \"#{@grep}\"" if @grep
+        command += " #{@files.map{|f| "\"#{f}\"" }.join(' ')}" if @files
+        command
+      end
+
+      def result
+        return nil unless success?
+        @count ? output.to_i : output.split(/\n/)
+      end
+
+    end
+  end
+end

data/lib/git_wrapper/commands/shell.rb

@@ -11,6 +11,8 @@ module GitWrapper
         end
       end
 
+      private
+
       def self.ruby_execute(command, options={})
         location_folder = options[:chdir] || '.'
         result = nil

data/lib/git_wrapper/repository.rb

@@ -96,13 +96,27 @@ module GitWrapper
     end
 
     def log(options={})
-      if options[:file_name]
-        execute(Commands::Log.new(@location).file(options[:file_name]))
-      elsif options[:commit]
-        execute(Commands::Log.new(@location).commit(options[:commit]))
-      else
-        execute(Commands::Log.new(@location))
+      command = Commands::Log.new(@location)
+      options.each do |option, value|
+        command.send option, value if value && !value.to_s.strip.empty?
+      end
+      execute(command)
+    end
+
+    def rev_list(options={})
+      command = Commands::RevList.new(@location)
+      options.each do |option, value|
+        command.send option, value if value && !value.to_s.strip.empty?
+      end
+      execute(command)
+    end
+
+    def rev_list_count(options={})
+      command = Commands::RevList.new(@location).count
+      options.each do |option, value|
+        command.send option, value if value && !value.to_s.strip.empty?
       end
+      execute(command)
     end
 
     def branches
@@ -174,6 +188,10 @@ module GitWrapper
       execute(Commands::Diff.new(@location).with(commit).reverse)
     end
 
+    def diff_tree(commit)
+      execute(Commands::DiffTree.new(@location).commit(commit))
+    end
+
     def revert(commit)
       if log(:commit => commit).merge?
         execute(Commands::Revert.new(@location).merge(commit))

data/lib/git_wrapper/results/log_info.rb

@@ -1,9 +1,14 @@
 module GitWrapper
   module Results
     class LogInfo
+
       def initialize(attributes)
-        attributes.each do |name, value|
-          define_singleton_method name, lambda { value }
+        @attributes = attributes
+      end
+
+      Commands::Log::ATTRIBUTES.keys.each do |name|
+        define_method name do
+          @attributes[name]
         end
       end
 

data/lib/git_wrapper/version.rb

@@ -1,3 +1,3 @@
 module GitWrapper
-  VERSION = '1.0.3'
+  VERSION = '1.1.0'
 end

data/lib/git_wrapper.rb

@@ -25,9 +25,11 @@ require 'git_wrapper/commands/tag'
 require 'git_wrapper/commands/merge'
 require 'git_wrapper/commands/fetch'
 require 'git_wrapper/commands/diff'
+require 'git_wrapper/commands/diff_tree'
 require 'git_wrapper/commands/revert'
 require 'git_wrapper/commands/reset'
 require 'git_wrapper/commands/config'
+require 'git_wrapper/commands/rev_list'
 
 require 'git_wrapper/results/file_status'
 require 'git_wrapper/results/status_porcelain'

data/spec/coverage_helper.rb

@@ -0,0 +1,8 @@
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start

data/spec/repository_spec.rb

@@ -117,12 +117,12 @@ describe GitWrapper, '-> Repository' do
     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 => 'another_author@mail.com').should be_true
+    repo.commit('first_commit', author_name: 'another_author', author_email: 'another_author@mail.com').should be_true
 
     log = repo.log.first
     log.author_name.should eq 'another_author'
@@ -255,7 +255,7 @@ describe GitWrapper, '-> Repository' do
     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
 
@@ -298,8 +298,8 @@ describe GitWrapper, '-> Repository' do
     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
@@ -333,6 +333,314 @@ describe GitWrapper, '-> Repository' do
     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: 'author_name@mail.com')
+
+    repo.log(author: 'another_name').should have(0).items
+    repo.log(author: 'Author_name').should have(1).items
+    repo.log(author: 'author_name@mail.com').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: 'author_name@mail.com')
+
+    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: 'author_name@mail.com' )
+    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: 'author_name@mail.com').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: 'author_name@mail.com')
+
+    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
@@ -663,6 +971,47 @@ describe GitWrapper, '-> Repository' do
     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: 'another_author@mail.com')
+
+    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: 'another_author@mail.com')
+
+    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: 'another_author@mail.com')
+
+    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
@@ -779,7 +1128,7 @@ describe GitWrapper, '-> Repository' do
     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
@@ -811,7 +1160,7 @@ describe GitWrapper, '-> Repository' do
     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
@@ -850,7 +1199,7 @@ describe GitWrapper, '-> Repository' do
     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

data/spec/spec_helper.rb

@@ -1,10 +1,13 @@
+require 'coverage_helper'
 require 'git_wrapper'
 
 include GitWrapper
 include GitWrapper::Results
 
+GitWrapper.logger.level = Logger::Severity::ERROR
+
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-
+  config.include DateHelper
 end

data/spec/support/helpers/date_helper.rb

@@ -0,0 +1,51 @@
+require 'time'
+
+module DateHelper
+
+  def yesterday
+    Time.now - seconds_per_day
+  end
+
+  def tomorrow
+    Time.now + seconds_per_day
+  end
+
+  def today
+    Time.parse Time.now.strftime("%Y-%m-%d 00:00:00 -0300")
+  end
+
+  def now
+    Time.now
+  end
+
+  def next_hour
+    Time.now + seconds_per_hour
+  end
+
+  def next_month
+    Time.now + seconds_per_month
+  end
+
+  def next_year
+    Time.new + seconds_per_year
+  end
+
+  private
+
+  def seconds_per_hour
+    60 * 60
+  end
+
+  def seconds_per_day
+    seconds_per_hour * 24
+  end
+
+  def seconds_per_month
+    seconds_per_day * 31
+  end
+
+  def seconds_per_year
+    seconds_per_day * 365
+  end
+
+end

data/spec/support/helpers/file_helper.rb

@@ -31,7 +31,7 @@ class FileHelper
   private
 
   def temp_path
-    Pathname.new("#{File.dirname(__FILE__)}/../../tmp").expand_path.to_s
+    Pathname.new("#{File.dirname(__FILE__)}/../../../tmp").expand_path.to_s
   end
 
   def timestamp

data/spec/support/matchers/git_status_matchers.rb

@@ -1,12 +1,3 @@
-RSpec::Matchers.define :eq_git_status do |expected|
-  match do |actual|
-    (expected[:file_name].nil? || actual.file_name == expected[:file_name]) &&
-      (expected[:original_file_name].nil? || actual.original_file_name == expected[:original_file_name]) &&
-      (expected[:status].nil? || actual.status == expected[:status]) &&
-      (expected[:staged_for_commit].nil? || actual.staged_for_commit == expected[:staged_for_commit])
-  end
-end
-
 RSpec::Matchers.define :be_git_untracked do |expected_file_name|
   match do |actual|
     actual.file_name == expected_file_name &&

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_wrapper
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -27,6 +27,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -43,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: OO git command line wrapper
 email:
 - gabynaiman@gmail.com
@@ -50,7 +98,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -62,6 +112,7 @@ files:
 - lib/git_wrapper/commands/commit.rb
 - lib/git_wrapper/commands/config.rb
 - lib/git_wrapper/commands/diff.rb
+- lib/git_wrapper/commands/diff_tree.rb
 - lib/git_wrapper/commands/fetch.rb
 - lib/git_wrapper/commands/git.rb
 - lib/git_wrapper/commands/init.rb
@@ -72,6 +123,7 @@ files:
 - lib/git_wrapper/commands/remote.rb
 - lib/git_wrapper/commands/remove.rb
 - lib/git_wrapper/commands/reset.rb
+- lib/git_wrapper/commands/rev_list.rb
 - lib/git_wrapper/commands/revert.rb
 - lib/git_wrapper/commands/shell.rb
 - lib/git_wrapper/commands/show.rb
@@ -83,9 +135,11 @@ files:
 - lib/git_wrapper/results/log_info.rb
 - lib/git_wrapper/results/status_porcelain.rb
 - lib/git_wrapper/version.rb
+- spec/coverage_helper.rb
 - spec/repository_spec.rb
 - spec/spec_helper.rb
 - spec/status_porcelain_parser_spec.rb
+- spec/support/helpers/date_helper.rb
 - spec/support/helpers/file_helper.rb
 - spec/support/matchers/git_status_matchers.rb
 homepage: https://github.com/gabynaiman/git_wrapper
@@ -113,3 +167,4 @@ signing_key:
 specification_version: 3
 summary: OO git command line wrapper
 test_files: []
+has_rdoc: