stomp 1.3.5 → 1.4.0

data/lib/connection/utils.rb

@@ -251,7 +251,7 @@ module Stomp
             $stderr.print "\n"
             $stderr.print "es2_oldrecv: " + errstr
             $stderr.print "\n"
-         end
+          end
 
           # !!! This initiates a re-connect !!!
           _reconn_prep()

data/lib/stomp/client.rb

@@ -30,29 +30,32 @@ module Stomp
     #       {:login => "login1", :passcode => "passcode1", :host => "localhost", :port => 61616, :ssl => false},
     #       {:login => "login2", :passcode => "passcode2", :host => "remotehost", :port => 61617, :ssl => false}
     #     ],
-    #     :reliable => true,
-    #     :initial_reconnect_delay => 0.01,
-    #     :max_reconnect_delay => 30.0,
-    #     :use_exponential_back_off => true,
-    #     :back_off_multiplier => 2,
-    #     :max_reconnect_attempts => 0,
-    #     :randomize => false,
-    #     :connect_timeout => 0,
-    #     :connect_headers => {},
-    #     :parse_timeout => 5,
-    #     :logger => nil,
-    #     :dmh => false,
-    #     :closed_check => true,
-    #     :hbser => false,
-    #     :stompconn => false,
-    #     :usecrlf => false,
-    #     :max_hbread_fails => 0,
-    #     :max_hbrlck_fails => 0,
-    #     :fast_hbs_adjust => 0.0,
-    #     :connread_timeout => 0,
-    #     :tcp_nodelay => true,
-    #     :start_timeout => 0,
-    #     :sslctx_newparm => nil,
+    #     # These are the default parameters and do not need to be set
+    #     :reliable => true,                  # reliable (use failover)
+    #     :initial_reconnect_delay => 0.01,   # initial delay before reconnect (secs)
+    #     :max_reconnect_delay => 30.0,       # max delay before reconnect
+    #     :use_exponential_back_off => true,  # increase delay between reconnect attpempts
+    #     :back_off_multiplier => 2,          # next delay multiplier
+    #     :max_reconnect_attempts => 0,       # retry forever, use # for maximum attempts
+    #     :randomize => false,                # do not radomize hosts hash before reconnect
+    #     :connect_timeout => 0,              # Timeout for TCP/TLS connects, use # for max seconds
+    #     :connect_headers => {},             # user supplied CONNECT headers (req'd for Stomp 1.1+)
+    #     :parse_timeout => 5,                # IO::select wait time on socket reads
+    #     :logger => nil,                     # user suplied callback logger instance
+    #     :dmh => false,                      # do not support multihomed IPV4 / IPV6 hosts during failover
+    #     :closed_check => true,              # check first if closed in each protocol method
+    #     :hbser => false,                    # raise on heartbeat send exception
+    #     :stompconn => false,                # Use STOMP instead of CONNECT
+    #     :usecrlf => false,                  # Use CRLF command and header line ends (1.2+)
+    #     :max_hbread_fails => 0,             # Max HB read fails before retry.  0 => never retry
+    #     :max_hbrlck_fails => 0,             # Max HB read lock obtain fails before retry.  0 => never retry
+    #     :fast_hbs_adjust => 0.0,            # Fast heartbeat senders sleep adjustment, seconds, needed ...
+    #                                         # For fast heartbeat senders.  'fast' == YMMV.  If not
+    #                                         # correct for your environment, expect unnecessary fail overs
+    #     :connread_timeout => 0,             # Timeout during CONNECT for read of CONNECTED/ERROR, secs
+    #     :tcp_nodelay => true,               # Turns on the TCP_NODELAY socket option; disables Nagle's algorithm
+    #     :start_timeout => 0,                # Timeout around Stomp::Client initialization
+    #     :sslctx_newparm => nil,             # Param for SSLContext.new
     #   }
     #
     #   e.g. c = Stomp::Client.new(hash)
@@ -86,6 +89,8 @@ module Stomp
       @start_timeout = @parameters[:start_timeout] || 0
       check_arguments!()
 
+      # p [ "cldbg01", @parameters ]
+
       begin
         Timeout::timeout(@start_timeout) {
           create_error_handler
@@ -93,6 +98,7 @@ module Stomp
           start_listeners()
         }
       rescue TimeoutError
+        # p [ "cldbg02" ]
         ex = Stomp::Error::StartTimeoutException.new(@start_timeout)
         raise ex
       end
@@ -116,6 +122,7 @@ module Stomp
     end
 
     def create_connection(autoflush)
+      # p [ "ccon01", @parameters ]
       @connection = Connection.new(@parameters)
       @connection.autoflush = autoflush
     end

data/lib/stomp/connection.rb

@@ -67,29 +67,32 @@ module Stomp
     #       {:login => "login1", :passcode => "passcode1", :host => "localhost", :port => 61616, :ssl => false},
     #       {:login => "login2", :passcode => "passcode2", :host => "remotehost", :port => 61617, :ssl => false}
     #     ],
-    #     :reliable => true,
-    #     :initial_reconnect_delay => 0.01,
-    #     :max_reconnect_delay => 30.0,
-    #     :use_exponential_back_off => true,
-    #     :back_off_multiplier => 2,
-    #     :max_reconnect_attempts => 0,
-    #     :randomize => false,
-    #     :connect_timeout => 0,
-    #     :connect_headers => {},
-    #     :parse_timeout => 5,
-    #     :logger => nil,
-    #     :dmh => false,
-    #     :closed_check => true,
-    #     :hbser => false,
-    #     :stompconn => false,
-    #     :usecrlf => false,
-    #     :max_hbread_fails => 0,
-    #     :max_hbrlck_fails => 0,
-    #     :fast_hbs_adjust => 0.0,
-    #     :connread_timeout => 0,
-    #     :tcp_nodelay => true,
-    #     :start_timeout => 0,
-    #     :sslctx_newparm => nil,
+    #     # These are the default parameters and do not need to be set
+    #     :reliable => true,                  # reliable (use failover)
+    #     :initial_reconnect_delay => 0.01,   # initial delay before reconnect (secs)
+    #     :max_reconnect_delay => 30.0,       # max delay before reconnect
+    #     :use_exponential_back_off => true,  # increase delay between reconnect attpempts
+    #     :back_off_multiplier => 2,          # next delay multiplier
+    #     :max_reconnect_attempts => 0,       # retry forever, use # for maximum attempts
+    #     :randomize => false,                # do not radomize hosts hash before reconnect
+    #     :connect_timeout => 0,              # Timeout for TCP/TLS connects, use # for max seconds
+    #     :connect_headers => {},             # user supplied CONNECT headers (req'd for Stomp 1.1+)
+    #     :parse_timeout => 5,                # IO::select wait time on socket reads
+    #     :logger => nil,                     # user suplied callback logger instance
+    #     :dmh => false,                      # do not support multihomed IPV4 / IPV6 hosts during failover
+    #     :closed_check => true,              # check first if closed in each protocol method
+    #     :hbser => false,                    # raise on heartbeat send exception
+    #     :stompconn => false,                # Use STOMP instead of CONNECT
+    #     :usecrlf => false,                  # Use CRLF command and header line ends (1.2+)
+    #     :max_hbread_fails => 0,             # Max HB read fails before retry.  0 => never retry
+    #     :max_hbrlck_fails => 0,             # Max HB read lock obtain fails before retry.  0 => never retry
+    #     :fast_hbs_adjust => 0.0,            # Fast heartbeat senders sleep adjustment, seconds, needed ...
+    #                                         # For fast heartbeat senders.  'fast' == YMMV.  If not
+    #                                         # correct for your environment, expect unnecessary fail overs
+    #     :connread_timeout => 0,             # Timeout during CONNECT for read of CONNECTED/ERROR, secs
+    #     :tcp_nodelay => true,               # Turns on the TCP_NODELAY socket option; disables Nagle's algorithm
+    #     :start_timeout => 0,                # Timeout around Stomp::Client initialization
+    #     :sslctx_newparm => nil,             # Param for SSLContext.new
     #   }
     #
     #   e.g. c = Stomp::Connection.new(hash)
@@ -111,6 +114,8 @@ module Stomp
       @hb_sent = true           # Assumed at first
       @hbs = @hbr = false       # Sending/Receiving heartbeats. Assume no for now.
       @jruby = false            # Assumed at first
+      # Initialize some variables
+      @closed, @socket, @hhas10, @rt, @st = true, nil, false, nil, nil
       if defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/
         @jruby = true
       end

data/lib/stomp/constants.rb

@@ -175,6 +175,8 @@ module Stomp
     ["SRP-RSA-AES-256-CBC-SHA","TLSv1/SSLv3",256,256],
   ]
 
+  original_verbose, $VERBOSE = $VERBOSE, nil # try to shut off warnings
+  
   # stomp URL regex pattern, for e.g. login:passcode@host:port or host:port
   URL_REPAT = '((([\w~!@#$%^&*()\-+=.?:<>,.]*\w):([\w~!@#$%^&*()\-+=.?:<>,.]*))?@)?([\w\.\-]+):(\d+)'
 
@@ -182,4 +184,6 @@ module Stomp
   #failover:(stomp+ssl://login1:passcode1@remotehost1:61612,stomp://login2:passcode2@remotehost2:61613)
   FAILOVER_REGEX = /^failover:(\/\/)?\(stomp(\+ssl)?:\/\/#{URL_REPAT}(,stomp(\+ssl)?:\/\/#{URL_REPAT})*\)(\?(.*))?$/
 
+  $VERBOSE = original_verbose
+  
 end # Module Stomp

data/lib/stomp/errors.rb

@@ -38,6 +38,15 @@ module Stomp
       end
     end
 
+    # ReceiveTimeout is raised if:
+    # * The read socket shows "not ready" at any time after the timeout
+    #   specified by :parse_timeout in the connection hash.
+    class ReceiveTimeout < RuntimeError
+      def message
+        "Receive status timeout"
+      end
+    end
+
     # SocketOpenTimeout is raised if:
     # * A timeout occurs during a socket open.
     class SocketOpenTimeout < RuntimeError

data/lib/stomp/version.rb

@@ -5,8 +5,8 @@ module Stomp
   # Define the gem version.
   module Version  #:nodoc: all
     MAJOR = 1
-    MINOR = 3
-    PATCH = 5
+    MINOR = 4
+    PATCH = 0
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/stomp.gemspec

@@ -5,80 +5,32 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stomp}
-  s.version = "1.3.5"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian McCallister", "Marius Mathiesen", "Thiago Morello", "Guy M. Allard"]
-  s.date = %q{2016-03-02}
+  s.date = %q{2016-06-08}
   s.description = %q{Ruby client for the Stomp messaging protocol.  Note that this gem is no longer supported on rubyforge.}
   s.email = ["brianm@apache.org", "marius@stones.com", "morellon@gmail.com", "allard.guy.m@gmail.com"]
-  s.executables = ["catstomp", "stompcat"]
+  s.executables = ["stompcat", "catstomp"]
   s.extra_rdoc_files = [
-    "CHANGELOG.rdoc",
     "LICENSE",
-    "README.rdoc",
-    "examples/amqdurasub.rb",
-    "examples/client11_ex1.rb",
-    "examples/client11_putget1.rb",
-    "examples/conn11_ex1.rb",
-    "examples/conn11_ex2.rb",
-    "examples/conn11_hb1.rb",
-    "examples/consumer.rb",
-    "examples/examplogger.rb",
-    "examples/get11conn_ex1.rb",
-    "examples/get11conn_ex2.rb",
-    "examples/logexamp.rb",
-    "examples/logexamp_ssl.rb",
-    "examples/publisher.rb",
-    "examples/put11conn_ex1.rb",
-    "examples/putget11_rh1.rb",
-    "examples/ssl_ctxoptions.rb",
-    "examples/ssl_newparm.rb",
-    "examples/ssl_uc1.rb",
-    "examples/ssl_uc1_ciphers.rb",
-    "examples/ssl_uc2.rb",
-    "examples/ssl_uc2_ciphers.rb",
-    "examples/ssl_uc3.rb",
-    "examples/ssl_uc3_ciphers.rb",
-    "examples/ssl_uc4.rb",
-    "examples/ssl_uc4_ciphers.rb",
-    "examples/ssl_ucx_default_ciphers.rb",
-    "examples/stomp11_common.rb",
-    "examples/topic_consumer.rb",
-    "examples/topic_publisher.rb",
-    "lib/client/utils.rb",
-    "lib/connection/heartbeats.rb",
-    "lib/connection/netio.rb",
-    "lib/connection/utf8.rb",
-    "lib/connection/utils.rb",
-    "lib/stomp.rb",
-    "lib/stomp/client.rb",
-    "lib/stomp/codec.rb",
-    "lib/stomp/connection.rb",
-    "lib/stomp/constants.rb",
-    "lib/stomp/errors.rb",
-    "lib/stomp/ext/hash.rb",
-    "lib/stomp/message.rb",
-    "lib/stomp/null_logger.rb",
-    "lib/stomp/slogger.rb",
-    "lib/stomp/sslparams.rb",
-    "lib/stomp/version.rb",
-    "test/test_anonymous.rb",
-    "test/test_client.rb",
-    "test/test_codec.rb",
-    "test/test_connection.rb",
-    "test/test_connection1p.rb",
-    "test/test_helper.rb",
-    "test/test_message.rb",
-    "test/test_ssl.rb",
-    "test/test_urlogin.rb",
-    "test/tlogger.rb"
+    "README.md"
   ]
   s.files = [
-    "CHANGELOG.rdoc",
+    "CHANGELOG.md",
     "LICENSE",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
+    "adhoc/.gitignore",
+    "adhoc/README.md",
+    "adhoc/issue121_01.rb",
+    "adhoc/issue121_01_conn.rb",
+    "adhoc/issue121_02.rb",
+    "adhoc/issue121_03.rb",
+    "adhoc/payload_generator.rb",
+    "adhoc/payload_generator_adhoctest.rb",
+    "adhoc/stomp_adhoc_common.rb",
     "bin/catstomp",
     "bin/stompcat",
     "examples/amqdurasub.rb",
@@ -87,12 +39,18 @@ Gem::Specification.new do |s|
     "examples/conn11_ex1.rb",
     "examples/conn11_ex2.rb",
     "examples/conn11_hb1.rb",
+    "examples/consume_file.rb",
     "examples/consumer.rb",
+    "examples/contrib.sh",
+    "examples/contributors.rb",
     "examples/examplogger.rb",
     "examples/get11conn_ex1.rb",
     "examples/get11conn_ex2.rb",
+    "examples/lflogger.rb",
     "examples/logexamp.rb",
     "examples/logexamp_ssl.rb",
+    "examples/publish_file.rb",
+    "examples/publish_file_conn.rb",
     "examples/publisher.rb",
     "examples/put11conn_ex1.rb",
     "examples/putget11_rh1.rb",
@@ -134,6 +92,7 @@ Gem::Specification.new do |s|
     "spec/message_spec.rb",
     "spec/spec_helper.rb",
     "stomp.gemspec",
+    "test/.gitignore",
     "test/test_anonymous.rb",
     "test/test_client.rb",
     "test/test_codec.rb",
@@ -146,7 +105,7 @@ Gem::Specification.new do |s|
     "test/tlogger.rb"
   ]
   s.homepage = %q{https://github.com/stompgem/stomp}
-  s.licenses = ["Apache 2.0"]
+  s.licenses = ["Apache-2.0"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby client for the Stomp messaging protocol}

data/test/.gitignore

@@ -0,0 +1,3 @@
+#
+1method.rb
+

data/test/test_anonymous.rb

@@ -203,11 +203,11 @@ class TestAnonymous < Test::Unit::TestCase
     end
     #
     assert_raise Stomp::Error::NoCurrentConnection do
-      m = @conn.receive
+      _ = @conn.receive
     end
     #
     assert_raise Stomp::Error::NoCurrentConnection do
-      m = @conn.poll
+      _ = @conn.poll
     end
   end
 
@@ -225,7 +225,7 @@ class TestAnonymous < Test::Unit::TestCase
     conn_subscribe make_destination
     @conn.publish make_destination, "a\0"
     msg = @conn.receive
-    assert_match /^<Stomp::Message headers=/ , msg.to_s
+    assert_match(/^<Stomp::Message headers=/ , msg.to_s)
     checkEmsg(@conn)
   end
 
@@ -309,7 +309,7 @@ class TestAnonymous < Test::Unit::TestCase
     1.upto(@max_threads) do |tnum|
       Thread.new(@conn) do |amq|
         while true
-          received = amq.receive
+          _ = amq.receive
           lock.synchronize do
             msg_ctr += 1
           end

data/test/test_client.rb

@@ -449,23 +449,25 @@ class TestClient < Test::Unit::TestCase
 
   # Test basic unsubscribe.
   def test_unsubscribe
+    @client.close if @client && @client.open? # close setup work
+    @client = nil
     message = nil
     dest = make_destination
     to_send = message_text
     client = get_client()
     sid = nil
-    if @client.protocol() == Stomp::SPL_10
+    if client.protocol() == Stomp::SPL_10
       client.subscribe(dest, :ack => 'client') { |m| message = m }
     else
       sid = client.uuid()
       client.subscribe(dest, :ack => 'client', :id => sid) { |m| message = m }
     end
-    @client.publish dest, to_send
+    client.publish dest, to_send
     Timeout::timeout(4) do
       sleep 0.01 until message
     end
     assert_equal to_send, message.body, "first body check"
-    if @client.protocol() == Stomp::SPL_10
+    if client.protocol() == Stomp::SPL_10
       client.unsubscribe dest
     else
       client.unsubscribe dest, :id => sid
@@ -474,7 +476,7 @@ class TestClient < Test::Unit::TestCase
     #  Same message should remain on the queue.  Receive it again with ack=>auto.
     message_copy = nil
     client = get_client()
-    if @client.protocol() == Stomp::SPL_10
+    if client.protocol() == Stomp::SPL_10
       client.subscribe(dest, :ack => 'auto') { |m| message_copy = m }
     else
       sid = client.uuid()
@@ -485,7 +487,8 @@ class TestClient < Test::Unit::TestCase
     end
     assert_equal to_send, message_copy.body, "second body check"
     assert_equal message.headers['message-id'], message_copy.headers['message-id'], "header check" unless ENV['STOMP_RABBIT']
-    checkEmsg(@client)
+    checkEmsg(client)
+    client.close
   end
 
   # Test subscribe from a worker thread.
@@ -524,7 +527,7 @@ class TestClient < Test::Unit::TestCase
           # this is ugly .....
           if acli.protocol() == Stomp::SPL_10
             acli.subscribe(dest) { |m| 
-              msg = m
+              _ = m
               lock.synchronize do
                 msg_ctr += 1
               end
@@ -533,7 +536,7 @@ class TestClient < Test::Unit::TestCase
             }
           else
             acli.subscribe(dest, :id => acli.uuid()) { |m| 
-              msg = m
+              _ = m
               lock.synchronize do
                 msg_ctr += 1
               end
@@ -547,7 +550,7 @@ class TestClient < Test::Unit::TestCase
     #
     1.upto(@max_msgs) do |mnum|
       msg = Time.now.to_s + " #{mnum}"
-      @client.publish(dest, message_text)
+      @client.publish(dest, msg)
     end
     #
     max_sleep = (RUBY_VERSION =~ /1\.8\.6/) ? 30 : 5
@@ -569,7 +572,7 @@ class TestClient < Test::Unit::TestCase
     #
     assert_raise Stomp::Error::NoCurrentConnection do
       m = Stomp::Message.new("")
-      @client.acknowledge(m) {|r| receipt = r}
+      @client.acknowledge(m) {|r| _ = r}
     end
     #
     assert_raise Stomp::Error::NoCurrentConnection do
@@ -585,7 +588,7 @@ class TestClient < Test::Unit::TestCase
     end
     #
     assert_raise Stomp::Error::NoCurrentConnection do
-      @client.subscribe("dummy_data", {:ack => 'auto'}) {|msg| received = msg}
+      @client.subscribe("dummy_data", {:ack => 'auto'}) {|msg| _ = msg}
     end
     #
     assert_raise Stomp::Error::NoCurrentConnection do
@@ -662,7 +665,7 @@ class TestClient < Test::Unit::TestCase
     ex_vals = dflt_data_ex()
     ex_vals.each do |hsv|
       assert_raise ArgumentError do
-        cli = Stomp::Client.open(hsv)
+        _ = Stomp::Client.open(hsv)
       end
     end
   end

data/test/test_connection.rb

@@ -203,11 +203,11 @@ class TestConnection < Test::Unit::TestCase
     end
     #
     assert_raise Stomp::Error::NoCurrentConnection do
-      m = @conn.receive
+      _ = @conn.receive
     end
     #
     assert_raise Stomp::Error::NoCurrentConnection do
-      m = @conn.poll
+      _ = @conn.poll
     end
   end
 
@@ -225,7 +225,7 @@ class TestConnection < Test::Unit::TestCase
     conn_subscribe make_destination
     @conn.publish make_destination, "a\0"
     msg = @conn.receive
-    assert_match /^<Stomp::Message headers=/ , msg.to_s
+    assert_match(/^<Stomp::Message headers=/ , msg.to_s)
     checkEmsg(@conn)
   end
   
@@ -309,7 +309,7 @@ class TestConnection < Test::Unit::TestCase
     1.upto(@max_threads) do |tnum|
       Thread.new(@conn) do |amq|
         while true
-          received = amq.receive
+          _ = amq.receive
           lock.synchronize do
             msg_ctr += 1
           end

data/test/test_connection1p.rb

@@ -34,12 +34,12 @@ class TestConnection1P < Test::Unit::TestCase
     #
     cha = {:host => "localhost"}
     assert_raise Stomp::Error::ProtocolErrorConnect do
-      conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
+      _ = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
     end    
     #
     chb = {"accept-version" => "1.0"}
     assert_raise Stomp::Error::ProtocolErrorConnect do
-      conn = Stomp::Connection.open(user, passcode, host, port, false, 5, chb)
+      _ = Stomp::Connection.open(user, passcode, host, port, false, 5, chb)
     end    
   end
 
@@ -62,11 +62,11 @@ class TestConnection1P < Test::Unit::TestCase
       :max_reconnect_attempts => 10,
     }
     assert_raise Stomp::Error::ProtocolErrorConnect do
-      conn = Stomp::Connection.open(hash)
+      _ = Stomp::Connection.open(hash)
     end
     hash[:connect_headers] = {"accept-version" => "1.1"}
     assert_raise Stomp::Error::ProtocolErrorConnect do
-      conn = Stomp::Connection.open(hash)
+      _ = Stomp::Connection.open(hash)
     end
   end
 

data/test/test_helper.rb

@@ -13,8 +13,8 @@ else
 end
 
 begin
-  dummy = RUBY_ENGINE
-rescue NameError => ne
+  _ = RUBY_ENGINE
+rescue NameError
   RUBY_ENGINE = "unknown"
 end
 
@@ -169,6 +169,7 @@ module TestBase
   def make_destination
     name = caller_method_name unless name
     qname = ENV['STOMP_DOTQUEUE'] ? "/queue/test.ruby.stomp." + name : "/queue/test/ruby/stomp/" + name
+    return qname
   end
 
   #
@@ -182,6 +183,7 @@ module TestBase
   # Check for JRuby before a connection exists
   def jruby?()
     jr = defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/ ? true : false
+    return jr
   end
 
   # OK Data For Default Tests

data/test/test_message.rb

@@ -104,49 +104,49 @@ class TestMessage < Test::Unit::TestCase
 	def test_0040_msg_create
 		#
 		assert_raise(Stomp::Error::InvalidFormat) {
-			aframe = Stomp::Message.new("junk", false)
+			_ = Stomp::Message.new("junk", false)
 		}
 		#
 		assert_raise(Stomp::Error::InvalidFormat) {
-			aframe = Stomp::Message.new("command\njunk", false)
+			_ = Stomp::Message.new("command\njunk", false)
 		}
 		#
 		assert_raise(Stomp::Error::InvalidFormat) {
-			aframe = Stomp::Message.new("command\nheaders\n\njunk", false)
+			_ = Stomp::Message.new("command\nheaders\n\njunk", false)
 		}
 		#
 		assert_raise(Stomp::Error::InvalidServerCommand) {
-			aframe = Stomp::Message.new("junkcommand\nheaders\n\njunk\0\n\n", false)
+			_ = Stomp::Message.new("junkcommand\nheaders\n\njunk\0\n\n", false)
 		}
 		#
 		assert_raise(Stomp::Error::InvalidFormat) {
-			aframe = Stomp::Message.new("ERROR\nbadheaders\n\njunk\0\n\n", false)
+			_ = Stomp::Message.new("ERROR\nbadheaders\n\njunk\0\n\n", false)
 		}
 		#
 		assert_nothing_raised {
-			aframe = Stomp::Message.new("CONNECTED\nh1:val1\n\njunk\0\n", false)
+			_ = Stomp::Message.new("CONNECTED\nh1:val1\n\njunk\0\n", false)
 		}
 		#
 		assert_nothing_raised {
-			aframe = Stomp::Message.new("MESSAGE\nh1:val1\n\njunk\0\n", false)
+			_ = Stomp::Message.new("MESSAGE\nh1:val1\n\njunk\0\n", false)
 		}
 		#
 		assert_nothing_raised {
-			aframe = Stomp::Message.new("MESSAGE\nh2:val2\n\n\0", false)
+			_ = Stomp::Message.new("MESSAGE\nh2:val2\n\n\0", false)
 		}
 		#
 		assert_nothing_raised {
-			aframe = Stomp::Message.new("RECEIPT\nh1:val1\n\njunk\0\n", false)
+			_ = Stomp::Message.new("RECEIPT\nh1:val1\n\njunk\0\n", false)
 		}
 		#
 		assert_nothing_raised {
-			aframe = Stomp::Message.new("ERROR\nh1:val1\n\njunk\0\n", false)
+			_ = Stomp::Message.new("ERROR\nh1:val1\n\njunk\0\n", false)
 		}
 
 	end
 
 	# Test multiple headers with the same key
-	def test_0050_mh_msg_create
+  def test_0050_mh_msg_create
     aframe = bframe = nil
 		assert_nothing_raised {
       amsg = "MESSAGE\n" +
@@ -173,7 +173,7 @@ class TestMessage < Test::Unit::TestCase
   end
 
 	# Test headers with empty key / value
-	def test_0060_hdr_ekv
+  def test_0060_hdr_ekv
     #
     amsg = "MESSAGE\n" +
       "h1:val1\n" +
@@ -183,10 +183,10 @@ class TestMessage < Test::Unit::TestCase
       "payload" +
       "\0\n"
     assert_raise Stomp::Error::ProtocolErrorEmptyHeaderKey do
-      aframe = Stomp::Message.new(amsg, false)
+      _ = Stomp::Message.new(amsg, false)
     end
     assert_raise Stomp::Error::ProtocolErrorEmptyHeaderKey do
-      aframe = Stomp::Message.new(amsg, true)
+      _ = Stomp::Message.new(amsg, true)
     end
     #
     amsg = "MESSAGE\n" +
@@ -197,10 +197,10 @@ class TestMessage < Test::Unit::TestCase
       "payload" +
       "\0\n"
     assert_raise Stomp::Error::ProtocolErrorEmptyHeaderValue do
-      aframe = Stomp::Message.new(amsg, false)
+      _ = Stomp::Message.new(amsg, false)
     end
     assert_nothing_raised {
-      aframe = Stomp::Message.new(amsg, true)
+      _ = Stomp::Message.new(amsg, true)
     }
   end