From b3a84507bfd9a1b55d7fa01a9c7546e839f211c1 Mon Sep 17 00:00:00 2001
From: lnu <lnu@f70e237a-67f3-0310-a06c-d2b8a7116972>
Date: Tue, 15 May 2007 14:29:49 +0000
Subject: release preparation

git-svn-id: svn+ssh://svn.gna.org/svn/feed2imap/trunk/feed2imap@123 f70e237a-67f3-0310-a06c-d2b8a7116972
---
 ChangeLog         |  2 +-
 Rakefile          | 47 ++++++++++++++++++++++++++++++++++++++++++-----
 build_debian.bash | 19 -------------------
 setup.rb          |  2 +-
 test/tc_mail.rb   |  2 +-
 5 files changed, 45 insertions(+), 27 deletions(-)
 delete mode 100755 build_debian.bash

diff --git a/ChangeLog b/ChangeLog
index 7d96476..f85b022 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Feed2Imap 0.9 (XX/XX/2006)
+Feed2Imap 0.9 (15/05/2007)
 ============================
 * Folder creation moved to upload. This should make feed2imap run
   slightly faster.
diff --git a/Rakefile b/Rakefile
index 083ddc8..5716352 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,10 +1,23 @@
 require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/packagetask'
+require 'rake'
+require 'find'
 
 task :default => [:package]
 
+PKG_NAME = 'feed2imap'
+PKG_VERSION = '0.9'
+PKG_FILES = [ 'ChangeLog', 'README', 'COPYING', 'setup.rb', 'Rakefile']
+Find.find('bin/', 'lib/', 'test/', 'data/') do |f|
+	if FileTest.directory?(f) and f =~ /\.svn/
+		Find.prune
+	else
+		PKG_FILES << f
+	end
+end
 Rake::TestTask.new do |t|
+  t.libs << "libs/feed2imap"
 	t.libs << "test"
 	t.test_files = FileList['test/tc_*.rb']
 end
@@ -13,14 +26,38 @@ Rake::RDocTask.new do |rd|
 	rd.main = 'README'
 	rd.rdoc_files.include('lib/*.rb', 'lib/feed2imap/*.rb')
 	rd.options << '--all'
+  rd.options << '--diagram'
+  rd.options << '--fileboxes'
+  rd.options << '--inline-source'
+  rd.options << '--line-numbers'
 	rd.rdoc_dir = 'rdoc'
 end
 
-Rake::PackageTask.new('feed2imap', '0.8') do |p|
+Rake::PackageTask.new(PKG_NAME, PKG_VERSION) do |p|
 	p.need_tar = true
-	p.package_files.include('ChangeLog', 'README', 'COPYING', 'setup.rb',
-	'Rakefile', 'data/doc/feed2imap/*/*', 'data/man/*/*', 'bin/feed2imap*',
-	'test/*.rb', 'test/parserdata/*.xml', 'test/parserdata/*.output',
-	'lib/*.rb', 'lib/feed2imap/*.rb')
+	p.need_zip = true
+	p.package_files = PKG_FILES
 end
 
+# "Gem" part of the Rakefile
+begin
+	require 'rake/gempackagetask'
+
+	spec = Gem::Specification.new do |s|
+		s.platform = Gem::Platform::RUBY
+		s.summary = "RSS/Atom feed aggregator"
+		s.name = PKG_NAME
+		s.version = PKG_VERSION
+		s.requirements << 'feedparser'
+		s.require_path = 'lib'
+		s.files = PKG_FILES
+		s.description = "RSS/Atom feed aggregator"
+	end
+
+	Rake::GemPackageTask.new(spec) do |pkg|
+		pkg.need_zip = true
+		pkg.need_tar = true
+	end
+rescue LoadError
+  puts "Will not generate gem."
+end
diff --git a/build_debian.bash b/build_debian.bash
deleted file mode 100755
index 5dc7e74..0000000
--- a/build_debian.bash
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-VERSION=0.5
-
-rm -rf pkg
-rake package
-cd pkg
-mv feed2imap-$VERSION.tgz feed2imap_$VERSION.orig.tar.gz
-cd feed2imap-$VERSION
-cp -r ../../debian .
-rm -rf debian/.svn
-dpkg-buildpackage -rfakeroot
-cd ..
-
-dpkg-scanpackages . /dev/null >Packages
-dpkg-scansources . /dev/null >Sources
-gzip Packages
-gzip Sources
-rm -rf feed2imap-$VERSION
diff --git a/setup.rb b/setup.rb
index 91e56ae..5cc16da 100755
--- a/setup.rb
+++ b/setup.rb
@@ -250,7 +250,7 @@ class ConfigTable
                       'the ruby program using for installation'),
       ProgramItem.new('makeprog', 'name', makeprog,
                       'the make program to compile ruby extentions'),
-      SelectItem.new('shebang', 'all/ruby/never', 'never',
+      SelectItem.new('shebang', 'all/ruby/never', 'ruby',
                      'shebang line (#!) editing mode'),
       BoolItem.new('without-ext', 'yes/no', 'no',
                    'does not compile/install ruby extentions')
diff --git a/test/tc_mail.rb b/test/tc_mail.rb
index de80f9c..bfc023a 100755
--- a/test/tc_mail.rb
+++ b/test/tc_mail.rb
@@ -3,7 +3,7 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'test/unit'
-require 'rmail'
+require 'feed2imap/rubymail_patch'
 
 class MailTest < Test::Unit::TestCase
   def test_require_rmail
-- 
cgit v1.2.3-54-g00ecf