schacon-git 1.0.7 → 1.1.1

data/lib/git/object.rb

@@ -8,36 +8,35 @@ module Git
     
     class AbstractObject
       attr_accessor :objectish, :size, :type, :mode
-    
-      @base = nil
-      @contents = nil
-      @size = nil
-      @sha = nil
       
       def initialize(base, objectish)
         @base = base
         @objectish = objectish.to_s
-        setup
+        @contents = nil
+        @trees = nil
+        @size = nil
+        @sha = nil
       end
 
       def sha
-        @sha || @sha = @base.lib.revparse(@objectish)
+        @sha ||= @base.lib.revparse(@objectish)
       end
       
       def size
-        @size || @size = @base.lib.object_size(@objectish)
+        @size ||= @base.lib.object_size(@objectish)
       end
       
-      # get the object's contents
-      # if no block is given, the contents are cached in memory and returned as a string
-      # if a block is given, it yields an IO object (via IO::popen) which could be used to
-      # read a large file in chunks. use this for large files so that they are not held
-      # in memory
+      # Get the object's contents.
+      # If no block is given, the contents are cached in memory and returned as a string.
+      # If a block is given, it yields an IO object (via IO::popen) which could be used to
+      # read a large file in chunks.
+      #
+      # Use this for large files so that they are not held in memory.
       def contents(&block)
         if block_given?
           @base.lib.object_contents(@objectish, &block)
         else
-          @contents || @contents = @base.lib.object_contents(@objectish)
+          @contents ||= @base.lib.object_contents(@objectish)
         end
       end
       
@@ -45,18 +44,13 @@ module Git
         self.contents.split("\n")
       end
       
-      def setup
-        raise NotImplementedError
-      end
-      
       def to_s
         @objectish
       end
       
       def grep(string, path_limiter = nil, opts = {})
-        default = {:object => sha, :path_limiter => path_limiter}
-        grep_options = default.merge(opts)
-        @base.lib.grep(string, grep_options)
+        opts = {:object => sha, :path_limiter => path_limiter}.merge(opts)
+        @base.lib.grep(string, opts)
       end
       
       def diff(objectish)
@@ -72,21 +66,13 @@ module Git
         @base.lib.archive(@objectish, file, opts)
       end
       
-      def tree?
-        @type == 'tree'
-      end
+      def tree?; false; end
       
-      def blob?
-        @type == 'blob'
-      end
+      def blob?; false; end
       
-      def commit?
-        @type == 'commit'
-      end
-       
-     def tag?
-       @type == 'tag'
-     end
+      def commit?; false; end
+
+      def tag?; false; end
      
     end
   
@@ -98,11 +84,10 @@ module Git
         @mode = mode
       end
       
-      private
-      
-        def setup
-          @type = 'blob'
-        end
+      def blob?
+        true
+      end
+
     end
   
     class Tree < AbstractObject
@@ -139,16 +124,16 @@ module Git
       def depth
         @base.lib.tree_depth(@objectish)
       end
+      
+      def tree?
+        true
+      end
        
       private
-      
-        def setup
-          @type = 'tree'
-        end 
 
         # actually run the git command
         def check_tree
-          if !@trees
+          unless @trees
             @trees = {}
             @blobs = {}
             data = @base.lib.ls_tree(@objectish)
@@ -161,14 +146,13 @@ module Git
   
     class Commit < AbstractObject
       
-      @tree = nil
-      @parents = nil
-      @author = nil
-      @committer = nil
-      @message = nil
-      
       def initialize(base, sha, init = nil)
         super(base, sha)
+        @tree = nil
+        @parents = nil
+        @author = nil
+        @committer = nil
+        @message = nil
         if init
           set_commit(init)
         end
@@ -233,16 +217,16 @@ module Git
         @parents = data['parent'].map{ |sha| Git::Object::Commit.new(@base, sha) }
         @message = data['message'].chomp
       end
-            
-      private
       
-        def setup
-          @type = 'commit'
-        end
+      def commit?
+        true
+      end
+
+      private
   
         # see if this object has been initialized and do so if not
         def check_commit
-          if !@tree
+          unless @tree
             data = @base.lib.commit_data(@objectish)
             set_commit(data)
           end
@@ -257,40 +241,33 @@ module Git
         super(base, sha)
         @name = name
       end
-      
-      private
-        
-        def setup
-          @type = 'tag'
-        end
+
+      def tag?
+        true
+      end
         
     end
     
-    class << self
-      # if we're calling this, we don't know what type it is yet
-      # so this is our little factory method
-      def new(base, objectish, type = nil, is_tag = false)
-        if is_tag
-          sha = base.lib.tag_sha(objectish)
-          if sha == ''
-            raise Git::GitTagNameDoesNotExist.new(objectish)
-          end
-          return Git::Object::Tag.new(base, sha, objectish)
-        else
-          if !type
-            type = base.lib.object_type(objectish) 
-          end
+    # if we're calling this, we don't know what type it is yet
+    # so this is our little factory method
+    def self.new(base, objectish, type = nil, is_tag = false)
+      if is_tag
+        sha = base.lib.tag_sha(objectish)
+        if sha == ''
+          raise Git::GitTagNameDoesNotExist.new(objectish)
         end
-        
-        klass =
-          case type
-          when /blob/:   Blob   
-          when /commit/: Commit
-          when /tree/:   Tree
-          end
-        klass::new(base, objectish)
+        return Git::Object::Tag.new(base, sha, objectish)
       end
-    end 
+      
+      type ||= base.lib.object_type(objectish)
+      klass =
+        case type
+        when /blob/   then Blob   
+        when /commit/ then Commit
+        when /tree/   then Tree
+        end
+      klass.new(base, objectish)
+    end
     
   end
-end
+end

data/lib/git/remote.rb

@@ -3,8 +3,6 @@ module Git
     
     attr_accessor :name, :url, :fetch_opts
     
-    @base = nil
-    
     def initialize(base, name)
       @base = base
       config = @base.lib.config_remote(name)
@@ -39,4 +37,4 @@ module Git
     end
     
   end
-end
+end

data/lib/git/stash.rb

@@ -1,9 +1,10 @@
 module Git
   class Stash
+    
     def initialize(base, message, existing=false)
       @base = base
       @message = message
-      save if existing == false
+      save unless existing
     end
     
     def save

data/lib/git/stashes.rb

@@ -4,9 +4,6 @@ module Git
   class Stashes
     include Enumerable
     
-    @base = nil
-    @stashes = nil
-    
     def initialize(base)
       @stashes = []
       
@@ -22,8 +19,8 @@ module Git
       @stashes.unshift(s) if s.saved?
     end
     
-    def apply(index=0)
-      @base.lib.stash_apply(index.to_i)
+    def apply(index=nil)
+      @base.lib.stash_apply(index)
     end
     
     def clear
@@ -35,10 +32,8 @@ module Git
       @stashes.size
     end
     
-    def each
-      @stashes.each do |s|
-        yield s
-      end
+    def each(&block)
+      @stashes.each(&block)
     end
     
     def [](index)
@@ -46,4 +41,4 @@ module Git
     end
     
   end
-end
+end

data/lib/git/status.rb

@@ -3,9 +3,6 @@ module Git
   class Status
     include Enumerable
     
-    @base = nil
-    @files = nil
-    
     def initialize(base)
       @base = base
       construct_status
@@ -48,19 +45,15 @@ module Git
       @files[file]
     end
     
-    def each
-      @files.each do |k, file|
-        yield file
-      end
+    def each(&block)
+      @files.values.each(&block)
     end
     
     class StatusFile
       attr_accessor :path, :type, :stage, :untracked
       attr_accessor :mode_index, :mode_repo
       attr_accessor :sha_index, :sha_repo
-      
-      @base = nil
-      
+
       def initialize(base, hash)
         @base = base
         @path = hash[:path]
@@ -88,16 +81,15 @@ module Git
     
       def construct_status
         @files = @base.lib.ls_files
+        ignore = @base.lib.ignored_files
         
         # find untracked in working dir
         Dir.chdir(@base.dir.path) do
           Dir.glob('**/*') do |file|
-            if !@files[file]
-              @files[file] = {:path => file, :untracked => true} if !File.directory?(file)
-            end
+            @files[file] = {:path => file, :untracked => true} unless @files[file] || File.directory?(file) || ignore.include?(file)
           end
         end
-
+        
         # find modified in tree
         @base.lib.diff_files.each do |path, data|
           @files[path] ? @files[path].merge!(data) : @files[path] = data
@@ -115,4 +107,4 @@ module Git
       
   end
   
-end
+end

data/lib/git.rb

@@ -92,5 +92,19 @@ module Git
   def self.clone(repository, name, options = {})
     Base.clone(repository, name, options)
   end
+  
+  # Export the current HEAD (or a branch, if <tt>options[:branch]</tt>
+  # is specified) into the +name+ directory, then remove all traces of git from the
+  # directory.
+  #
+  # See +clone+ for options.  Does not obey the <tt>:remote</tt> option,
+  # since the .git info will be deleted anyway; always uses the default
+  # remote, 'origin.'
+  def self.export(repository, name, options = {})
+    options.delete(:remote)
+    repo = clone(repository, name, {:depth => 1}.merge(options))
+    repo.checkout("origin/#{options[:branch]}") if options[:branch]
+    Dir.chdir(repo.dir.to_s) { FileUtils.rm_r '.git' }
+  end
     
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: schacon-git
 version: !ruby/object:Gem::Version 
-  version: 1.0.7
+  version: 1.1.1
 platform: ruby
 authors: 
 - Scott Chacon
@@ -9,7 +9,7 @@ autorequire: git
 bindir: bin
 cert_chain: []
 
-date: 2008-05-14 00:00:00 -07:00
+date: 2009-04-08 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -42,7 +42,7 @@ files:
 - lib/git.rb
 - README
 has_rdoc: true
-homepage: 
+homepage: http://github.com/schacon/ruby-git/tree/master
 post_install_message: 
 rdoc_options: []
 
@@ -63,10 +63,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A package for using Git in Ruby code.
-test_files: 
-- tests/all_tests.rb
-- tests/test_helper.rb
+test_files: []
+

data/tests/all_tests.rb

@@ -1,4 +0,0 @@
-Dir.chdir(File.dirname(__FILE__)) do
-  Dir.glob('**/test_*.rb') { |test_case| require test_case }
-  #Dir.glob('**/test_index.rb') { |test_case| require test_case }
-end

data/tests/test_helper.rb

@@ -1,77 +0,0 @@
-require 'test/unit'
-require 'fileutils'
-require 'logger'
-require File.dirname(__FILE__) + '/../lib/git'
-
-class Test::Unit::TestCase
-  
-  def set_file_paths
-    cwd = `pwd`.chomp
-    if File.directory?(File.join(cwd, 'files'))
-      @test_dir = File.join(cwd, 'files')
-    elsif File.directory?(File.join(cwd, '..', 'files'))
-      @test_dir = File.join(cwd, '..', 'files')
-    elsif File.directory?(File.join(cwd, 'tests', 'files'))
-      @test_dir = File.join(cwd, 'tests', 'files')
-    end
-    
-    @wdir_dot = File.expand_path(File.join(@test_dir, 'working'))
-    @wbare = File.expand_path(File.join(@test_dir, 'working.git'))
-    @index = File.expand_path(File.join(@test_dir, 'index'))
-    
-    @wdir = create_temp_repo(@wdir_dot)
-  end
-  
-  def teardown
-    if @tmp_path
-      #puts "teardown #{@tmp_path}"
-      FileUtils.rm_r(@tmp_path)
-    end
-  end
-  
-  
-  def with_temp_bare
-    in_temp_dir do |path|
-      g = Git.clone(@wbare, 'new')
-      Dir.chdir('new') do
-        yield g
-      end
-    end
-  end
-  
-  def create_temp_repo(clone_path)
-    filename = 'git_test' + Time.now.to_i.to_s + rand(300).to_s.rjust(3, '0')
-    @tmp_path = File.join("/tmp/", filename)
-    FileUtils.mkdir_p(@tmp_path)
-    FileUtils.cp_r(clone_path, @tmp_path)
-    tmp_path = File.join(@tmp_path, 'working')
-    Dir.chdir(tmp_path) do
-      FileUtils.mv('dot_git', '.git')
-    end
-    tmp_path
-  end
-  
-  def in_temp_dir(remove_after = true)
-    filename = 'git_test' + Time.now.to_i.to_s + rand(300).to_s.rjust(3, '0')
-    tmp_path = File.join("/tmp/", filename)
-    FileUtils.mkdir(tmp_path)
-    Dir.chdir tmp_path do
-      yield tmp_path
-    end
-    FileUtils.rm_r(tmp_path) if remove_after
-  end
-  
-  
-  def new_file(name, contents)
-    File.open(name, 'w') do |f|
-      f.puts contents
-    end
-  end
-
-  def append_file(name, contents)
-    File.open(name, 'a') do |f|
-      f.puts contents
-    end
-  end
-  
-end