marcandre	2010-11-09 05:58:42 +0900 (Tue, 09 Nov 2010)

  New Revision: 29725

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29725

  Log:
    * lib/rubygems/*: Remove unused variables warnings
      Patch by Run Paint [ruby-core:30991]

  Modified files:
    trunk/lib/rubygems/command.rb
    trunk/lib/rubygems/commands/build_command.rb
    trunk/lib/rubygems/commands/check_command.rb
    trunk/lib/rubygems/commands/query_command.rb
    trunk/lib/rubygems/commands/server_command.rb
    trunk/lib/rubygems/commands/update_command.rb
    trunk/lib/rubygems/doc_manager.rb
    trunk/lib/rubygems/format.rb
    trunk/lib/rubygems/gem_openssl.rb
    trunk/lib/rubygems/installer.rb
    trunk/lib/rubygems/old_format.rb
    trunk/lib/rubygems/uninstaller.rb

Index: lib/rubygems/command.rb
===================================================================
--- lib/rubygems/command.rb	(revision 29724)
+++ lib/rubygems/command.rb	(revision 29725)
@@ -168,7 +168,7 @@
             "Please specify at least one gem name (e.g. gem build GEMNAME)"
     end
 
-    gem_names = args.select { |arg| arg !~ /^-/ }
+    args.select { |arg| arg !~ /^-/ }
   end
 
   ##
@@ -430,7 +430,7 @@
     @parser.separator "  #{header}Options:"
 
     option_list.each do |args, handler|
-      dashes = args.select { |arg| arg =~ /^-/ }
+      args.select { |arg| arg =~ /^-/ }
       @parser.on(*args) do |value|
         handler.call(value, @options)
       end
Index: lib/rubygems/old_format.rb
===================================================================
--- lib/rubygems/old_format.rb	(revision 29724)
+++ lib/rubygems/old_format.rb	(revision 29725)
@@ -143,7 +143,7 @@
         end
         yield [entry, Zlib::Inflate.inflate(file_data.strip.unpack("m")[0])]
       end
-    rescue Zlib::DataError => e
+    rescue Zlib::DataError
       raise Gem::Exception, errstr
     end
   end
Index: lib/rubygems/format.rb
===================================================================
--- lib/rubygems/format.rb	(revision 29724)
+++ lib/rubygems/format.rb	(revision 29725)
@@ -32,8 +32,6 @@
   # representing the data in the gem
 
   def self.from_file_by_path(file_path, security_policy = nil)
-    format = nil
-
     unless File.exist?(file_path)
       raise Gem::Exception, "Cannot load gem at [#{file_path}] in #{Dir.pwd}"
     end
Index: lib/rubygems/doc_manager.rb
===================================================================
--- lib/rubygems/doc_manager.rb	(revision 29724)
+++ lib/rubygems/doc_manager.rb	(revision 29725)
@@ -77,7 +77,7 @@
       :formatter => RDoc::RI::Formatter,
     }
 
-    driver = RDoc::RI::Driver.new(options).class_cache
+    RDoc::RI::Driver.new(options).class_cache
   end
 
   ##
Index: lib/rubygems/installer.rb
===================================================================
--- lib/rubygems/installer.rb	(revision 29724)
+++ lib/rubygems/installer.rb	(revision 29725)
@@ -318,7 +318,7 @@
   def generate_bin_script(filename, bindir)
     bin_script_path = File.join bindir, formatted_program_filename(filename)
 
-    exec_path = File.join @gem_dir, @spec.bindir, filename
+    File.join @gem_dir, @spec.bindir, filename
 
     # HACK some gems don't have #! in their executables, restore 2008/06
     #if File.read(exec_path, 2) == '#!' then
@@ -466,7 +466,7 @@
 
         say results.join("\n") if Gem.configuration.really_verbose
 
-      rescue => ex
+      rescue
         results = results.join "\n"
 
         File.open('gem_make.out', 'wb') { |f| f.puts results }
Index: lib/rubygems/commands/update_command.rb
===================================================================
--- lib/rubygems/commands/update_command.rb	(revision 29724)
+++ lib/rubygems/commands/update_command.rb	(revision 29725)
@@ -181,11 +181,11 @@
         end
       end
 
-      matching_gems = spec_tuples.select do |(name, version, platform),|
+      matching_gems = spec_tuples.select do |(name, _, platform),|
         name == l_name and Gem::Platform.match platform
       end
 
-      highest_remote_gem = matching_gems.sort_by do |(name, version),|
+      highest_remote_gem = matching_gems.sort_by do |(_, version),|
         version
       end.last
 
Index: lib/rubygems/commands/build_command.rb
===================================================================
--- lib/rubygems/commands/build_command.rb	(revision 29724)
+++ lib/rubygems/commands/build_command.rb	(revision 29725)
@@ -35,7 +35,7 @@
           while not f.eof? and spec = Gem::Specification.from_yaml(f)
             result << spec
           end
-        rescue Gem::EndOfYAMLException => e
+        rescue Gem::EndOfYAMLException
           # OK
         end
       end
Index: lib/rubygems/commands/query_command.rb
===================================================================
--- lib/rubygems/commands/query_command.rb	(revision 29724)
+++ lib/rubygems/commands/query_command.rb	(revision 29725)
@@ -161,19 +161,19 @@
     end
 
     versions.each do |gem_name, matching_tuples|
-      matching_tuples = matching_tuples.sort_by do |(name, version,_),_|
+      matching_tuples = matching_tuples.sort_by do |(_, version,_),_|
         version
       end.reverse
 
       platforms = Hash.new { |h,version| h[version] = [] }
 
-      matching_tuples.map do |(name, version, platform,_),_|
+      matching_tuples.map do |(_, version, platform,_),_|
         platforms[version] << platform if platform
       end
 
       seen = {}
 
-      matching_tuples.delete_if do |(name, version,_),_|
+      matching_tuples.delete_if do |(_, version,_),_|
         if seen[version] then
           true
         else
@@ -186,7 +186,7 @@
 
       if options[:versions] then
         list = if platforms.empty? or options[:details] then
-                 matching_tuples.map { |(name, version,_),_| version }.uniq
+                 matching_tuples.map { |(_, version,_),_| version }.uniq
                else
                  platforms.sort.reverse.map do |version, pls|
                    if pls == [Gem::Platform::RUBY] then
Index: lib/rubygems/commands/server_command.rb
===================================================================
--- lib/rubygems/commands/server_command.rb	(revision 29724)
+++ lib/rubygems/commands/server_command.rb	(revision 29725)
@@ -17,7 +17,7 @@
       else
         begin
           Socket.getservbyname port
-        rescue SocketError => e
+        rescue SocketError
           raise OptionParser::InvalidArgument, "#{port}: no such named service"
         end
       end
Index: lib/rubygems/commands/check_command.rb
===================================================================
--- lib/rubygems/commands/check_command.rb	(revision 29724)
+++ lib/rubygems/commands/check_command.rb	(revision 29725)
@@ -71,7 +71,7 @@
       say "Verifying gem: '#{gem_name}'"
       begin
         Gem::Validator.new.verify_gem_file(gem_name)
-      rescue Exception => e
+      rescue Exception
         alert_error "#{gem_name} is invalid."
       end
     end
Index: lib/rubygems/uninstaller.rb
===================================================================
--- lib/rubygems/uninstaller.rb	(revision 29724)
+++ lib/rubygems/uninstaller.rb	(revision 29725)
@@ -82,7 +82,7 @@
       gem_names = list.collect {|gem| gem.full_name} + ["All versions"]
 
       say
-      gem_name, index = choose_from_list "Select gem to uninstall:", gem_names
+      _, index = choose_from_list "Select gem to uninstall:", gem_names
 
       if index == list.size then
         remove_all list.dup
Index: lib/rubygems/gem_openssl.rb
===================================================================
--- lib/rubygems/gem_openssl.rb	(revision 29724)
+++ lib/rubygems/gem_openssl.rb	(revision 29725)
@@ -42,7 +42,7 @@
   # Reference a constant defined in the .rb portion of ssl (just to
   # make sure that part is loaded too).
 
-  dummy = OpenSSL::Digest::SHA1
+  OpenSSL::Digest::SHA1
 
   Gem.ssl_available = true
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/