Cleaning up warnings

robertodecurnex · robertodecurnex · commit 3644088b1c48 · 2013-04-26T16:38:06.000-03:00
* unused local variables
 * redefined methods on the same file and class
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -115,11 +115,9 @@ def chdir # :yields: the Git::Path
     
     # returns the repository size in bytes
     def repo_size
-      size = 0
       Dir.chdir(repo.path) do
-        (size, dot) = `du -s`.chomp.split
+        return `du -s`.chomp.split.first.to_i
       end
-      size.to_i
     end
     
     #g.config('user.name', 'Scott Chacon') # sets value
diff --git a/lib/git/branch.rb b/lib/git/branch.rb
@@ -110,7 +110,7 @@ def determine_current
       # param [String] name branch full name.
       # return [<Git::Remote,NilClass,String>] an Array containing the remote and branch names. 
       def parse_name(name)
-        if name.match /^(?:remotes)?\/([^\/]+)\/(.+)/
+        if name.match(/^(?:remotes)?\/([^\/]+)\/(.+)/)
           return [Git::Remote.new(@base, $1), $2]
         end
 
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -363,24 +363,7 @@ def parse_config_list(lines)
     end
 
     def parse_config(file)
-      hsh = {}
       parse_config_list command_lines('config', ['--list', '--file', file], false)
-      #hsh = {}
-      #file = File.expand_path(file)
-      #if File.file?(file)
-      #  current_section = nil
-      #  File.readlines(file).each do |line|
-      #    if m = /\[(\w+)\]/.match(line)
-      #      current_section = m[1]
-      #    elsif m = /\[(\w+?) "(.*?)"\]/.match(line)
-      #      current_section = "#{m[1]}.#{m[2]}"
-      #    elsif m = /(\w+?) = (.*)/.match(line)
-      #      key = "#{current_section}.#{m[1]}"
-      #      hsh[key] = m[2] 
-      #    end
-      #  end
-      #end
-      #hsh
     end
     
     ## WRITE COMMANDS ##
diff --git a/lib/git/object.rb b/lib/git/object.rb
@@ -7,7 +7,9 @@ class GitTagNameDoesNotExist< StandardError
   class Object
     
     class AbstractObject
-      attr_accessor :objectish, :size, :type, :mode
+      attr_accessor :objectish, :type, :mode
+
+      attr_writer :size
       
       def initialize(base, objectish)
         @base = base
diff --git a/lib/git/remote.rb b/lib/git/remote.rb
@@ -11,10 +11,6 @@ def initialize(base, name)
       @fetch_opts = config['fetch']
     end
     
-    def remove
-      @base.remote_remove(@name)
-    end
-    
     def fetch
       @base.fetch(@name)
     end
diff --git a/tests/units/test_init.rb b/tests/units/test_init.rb
@@ -77,7 +77,7 @@ def test_git_clone_config
   # trying to open a git project using a bare repo - rather than using Git.repo
   def test_git_open_error
     assert_raise ArgumentError do
-      g = Git.open @wbare
+      Git.open @wbare
     end
   end
   
diff --git a/tests/units/test_remotes.rb b/tests/units/test_remotes.rb
@@ -86,7 +86,7 @@ def test_push
       loc = Git.clone(@wbare, 'local')
       rem = Git.clone(@wbare, 'remote', :config => 'receive.denyCurrentBranch=ignore')
         
-      r = loc.add_remote('testrem', rem)
+      loc.add_remote('testrem', rem)
 
       loc.chdir do
         new_file('test-file1', 'blahblahblah1')
diff --git a/tests/units/test_tree_ops.rb b/tests/units/test_tree_ops.rb
@@ -91,14 +91,16 @@ def test_read_tree
         tmp = Tempfile.new('tesxt')
         tmppath = tmp.path
         tmp.unlink
-        tr2 = g.with_index(tmppath) do
+        
+        g.with_index(tmppath) do
           g.read_tree('testbranch1', :prefix => 'b1/')
           g.read_tree('testbranch3', :prefix => 'b3/')
           index = g.ls_files
           assert(!index['b2/test-file2'])
           assert(index['b3/test-file3'])
           g.commit('hi')
         end
+
         assert(c.commit?)
 
         files = g.ls_files
