Lint/UnusedBlockArgument

Author: tamird

.rubocop_todo.yml

@@ -1,24 +1,15 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-03-12 17:46:52 -0700 using RuboCop version 0.29.1.
+# on 2015-03-12 18:00:35 -0700 using RuboCop version 0.29.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
-Lint/ShadowingOuterLocalVariable:
-  Enabled: false
-
-# Offense count: 23
-# Cop supports --auto-correct.
-Lint/UnusedBlockArgument:
-  Enabled: false
-
 # Offense count: 1
 Lint/UselessAccessModifier:
   Enabled: false
 
-# Offense count: 4
+# Offense count: 10
 Lint/UselessAssignment:
   Enabled: false
 

benchmark/query_with_mysql_casting.rb

@@ -43,9 +43,7 @@ def mysql_cast(type, value)
   mysql2.query "USE #{database}"
   x.report "Mysql2" do
     mysql2_result = mysql2.query sql, :symbolize_keys => true
-    mysql2_result.each do |res|
-      # puts res.inspect
-    end
+    # mysql2_result.each { |res| puts res.inspect }
   end
 
   mysql = Mysql.new("localhost", "root")
@@ -55,7 +53,7 @@ def mysql_cast(type, value)
     fields = mysql_result.fetch_fields
     mysql_result.each do |row|
       row_hash = row.each_with_index.each_with_object({}) do |(f, j), hash|
-        hash[fields[j].name.to_sym] = mysql_cast(fields[j].type, row[j])
+        hash[fields[j].name.to_sym] = mysql_cast(fields[j].type, f)
       end
       # puts row_hash.inspect
     end
@@ -65,9 +63,7 @@ def mysql_cast(type, value)
   command = do_mysql.create_command sql
   x.report "do_mysql" do
     do_result = command.execute_reader
-    do_result.each do |res|
-      # puts res.inspect
-    end
+    # do_result.each { |res| puts res.inspect }
   end
 
   x.compare!

benchmark/query_without_mysql_casting.rb

@@ -15,34 +15,26 @@
   mysql2.query "USE #{database}"
   x.report "Mysql2 (cast: true)" do
     mysql2_result = mysql2.query sql, :symbolize_keys => true, :cast => true
-    mysql2_result.each do |res|
-      # puts res.inspect
-    end
+    # mysql2_result.each { |res| puts res.inspect }
   end
 
   x.report "Mysql2 (cast: false)" do
     mysql2_result = mysql2.query sql, :symbolize_keys => true, :cast => false
-    mysql2_result.each do |res|
-      # puts res.inspect
-    end
+    # mysql2_result.each { |res| puts res.inspect }
   end
 
   mysql = Mysql.new("localhost", "root")
   mysql.query "USE #{database}"
   x.report "Mysql" do
     mysql_result = mysql.query sql
-    mysql_result.each_hash do |res|
-      # puts res.inspect
-    end
+    # mysql_result.each_hash { |res| puts res.inspect }
   end
 
   do_mysql = DataObjects::Connection.new("mysql://localhost/#{database}")
   command = DataObjects::Mysql::Command.new do_mysql, sql
   x.report "do_mysql" do
     do_result = command.execute_reader
-    do_result.each do |res|
-      # puts res.inspect
-    end
+    # do_result.each { |res| puts res.inspect }
   end
 
   x.compare!

ext/mysql2/extconf.rb

@@ -117,7 +117,7 @@ def asplode(lib)
   # Use rake to rebuild only if these files change
   deffile = File.expand_path('../../../support/libmysql.def', __FILE__)
   libfile = File.expand_path(File.join(rpath_dir, 'libmysql.lib'))
-  file 'libmysql.a' => [deffile, libfile] do |t|
+  file 'libmysql.a' => [deffile, libfile] do
     when_writing 'building libmysql.a' do
       # Ruby kindly shows us where dllwrap is, but that tool does more than we want.
       # Maybe in the future Ruby could provide RbConfig::CONFIG['DLLTOOL'] directly.
@@ -144,7 +144,7 @@ def asplode(lib)
 
   vendordll = File.join(vendordir, 'libmysql.dll')
   dllfile = File.expand_path(File.join(rpath_dir, 'libmysql.dll'))
-  file vendordll => [dllfile, vendordir] do |t|
+  file vendordll => [dllfile, vendordir] do
     when_writing 'copying libmysql.dll' do
       cp dllfile, vendordll
     end

lib/mysql2/console.rb

@@ -1,5 +1,5 @@
 # Loaded by script/console. Land helpers here.
 
-Pry.config.prompt = lambda do |context, nesting, pry|
+Pry.config.prompt = lambda do |context, *|
   "[mysql2] #{context}> "
 end

spec/em/em_spec.rb

@@ -53,11 +53,11 @@
         EM.run do
           client = Mysql2::EM::Client.new DatabaseCredentials['root']
           defer = client.query "SELECT sleep(0.1) as first_query"
-          defer.callback do |result|
+          defer.callback do
             client.close
             fail 'some error'
           end
-          defer.errback do |err|
+          defer.errback do
             # This _shouldn't_ be run, but it needed to prevent the specs from
             # freezing if this test fails.
             EM.stop_event_loop
@@ -75,7 +75,7 @@
         errors = []
         EM.run do
           defer = client.query "SELECT sleep(0.1) as first_query"
-          defer.callback do |result|
+          defer.callback do
             # This _shouldn't_ be run, but it is needed to prevent the specs from
             # freezing if this test fails.
             EM.stop_event_loop
@@ -93,13 +93,13 @@
         EM.run do
           defer = client.query "SELECT sleep(0.025) as first_query"
           EM.add_timer(0.1) do
-            defer.callback do |result|
+            defer.callback do
               callbacks_run << :callback
               # This _shouldn't_ be run, but it is needed to prevent the specs from
               # freezing if this test fails.
               EM.stop_event_loop
             end
-            defer.errback do |err|
+            defer.errback do
               callbacks_run << :errback
               EM.stop_event_loop
             end
@@ -114,10 +114,10 @@
       EM.run do
         client = Mysql2::EM::Client.new DatabaseCredentials['root']
         defer = client.query("select sleep(0.025)")
-        defer.callback do |result|
+        defer.callback do
           callbacks_run << :callback
         end
-        defer.errback do |err|
+        defer.errback do
           callbacks_run << :errback
         end
         EM.add_timer(0.1) do

spec/mysql2/result_spec.rb

@@ -158,7 +158,7 @@
       res = client.query "SELECT * FROM streamingTest", :stream => true, :cache_rows => false
 
       expect {
-        res.each_with_index do |row, i|
+        res.each_with_index do |_, i|
           # Exhaust the first result packet then trigger a timeout
           sleep 2 if i > 0 && i % 1000 == 0
         end

tasks/compile.rake

@@ -50,7 +50,7 @@ Rake::ExtensionTask.new("mysql2", Mysql2::GEMSPEC) do |ext|
 end
 Rake::Task[:spec].prerequisites << :compile
 
-file 'vendor/README' do |t|
+file 'vendor/README' do
   connector_dir = File.expand_path("../../vendor/#{vendor_mysql_dir}", __FILE__)
   when_writing 'copying Connector/C README' do
     cp "#{connector_dir}/README", 'vendor/README'

tasks/vendor_mysql.rake

@@ -21,13 +21,13 @@ def vendor_mysql_url(*args)
 end
 
 # vendor:mysql
-task "vendor:mysql:cross" do |t|
+task "vendor:mysql:cross" do
   # When cross-compiling, grab both 32 and 64 bit connectors
   Rake::Task['vendor:mysql'].invoke('x86')
   Rake::Task['vendor:mysql'].invoke('x64')
 end
 
-task "vendor:mysql", [:platform] do |t, args|
+task "vendor:mysql", [:platform] do |_t, args|
   puts "vendor:mysql for #{vendor_mysql_dir(args[:platform])}"
 
   # download mysql library and headers
@@ -37,7 +37,7 @@ task "vendor:mysql", [:platform] do |t, args|
     url = vendor_mysql_url(args[:platform])
     when_writing "downloading #{t.name}" do
       cd "vendor" do
-        sh "curl", "-C", "-", "-O", url do |ok, res|
+        sh "curl", "-C", "-", "-O", url do |ok|
           sh "wget", "-c", url unless ok
         end
       end