posix_mq 2.1.0 → 2.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cd61a0174a8b5bc70e3c7f7dba0a3192ed5c3a4f
+  data.tar.gz: 33d0325cd7b5804755ef3ab663e71acaa22d4171
+SHA512:
+  metadata.gz: df3e903bd7fcd24583a3a7202d565ba83963974d071dc5a292ad3451324ed95e538ad20a50552cc5a3c28c9680cbe3d736be82fd6d975b9a308f94899d28759a
+  data.tar.gz: 06c68326b0514f8ca43d2ade5621bee95d62f11526779715f6b1a0732e01c038fe906c58c8b887aa09cb7034ce97c957227f051743fd5a5fae599c14c4934679

data/.document

@@ -1,8 +1,6 @@
 README
 LICENSE
 NEWS
-ChangeLog
 lib
 ext/posix_mq/posix_mq.c
 posix-mq-rb_1
-LATEST

data/.gitignore

@@ -5,8 +5,7 @@
 Makefile
 /GIT-VERSION-FILE
 /local.mk
-/NEWS
-/ChangeLog
+/NEWS*
 /.manifest
 /GIT-VERSION-FILE
 /man
@@ -14,3 +13,4 @@ Makefile
 /doc
 /LATEST
 /tmp
+*_1

data/{.wrongdoc.yml → .olddoc.yml}

@@ -2,6 +2,9 @@
 rdoc_url: http://bogomips.org/ruby_posix_mq/
 cgit_url: http://bogomips.org/ruby_posix_mq.git
 git_url: git://bogomips.org/ruby_posix_mq.git
+public_email: ruby-posix-mq@bogomips.org
+private_email: bofh@bogomips.org
+ml_url: http://bogomips.org/ruby-posix-mq/
 changelog_since: 0.4.0
 merge_html:
   posix-mq-rb_1: Documentation/posix-mq-rb.1.html

data/Documentation/GNUmakefile

@@ -1,7 +1,7 @@
 all::
 
 PANDOC = pandoc
-PANDOC_OPTS = -f markdown --email-obfuscation=none --sanitize-html
+PANDOC_OPTS = -f markdown --email-obfuscation=none
 pandoc = $(PANDOC) $(PANDOC_OPTS)
 pandoc_html = $(pandoc) --toc -t html --no-wrap
 

data/Documentation/posix-mq-rb.1.txt

@@ -1,5 +1,5 @@
 % posix-mq-rb(1) posix-mq-rb User Manual
-% Ruby POSIX MQ hackers <ruby.posix.mq@librelist.com>
+% Ruby POSIX MQ hackers <ruby-posix-mq@bogomips.org>
 % Jan 1, 2010
 
 # NAME

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.1.0
+DEF_VER=v2.2.0
 
 LF='
 '

data/GNUmakefile

@@ -1,15 +1,7 @@
 all::
+PLACEHOLDERS = posix-mq-rb_1
 RSYNC_DEST := bogomips.org:/srv/bogomips/ruby_posix_mq
-rfproject := qrp
 rfpackage := posix_mq
-man-rdoc: man html
-	for i in $(man1_rdoc); do echo > $$i; done
-doc:: man-rdoc
-include pkg.mk
-ifneq ($(VERSION),)
-release::
-	$(RAKE) publish_news VERSION=$(VERSION)
-endif
 
 base_bins := posix-mq-rb
 bins := $(addprefix bin/, $(base_bins))
@@ -24,8 +16,9 @@ man html:
 	$(MAKE) -C Documentation install-$@
 
 pkg_extra += $(man1_paths)
+$(man1_paths): man
+include pkg.mk
 
 doc::
 	install -m644 COPYING-GPL2 doc/COPYING-GPL2
-	$(RM) $(man1_rdoc)
 .PHONY: man html

data/LICENSE

@@ -3,13 +3,11 @@ revision control for names and email addresses of all of them.
 
 You can redistribute it and/or modify it either under the terms of the GNU
 Lesser General Public License as published by the Free Software Foundation,
-version 3.0 {LGPLv3}[http://www.gnu.org/licenses/lgpl-3.0.txt] (see
-link:COPYING) or version 2 of the GNU General Public License
-{GPLv2}[http://www.gnu.org/licenses/gpl-2.0.txt] (see link:COPYING-GPL2).
+version 3.0 or later {LGPLv3+}[https://www.gnu.org/licenses/lgpl-3.0.txt]
+(see link:COPYING).
 
-The project leader {Eric Wong}[mailto:normalperson@yhbt.net] reserves
-the right to upgrade the project license to future versions of the LGPL
-(but no other licenses).
+It is also available under the GNU General Public License
+{GPLv2}[https://www.gnu.org/licenses/gpl-2.0.txt] (see link:COPYING-GPL2).
 
 Ruby posix_mq is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,5 +15,5 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
 General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License
-along with Ruby posix_mq; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+along with Ruby posix_mq; if not, see:
+https://www.gnu.org/licenses/lgpl-3.0.txt

data/README

@@ -23,10 +23,10 @@ network-aware message queue implementations.
 
 * Optional timeouts may be applied to send and receive operations.
 
-* Thread-safe blocking operations under Ruby 1.9, releases GVL
+* Thread-safe blocking operations under Ruby 1.9+, releases GVL
   before blocking operations.
 
-* Works under Ruby 1.8, Ruby 1.9 and Rubinius 1.2
+* Works under Ruby 1.9 and later.
 
 * Documented library API
 
@@ -113,7 +113,7 @@ don't email the git mailing list or maintainer with Ruby posix_mq patches.
 == Contact
 
 All feedback (bug reports, user/development discussion, patches, pull
-requests) go to the mailing list: mailto:ruby.posix.mq@librelist.com
+requests) go to the mailing list: mailto:ruby-posix-mq@bogomips.org
 
 Send patches (from "git format-patch") with "git send-email" and do not
 send HTML email or attachments.  We are very responsive to email and you
@@ -121,10 +121,38 @@ will usually get a response within 24-72 hours.
 
 == Mailing List Archives
 
-In addition to the rsync-able archives provided by http://librelist.com/, we
-are also mirrored to
-{Gmane}[http://gmane.org/info.php?group=gmane.comp.lang.ruby.posix-mq.general]
-and maintain our own mbox mirrors downloadable via HTTP.
+We operate a {public-inbox}[http://public-inbox.org/] which
+feeds the mailing list.  You may subscribe either using
+{ssoma}[http://ssoma.public-inbox.org/] or by sending a mail
+to mailto:ruby-posix-mq+subscribe@bogomips.org
 
-* nntp://news.gmane.org/gmane.comp.lang.ruby.posix-mq.general
-* http://bogomips.org/ruby_posix_mq/archives/
+ssoma is a mail archiver/fetcher using git.  It operates in a similar
+fashion to tools such as slrnpull, fetchmail, or getmail.  ssoma
+subscription instructions:
+
+    URL=git://bogomips.org/ruby-posix-mq
+    LISTNAME=ruby-posix-mq
+
+    # to initialize a maildir (this may be a new or existing maildir,
+    # ssoma will not touch existing messages)
+    # If you prefer mbox, use mbox:/path/to/mbox as the last argument
+    # You may also use imap://$MAILSERVER/INBOX for an IMAP account
+    # or imaps:// for an IMAPS account, as well.
+    ssoma add $LISTNAME $URL maildir:/path/to/maildir
+
+    # read with your favorite MUA (only using mutt as an example)
+    mutt -f /path/to/maildir # (or /path/to/mbox)
+
+    # to keep your mbox or maildir up-to-date, periodically run:
+    ssoma sync $LISTNAME
+
+    # your MUA may modify and delete messages from the maildir or mbox,
+    # this does not affect ssoma functionality at all
+
+    # to sync all your ssoma subscriptions
+    ssoma sync
+
+    # You may wish to sync in your cronjob
+    ssoma sync --cron
+
+* Mailing list archives: http://bogomips.org/ruby-posix-mq/

data/archive/.gitignore

@@ -0,0 +1,3 @@
+/data
+/news
+/requests

data/archive/slrnpull.conf

@@ -0,0 +1,4 @@
+# group_name                         max        expire     headers_only
+gmane.comp.lang.ruby.posix-mq.general 1000000000 1000000000 0
+
+# usage: slrnpull -d $PWD -h news.gmane.org --no-post

data/ext/posix_mq/posix_mq.c

@@ -26,6 +26,7 @@
 
 #if defined(__linux__)
 #  define MQD_TO_FD(mqd) (int)(mqd)
+#  define FD_TO_MQD(fd) (mqd_t)(fd)
 #elif defined(HAVE___MQ_OSHANDLE) /* FreeBSD */
 #  define MQD_TO_FD(mqd) __mq_oshandle(mqd)
 #else
@@ -33,10 +34,12 @@
 #  define MQ_IO_SET(mq,val) ((void)(0))
 #  define MQ_IO_CLOSE(mq) ((int)(0))
 #  define MQ_IO_NIL_P(mq) ((int)(1))
+#  define MQ_IO_SET_AUTOCLOSE(mq, boolean) for(;0;)
 #endif
 
 struct posix_mq {
 	mqd_t des;
+	unsigned autoclose:1;
 	struct mq_attr attr;
 	VALUE name;
 	VALUE thread;
@@ -46,9 +49,17 @@ struct posix_mq {
 };
 
 #ifdef MQD_TO_FD
+static ID id_setautoclose;
 #  define MQ_IO_MARK(mq) rb_gc_mark((mq)->io)
 #  define MQ_IO_SET(mq,val) do { (mq)->io = (val); } while (0)
 #  define MQ_IO_NIL_P(mq) NIL_P((mq)->io)
+
+static void MQ_IO_SET_AUTOCLOSE(struct posix_mq *mq, VALUE boolean)
+{
+	if (!NIL_P(mq->io))
+		rb_funcall(mq->io, id_setautoclose, 1, boolean);
+}
+
 static int MQ_IO_CLOSE(struct posix_mq *mq)
 {
 	if (NIL_P(mq->io))
@@ -139,13 +150,13 @@ struct open_args {
 /* used to pass arguments to mq_send/mq_receive inside blocking region */
 struct rw_args {
 	mqd_t des;
+	unsigned msg_prio;
 	union {
 		ssize_t received;
 		int retval;
 	};
 	char *msg_ptr;
 	size_t msg_len;
-	unsigned msg_prio;
 	struct timespec *timeout;
 };
 
@@ -299,7 +310,8 @@ static void _free(void *ptr)
 
 	if (mq->des != MQD_INVALID && MQ_IO_NIL_P(mq)) {
 		/* we ignore errors when gc-ing */
-		mq_close(mq->des);
+		if (mq->autoclose)
+			mq_close(mq->des);
 		errno = 0;
 	}
 	xfree(ptr);
@@ -312,6 +324,7 @@ static VALUE alloc(VALUE klass)
 	VALUE rv = Data_Make_Struct(klass, struct posix_mq, mark, _free, mq);
 
 	mq->des = MQD_INVALID;
+	mq->autoclose = 1;
 	mq->attr.mq_flags = 0;
 	mq->attr.mq_maxmsg = 0;
 	mq->attr.mq_msgsize = -1;
@@ -365,6 +378,37 @@ static void rstruct2mqattr(struct mq_attr *attr, VALUE astruct, int all)
 		attr->mq_curmsgs = NUM2LONG(tmp);
 }
 
+#ifdef FD_TO_MQD
+/*
+ * call-seq:
+ *	POSIX_MQ.for_fd(socket)	=> mq
+ *
+ * Adopts a socket as a POSIX message queue. Argument will be
+ * checked to ensure it is a POSIX message queue socket.
+ *
+ * This is useful for adopting systemd sockets passed via the
+ * ListenMessageQueue directive.
+ * Returns a +POSIX_MQ+ instance.  This method is only available
+ * under Linux and FreeBSD and is not intended to be portable.
+ *
+ */
+static VALUE for_fd(VALUE klass, VALUE socket)
+{
+	VALUE mqv = alloc(klass);
+	struct posix_mq *mq = get(mqv, 0);
+	mqd_t mqd;
+
+	mq->name = Qnil;
+	mqd = FD_TO_MQD(NUM2INT(socket));
+
+	if (mq_getattr(mqd, &mq->attr) < 0)
+		rb_sys_fail("provided file descriptor is not a POSIX MQ");
+
+	mq->des = mqd;
+	return mqv;
+}
+#endif /* FD_TO_MQD */
+
 /*
  * call-seq:
  *	POSIX_MQ.new(name [, flags [, mode [, mq_attr]])	=> mq
@@ -486,7 +530,7 @@ static VALUE s_unlink(VALUE self, VALUE name)
 {
 	int rv = mq_unlink(StringValueCStr(name));
 
-	if (rv == -1)
+	if (rv < 0)
 		rb_sys_fail("mq_unlink");
 
 	return INT2NUM(1);
@@ -507,10 +551,14 @@ static VALUE _unlink(VALUE self)
 	struct posix_mq *mq = get(self, 0);
 	int rv;
 
+	if (NIL_P(mq->name)) {
+		rb_raise(rb_eArgError, "can not unlink an adopted socket");
+	}
+
 	assert(TYPE(mq->name) == T_STRING && "mq->name is not a string");
 
 	rv = mq_unlink(RSTRING_PTR(mq->name));
-	if (rv == -1)
+	if (rv < 0)
 		rb_sys_fail("mq_unlink");
 
 	return self;
@@ -559,7 +607,7 @@ static VALUE _send(int sflags, int argc, VALUE *argv, VALUE self)
 
 retry:
 	WITHOUT_GVL(xsend, &x, RUBY_UBF_IO, 0);
-	if (x.retval == -1) {
+	if (x.retval < 0) {
 		if (errno == EINTR)
 			goto retry;
 		if (errno == EAGAIN && (sflags & PMQ_TRY))
@@ -593,7 +641,7 @@ static VALUE send0(VALUE self, VALUE buffer)
 
 retry:
 	WITHOUT_GVL(xsend, &x, RUBY_UBF_IO, 0);
-	if (x.retval == -1) {
+	if (x.retval < 0) {
 		if (errno == EINTR)
 			goto retry;
 		rb_sys_fail("mq_send");
@@ -615,9 +663,13 @@ static VALUE to_io(VALUE self)
 	struct posix_mq *mq = get(self, 1);
 	int fd = MQD_TO_FD(mq->des);
 
-	if (NIL_P(mq->io))
+	if (NIL_P(mq->io)) {
 		mq->io = rb_funcall(rb_cIO, id_new, 1, INT2NUM(fd));
 
+		if (!mq->autoclose)
+			rb_funcall(mq->io, id_setautoclose, 1, Qfalse);
+	}
+
 	return mq->io;
 }
 #endif
@@ -775,7 +827,7 @@ static VALUE _close(VALUE self)
 	struct posix_mq *mq = get(self, 1);
 
 	if (! MQ_IO_CLOSE(mq)) {
-		if (mq_close(mq->des) == -1)
+		if (mq_close(mq->des) < 0)
 			rb_sys_fail("mq_close");
 	}
 	mq->des = MQD_INVALID;
@@ -807,6 +859,15 @@ static VALUE name(VALUE self)
 {
 	struct posix_mq *mq = get(self, 0);
 
+	if (NIL_P(mq->name)) {
+		/*
+		 * We could use readlink(2) on /proc/self/fd/N, but lots of
+		 * care required.
+		 * http://stackoverflow.com/questions/1188757/
+		 */
+		rb_raise(rb_eArgError, "can not get name of an adopted socket");
+	}
+
 	return rb_str_dup(mq->name);
 }
 
@@ -853,12 +914,12 @@ static void my_mq_notify(mqd_t des, struct sigevent *not)
 {
 	int rv = mq_notify(des, not);
 
-	if (rv == -1) {
+	if (rv < 0) {
 		if (errno == ENOMEM) {
 			rb_gc();
 			rv = mq_notify(des, not);
 		}
-		if (rv == -1)
+		if (rv < 0)
 			rb_sys_fail("mq_notify");
 	}
 }
@@ -1019,6 +1080,36 @@ static VALUE setnonblock(VALUE self, VALUE nb)
 	return nb;
 }
 
+/*
+ * call-seq:
+ *	mq.autoclose = boolean	=> boolean
+ *
+ * Determines whether or not the _mq_ will be closed automatically
+ * at finalization.
+ */
+static VALUE setautoclose(VALUE self, VALUE autoclose)
+{
+	struct posix_mq *mq = get(self, 1);
+
+	MQ_IO_SET_AUTOCLOSE(mq, autoclose);
+	mq->autoclose = RTEST(autoclose) ? 1 : 0;
+	return autoclose;
+}
+
+/*
+ * call-seq:
+ *	mq.autoclose?	=> boolean
+ *
+ * Returns whether or not the _mq_ will be closed automatically
+ * at finalization.
+ */
+static VALUE autoclose_p(VALUE self)
+{
+	struct posix_mq *mq = get(self, 1);
+
+	return mq->autoclose ? Qtrue : Qfalse;
+}
+
 /*
  * call-seq:
  *	mq.trysend(string [,priority[, timeout]]) => +true+ or +false+
@@ -1110,10 +1201,17 @@ void Init_posix_mq_ext(void)
 	rb_define_private_method(cPOSIX_MQ, "notify_exec", setnotify_exec, 2);
 	rb_define_private_method(cPOSIX_MQ, "notify_cleanup", notify_cleanup, 0);
 	rb_define_method(cPOSIX_MQ, "nonblock?", nonblock_p, 0);
+	rb_define_method(cPOSIX_MQ, "autoclose?", autoclose_p, 0);
+	rb_define_method(cPOSIX_MQ, "autoclose=", setautoclose, 1);
 #ifdef MQD_TO_FD
 	rb_define_method(cPOSIX_MQ, "to_io", to_io, 0);
 #endif
 
+#ifdef FD_TO_MQD
+	rb_define_module_function(cPOSIX_MQ, "for_fd", for_fd, 1);
+	id_setautoclose = rb_intern("autoclose=");
+#endif
+
 	id_new = rb_intern("new");
 	id_kill = rb_intern("kill");
 	id_fileno = rb_intern("fileno");

data/lib/posix_mq.rb

@@ -41,7 +41,7 @@ class POSIX_MQ
   # SIGEV_THREAD functionality in mq_notify(3).  So far we only
   # know of glibc + Linux supporting this.  Please let us
   # know if your platform can support this functionality and
-  # are willing to test for us <ruby.posix.mq@librelist.com>
+  # are willing to test for us <ruby-posix-mq@bogomips.org>
   #
   # As far as we can tell, this method is not very useful
   # nor efficient.  You would be better served using signals or

data/pkg.mk

@@ -1,7 +1,8 @@
 RUBY = ruby
 RAKE = rake
 RSYNC = rsync
-WRONGDOC = wrongdoc
+OLDDOC = olddoc
+RDOC = rdoc
 
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 	@./GIT-VERSION-GEN
@@ -12,14 +13,6 @@ RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
 RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))')
 lib := lib
 
-ifeq ($(shell test -f script/isolate_for_tests && echo t),t)
-isolate_libs := tmp/isolate/$(RUBY_ENGINE)-$(RUBY_VERSION)/isolate.mk
-$(isolate_libs): script/isolate_for_tests
-	@$(RUBY) script/isolate_for_tests
--include $(isolate_libs)
-lib := $(lib):$(ISOLATE_LIBS)
-endif
-
 ext := $(firstword $(wildcard ext/*))
 ifneq ($(ext),)
 ext_pfx := tmp/ext/$(RUBY_ENGINE)-$(RUBY_VERSION)
@@ -36,7 +29,7 @@ $(ext_pfx)/$(ext)/%: $(ext)/% $(ext_d)
 	install -m 644 $< $@
 $(ext_pfx)/$(ext)/Makefile: $(ext)/extconf.rb $(ext_d) $(ext_h)
 	$(RM) -f $(@D)/*.o
-	cd $(@D) && $(RUBY) $(CURDIR)/$(ext)/extconf.rb
+	cd $(@D) && $(RUBY) $(CURDIR)/$(ext)/extconf.rb $(EXTCONF_ARGS)
 ext_sfx := _ext.$(DLEXT)
 ext_dl := $(ext_pfx)/$(ext)/$(notdir $(ext)_ext.$(DLEXT))
 $(ext_dl): $(ext_src) $(ext_pfx_src) $(ext_pfx)/$(ext)/Makefile
@@ -48,10 +41,10 @@ else
 build:
 endif
 
-pkg_extra += GIT-VERSION-FILE NEWS ChangeLog LATEST
-ChangeLog: GIT-VERSION-FILE .wrongdoc.yml
-	$(WRONGDOC) prepare
-NEWS LATEST: ChangeLog
+pkg_extra += GIT-VERSION-FILE NEWS LATEST
+NEWS: GIT-VERSION-FILE .olddoc.yml
+	$(OLDDOC) prepare
+LATEST: NEWS
 
 manifest:
 	$(RM) .manifest
@@ -63,28 +56,20 @@ manifest:
 	cmp $@+ $@ || mv $@+ $@
 	$(RM) $@+
 
-doc:: .document .wrongdoc.yml $(pkg_extra)
+doc:: .document .olddoc.yml $(pkg_extra) $(PLACEHOLDERS)
 	-find lib -type f -name '*.rbc' -exec rm -f '{}' ';'
 	-find ext -type f -name '*.rbc' -exec rm -f '{}' ';'
 	$(RM) -r doc
-	$(WRONGDOC) all
+	$(RDOC) -f oldweb
+	$(OLDDOC) merge
 	install -m644 COPYING doc/COPYING
+	install -m644 NEWS doc/NEWS
+	install -m644 NEWS.atom.xml doc/NEWS.atom.xml
 	install -m644 $(shell LC_ALL=C grep '^[A-Z]' .document) doc/
 
 ifneq ($(VERSION),)
 pkggem := pkg/$(rfpackage)-$(VERSION).gem
 pkgtgz := pkg/$(rfpackage)-$(VERSION).tgz
-release_notes := release_notes-$(VERSION)
-release_changes := release_changes-$(VERSION)
-
-release-notes: $(release_notes)
-release-changes: $(release_changes)
-$(release_changes):
-	$(WRONGDOC) release_changes > $@+
-	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
-$(release_notes):
-	$(WRONGDOC) release_notes > $@+
-	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
 
 # ensures we're actually on the tagged $(VERSION), only used for release
 verify:
@@ -120,31 +105,18 @@ $(pkgtgz): manifest fix-perms
 
 package: $(pkgtgz) $(pkggem)
 
-test-release:: verify package $(release_notes) $(release_changes)
-	# make tgz release on RubyForge
-	@echo rubyforge add_release -f \
-	  -n $(release_notes) -a $(release_changes) \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkgtgz)
-	@echo gem push $(pkggem)
-	@echo rubyforge add_file \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
-release:: verify package $(release_notes) $(release_changes)
-	# make tgz release on RubyForge
-	rubyforge add_release -f -n $(release_notes) -a $(release_changes) \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkgtgz)
+release:: verify package
 	# push gem to RubyGems.org
 	gem push $(pkggem)
-	# in case of gem downloads from RubyForge releases page
-	rubyforge add_file \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
 else
 gem install-gem: GIT-VERSION-FILE
 	$(MAKE) $@ VERSION=$(GIT_VERSION)
 endif
 
-all:: test
+all:: check
 test_units := $(wildcard test/test_*.rb)
-test: test-unit
+test: check
+check: test-unit
 test-unit: $(test_units)
 $(test_units): build
 	$(RUBY) -I $(lib) $@ $(RUBY_TEST_OPTS)
@@ -154,8 +126,6 @@ ifneq ($(RSYNC_DEST),)
 publish_doc:
 	-git set-file-times
 	$(MAKE) doc
-	find doc/images -type f | \
-		TZ=UTC xargs touch -d '1970-01-01 00:00:06' doc/rdoc.css
 	$(MAKE) doc_gz
 	$(RSYNC) -av doc/ $(RSYNC_DEST)/
 	git ls-files | xargs touch
@@ -163,7 +133,7 @@ endif
 
 # Create gzip variants of the same timestamp as the original so nginx
 # "gzip_static on" can serve the gzipped versions directly.
-doc_gz: docs = $(shell find doc -type f ! -regex '^.*\.\(gif\|jpg\|png\|gz\)$$')
+doc_gz: docs = $(shell find doc -type f ! -regex '^.*\.gz$$')
 doc_gz:
 	for i in $(docs); do \
 	  gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done
@@ -171,5 +141,10 @@ check-warnings:
 	@(for i in $$(git ls-files '*.rb'| grep -v '^setup\.rb$$'); \
 	  do $(RUBY) -d -W2 -c $$i; done) | grep -v '^Syntax OK$$' || :
 
-.PHONY: all .FORCE-GIT-VERSION-FILE doc test $(test_units) manifest
+ifneq ($(PLACEHOLDERS),)
+$(PLACEHOLDERS):
+	echo olddoc_placeholder > $@
+endif
+
+.PHONY: all .FORCE-GIT-VERSION-FILE doc check test $(test_units) manifest
 .PHONY: check-warnings

data/posix_mq.gemspec

@@ -1,27 +1,23 @@
 # -*- encoding: binary -*-
 ENV["VERSION"] or abort "VERSION= must be specified"
 manifest = File.readlines('.manifest').map! { |x| x.chomp! }
-require 'wrongdoc'
-extend Wrongdoc::Gemspec
+require 'olddoc'
+extend Olddoc::Gemspec
 name, summary, title = readme_metadata
 
 Gem::Specification.new do |s|
   s.name = %q{posix_mq}
   s.version = ENV["VERSION"].dup
   s.authors = ["Ruby POSIX MQ hackers"]
-  s.date = Time.now.utc.strftime('%Y-%m-%d')
   s.description = readme_description
-  s.email = %q{ruby.posix.mq@librelist.com}
+  s.email = %q{ruby-posix-mq@bogomips.org}
   s.executables = %w(posix-mq-rb)
   s.extensions = %w(ext/posix_mq/extconf.rb)
   s.extra_rdoc_files = extra_rdoc_files(manifest)
   s.files = manifest
-  s.homepage = Wrongdoc.config[:rdoc_url]
+  s.homepage = Olddoc.config['rdoc_url']
   s.summary = summary
-  s.rdoc_options = rdoc_options
-  s.rubyforge_project = %q{qrp}
   s.test_files = manifest.grep(%r{\Atest/test_.*\.rb\z})
-  s.add_development_dependency(%q<wrongdoc>, "~> 1.5")
-
-  # s.licenses = %w(LGPLv3) # accessor not compatible with older RubyGems
+  s.add_development_dependency(%q<olddoc>, "~> 1.0")
+  s.licenses = %w(GPL-2.0 LGPL-3.0+)
 end

data/test/test_posix_mq.rb

@@ -3,11 +3,6 @@ require 'test/unit'
 require 'thread'
 require 'fcntl'
 $stderr.sync = $stdout.sync = true
-require "dl"
-begin
-  require "dl/func"
-rescue LoadError
-end
 $-w = true
 require 'posix_mq'
 
@@ -17,6 +12,8 @@ class Test_POSIX_MQ < Test::Unit::TestCase
     warn "POSIX_MQ#to_io not supported on this platform: #{RUBY_PLATFORM}"
   POSIX_MQ.method_defined?(:notify) or
     warn "POSIX_MQ#notify not supported on this platform: #{RUBY_PLATFORM}"
+  POSIX_MQ.respond_to?(:for_fd) or
+    warn "POSIX_MQ::for_fd not supported on this platform: #{RUBY_PLATFORM}"
 
   def setup
     @mq = nil
@@ -102,23 +99,15 @@ class Test_POSIX_MQ < Test::Unit::TestCase
     assert elapsed < 1.10, elapsed.inspect
   end
 
-  def test_alarm_signal_safe
-    libc = alarm = nil
-    libcs = %w(libc.so.6 libc.so.0.1 libc.so.7 /usr/lib/libc.sl)
-    libcs.each do |name|
-      libc = DL::Handle.new(name) rescue next
-      if defined?(DL::Function)
-        alarm = libc["alarm"]
-        alarm = DL::CFunc.new(alarm, DL::TYPE_INT, "alarm")
-        alarm = DL::Function.new(alarm, [DL::TYPE_INT])
-      else
-        alarm = libc["alarm", "II"]
+  def test_signal_safe
+    alarm = lambda do |x|
+      Thread.new(x) do |time|
+        sleep(time)
+        Process.kill(:USR1, $$)
       end
-      break
     end
-    alarm or return warn "alarm() not found in #{libcs.inspect}"
     alarms = 0
-    trap("ALRM") do
+    sig = trap(:USR1) do
       alarms += 1
       Thread.new { @mq.send("HI") }
     end
@@ -133,6 +122,8 @@ class Test_POSIX_MQ < Test::Unit::TestCase
     assert elapsed >= interval, elapsed.inspect
     assert elapsed < 1.10, elapsed.inspect
     assert_equal 1, alarms
+  ensure
+    trap(:USR1, sig) if sig
   end
 
   def test_timed_send
@@ -244,6 +235,37 @@ class Test_POSIX_MQ < Test::Unit::TestCase
     assert_nothing_raised { IO.select([@mq], nil, nil, 0) }
   end if POSIX_MQ.method_defined?(:to_io)
 
+  def test_for_fd
+    buf = ""
+    @mq = POSIX_MQ.new @path, IO::CREAT|IO::RDWR, 0666
+    @alt = POSIX_MQ.for_fd(@mq.to_io.to_i)
+    assert_equal true, @mq.send("hello", 0)
+    assert_equal [ "hello", 0 ], @alt.receive(buf)
+    assert_equal "hello", buf
+    assert_equal @mq.to_io.to_i, @alt.to_io.to_i
+    assert_raises(ArgumentError) { @alt.name }
+    assert_raises(Errno::EBADF) { POSIX_MQ.for_fd(1) }
+    @alt.autoclose = false
+    assert_equal false, @alt.autoclose?
+
+    # iterate a bunch and hope GC kicks in
+    fd = @mq.to_io.fileno
+    10_000.times do
+      mq = POSIX_MQ.for_fd(fd)
+      assert_equal true, mq.autoclose?
+      mq.autoclose = false
+      assert_equal false, mq.autoclose?
+    end
+  end if POSIX_MQ.respond_to?(:for_fd) && POSIX_MQ.method_defined?(:to_io)
+
+  def test_autoclose_propagates_to_io
+    @mq = POSIX_MQ.new @path, IO::CREAT|IO::RDWR, 0666
+    @mq.autoclose = false
+    assert_equal false, @mq.to_io.autoclose?
+    @mq.autoclose = true
+    assert_equal true, @mq.to_io.autoclose?
+  end if POSIX_MQ.method_defined?(:to_io)
+
   def test_notify
     rd, wr = IO.pipe
     orig = trap(:USR1) { wr.syswrite('.') }

metadata

@@ -1,69 +1,52 @@
 --- !ruby/object:Gem::Specification
-name: !binary |-
-  cG9zaXhfbXE=
+name: posix_mq
 version: !ruby/object:Gem::Version
-  version: 2.1.0
-  prerelease: 
+  version: 2.2.0
 platform: ruby
 authors:
-- !binary |-
-  UnVieSBQT1NJWCBNUSBoYWNrZXJz
+- Ruby POSIX MQ hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-15 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    d3Jvbmdkb2M=
+  name: olddoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS41
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS41
-description: ! 'POSIX message queues allow local processes to exchange data in the
-  form
-
+        version: '1.0'
+description: |-
+  POSIX message queues allow local processes to exchange data in the form
   of messages.  This API is distinct from that provided by System V
-
-  message queues, but provides similar functionality.'
-email: !binary |-
-  cnVieS5wb3NpeC5tcUBsaWJyZWxpc3QuY29t
+  message queues, but provides similar functionality.
+email: ruby-posix-mq@bogomips.org
 executables:
-- !binary |-
-  cG9zaXgtbXEtcmI=
+- posix-mq-rb
 extensions:
-- !binary |-
-  ZXh0L3Bvc2l4X21xL2V4dGNvbmYucmI=
+- ext/posix_mq/extconf.rb
 extra_rdoc_files:
 - README
 - LICENSE
 - NEWS
-- ChangeLog
 - lib/posix_mq.rb
 - ext/posix_mq/posix_mq.c
-- LATEST
+- posix-mq-rb_1
 files:
-- .document
-- .gitignore
-- .manifest
-- .wrongdoc.yml
+- ".document"
+- ".gitignore"
+- ".manifest"
+- ".olddoc.yml"
 - COPYING
 - COPYING-GPL2
-- ChangeLog
 - Documentation/.gitignore
 - Documentation/GNUmakefile
 - Documentation/posix-mq-rb.1.txt
@@ -74,44 +57,42 @@ files:
 - LICENSE
 - NEWS
 - README
-- Rakefile
+- archive/.gitignore
+- archive/slrnpull.conf
 - bin/posix-mq-rb
 - ext/posix_mq/extconf.rb
 - ext/posix_mq/posix_mq.c
 - lib/posix_mq.rb
 - man/man1/posix-mq-rb.1
 - pkg.mk
+- posix-mq-rb_1
 - posix_mq.gemspec
 - setup.rb
 - test/test_posix_mq.rb
 homepage: http://bogomips.org/ruby_posix_mq/
-licenses: []
+licenses:
+- GPL-2.0
+- LGPL-3.0+
+metadata: {}
 post_install_message: 
-rdoc_options:
-- -t
-- posix_mq - POSIX Message Queues for Ruby
-- -W
-- http://bogomips.org/ruby_posix_mq.git/tree/%s
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: !binary |-
-  cXJw
-rubygems_version: 1.8.23
+rubyforge_project: 
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: POSIX Message Queues for Ruby
 test_files:
 - test/test_posix_mq.rb

data/Rakefile

@@ -1,33 +0,0 @@
-# -*- encoding: binary -*-
-require 'wrongdoc'
-cgit_url = Wrongdoc.config[:cgit_url]
-git_url = Wrongdoc.config[:git_url]
-
-desc "post news article to rubyforge"
-task :publish_news do
-  require 'rubyforge'
-  spec = Gem::Specification.load('posix_mq.gemspec')
-  tmp = Tempfile.new('rf-news')
-  _, subject, body = `git cat-file tag v#{spec.version}`.split(/\n\n/, 3)
-  tmp.puts subject
-  tmp.puts
-  tmp.puts spec.description.strip
-  tmp.puts ""
-  tmp.puts "* #{spec.homepage}"
-  tmp.puts "* #{spec.email}"
-  tmp.puts "* #{git_url}"
-  tmp.print "\nChanges:\n\n"
-  tmp.puts body
-  tmp.flush
-  system(ENV["VISUAL"], tmp.path) or abort "#{ENV["VISUAL"]} failed: #$?"
-  msg = File.readlines(tmp.path)
-  subject = msg.shift
-  blank = msg.shift
-  blank == "\n" or abort "no newline after subject!"
-  subject.strip!
-  body = msg.join("").strip!
-
-  rf = RubyForge.new.configure
-  rf.login
-  rf.post_news('qrp', subject, body)
-end