omgf 0.0.8 → 0.0.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 47f159650900670bddc7847dc6e00f18e30b7e92c160da4c733cf0ac91f9862e
+  data.tar.gz: ba808f62c3de3353db8f9e6ab2ab630a7d0ea63f52bcd196c0280dec34816178
+SHA512:
+  metadata.gz: f4702c24dc0beda993d1bbd1201c0caf0d7a462875a740eb86fb9b6395ec97a9341a3ddf8c55afbf9c4880b3642c82417c50a607f37e3cf5bafe004c1b5cea53
+  data.tar.gz: 4c8cdd49598c473a7620c81d3e727ac3c3382b9b6858c092e20c7f3dece5914bddbf3b79200639f1fc1836463dddd105301bef75262742e3d06344faca0630ee

data/.document

@@ -1,4 +1,3 @@
-ChangeLog
 lib
 NEWS
 README

data/.gitignore

@@ -13,3 +13,4 @@ pkg/
 /tmp
 /LATEST
 lib/omgf/version.rb
+*.xml

data/.olddoc.yml

@@ -0,0 +1,4 @@
+---
+cgit_url: https://yhbt.net/omgf.git
+git_url: https://yhbt.net/omgf.git
+rdoc_url: https://yhbt.net/omgf/

data/GIT-VERSION-GEN

@@ -2,7 +2,7 @@
 CONSTANT = "OMGF::VERSION"
 RVF = "lib/omgf/version.rb"
 GVF = "GIT-VERSION-FILE"
-DEF_VER = "v0.0.8"
+DEF_VER = "v0.0.9"
 vn = DEF_VER
 
 # First see if there is a version file (included in release tarballs),

data/GNUmakefile

@@ -1,6 +1,5 @@
 all::
-RSYNC_DEST := bogomips.org:/srv/bogomips/omgf
-rfproject := rainbows
+RSYNC_DEST := yhbt.net:/srv/yhbt/omgf
 rfpackage := omgf
 pkg_extra += lib/omgf/version.rb
 include pkg.mk

data/README

@@ -6,7 +6,7 @@ libraries to interface with MogileFS.  Currently, HystericalRaisins
 is supported.  OMGF is short for "OMGFiles", an anagram for "MogileFS".
 
 It is built on top of the
-{Ruby mogilefs-client}[http://bogomips.org/mogilefs-client] library
+{Ruby mogilefs-client}[http://yhbt.net/mogilefs-client] library
 
 == Features
 
@@ -30,7 +30,7 @@ You may install it via RubyGems on RubyGems.org:
 You can get the latest source via git from the following locations
 (these versions may not be stable):
 
-  git://bogomips.org/omgf.git
+  git://yhbt.net/omgf.git
   git://repo.or.cz/omgf.git (mirror)
 
 You may browse the code from the web and download the latest snapshot

data/examples/verify_paths_manual_test.rb

@@ -6,10 +6,10 @@ require "pp"
 vp = OMGF::VerifyPaths.new(Logger.new($stderr))
 urls = %w(
   http://yhbt.net/
-  http://bogomips.org/omgf.git
-  http://bogomips.org/ozZZZZmgf.git
-  http://bogomips.org/ozZZZZ
-  http://bogomips.org/
+  http://yhbt.net/omgf.git
+  http://yhbt.net/ozZZZZmgf.git
+  http://yhbt.net/ozZZZZ
+  http://yhbt.net/
   http://127.0.0.1:666/
 )
 uris = urls.map { |uri| URI(uri) }

data/lib/omgf/regurgitator.rb

@@ -32,7 +32,7 @@ module OMGF::Regurgitator
   end
 
   def _uris!(info)
-    info[:uris].values.flatten!
+    info[:uris].values.flatten! || []
   end
 
   def mg_get_uris(env, domain, key, get_path_opts = {})

data/omgf.gemspec

@@ -1,23 +1,19 @@
-# -*- encoding: binary -*-
-ENV["VERSION"] or abort "VERSION= must be specified"
-manifest = File.readlines('.manifest').map! { |x| x.chomp! }
-require 'wrongdoc'
-extend Wrongdoc::Gemspec
-name, summary, title = readme_metadata
+manifest = File.exist?('.manifest') ?
+  IO.readlines('.manifest').map!(&:chomp!) : `git ls-files`.split("\n")
 
 Gem::Specification.new do |s|
   s.name = %q{omgf}
-  s.version = ENV["VERSION"].dup
+  s.version = (ENV['VERSION'] || '0.0.9').dup
 
   s.authors = ["OMGF hackers"]
-  s.date = Time.now.utc.strftime('%Y-%m-%d')
-  s.description = readme_description
-  s.email = %q{omgf@librelist.org}
-  s.extra_rdoc_files = extra_rdoc_files(manifest)
+  s.email = %q{bofh@yhbt.net}
+  s.description = File.read('README').split("\n\n")[1]
+  s.extra_rdoc_files = IO.readlines('.document').map!(&:chomp!).keep_if do |f|
+    File.exist?(f)
+  end
   s.files = manifest
-  s.homepage = Wrongdoc.config[:rdoc_url]
-  s.summary = summary
-  s.rdoc_options = rdoc_options
+  s.homepage = 'https://yhbt.net/omgf/'
+  s.summary = 'hysterical REST API for MogileFS using Rack'
   s.test_files = Dir['test/test_*.rb']
   s.add_dependency('rack', ['~> 1.3'])
   s.add_dependency('kgio', ['~> 2.7'])
@@ -26,5 +22,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency('regurgitator')
   s.add_development_dependency('sqlite3')
 
-  s.licenses = %w(AGPLv3+)
+  s.licenses = %w(AGPL-3.0+)
 end

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 dark216
+	$(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:
@@ -101,7 +86,7 @@ fix-perms:
 gem: $(pkggem)
 
 install-gem: $(pkggem)
-	gem install $(CURDIR)/$<
+	gem install --local $(CURDIR)/$<
 
 $(pkggem): manifest fix-perms
 	gem build $(rfpackage).gemspec
@@ -120,42 +105,27 @@ $(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)
+	$(VALGRIND) $(RUBY) -w -I $(lib) $@ $(RUBY_TEST_OPTS)
 
 # this requires GNU coreutils variants
 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

metadata

@@ -1,164 +1,116 @@
 --- !ruby/object:Gem::Specification
-name: !binary |-
-  b21nZg==
+name: omgf
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 0.0.9
 platform: ruby
 authors:
-- !binary |-
-  T01HRiBoYWNrZXJz
+- OMGF hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2020-02-22 00:00:00.000000000 Z
 dependencies:
 - !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 |-
-          MS4z
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4z
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    a2dpbw==
+  name: kgio
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi43
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi43
+        version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    a2Nhcg==
+  name: kcar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC4z
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC4z
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    bW9naWxlZnMtY2xpZW50
+  name: mogilefs-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          My4x
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          My4x
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    cmVndXJnaXRhdG9y
+  name: regurgitator
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    c3FsaXRlMw==
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'OMGF provides an HTTP interface for {MogileFS}[http://mogilefs.org],
-
+description: |-
+  OMGF provides an HTTP interface for {MogileFS}[http://mogilefs.org],
   allowing clients to connect to MogileFS without needing specialized
-
   libraries to interface with MogileFS.  Currently, HystericalRaisins
-
-  is supported.  OMGF is short for "OMGFiles", an anagram for "MogileFS".'
-email: !binary |-
-  b21nZkBsaWJyZWxpc3Qub3Jn
+  is supported.  OMGF is short for "OMGFiles", an anagram for "MogileFS".
+email: bofh@yhbt.net
 executables: []
 extensions: []
 extra_rdoc_files:
-- ChangeLog
-- lib/omgf.rb
-- lib/omgf/hysterical_raisins.rb
-- lib/omgf/pool.rb
-- lib/omgf/regurgitator.rb
-- lib/omgf/verify_paths.rb
-- lib/omgf/version.rb
 - NEWS
 - README
 files:
-- .document
-- .gitignore
-- .manifest
-- .wrongdoc.yml
+- ".document"
+- ".gitignore"
+- ".manifest"
+- ".olddoc.yml"
 - COPYING
-- ChangeLog
 - GIT-VERSION-FILE
 - GIT-VERSION-GEN
 - GNUmakefile
@@ -181,43 +133,31 @@ files:
 - test/test_hysterical_raisins.rb
 - test/test_hysterical_raisins_cmogstored.rb
 - test/test_regurgitator.rb
-homepage: http://bogomips.org/omgf/
+homepage: https://yhbt.net/omgf/
 licenses:
-- !binary |-
-  QUdQTHYzKw==
+- AGPL-3.0+
+metadata: {}
 post_install_message: 
-rdoc_options:
-- -t
-- OMGF - hysterical REST API for MogileFS using Rack
-- -W
-- http://bogomips.org/omgf.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: 
-rubygems_version: 1.8.24
+rubygems_version: 3.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: hysterical REST API for MogileFS using Rack
 test_files:
-- !binary |-
-  dGVzdC90ZXN0X2h5c3RlcmljYWxfcmFpc2luc19jbW9nc3RvcmVkLnJi
-- !binary |-
-  dGVzdC90ZXN0X3JlZ3VyZ2l0YXRvci5yYg==
-- !binary |-
-  dGVzdC90ZXN0X2h5c3RlcmljYWxfcmFpc2lucy5yYg==
-- !binary |-
-  dGVzdC90ZXN0X2h5c3QucmI=
-has_rdoc: 
+- test/test_regurgitator.rb
+- test/test_hysterical_raisins.rb
+- test/test_hysterical_raisins_cmogstored.rb
+- test/test_hyst.rb

data/.wrongdoc.yml

@@ -1,6 +0,0 @@
----
-cgit_url: http://bogomips.org/omgf.git
-git_url: git://bogomips.org/omgf.git
-rdoc_url: http://bogomips.org/omgf/
-private_email: normalperson@yhbt.net
-public_email: omgf@librelist.org