From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00, T_FILL_THIS_FORM_SHORT shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id E3FE82023D for ; Mon, 22 May 2017 18:47:43 +0000 (UTC) From: Eric Wong To: clogger-public@bogomips.org Subject: [PATCH] build: remove build-time olddoc dependency Date: Mon, 22 May 2017 18:47:43 +0000 Message-Id: <20170522184743.6021-1-e@80x24.org> List-Id: This should make it easier for distros to pick this up without picking up olddoc, too. We will still use olddoc for generating the website since it reduces bandwidth costs, and for generating NEWS for our own builds. Also, remove the "private" email address since it might be unfair to the public for people to send private support requests. --- .olddoc.yml | 1 - clogger.gemspec | 23 +++++++++++------------ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.olddoc.yml b/.olddoc.yml index ece1573..fd7b52d 100644 --- a/.olddoc.yml +++ b/.olddoc.yml @@ -3,7 +3,6 @@ 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: - https://bogomips.org/clogger-public/ - http://ou63pmih66umazou.onion/clogger-public/ diff --git a/clogger.gemspec b/clogger.gemspec index ba1829c..ebc0baf 100644 --- a/clogger.gemspec +++ b/clogger.gemspec @@ -1,24 +1,23 @@ -ENV["VERSION"] or abort "VERSION= must be specified" -manifest = File.readlines('.manifest').map! { |x| x.chomp! } -require 'olddoc' -extend Olddoc::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{clogger} - s.version = ENV["VERSION"].dup - s.homepage = Olddoc.config['rdoc_url'] + s.version = (ENV['VERSION'] || '2.1.0').dup + s.homepage = 'https://bogomips.org/clogger/' s.authors = ["cloggers"] - s.description = readme_description - s.email = %q{clogger@bogomips.org} - s.extra_rdoc_files = extra_rdoc_files(manifest) + s.summary = 'configurable request logging for Rack' + s.description = File.read('README').split("\n\n")[1] + s.email = %q{clogger-public@bogomips.org} + s.extra_rdoc_files = IO.readlines('.document').map!(&:chomp!).keep_if do |f| + File.exist?(f) + end s.files = manifest - s.summary = summary 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, ['>= 1.0', '< 3.0']) + s.add_development_dependency('test-unit', '~> 3.0') s.extensions = %w(ext/clogger_ext/extconf.rb) - s.licenses = %w(LGPL-2.1+) end -- EW