initialize instance variables to prevent warnings,

Daniel Mendler · Daniel Mendler · commit dd4706edc324 · 2009-02-10T01:03:14.000+01:00
add $VERBOSE = true for the tests
diff --git a/Rakefile b/Rakefile
@@ -24,6 +24,7 @@ end
 
 desc "Run Unit Tests"
 task :test do |t|
+    $VERBOSE = true
     require File.dirname(__FILE__) + '/tests/all_tests.rb'
 end
 
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -2,13 +2,6 @@ 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 = {})
       self.new({:repository => git_dir}.merge(opts))
@@ -66,11 +59,13 @@ def initialize(options = {})
       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
   
   
diff --git a/lib/git/diff.rb b/lib/git/diff.rb
@@ -4,19 +4,15 @@ 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
     
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -7,14 +7,12 @@ class GitExecuteError < StandardError
   
   class Lib
       
-    @git_dir = nil
-    @git_index_file = nil
-    @git_work_dir = nil
-    @path = nil
-    
-    @logger = nil
-    
     def initialize(base = nil, logger = nil)
+      @git_dir = nil
+      @git_index_file = nil
+      @git_work_dir = nil
+      @path = nil
+      
       if base.is_a?(Git::Base)
         @git_dir = base.repo.path
         @git_index_file = base.index.path if base.index
diff --git a/lib/git/log.rb b/lib/git/log.rb
@@ -4,23 +4,20 @@ module Git
   class Log
     include Enumerable
     
-    @base = nil
-    @commits = nil
-    
-    @object = nil
-    @path = nil
-    @count = nil
-    @since = nil
-    @skip = nil
-    @until = nil
-    @between = nil
-    
-    @dirty_flag = nil
-    
     def initialize(base, count = 30)
       dirty_log
       @base = base
       @count = count
+ 
+      @commits = nil
+      @author = nil
+      @grep = nil
+      @object = nil
+      @path = nil
+      @since = nil
+      @skip = nil
+      @until = nil
+      @between = nil
     end
 
     def object(objectish)
diff --git a/lib/git/object.rb b/lib/git/object.rb
@@ -8,15 +8,14 @@ class Object
     
     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
+        @contents = nil
+        @trees = nil
+        @size = nil
+        @sha = nil
       end
 
       def sha
@@ -147,14 +146,13 @@ def check_tree
   
     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
@@ -272,4 +270,4 @@ def self.new(base, objectish, type = nil, is_tag = false)
     end
     
   end
-end
+end
