.gitignore reliable-msg.gemspec @@ -1,11 +1,11 @@ Release 1.1.1 (Planned) -* Changed: enqueue is actually dequeue, and queue is now enqueue. - Contributed by John-Mason Shackelford +* Changed: enqueue is actually dequeue, and queue is now enqueue. Contributed +by John-Mason Shackelford * Fixed: ACL uses localhost instead of 127.0.0.1 to work with OS/X IPv6 - Contributed by Chuck Remes -* Fixed: merge of DRB options - Contributed by Kevin Burge +Contributed by Chuck Remes +* Fixed: merge of DRB options Contributed by Kevin Burge +* Fixed: made to work with UUID 2.0. Release 1.1.0 (Nov 26, 2005) CHANGELOG @@ -1,170 +1,69 @@ -# Adapted from the rake Rakefile. - -require "rubygems" -Gem::manage_gems -require "rake/testtask" -require "rake/rdoctask" -require "rake/gempackagetask" - - +# Adapted from the rake Rakefile. + +require "rake/testtask" +require "rake/rdoctask" +require "rake/gempackagetask" + + desc "Default Task" -task :default => [:tests, :rdoc] - - -desc "Run test case for Queue API" -Rake::TestTask.new :test_queue do |test| - test.verbose = true - test.test_files = ["test/test-queue.rb"] -end -desc "Run test case for Topic API" -Rake::TestTask.new :test_topic do |test| - test.verbose = true - test.test_files = ["test/test-topic.rb"] -end -desc "Run test case for Rails integration" -Rake::TestTask.new :test_rails do |test| - test.verbose = true - test.test_files = ["test/test-rails.rb"] -end -desc "Run all test cases" -Rake::TestTask.new :tests do |test| - test.verbose = true - test.test_files = ["test/*.rb"] - #test.warning = true -end - - -# Create the documentation. -Rake::RDocTask.new do |rdoc| - rdoc.main = "README.rdoc" - rdoc.rdoc_files.include("README.rdoc", "lib/**/*.rb") - rdoc.title = "Reliable Messaging" -end - -# Handle version number. -class Version - - PATTERN = /(\s*)VERSION.*(\d+\.\d+\.\d+)/ - - def initialize file, new_version - @file = file - @version = File.open @file, "r" do |file| - version = nil - file.each_line do |line| - match = line.match PATTERN - if match - version = match[2] - break - end - end - version - end - fail "Can't determine version number" unless @version - @new_version = new_version || @version - end - - def changed? - @version != @new_version - end - - def number - @version - end - - def next - @new_version - end - - def update - puts "Updating to version #{@new_version}" - copy = "#{@file}.new" - open @file, "r" do |input| - open copy, "w" do |output| - input.each_line do |line| - match = line.match PATTERN - if match - output.puts "#{match[1]}VERSION = \"#{@new_version}\"" - else - output.puts line - end - end - end - end - mv copy, @file - @version = @new_version - end - -end -version = Version.new "lib/reliable-msg.rb", ENV["version"] - - -# Create the GEM package. -gem_spec = Gem::Specification.new do |spec| - spec.name = "reliable-msg" - spec.version = version.next - spec.summary = "Reliable messaging and persistent queues for building asynchronous applications in Ruby" - spec.description = <<-EOF - This package provides reliable messaging and persistent queues for - building asynchronous applications in Ruby. - - It supports transaction processing, message selectors, priorities, - delivery semantics, remote queue managers, disk-based and MySQL message - stores and more. -EOF - spec.author = "Assaf Arkin" - spec.email = "assaf@labnotes.org" - spec.homepage = "http://github.com/assaf/reliable-msg" - - spec.files = FileList["{bin,test,lib,docs}/**/*", "README.rdoc", "MIT-LICENSE", "Rakefile", "changelog.txt"].to_a - spec.require_path = "lib" - spec.autorequire = "reliable-msg.rb" - spec.bindir = "bin" - spec.executables = ["queues"] - spec.default_executable = "queues" - spec.requirements << "MySQL for database store, otherwise uses the file system" - spec.has_rdoc = true - spec.rdoc_options << "--main" << "README.rdoc" << "--title" << "Reliable Messaging for Ruby" << "--line-numbers" - spec.extra_rdoc_files = ["README.rdoc"] - spec.rubyforge_project = "reliable-msg" - spec.add_dependency(%q<uuid>, [">= 1.0.0"]) -end - -gem = Rake::GemPackageTask.new(gem_spec) do |pkg| - pkg.need_tar = true - pkg.need_zip = true -end - - +task :default => [:tests, :rdoc] + + +desc "Run test case for Queue API" +Rake::TestTask.new :test_queue do |test| + test.verbose = true + test.test_files = ["test/test-queue.rb"] +end +desc "Run test case for Topic API" +Rake::TestTask.new :test_topic do |test| + test.verbose = true + test.test_files = ["test/test-topic.rb"] +end +desc "Run test case for Rails integration" +Rake::TestTask.new :test_rails do |test| + test.verbose = true + test.test_files = ["test/test-rails.rb"] +end +desc "Run all test cases" +Rake::TestTask.new :tests do |test| + test.verbose = true + test.test_files = ["test/*.rb"] + #test.warning = true +end + + +# Create the documentation. +Rake::RDocTask.new do |rdoc| + rdoc.main = "README.rdoc" + rdoc.rdoc_files.include("README.rdoc", "lib/**/*.rb") + rdoc.title = "Reliable Messaging" +end + + +# Create the GEM package. +gem_spec = Gem::Specification.load('reliable-msg.gemspec') + +gem = Rake::GemPackageTask.new(gem_spec) do |pkg| + pkg.need_tar = true + pkg.need_zip = true +end + + desc "Look for TODO and FIXME tags in the code" task :todo do FileList["**/*.rb"].egrep /#.*(FIXME|TODO|TBD)/ end - - + + # -------------------------------------------------------------------- # Creating a release desc "Make a new release" -task :release => [:tests, :prerelease, :clobber, :update_version, :package] do - puts - puts "**************************************************************" - puts "* Release #{version.number} Complete." - puts "* Packages ready to upload." - puts "**************************************************************" - puts -end - -task :prerelease do - if !version.changed? && ENV["reuse"] != version.number - fail "Current version is #{version.number}, must specify reuse=ver to reuse existing version" - end -end - -task :update_version => [:prerelease] do - if !version.changed? - puts "No version change ... skipping version update" - else - version.update - end +task :release => [:tests, :clobber, :package] do + puts + puts "**************************************************************" + puts "* Release #{spec.version} Complete." + puts "* Packages ready to upload." + puts "**************************************************************" + puts end - Rakefile @@ -2,7 +2,7 @@ begin require 'reliable-msg' rescue LoadError require 'rubygems' - require_gem 'reliable-msg' + gem 'reliable-msg' end ReliableMsg::CLI.new.run bin/queues @@ -2,8 +2,8 @@ $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__))) module ReliableMsg - PACKAGE = "reliable-msg" - VERSION = "1.1.0" + PACKAGE = 'reliable-msg' + VERSION = '1.1.1' end require "reliable-msg/queue" lib/reliable-msg.rb @@ -279,7 +279,7 @@ module ReliableMsg # any referenced message to store new messages. The File object exists # if the file was opened before, otherwise, we need to open it again. free = @mutex.synchronize { @file_free.shift } - name = free ? free[0] : "#{@path}/#{UUID.new}.msg" + name = free ? free[0] : "#{@path}/#{UUID.generate}.msg" file = if free && free[1] free[1] else lib/reliable-msg/message-store.rb @@ -13,12 +13,7 @@ require "drb" require "drb/acl" require "thread" require "yaml" -begin - require "uuid" -rescue LoadError - require "rubygems" - require_gem "uuid" -end +require "uuid" require "reliable-msg/client" require "reliable-msg/message-store" @@ -273,7 +268,7 @@ module ReliableMsg raise ArgumentError, ERROR_SEND_MISSING_QUEUE unless queue && queue.instance_of?(String) && !queue.empty? time = Time.new.to_i # TODO: change this to support the RM delivery protocol. - id = args[:id] || UUID.new + id = args[:id] || UUID.generate created = args[:created] || time # Validate and freeze the headers. The cloning ensures that the headers we hold in memory @@ -439,7 +434,7 @@ module ReliableMsg message, headers, topic, tid = args[:message], args[:headers], args[:topic].downcase, args[:tid] raise ArgumentError, ERROR_PUBLISH_MISSING_TOPIC unless topic and topic.instance_of?(String) and !topic.empty? time = Time.new.to_i - id = args[:id] || UUID.new + id = args[:id] || UUID.generate created = args[:created] || time # Validate and freeze the headers. The cloning ensures that the headers we hold in memory @@ -518,7 +513,7 @@ module ReliableMsg # Called by client to begin a transaction. def begin(timeout) - tid = UUID.new + tid = UUID.generate @transactions[tid] = {:inserts=>[], :deletes=>[], :timeout=>Time.new.to_i + timeout} tid end lib/reliable-msg/queue-manager.rb @@ -9,6 +9,7 @@ #++ require 'test/unit' +require 'rubygems' require 'reliable-msg' class TestQueue < Test::Unit::TestCase test/test-queue.rb @@ -9,6 +9,7 @@ #++ require 'test/unit' +require 'rubygems' require 'reliable-msg' class TestRails < Test::Unit::TestCase test/test-rails.rb @@ -9,6 +9,7 @@ #++ require 'test/unit' +require 'rubygems' require 'reliable-msg' class TestTopic < Test::Unit::TestCase @@ -40,8 +41,8 @@ class TestTopic < Test::Unit::TestCase def _test_single restart = nil # Put one message, check that we can retrieve it. Check that we # can only retrieve it once. Then put another message, repeat. - msg1 = UUID.new - msg2 = UUID.new + msg1 = UUID.generate + msg2 = UUID.generate @topic.put msg1 restart.call if restart msg = @topic.get @@ -66,7 +67,7 @@ class TestTopic < Test::Unit::TestCase end def _test_selector restart = nil - msg1 = UUID.new + msg1 = UUID.generate @topic.put msg1, :name=>"foo" restart.call if restart msg = @topic.get(ReliableMsg::Queue.selector { name == 'bar' }) @@ -85,8 +86,8 @@ class TestTopic < Test::Unit::TestCase def _test_non_expires restart = nil # Test that we can receive message that has not yet expired (30 second delay), # but cannot receive message that has expires (1 second, we wait for 2). - msg1 = UUID.new - msg2 = UUID.new + msg1 = UUID.generate + msg2 = UUID.generate @topic.put msg1, :expires=>30 restart.call if restart msg = @topic.get test/test-topic.rb 9450b2d04ee71dac12542f217c678cfdd7d021c7 Assaf Arkin assaf@labnotes.org http://github.com/assaf/reliable-msg/commit/81e4b5eb4723d69814c9311d94afa4c53805968a 81e4b5eb4723d69814c9311d94afa4c53805968a 2009-03-24T17:28:29-07:00 2009-03-24T17:28:29-07:00 Made to work with UUID 2.0. 3ef3eda8c075279ba99da4a9678a77aaa01c5dfb Assaf Arkin assaf@labnotes.org