get rid of some more warnings

Author: brianmario

spec/em/em_spec.rb

@@ -34,8 +34,8 @@
         defer1.callback do |result|
           results << result.first
           defer2 = client.query "SELECT sleep(0.025) as second_query"
-          defer2.callback do |result|
-            results << result.first
+          defer2.callback do |r|
+            results << r.first
             EM.stop_event_loop
           end
         end

spec/mysql2/client_spec.rb

@@ -17,17 +17,17 @@
   if defined? Encoding
     it "should raise an exception on create for invalid encodings" do
       lambda {
-        c = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "fake"))
+        Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "fake"))
       }.should raise_error(Mysql2::Error)
     end
 
     it "should not raise an exception on create for a valid encoding" do
       lambda {
-        c = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "utf8"))
+        Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "utf8"))
       }.should_not raise_error(Mysql2::Error)
 
       lambda {
-        c = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "big5"))
+        Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "big5"))
       }.should_not raise_error(Mysql2::Error)
     end
   end
@@ -160,8 +160,8 @@ def connect *args
         @client.query("INSERT INTO infoTest (blah) VALUES (1234),(4535)")
       end
       it "should retrieve it" do
-        @client.query_info.should == {:records => 2, :duplicates => 0, :warnings => 0}
-        @client.query_info_string.should eq 'Records: 2  Duplicates: 0  Warnings: 0'
+        @client.query_info.should  eql({:records => 2, :duplicates => 0, :warnings => 0})
+        @client.query_info_string.should eq('Records: 2  Duplicates: 0  Warnings: 0')
       end
     end
   end
@@ -419,12 +419,12 @@ def connect *args
       end
 
       it "returns multiple result sets" do
-        @multi_client.query( "select 1 as 'set_1'; select 2 as 'set_2'").first.should == { 'set_1' => 1 }
+        @multi_client.query( "select 1 as 'set_1'; select 2 as 'set_2'").first.should eql({ 'set_1' => 1 })
 
-        @multi_client.next_result.should == true
-        @multi_client.store_result.first.should == { 'set_2' => 2 }
+        @multi_client.next_result.should be_true
+        @multi_client.store_result.first.should eql({ 'set_2' => 2 })
 
-        @multi_client.next_result.should == false
+        @multi_client.next_result.should be_false
       end
 
       it "does not interfere with other statements" do
@@ -453,12 +453,12 @@ def connect *args
 
       it "#more_results? should work" do
         @multi_client.query( "select 1 as 'set_1'; select 2 as 'set_2'")
-        @multi_client.more_results?.should == true
+        @multi_client.more_results?.should be_true
 
         @multi_client.next_result
         @multi_client.store_result
 
-        @multi_client.more_results?.should == false
+        @multi_client.more_results?.should be_false
       end
     end
   end
@@ -621,11 +621,11 @@ def connect *args
 
   it "should raise a Mysql2::Error exception upon connection failure" do
     lambda {
-      bad_client = Mysql2::Client.new :host => "localhost", :username => 'asdfasdf8d2h', :password => 'asdfasdfw42'
+      Mysql2::Client.new :host => "localhost", :username => 'asdfasdf8d2h', :password => 'asdfasdfw42'
     }.should raise_error(Mysql2::Error)
 
     lambda {
-      good_client = Mysql2::Client.new DatabaseCredentials['root']
+      Mysql2::Client.new DatabaseCredentials['root']
     }.should_not raise_error(Mysql2::Error)
   end
 

spec/mysql2/result_spec.rb

@@ -148,11 +148,11 @@
     it "should return nil values for NULL and strings for everything else when :cast is false" do
       result = @client.query('SELECT null_test, tiny_int_test, bool_cast_test, int_test, date_test, enum_test FROM mysql2_test WHERE bool_cast_test = 1 LIMIT 1', :cast => false).first
       result["null_test"].should be_nil
-      result["tiny_int_test"].should  == "1"
-      result["bool_cast_test"].should == "1"
-      result["int_test"].should       == "10"
-      result["date_test"].should      == "2010-04-04"
-      result["enum_test"].should      == "val1"
+      result["tiny_int_test"].should  eql("1")
+      result["bool_cast_test"].should eql("1")
+      result["int_test"].should       eql("10")
+      result["date_test"].should      eql("2010-04-04")
+      result["enum_test"].should      eql("val1")
     end
 
     it "should return nil for a NULL value" do