raindrops 0.12.0 → 0.12.0.5.g821b

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7e0944aa1ddeeb4053cca3fcf100bf6dc24e1e19
+  data.tar.gz: d58d8bee09014bea7ead3fc3bcf4abff24c7d1c9
+SHA512:
+  metadata.gz: 9deecb71c6a9393970d94069e3c4fe698a4035ac37d00b61967d30b39fb83f11bd76edb4e18a21dda055ed16bfead9bb1441b9d587d527944e363da1d908c8a3
+  data.tar.gz: bcac5e4baf4a6fd2de0aea7bd2b0799dae7632e900d018bb9aec25cff883f706f12c96c37f5ad8f837be60b65e16113b2d2d401ed484dab1103f3575abdece84

data/ChangeLog

@@ -1,5 +1,52 @@
 ChangeLog from http://bogomips.org/raindrops.git
 
+   commit 821b190e39fa48496520eb8f7f782ead8419df58
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Tue Feb 18 06:48:36 2014 +0000
+   
+       linux_inet_diag: fix Ruby 2.2 (dev) build
+       
+       Do not define or use rb_thread_blocking_region if
+       rb_thread_io_blocking_region is available.
+       rb_thread_blocking_region is gone entirely in Ruby trunk.
+   
+   commit 7c61c7cc7d2571d1778da2f6dd01ea56cdac0530
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Tue Feb 18 06:46:43 2014 +0000
+   
+       raindrops.gemspec: add wrongdoc dev dependency
+       
+       Ugh, I really need to work on an 80x24-friendly rdoc :P
+   
+   commit 8297d1dc600e34db29bb071ff7b94f6aaa7b45c5
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Tue Nov 5 07:05:04 2013 +0000
+   
+       last_data_recv: do not assume Unicorn includes all constants
+       
+       Some projects may load parts of Unicorn and not others.
+   
+   commit f76c6ba8aa64018fcfac6f1c1989ddc828bd180b
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Tue Nov 5 07:00:26 2013 +0000
+   
+       Rakefile: remove raa_update task
+       
+       RAA is dead
+   
+   commit f952501c14316f8639949e3537aead6351224bcd
+   Author: Hleb Valoshka <375gnu@gmail.com>
+   Date:   Thu Sep 12 16:31:13 2013 +0300
+   
+       Remove Scope IDs from IPv6 addresses.
+       
+       	Scoped ipv6 addresses are defined in rfc4007.
+       	Ruby doesn't support them yet and it's unknown whether it will
+       	(see http://bugs.ruby-lang.org/issues/8464).
+       	So we just remove scope ids.
+       
+       	Tested with MRI and Rubinius.
+   
    commit 05cde4657605caa2db2cb9bd3da611e4bc9d79f6
    Author: Eric Wong <normalperson@yhbt.net>
    Date:   Mon Sep 2 10:30:39 2013 +0000

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 0.12.0
+GIT_VERSION = 0.12.0.5.g821b

data/Rakefile

@@ -26,40 +26,3 @@ task :publish_news do
   rf.login
   rf.post_news('rainbows', subject, body)
 end
-
-desc "post to RAA"
-task :raa_update do
-  require 'net/http'
-  require 'net/netrc'
-  rc = Net::Netrc.locate('raindrops-raa') or abort "~/.netrc not found"
-  password = rc.password
-
-  s = Gem::Specification.load('raindrops.gemspec')
-  desc = [ s.description.strip ]
-  desc << ""
-  desc << "* #{s.email}"
-  desc << "* #{git_url}"
-  desc << "* #{cgit_url}"
-  desc = desc.join("\n")
-  uri = URI.parse('http://raa.ruby-lang.org/regist.rhtml')
-  form = {
-    :name => s.name,
-    :short_description => s.summary,
-    :version => s.version.to_s,
-    :status => 'experimental',
-    :owner => s.authors.first,
-    :email => s.email,
-    :category_major => 'Library',
-    :category_minor => 'Rack',
-    :url => s.homepage,
-    :download => 'http://rubyforge.org/frs/?group_id=8977',
-    :license => 'LGPL', # LGPLv3, actually, but RAA is ancient...
-    :description_style => 'Plain',
-    :description => desc,
-    :pass => password,
-    :submit => 'Update',
-  }
-  res = Net::HTTP.post_form(uri, form)
-  p res
-  puts res.body
-end

data/ext/raindrops/linux_inet_diag.c

@@ -13,7 +13,8 @@
 #endif
 
 /* partial emulation of the 1.9 rb_thread_blocking_region under 1.8 */
-#ifndef HAVE_RB_THREAD_BLOCKING_REGION
+#if !defined(HAVE_RB_THREAD_BLOCKING_REGION) && \
+    !defined(HAVE_RB_THREAD_IO_BLOCKING_REGION)
 #  include <rubysig.h>
 #  define RUBY_UBF_IO ((rb_unblock_function_t *)-1)
 typedef void rb_unblock_function_t(void *);
@@ -134,12 +135,49 @@ static int st_free_data(st_data_t key, st_data_t value, st_data_t ignored)
 	return ST_DELETE;
 }
 
+/*
+ * call-seq:
+ *      remove_scope_id(ip_address)
+ *
+ * Returns copy of IP address with Scope ID removed,
+ * if address has it (only IPv6 actually may have it).
+ */
+static VALUE remove_scope_id(const char *addr)
+{
+	VALUE rv = rb_str_new2(addr);
+	long len = RSTRING_LEN(rv);
+	char *ptr = RSTRING_PTR(rv);
+	char *pct = memchr(ptr, '%', len);
+
+	/*
+	 * remove scoped portion
+	 * Ruby equivalent: rv.sub!(/%([^\]]*)\]/, "]")
+	 */
+	if (pct) {
+		size_t newlen = pct - ptr;
+		char *rbracket = memchr(pct, ']', len - newlen);
+
+		if (rbracket) {
+			size_t move = len - (rbracket - ptr);
+
+			memmove(pct, rbracket, move);
+			newlen += move;
+
+			rb_str_set_len(rv, newlen);
+		} else {
+			rb_raise(rb_eArgError,
+				"']' not found in IPv6 addr=%s", ptr);
+                }
+        }
+        return rv;
+}
+
 static int st_to_hash(st_data_t key, st_data_t value, VALUE hash)
 {
 	struct listen_stats *stats = (struct listen_stats *)value;
 
 	if (stats->listener_p) {
-		VALUE k = rb_str_new2((const char *)key);
+		VALUE k = remove_scope_id((const char *)key);
 		VALUE v = rb_listen_stats(stats);
 
 		OBJ_FREEZE(k);
@@ -153,7 +191,7 @@ static int st_AND_hash(st_data_t key, st_data_t value, VALUE hash)
 	struct listen_stats *stats = (struct listen_stats *)value;
 
 	if (stats->listener_p) {
-		VALUE k = rb_str_new2((const char *)key);
+		VALUE k = remove_scope_id((const char *)key);
 
 		if (rb_hash_lookup(hash, k) == Qtrue) {
 			VALUE v = rb_listen_stats(stats);

data/lib/raindrops/last_data_recv.rb

@@ -73,7 +73,9 @@ class Raindrops::LastDataRecv
   # :startdoc
 
   def initialize(opts = {})
-    Raindrops::Aggregate::LastDataRecv.cornify! if defined?(Unicorn)
+    if defined?(Unicorn::HttpServer::LISTENERS)
+      Raindrops::Aggregate::LastDataRecv.cornify!
+    end
     @aggregate =
       opts[:aggregate] || Raindrops::Aggregate::LastDataRecv.default_aggregate
   end

data/raindrops.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('posix_mq', '~> 2.0')
   s.add_development_dependency('rack', '~> 1.2')
   s.add_development_dependency('unicorn', '>= 0.98')
+  s.add_development_dependency('wrongdoc', ['~> 1.6.2', '>= 1.6.2'])
 
   # s.licenses = %w(LGPLv3) # accessor not compatible with older RubyGems
 end

metadata

@@ -1,151 +1,122 @@
 --- !ruby/object:Gem::Specification
-name: !binary |-
-  cmFpbmRyb3Bz
+name: raindrops
 version: !ruby/object:Gem::Version
-  version: 0.12.0
-  prerelease: 
+  version: 0.12.0.5.g821b
 platform: ruby
 authors:
-- !binary |-
-  cmFpbmRyb3BzIGhhY2tlcnM=
+- raindrops hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    YWdncmVnYXRl
+  name: aggregate
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC4y
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC4y
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    aW8tZXh0cmE=
+  name: io-extra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4y
-    - - !binary |-
-        Pj0=
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4yLjM=
+        version: 1.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4y
-    - - !binary |-
-        Pj0=
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4yLjM=
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    cG9zaXhfbXE=
+  name: posix_mq
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi4w
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi4w
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    cmFjaw==
+  name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4y
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4y
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    dW5pY29ybg==
+  name: unicorn
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        Pj0=
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC45OA==
+        version: '0.98'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        Pj0=
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC45OA==
-description: ! 'Raindrops is a real-time stats toolkit to show statistics for Rack
-  HTTP
-
+        version: '0.98'
+- !ruby/object:Gem::Dependency
+  name: wrongdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.2
+description: |-
+  Raindrops is a real-time stats toolkit to show statistics for Rack HTTP
   servers.  It is designed for preforking servers such as Rainbows! and
-
   Unicorn, but should support any Rack HTTP server under Ruby 2.0, 1.9,
-
   1.8 and Rubinius on platforms supporting POSIX shared memory.  It may
-
   also be used as a generic scoreboard for sharing atomic counters across
-
-  multiple processes.'
-email: !binary |-
-  cmFpbmRyb3BzQGxpYnJlbGlzdC5vcmc=
+  multiple processes.
+email: raindrops@librelist.org
 executables: []
 extensions:
-- !binary |-
-  ZXh0L3JhaW5kcm9wcy9leHRjb25mLnJi
+- ext/raindrops/extconf.rb
 extra_rdoc_files:
 - README
 - LICENSE
@@ -165,10 +136,10 @@ extra_rdoc_files:
 - ext/raindrops/linux_inet_diag.c
 - ext/raindrops/linux_tcp_info.c
 files:
-- .document
-- .gitignore
-- .manifest
-- .wrongdoc.yml
+- ".document"
+- ".gitignore"
+- ".manifest"
+- ".wrongdoc.yml"
 - COPYING
 - ChangeLog
 - GIT-VERSION-FILE
@@ -224,32 +195,30 @@ files:
 - test/test_watcher.rb
 homepage: http://raindrops.bogomips.org/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- -t
+- "-t"
 - raindrops - real-time stats for preforking Rack servers
-- -W
+- "-W"
 - http://bogomips.org/raindrops.git/tree/%s
 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'
+      version: 1.3.1
 requirements: []
-rubyforge_project: !binary |-
-  cmFpbmJvd3M=
-rubygems_version: 1.8.23
+rubyforge_project: rainbows
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: real-time stats for preforking Rack servers
 test_files:
 - test/test_aggregate_pmq.rb