grit 2.4.0 → 2.4.1

data/History.txt

@@ -1,3 +1,8 @@
+== 2.4.1 / 2011-01-13
+  * Minor Enhancements
+    * Grit::Process is used to implement Grit::Git#check_applies,
+      Grit::Git#get_patch, and Grit::Git#apply_patch.
+
 == 2.4.0 / 2011-01-06
   * Major Enhancements
     * Add support for parsing git notes.

data/grit.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'grit'
-  s.version           = '2.4.0'
-  s.date              = '2011-01-06'
+  s.version           = '2.4.1'
+  s.date              = '2011-01-13'
   s.rubyforge_project = 'grit'
 
   s.summary     = "Ruby Git bindings."

data/lib/grit.rb

@@ -55,7 +55,7 @@ if defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/
 end
 
 module Grit
-  VERSION = '2.4.0'
+  VERSION = '2.4.1'
 
   class << self
     # Set +debug+ to true to log all git calls and responses

data/lib/grit/git.rb

@@ -178,56 +178,60 @@ module Grit
       end
     end
 
+    # Checks if the patch of a commit can be applied to the given head.
+    #
+    # head_sha    - String SHA or ref to check the patch against.
+    # applies_sha - String SHA of the patch.  The patch itself is retrieved
+    #               with #get_patch.
+    #
+    # Returns 0 if the patch applies cleanly (according to `git apply`), or
+    # an Integer that is the sum of the failed exit statuses.
     def check_applies(head_sha, applies_sha)
       git_index = create_tempfile('index', true)
-      (o1, exit1) = raw_git("git read-tree #{head_sha} 2>/dev/null", git_index)
-      (o2, exit2) = raw_git("git diff #{applies_sha}^ #{applies_sha} | git apply --check --cached >/dev/null 2>/dev/null", git_index)
-      return (exit1 + exit2)
+      options   = {:env => {'GIT_INDEX_FILE' => git_index}, :raise => true}
+      status    = 0
+      begin
+        native(:read_tree, options.dup, head_sha)
+        stdin = native(:diff, options.dup, "#{applies_sha}^", applies_sha)
+        native(:apply, options.merge(:check => true, :cached => true, :input => stdin))
+      rescue CommandFailed => fail
+        status += fail.exitstatus
+      end
+      status
     end
 
+    # Gets a patch for a given SHA using `git diff`.
+    #
+    # applies_sha - String SHA to get the patch from, using this command:
+    #               `git diff #{applies_sha}^ #{applies_sha}`
+    #
+    # Returns the String patch from `git diff`.
     def get_patch(applies_sha)
       git_index = create_tempfile('index', true)
-      (patch, exit2) = raw_git("git diff #{applies_sha}^ #{applies_sha}", git_index)
-      patch
+      native(:diff, {
+        :env => {'GIT_INDEX_FILE' => git_index}},
+        "#{applies_sha}^", applies_sha)
     end
 
+    # Applies the given patch against the given SHA of the current repo.
+    #
+    # head_sha - String SHA or ref to apply the patch to.
+    # patch    - The String patch to apply.  Get this from #get_patch.
+    #
+    # Returns the String Tree SHA on a successful patch application, or false.
     def apply_patch(head_sha, patch)
       git_index = create_tempfile('index', true)
 
-      git_patch = create_tempfile('patch')
-      File.open(git_patch, 'w+') { |f| f.print patch }
-
-      raw_git("git read-tree #{head_sha} 2>/dev/null", git_index)
-      (op, exit) = raw_git("git apply --cached < #{git_patch}", git_index)
-      if exit == 0
-        return raw_git("git write-tree", git_index).first.chomp
+      options = {:env => {'GIT_INDEX_FILE' => git_index}, :raise => true}
+      begin
+        native(:read_tree, options.dup, head_sha)
+        native(:apply, options.merge(:cached => true, :input => patch))
+      rescue CommandFailed
+        return false
       end
-      false
+      native(:write_tree, :env => options[:env]).to_s.chomp!
     end
 
-    # RAW CALLS WITH ENV SETTINGS
-    def raw_git_call(command, index)
-      tmp = ENV['GIT_INDEX_FILE']
-      ENV['GIT_INDEX_FILE'] = index
-      out = `#{command}`
-      after = ENV['GIT_INDEX_FILE'] # someone fucking with us ??
-      ENV['GIT_INDEX_FILE'] = tmp
-      if after != index
-        raise 'environment was changed for the git call'
-      end
-      [out, $?.exitstatus]
-    end
-
-    def raw_git(command, index)
-      output = nil
-      Dir.chdir(self.git_dir) do
-        output = raw_git_call(command, index)
-      end
-      output
-    end
-    # RAW CALLS WITH ENV SETTINGS END
-
-
     # Execute a git command, bypassing any library implementation.
     #
     # cmd - The name of the git command as a Symbol. Underscores are

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grit
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 2
   - 4
-  - 0
-  version: 2.4.0
+  - 1
+  version: 2.4.1
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-06 00:00:00 -08:00
+date: 2011-01-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency