Merge remote-tracking branch 'base/master'

Author: bsedat

.travis.yml

@@ -1,15 +1,12 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1.1
   - 2.1.2
   - jruby-18mode
   - jruby-19mode
-  - ree
-matrix:
-  allow_failures:
-    - rbx-18mode
-    - rbx-19mode
+before_install:
+  - gem install bundler
+  - bundle --version

CHANGELOG

@@ -1,3 +1,12 @@
+== 1.3.0
+
+ * Dropping Ruby 1.8.x support
+
+== 1.2.10
+
+ * Adding Git::Diff.name_status
+ * Checking and fixing encoding on commands output to prevent encoding errors afterwards
+
 == 1.2.9
 
 * Adding Git.configure (to configure the git env)
@@ -14,17 +23,17 @@
 * Improving Git::Object::Tag. Adding annotated?, tagger and message
 * Supporting a submodule path as a valid repo
 * Git.checkout - supporting -f and -b
-* Git.clone - supporting --branch 
+* Git.clone - supporting --branch
 * Git.fetch - supporting --prune
-* Git.tag - supporting 
+* Git.tag - supporting
 
 == 1.2.8
 
 * Keeping the old escape format for windows users
 * revparse: Supporting ref names containing SHA like substrings (40-hex strings)
 * Fix warnings on Ruby 2.1.2
 
-== 1.2.7 
+== 1.2.7
 
 * Fixing mesages encoding
 * Fixing -f flag in git push
@@ -47,9 +56,9 @@
 * Git.add - supporting --fore
 * Git.init - supporting --bare
 * Git.commit - supporting --all and --amend
-* Added Git.remote_remote, Git.revert and Git.clean 
+* Added Git.remote_remote, Git.revert and Git.clean
 * Added Bundler to the formula
-* Travis configuration 
+* Travis configuration
 * Licence included with the gem
 
 == 1.0.4

README.md

@@ -13,7 +13,7 @@ http://github.com/schacon/ruby-git
 You can install Ruby/Git like this:
 
     $ sudo gem install git
-    
+
 ## Code Status
 
 * [![Build Status](https://api.travis-ci.org/schacon/ruby-git.png)](https://travis-ci.org/schacon/ruby-git)
@@ -46,7 +46,7 @@ like:
 
 Here are a bunch of examples of how to use the Ruby/Git package.
 
-Ruby < 1.9 will require rubygems to be loaded. 
+Ruby < 1.9 will require rubygems to be loaded.
 
 ```ruby
     require 'rubygems'
@@ -127,12 +127,13 @@ Here are the operations that need read permission only.
     g.grep('hello')  # implies HEAD
     g.blob('v2.5:Makefile').grep('hello')
     g.tag('v2.5').grep('hello', 'docs/')
-    g.describe() 
+    g.describe()
     g.describe('0djf2aa')
     g.describe('HEAD', {:all => true, :tags => true})
-  
+
     g.diff(commit1, commit2).size
     g.diff(commit1, commit2).stats
+    g.diff(commit1, commit2).name_status
     g.gtree('v2.5').diff('v2.6').insertions
     g.diff('gitsearch1', 'v2.5').path('lib/')
     g.diff('gitsearch1', @git.gtree('v2.5'))
@@ -149,7 +150,7 @@ Here are the operations that need read permission only.
     g.config # returns whole config hash
 
     g.tags # returns array of Git::Tag objects
-    
+
     g.show()
     g.show('HEAD')
     g.show('v2.8', 'README.md')
@@ -178,9 +179,11 @@ And here are the operations that will need to write to your git repository.
      g.add('file_path')                      # git add -- "file_path"
      g.add(['file_path_1', 'file_path_2'])   # git add -- "file_path_1" "file_path_2"
 
-
-     g.remove('file.txt')
-     g.remove(['file.txt', 'file2.txt'])
+     g.remove()									# git rm -f -- "."
+     g.remove('file.txt')						# git rm -f -- "file.txt"
+     g.remove(['file.txt', 'file2.txt'])		# git rm -f -- "file.txt" "file2.txt"
+     g.remove('file.txt', :recursive => true) 	# git rm -f -r -- "file.txt"
+     g.remove('file.txt', :cached => true)		# git rm -f --cached -- "file.txt"
 
      g.commit('message')
      g.commit_all('message')

VERSION

@@ -1 +1,2 @@
-1.2.9.1
+1.3.0
+

git.gemspec

@@ -1,21 +1,22 @@
 Gem::Specification.new do |s|
   s.authors = ['Scott Chacon']
-  s.date = '2015-01-13' 
+  s.date = '2016-02-25'
   s.email = '[email protected]'
   s.homepage = 'http://github.com/schacon/ruby-git'
   s.license = 'MIT'
   s.name = 'git'
   s.summary = 'Ruby/Git is a Ruby library that can be used to create, read and manipulate Git repositories by wrapping system calls to the git binary.'
-  s.version = '1.2.9.1'
+  s.version = '1.3.0'
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ['lib']
+  s.required_ruby_version = '>= 1.9'
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.requirements = ['git 1.6.0.0, or greater']
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rdoc'
   s.add_development_dependency 'test-unit', '>=2', '< 4'
-  
+
   s.extra_rdoc_files = ['README.md']
   s.rdoc_options = ['--charset=UTF-8']
 

lib/git/diff.rb

@@ -1,12 +1,12 @@
 module Git
-  
+
   # object that holds the last X commits on given branch
   class Diff
     include Enumerable
-    
+
     def initialize(base, from = nil, to = nil)
       @base = base
-      @from = from && from.to_s 
+      @from = from && from.to_s
       @to = to && to.to_s
 
       @path = nil
@@ -15,60 +15,64 @@ def initialize(base, from = nil, to = nil)
       @stats = nil
     end
     attr_reader :from, :to
-    
+
+    def name_status
+      cache_name_status
+    end
+
     def path(path)
       @path = path
       return self
     end
-    
+
     def size
       cache_stats
       @stats[:total][:files]
     end
-    
+
     def lines
       cache_stats
       @stats[:total][:lines]
     end
-    
+
     def deletions
       cache_stats
       @stats[:total][:deletions]
     end
-    
+
     def insertions
       cache_stats
       @stats[:total][:insertions]
     end
-    
+
     def stats
       cache_stats
       @stats
     end
-    
+
     # if file is provided and is writable, it will write the patch into the file
     def patch(file = nil)
       cache_full
       @full_diff
     end
     alias_method :to_s, :patch
-    
+
     # enumerable methods
-    
+
     def [](key)
       process_full
       @full_diff_files.assoc(key)[1]
     end
-    
+
     def each(&block) # :yields: each Git::DiffFile in turn
       process_full
       @full_diff_files.map { |file| file[1] }.each(&block)
     end
-    
+
     class DiffFile
       attr_accessor :patch, :path, :mode, :src, :dst, :type
       @base = nil
-      
+
       def initialize(base, hash)
         @base = base
         @patch = hash[:patch]
@@ -83,7 +87,7 @@ def initialize(base, hash)
       def binary?
         !!@binary
       end
-      
+
       def blob(type = :dst)
         if type == :src
           @base.object(@src) if @src != '0000000'
@@ -92,28 +96,27 @@ def blob(type = :dst)
         end
       end
     end
-    
+
     private
-    
+
       def cache_full
-        unless @full_diff
-          @full_diff = @base.lib.diff_full(@from, @to, {:path_limiter => @path})
-        end
+        @full_diff ||= @base.lib.diff_full(@from, @to, {:path_limiter => @path})
       end
-      
+
       def process_full
-        unless @full_diff_files
-          cache_full
-          @full_diff_files = process_full_diff
-        end
+        return if @full_diff_files
+        cache_full
+        @full_diff_files = process_full_diff
       end
-      
+
       def cache_stats
-        unless @stats
-          @stats = @base.lib.diff_stats(@from, @to, {:path_limiter => @path})
-        end
+        @stats ||=  @base.lib.diff_stats(@from, @to, {:path_limiter => @path})
       end
-      
+
+      def cache_name_status
+        @name_status ||= @base.lib.diff_name_status(@from, @to, {:path => @path})
+      end
+
       # break up @diff_full
       def process_full_diff
         defaults = {
@@ -124,7 +127,11 @@ def process_full_diff
         }
         final = {}
         current_file = nil
-        @full_diff.split("\n").each do |line|
+        full_diff_utf8_encoded = @full_diff.encode("UTF-8", "binary", {
+			:invalid => :replace,
+			:undef => :replace
+		})
+        full_diff_utf8_encoded.split("\n").each do |line|
           if m = /^diff --git a\/(.*?) b\/(.*?)/.match(line)
             current_file = m[1]
             final[current_file] = defaults.merge({:patch => line, :path => current_file})
@@ -141,11 +148,11 @@ def process_full_diff
             if m = /^Binary files /.match(line)
               final[current_file][:binary] = true
             end
-            final[current_file][:patch] << "\n" + line 
+            final[current_file][:patch] << "\n" + line
           end
         end
         final.map { |e| [e[0], DiffFile.new(@base, e[1])] }
       end
-      
+
   end
 end