clogger 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd4966f902d26e1a0037ddf465336678a0d342ed
-  data.tar.gz: b2f531772d210d2823187a8de8c76a1f8cdf0387
+  metadata.gz: 7d599688759448c6bf0402ae0ffe376133f79caa
+  data.tar.gz: 87a801805a909d115597fd8fb89c839f81db9c59
 SHA512:
-  metadata.gz: aa24a2c1f213548c32055f04bbeb1e113ec063d27f77fb264ae121cb865aba887f525366a52cc375731be2f121a5dc102053b1ee146deb3c21e2f33ba5d209e0
-  data.tar.gz: 618537067d02ef74554bc5355b0364c5bb4260212ee7b6cca218fe74a683cfed4e88ce3d0c257d9d45e14a1826044368c373c34e79e977c73a67f3fbf2d867ce
+  metadata.gz: c77852c8b454f4e7b67c3c1de5701506d7196e6d9307a14808ba28e1c69b48032b37f03b6b9ef281821b5c35bf818214e7c5a25956e95d195c7f8ccda068c81a
+  data.tar.gz: 472bdd0b12d9d79d43ac97070c9daee1c156adf7eadb38c9d634a52cc6e72314f62dcf32d73bef4b9f6abbee387ef9603e90fd799ad1e3015023b897fbaafbaf

data/.olddoc.yml

@@ -1,7 +1,13 @@
 ---
-rdoc_url: http://clogger.bogomips.org/
-cgit_url: http://bogomips.org/clogger.git
+rdoc_url: https://bogomips.org/clogger/
+cgit_url: https://bogomips.org/clogger.git
 git_url: git://bogomips.org/clogger.git
 public_email: clogger-public@bogomips.org
 private_email: clogger@bogomips.org
-ml_url: http://bogomips.org/clogger-public/
+ml_url:
+- https://bogomips.org/clogger-public/
+- http://ou63pmih66umazou.onion/clogger-public/
+- nntp://news.public-inbox.org/inbox.comp.lang.ruby.clogger
+source_code:
+- git clone git://bogomips.org/clogger.git
+- git clone https://bogomips.org/clogger.git

data/GIT-VERSION-GEN

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

data/GNUmakefile

@@ -1,5 +1,5 @@
 all::
-RSYNC_DEST := clogger.bogomips.org:/srv/clogger/
+RSYNC_DEST := bogomips.org:/srv/bogomips/clogger/
 rfpackage := clogger
 include pkg.mk
 test-ext:

data/LICENSE

@@ -3,7 +3,7 @@ revision control for names and email addresses of all of them.
 
 You can redistribute it and/or modify it under the terms of the GNU
 Lesser General Public License (LGPL) as published by the Free Software
-Foundation, version {2.1}[http://www.gnu.org/licenses/lgpl-2.1.txt] or
+Foundation, version {2.1}[https://www.gnu.org/licenses/lgpl-2.1.txt] or
 (at your option) any later version.
 
 clogger is distributed in the hope that it will be useful, but WITHOUT
@@ -12,5 +12,4 @@ 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 this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+along with this library; if not, see https://www.gnu.org/licenses/

data/README

@@ -92,18 +92,18 @@ that receives a "<<" method:
 
 == REQUIREMENTS
 
-* {Ruby}[http://www.ruby-lang.org/], {Rack}[http://rack.github.io/]
+* {Ruby}[https://www.ruby-lang.org/], {Rack}[https://rack.github.io/]
 
 == DEVELOPMENT
 
 The latest development happens in git and is published to the following:
 
-   git://bogomips.org/clogger.git
-   git://repo.or.cz/clogger.git
+   git clone git://bogomips.org/clogger.git
+   git clone git://repo.or.cz/clogger.git
 
 You may also browse and download snapshot tarballs:
 
-* http://bogomips.org/clogger.git (cgit)
+* https://bogomips.org/clogger.git
 * http://repo.or.cz/w/clogger.git (gitweb)
 
 The mailing list (see below) is central for coordination and
@@ -119,7 +119,7 @@ requests) go to the public mailing list.
 
 Do not send HTML mail or attachments.  Do not top post.
 
-Homepage: http://clogger.bogomips.org/
+Homepage: https://bogomips.org/clogger/
 
 == INSTALL
 

data/clogger.gemspec

@@ -17,8 +17,7 @@ Gem::Specification.new do |s|
   s.test_files = %w(test/test_clogger.rb test/test_clogger_to_path.rb)
 
   # HeaderHash wasn't case-insensitive in old versions
-  s.add_dependency(%q<rack>, ["~> 1.0"])
-  s.add_development_dependency(%q<olddoc>, "~> 1.0")
+  s.add_dependency(%q<rack>, ['>= 1.0', '< 3.0'])
   s.extensions = %w(ext/clogger_ext/extconf.rb)
 
   s.licenses = %w(LGPL-2.1+)

data/ext/clogger_ext/blocking_helpers.h

@@ -54,6 +54,9 @@ static ssize_t my_write(int fd, const void *buf, size_t count)
 
 	return r;
 }
-#  define stat(path,buf) my_stat((path),(buf))
-#  define write(fd,buf,count) my_write((fd),(buf),(count))
+#  define nogvl_stat(path,buf) my_stat((path),(buf))
+#  define nogvl_write(fd,buf,count) my_write((fd),(buf),(count))
+#else /* !WITHOUT_GVL, for Ruby 1.8 users: */
+#  define nogvl_stat(path,buf) stat((path),(buf))
+#  define nogvl_write(fd,buf,buf) write((fd),(buf),(count))
 #endif /* !WITHOUT_GVL */

data/ext/clogger_ext/clogger.c

@@ -243,7 +243,7 @@ static void write_full(int fd, const char *buf, size_t count)
 	ssize_t r;
 
 	while (count > 0) {
-		r = write(fd, buf, count);
+		r = nogvl_write(fd, buf, count);
 
 		if ((size_t)r == count) { /* overwhelmingly likely */
 			return;
@@ -993,7 +993,7 @@ static VALUE to_path(VALUE self)
 	if (sscanf(cpath, "/dev/fd/%u", &devfd) == 1)
 		rv = fstat((int)devfd, &sb);
 	else
-		rv = stat(cpath, &sb);
+		rv = nogvl_stat(cpath, &sb);
 
 	/*
 	 * calling this method implies the web server will bypass

data/lib/clogger/format.rb

@@ -5,12 +5,12 @@ class Clogger
   # predefined log formats in wide use
   module Format
     # common log format used by Apache:
-    # http://httpd.apache.org/docs/2.2/logs.html
+    # https://httpd.apache.org/docs/2.4/logs.html
     Common = "$remote_addr - $remote_user [$time_local] " \
              '"$request" $status $response_length'
 
     # combined log format used by Apache:
-    # http://httpd.apache.org/docs/2.2/logs.html
+    # https://httpd.apache.org/docs/2.4/logs.html
     Combined = %Q|#{Common} "$http_referer" "$http_user_agent"|
 
     # combined log format used by nginx:

data/lib/clogger/pure.rb

@@ -53,7 +53,7 @@ class Clogger
   def each
     @body_bytes_sent = 0
     @body.each do |part|
-      @body_bytes_sent += Rack::Utils.bytesize(part)
+      @body_bytes_sent += part.bytesize
       yield part
     end
     self

data/test/test_clogger.rb

@@ -147,6 +147,7 @@ class TestClogger < Test::Unit::TestCase
     req = {
       'HTTP_HOST' => 'example.com:12345',
       'HTTP_COOKIE' => cookie,
+      'REMOTE_USER' => 'foo_user',
     }
     req = @req.merge(req)
     body = cl.call(req).last
@@ -154,6 +155,7 @@ class TestClogger < Test::Unit::TestCase
     body.close
     str = str.string
     assert(str.size > 128)
+    assert_equal 'foo_user', str.split(' ')[2]
     assert_match %r["echo and socat \\o/" "#{cookie}" \d+\.\d{3}], str
     assert_match %r["#{cookie}" \d+\.\d{3} example\.com:12345\n\z], str
   end

metadata

@@ -1,43 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: clogger
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - cloggers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: olddoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
 description: |-
   clogger is Rack middleware for logging HTTP requests.  The log format
   is customizable so you can specify exactly which fields to log.
@@ -83,7 +75,7 @@ files:
 - setup.rb
 - test/test_clogger.rb
 - test/test_clogger_to_path.rb
-homepage: http://clogger.bogomips.org/
+homepage: https://bogomips.org/clogger/
 licenses:
 - LGPL-2.1+
 metadata: {}
@@ -103,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: configurable request logging for Rack