schacon-git 1.0.7 → 1.1.1

data/README

@@ -1,6 +1,6 @@
 == Git Library for Ruby
 
-Library for using Git in Ruby.
+Library for using Git in Ruby. Test.
 
 = Homepage
 
@@ -12,6 +12,12 @@ Git public hosting of the project source code is at:
 
 http://github/schacon/ruby-git
 
+= Install
+
+You can install Ruby/Git like this:
+
+$ sudo gem install schacon-git --source=http://gems.github.com
+
 = Major Objects
 
 Git::Base - this is the object returned from a Git.open or Git.clone.  

data/lib/git/base.rb

@@ -2,28 +2,15 @@ module Git
   
   class Base
 
-    @working_directory = nil
-    @repository = nil
-    @index = nil
-
-    @lib = nil
-    @logger = nil
-    
     # opens a bare Git Repository - no working directory options
     def self.bare(git_dir, opts = {})
-      default = {:repository => git_dir}
-      git_options = default.merge(opts)
-      
-      self.new(git_options)
+      self.new({:repository => git_dir}.merge(opts))
     end
     
     # opens a new Git Project from a working directory
     # you can specify non-standard git_dir and index file in the options
-    def self.open(working_dir, opts={})    
-      default = {:working_directory => working_dir}
-      git_options = default.merge(opts)
-      
-      self.new(git_options)
+    def self.open(working_dir, opts={})
+      self.new({:working_directory => working_dir}.merge(opts))
     end
 
     # initializes a git repository
@@ -33,19 +20,17 @@ module Git
     #  :index_file
     #
     def self.init(working_dir, opts = {})
-      default = {:working_directory => working_dir,
-                 :repository => File.join(working_dir, '.git')}
-      git_options = default.merge(opts)
+      opts = {
+        :working_directory => working_dir,
+        :repository => File.join(working_dir, '.git')
+      }.merge(opts)
       
-      if git_options[:working_directory]
-        # if !working_dir, make it
-        FileUtils.mkdir_p(git_options[:working_directory]) if !File.directory?(git_options[:working_directory])
-      end
+      FileUtils.mkdir_p(opts[:working_directory]) if opts[:working_directory] && !File.directory?(opts[:working_directory])
       
       # run git_init there
-      Git::Lib.new(git_options).init
+      Git::Lib.new(opts).init
        
-      self.new(git_options)
+      self.new(opts)
     end
 
     # clones a git repository locally
@@ -68,17 +53,19 @@ module Git
         
     def initialize(options = {})
       if working_dir = options[:working_directory]
-        options[:repository] = File.join(working_dir, '.git') if !options[:repository]
-        options[:index] = File.join(working_dir, '.git', 'index') if !options[:index]
+        options[:repository] ||= File.join(working_dir, '.git')
+        options[:index] ||= File.join(working_dir, '.git', 'index')
       end
       if options[:log]
         @logger = options[:log]
         @logger.info("Starting Git")
+      else
+        @logger = nil
       end
-      
-      @working_directory = Git::WorkingDirectory.new(options[:working_directory]) if options[:working_directory]
-      @repository = Git::Repository.new(options[:repository]) if options[:repository]
-      @index = Git::Index.new(options[:index], false) if options[:index]
+     
+      @working_directory = options[:working_directory] ? Git::WorkingDirectory.new(options[:working_directory]) : nil
+      @repository = options[:repository] ? Git::Repository.new(options[:repository]) : nil 
+      @index = options[:index] ? Git::Index.new(options[:index], false) : nil
     end
   
   
@@ -120,7 +107,7 @@ module Git
     #    @git.add
     #    @git.commit('message')
     #  end
-    def chdir
+    def chdir # :yields: the Git::Path
       Dir.chdir(dir.path) do
         yield dir.path
       end
@@ -197,6 +184,24 @@ module Git
     def branch(branch_name = 'master')
       Git::Branch.new(self, branch_name)
     end
+    
+    # returns +true+ if the branch exists locally
+    def is_local_branch?(branch)
+      branch_names = self.branches.local.map {|b| b.name}
+      branch_names.include?(branch)
+    end
+
+    # returns +true+ if the branch exists remotely
+    def is_remote_branch?(branch)
+      branch_names = self.branches.local.map {|b| b.name}
+      branch_names.include?(branch)
+    end
+
+    # returns +true+ if the branch exists
+    def is_branch?(branch)
+      branch_names = self.branches.map {|b| b.name}
+      branch_names.include?(branch)
+    end
 
     # returns a Git::Remote object
     def remote(remote_name = 'origin')
@@ -229,8 +234,8 @@ module Git
     #       puts "\t line #{match[0]}: '#{match[1]}'"
     #     end
     #   end
-    def grep(string)
-      self.object('HEAD').grep(string)
+    def grep(string, path_limiter = nil, opts = {})
+      self.object('HEAD').grep(string, path_limiter, opts)
     end
     
     # returns a Git::Diff object
@@ -260,6 +265,11 @@ module Git
     end
 
     # commits all pending changes in the index file to the git repository
+    # 
+    # options:
+    #   :add_all
+    #   :allow_empty
+    #   :author
     def commit(message, opts = {})
       self.lib.commit(message, opts)
     end
@@ -293,8 +303,8 @@ module Git
     #
     #  @git.config('remote.remote-name.push', 'refs/heads/master:refs/heads/master')
     #
-    def push(remote = 'origin', branch = 'master')
-      self.lib.push(remote, branch)
+    def push(remote = 'origin', branch = 'master', tags = false)
+      self.lib.push(remote, branch, tags)
     end
     
     # merges one or more branches into the current working branch
@@ -305,9 +315,7 @@ module Git
     end
 
     # iterates over the files which are unmerged
-    #
-    # yields file, your_version, their_version
-    def each_conflict(&block)
+    def each_conflict(&block) # :yields: file, your_version, their_version
       self.lib.conflicts(&block)
     end
 
@@ -330,9 +338,7 @@ module Git
     #  @git.merge('scotts_git/master')
     #
     def add_remote(name, url, opts = {})
-      if url.is_a?(Git::Base)
-        url = url.repo.path
-      end
+      url = url.repo.path if url.is_a?(Git::Base)
       self.lib.remote_add(name, url, opts)
       Git::Remote.new(self, name)
     end
@@ -374,14 +380,12 @@ module Git
     end
     
     def apply_mail(file)
-      if File.exists?(file)
-        self.lib.apply_mail(file)
-      end
+      self.lib.apply_mail(file) if File.exists?(file)
     end
     
     ## LOWER LEVEL INDEX OPERATIONS ##
     
-    def with_index(new_index)
+    def with_index(new_index) # :yields: new_index
       old_index = @index
       set_index(new_index, false)
       return_value = yield @index
@@ -426,7 +430,7 @@ module Git
       self.lib.ls_files
     end
 
-    def with_working(work_dir)
+    def with_working(work_dir) # :yields: the Git::WorkingDirectory
       return_value = false
       old_working = @working_directory
       set_working(work_dir) 

data/lib/git/branch.rb

@@ -3,14 +3,12 @@ module Git
     
     attr_accessor :full, :remote, :name
     
-    @base = nil
-    @gcommit = nil
-    @stashes = nil
-    
     def initialize(base, name)
       @remote = nil
       @full = name
       @base = base
+      @gcommit = nil
+      @stashes = nil
       
       parts = name.split('/')
       if parts[1]
@@ -22,7 +20,7 @@ module Git
     end
     
     def gcommit
-      @gcommit = @base.gcommit(@full) if !@gcommit
+      @gcommit ||= @base.gcommit(@full)
       @gcommit
     end
     

data/lib/git/branches.rb

@@ -4,9 +4,6 @@ module Git
   class Branches
     include Enumerable
     
-    @base = nil
-    @branches = nil
-    
     def initialize(base)
       @branches = {}
       
@@ -31,10 +28,8 @@ module Git
       @branches.size
     end    
     
-    def each
-      @branches.each do |k, b|
-        yield b
-      end
+    def each(&block)
+      @branches.values.each(&block)
     end
     
     def [](symbol)
@@ -44,14 +39,10 @@ module Git
     def to_s
       out = ''
       @branches.each do |k, b|
-        if b.current
-          out += "* " + b.to_s + "\n"
-        else
-          out += "  " + b.to_s + "\n"
-        end
+        out << (b.current ? '* ' : '  ') << b.to_s << "\n"
       end
       out
     end
     
   end
-end
+end

data/lib/git/diff.rb

@@ -4,20 +4,17 @@ module Git
   class Diff
     include Enumerable
     
-    @base = nil
-    @from = nil
-    @to = nil
-    @path = nil
-    
-    @full_diff = nil
-    @full_diff_files = nil
-    @stats = nil
-    
     def initialize(base, from = nil, to = nil)
       @base = base
       @from = from.to_s
       @to = to.to_s
+
+      @path = nil
+      @full_diff = nil
+      @full_diff_files = nil
+      @stats = nil
     end
+    attr_reader :from, :to
     
     def path(path)
       @path = path
@@ -63,11 +60,9 @@ module Git
       @full_diff_files.assoc(key)[1]
     end
     
-    def each
+    def each(&block) # :yields: each Git::DiffFile in turn
       process_full
-      @full_diff_files.each do |file|
-        yield file[1]
-      end
+      @full_diff_files.map { |file| file[1] }.each(&block)
     end
     
     class DiffFile
@@ -82,6 +77,11 @@ module Git
         @src = hash[:src]
         @dst = hash[:dst]
         @type = hash[:type]
+        @binary = hash[:binary]
+      end
+
+      def binary?
+        !!@binary
       end
       
       def blob(type = :dst)
@@ -96,20 +96,20 @@ module Git
     private
     
       def cache_full
-        if !@full_diff
+        unless @full_diff
           @full_diff = @base.lib.diff_full(@from, @to, {:path_limiter => @path})
         end
       end
       
       def process_full
-        if !@full_diff_files
+        unless @full_diff_files
           cache_full
           @full_diff_files = process_full_diff
         end
       end
       
       def cache_stats
-        if !@stats
+        unless @stats
           @stats = @base.lib.diff_stats(@from, @to, {:path_limiter => @path})
         end
       end
@@ -133,6 +133,9 @@ module Git
               final[current_file][:type] = m[1]
               final[current_file][:mode] = m[2]
             end
+            if m = /^Binary files /.match(line)
+              final[current_file][:binary] = true
+            end
             final[current_file][:patch] << "\n" + line 
           end
         end
@@ -140,4 +143,4 @@ module Git
       end
       
   end
-end
+end