bluecloth 2.0.5 → 2.0.6.pre120

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2008, Michael Granger
+Copyright (c) 2004-2010, Michael Granger
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README

@@ -60,10 +60,10 @@ You can also install as a site library via the Rakefile:
 
 == Source 
 
-You can check out the current development source with Subversion from
+You can check out the current development source with Mercurial from
 the following URL:
 
-  svn://deveiate.org/BlueCloth/trunk
+  http://repo.deveiate.org/BlueCloth
 
 You can report bugs, suggest improvements, or check on development
 activity at the project page:

data/Rakefile

@@ -1,10 +1,10 @@
-#!rake
+#!rake -*- ruby -*-
 #
 # BlueCloth rakefile
 #
 # Based on various other Rakefiles, especially one by Ben Bleything
 #
-# Copyright (c) 2007-2009 The FaerieMUD Consortium
+# Copyright (c) 2007-2010 The FaerieMUD Consortium
 #
 # Authors:
 #  * Michael Granger <ged@FaerieMUD.org>
@@ -21,13 +21,31 @@ BEGIN {
 	$LOAD_PATH.unshift( extdir.to_s ) unless $LOAD_PATH.include?( extdir.to_s )
 }
 
+begin
+	require 'readline'
+	include Readline
+rescue LoadError
+	# Fall back to a plain prompt
+	def readline( text )
+		$stderr.print( text.chomp )
+		return $stdin.gets
+	end
+end
+
+begin
+	require 'rubygems'
+rescue LoadError
+	module Gem
+		class Specification; end
+	end
+end
+
 require 'rbconfig'
 require 'rake'
-require 'rake/rdoctask'
 require 'rake/testtask'
 require 'rake/packagetask'
 require 'rake/clean'
-require 'rake/191_compat.rb'
+# require 'rake/191_compat.rb'
 
 $dryrun = false
 
@@ -40,6 +58,8 @@ DOCSDIR       = BASEDIR + 'docs'
 PKGDIR        = BASEDIR + 'pkg'
 DATADIR       = BASEDIR + 'data'
 
+MANUALDIR     = DOCSDIR + 'manual'
+
 PROJECT_NAME  = 'BlueCloth'
 PKG_NAME      = PROJECT_NAME.downcase
 PKG_SUMMARY   = 'BlueCloth is a Ruby implementation of Markdown'
@@ -60,33 +80,42 @@ end
 PKG_FILE_NAME = "#{PKG_NAME.downcase}-#{PKG_VERSION}"
 GEM_FILE_NAME = "#{PKG_FILE_NAME}.gem"
 
+# Universal VCS constants
+DEFAULT_EDITOR  = 'vi'
+COMMIT_MSG_FILE = 'commit-msg.txt'
+FILE_INDENT     = " " * 12
+LOG_INDENT      = " " * 3
+
 EXTCONF       = EXTDIR + 'extconf.rb'
 
 ARTIFACTS_DIR = Pathname.new( CC_BUILD_ARTIFACTS )
 
 TEXT_FILES    = Rake::FileList.new( %w[Rakefile ChangeLog README LICENSE] )
-BIN_FILES     = Rake::FileList.new( "#{BINDIR}/*" ).exclude( /\.svn/ )
-LIB_FILES     = Rake::FileList.new( "#{LIBDIR}/**/*.rb" ).exclude( /\.svn/ )
-EXT_FILES     = Rake::FileList.new( "#{EXTDIR}/**/*.{c,h,rb}" ).exclude( /\.svn/ )
-DATA_FILES    = Rake::FileList.new( "#{DATADIR}/**/*" ).exclude( /\.svn/ )
+BIN_FILES     = Rake::FileList.new( "#{BINDIR}/*" )
+LIB_FILES     = Rake::FileList.new( "#{LIBDIR}/**/*.rb" )
+EXT_FILES     = Rake::FileList.new( "#{EXTDIR}/**/*.{c,h,rb}" )
+DATA_FILES    = Rake::FileList.new( "#{DATADIR}/**/*" )
 
 SPECDIR       = BASEDIR + 'spec'
 SPECLIBDIR    = SPECDIR + 'lib'
 SPEC_FILES    = Rake::FileList.new( "#{SPECDIR}/**/*_spec.rb", "#{SPECLIBDIR}/**/*.rb" )
 
 TESTDIR       = BASEDIR + 'tests'
-TEST_FILES    = Rake::FileList.new( "#{TESTDIR}/**/*.tests.rb" ).exclude( /\.svn/ )
+TEST_FILES    = Rake::FileList.new( "#{TESTDIR}/**/*.tests.rb" )
 
 RAKE_TASKDIR  = BASEDIR + 'rake'
 RAKE_TASKLIBS = Rake::FileList.new( "#{RAKE_TASKDIR}/*.rb" )
+PKG_TASKLIBS  = Rake::FileList.new( "#{RAKE_TASKDIR}/{191_compat,helpers,packaging,rdoc,testing}.rb" )
+PKG_TASKLIBS.include( "#{RAKE_TASKDIR}/manual.rb" ) if MANUALDIR.exist?
+
+RAKE_TASKLIBS_URL = 'http://repo.deveiate.org/rake-tasklibs'
 
 LOCAL_RAKEFILE = BASEDIR + 'Rakefile.local'
 
 EXTRA_PKGFILES = Rake::FileList.new
-EXTRA_PKGFILES.include "#{BASEDIR}/LICENSE.discount"
-EXTRA_PKGFILES.include "#{BASEDIR}/spec/data/**/*.{txt,text,html}"
-EXTRA_PKGFILES.include "#{BASEDIR}/ext/VERSION"
-EXTRA_PKGFILES.exclude( /\.svn/ )
+EXTRA_PKGFILES.include( "#{BASEDIR}/LICENSE.discount" )
+EXTRA_PKGFILES.include( "#{BASEDIR}/spec/data/**/*.{txt,text,html}" )
+EXTRA_PKGFILES.include( "#{BASEDIR}/ext/VERSION" )
 
 RELEASE_FILES = TEXT_FILES + 
 	SPEC_FILES + 
@@ -98,8 +127,13 @@ RELEASE_FILES = TEXT_FILES +
 	RAKE_TASKLIBS +
 	EXTRA_PKGFILES
 
+
 RELEASE_FILES << LOCAL_RAKEFILE.to_s if LOCAL_RAKEFILE.exist?
 
+RELEASE_ANNOUNCE_ADDRESSES = [
+	"Ruby-Talk List <ruby-talk@ruby-lang.org>",
+]
+
 COVERAGE_MINIMUM = ENV['COVERAGE_MINIMUM'] ? Float( ENV['COVERAGE_MINIMUM'] ) : 85.0
 RCOV_EXCLUDES = 'spec,tests,/Library/Ruby,/var/lib,/usr/local/lib'
 RCOV_OPTS = [
@@ -111,23 +145,35 @@ RCOV_OPTS = [
   ]
 
 
-# Subversion constants -- directory names for releases and tags
-SVN_TRUNK_DIR    = 'trunk'
-SVN_RELEASES_DIR = 'releases'
-SVN_BRANCHES_DIR = 'branches'
-SVN_TAGS_DIR     = 'tags'
-
-SVN_DOTDIR       = BASEDIR + '.svn'
-SVN_ENTRIES      = SVN_DOTDIR + 'entries'
+### Load some task libraries that need to be loaded early
+if !RAKE_TASKDIR.exist?
+	$stderr.puts "It seems you don't have the build task directory. Shall I fetch it "
+	ans = readline( "for you? [y]" )
+	ans = 'y' if !ans.nil? && ans.empty?
+
+	if ans =~ /^y/i
+		$stderr.puts "Okay, fetching #{RAKE_TASKLIBS_URL} into #{RAKE_TASKDIR}..."
+		system 'hg', 'clone', RAKE_TASKLIBS_URL, "./#{RAKE_TASKDIR}"
+		if ! $?.success?
+			fail "Damn. That didn't work. Giving up; maybe try manually fetching?"
+		end
+	else
+		$stderr.puts "Then I'm afraid I can't continue. Best of luck."
+		fail "Rake tasklibs not present."
+	end
 
+	RAKE_TASKLIBS.include( "#{RAKE_TASKDIR}/*.rb" )
+end
 
-### Load some task libraries that need to be loaded early
 require RAKE_TASKDIR + 'helpers.rb'
-require RAKE_TASKDIR + 'svn.rb'
-require RAKE_TASKDIR + 'verifytask.rb'
 
-# Define some constants that depend on the 'svn' tasklib
-PKG_BUILD = get_svn_rev( BASEDIR ) || 0
+# Set the build ID if the mercurial executable is available
+if hg = which( 'hg' )
+	id = IO.read('|-') or exec hg.to_s, 'id', '-n'
+	PKG_BUILD = 'pre' + (id.chomp[ /^[[:xdigit:]]+/ ] || '1')
+else
+	PKG_BUILD = 'pre0'
+end
 SNAPSHOT_PKG_NAME = "#{PKG_FILE_NAME}.#{PKG_BUILD}"
 SNAPSHOT_GEM_NAME = "#{SNAPSHOT_PKG_NAME}.gem"
 
@@ -139,11 +185,11 @@ RDOC_OPTIONS = [
 	'-i', '.',
 	'-m', 'README',
 	'-t', PKG_NAME,
-	'-W', 'http://deveiate.org/projects/BlueCloth/browser/trunk/'
+	'-W', 'http://deveiate.org/projects/BlueCloth/browser/'
   ]
 
 # Release constants
-SMTP_HOST = 'mail.faeriemud.org'
+SMTP_HOST = "mail.faeriemud.org"
 SMTP_PORT = 465 # SMTP + SSL
 
 # Project constants
@@ -153,29 +199,23 @@ PROJECT_DOCDIR = "#{PROJECT_PUBDIR}/#{PKG_NAME}"
 PROJECT_SCPPUBURL = "#{PROJECT_HOST}:#{PROJECT_PUBDIR}"
 PROJECT_SCPDOCURL = "#{PROJECT_HOST}:#{PROJECT_DOCDIR}"
 
-# Rubyforge stuff
-RUBYFORGE_GROUP = 'deveiate'
-RUBYFORGE_PROJECT = 'bluecloth'
-
 # Gem dependencies: gemname => version
 DEPENDENCIES = {
 }
 
 # Developer Gem dependencies: gemname => version
 DEVELOPMENT_DEPENDENCIES = {
-	'amatch'      => '>= 0.2.3',
-	'rake'        => '>= 0.8.1',
+	'rake'        => '>= 0.8.7',
 	'rcodetools'  => '>= 0.7.0.0',
-	'rcov'        => '>= 0',
+	'rcov'        => '>= 0.8.1.2.0',
+	'rdoc'        => '>= 2.4.3',
 	'RedCloth'    => '>= 4.0.3',
-	'rspec'       => '>= 0',
-	'rubyforge'   => '>= 0',
+	'rspec'       => '>= 1.2.6',
 	'termios'     => '>= 0',
 	'text-format' => '>= 1.0.0',
 	'tmail'       => '>= 1.2.3.1',
-	'ultraviolet' => '>= 0.10.2',
-	'libxml-ruby' => '>= 0.8.3',
-	'rdoc'        => '>= 2.4.3',
+	'diff-lcs'    => '>= 1.1.2',
+	'rake-compiler' => '>= 0.7.0',
 }
 
 # Non-gem requirements: packagename => version
@@ -196,9 +236,8 @@ GEMSPEC   = Gem::Specification.new do |gem|
   	  ].join( "\n" )
 
 	gem.authors           = "Michael Granger"
-	gem.email             = "ged@FaerieMUD.org"
+	gem.email             = ["ged@FaerieMUD.org"]
 	gem.homepage          = 'http://deveiate.org/projects/BlueCloth/'
-	gem.rubyforge_project = RUBYFORGE_PROJECT
 
 	gem.has_rdoc          = true
 	gem.rdoc_options      = RDOC_OPTIONS
@@ -207,6 +246,7 @@ GEMSPEC   = Gem::Specification.new do |gem|
 	gem.bindir            = BINDIR.relative_path_from(BASEDIR).to_s
 	gem.executables       = BIN_FILES.select {|pn| File.executable?(pn) }.
 	                            collect {|pn| File.basename(pn) }
+	gem.require_paths << EXTDIR.relative_path_from( BASEDIR ).to_s if EXTDIR.exist?
 
 	if EXTCONF.exist?
 		gem.extensions << EXTCONF.relative_path_from( BASEDIR ).to_s
@@ -214,38 +254,33 @@ GEMSPEC   = Gem::Specification.new do |gem|
 
 	gem.files             = RELEASE_FILES
 	gem.test_files        = SPEC_FILES
-		
+
 	DEPENDENCIES.each do |name, version|
 		version = '>= 0' if version.length.zero?
 		gem.add_runtime_dependency( name, version )
 	end
-	
-	# Developmental dependencies don't work as of RubyGems 1.2.0
-	unless Gem::Version.new( Gem::RubyGemsVersion ) <= Gem::Version.new( "1.2.0" )
-		DEVELOPMENT_DEPENDENCIES.each do |name, version|
-			version = '>= 0' if version.length.zero?
-			gem.add_development_dependency( name, version )
-		end
-	end
-	
+
 	REQUIREMENTS.each do |name, version|
 		gem.requirements << [ name, version ].compact.join(' ')
 	end
 end
 
-# Manual-generation config
-MANUALDIR = DOCSDIR + 'manual'
+
+task :prerelease do
+	GEMSPEC.version.version += '.' + PKG_BUILD
+end
+
 
 $trace = Rake.application.options.trace ? true : false
 $dryrun = Rake.application.options.dryrun ? true : false
-
+$include_dev_dependencies = false
 
 # Load any remaining task libraries
 RAKE_TASKLIBS.each do |tasklib|
-	next if tasklib.to_s =~ %r{/(helpers|svn|verifytask)\.rb$}
+	next if tasklib.to_s =~ %r{/helpers\.rb$}
 	begin
 		trace "  loading tasklib %s" % [ tasklib ]
-		require tasklib
+		import tasklib
 	rescue ScriptError => err
 		fail "Task library '%s' failed to load: %s: %s" %
 			[ tasklib, err.class.name, err.message ]
@@ -271,19 +306,15 @@ task :default  => [:clean, :local, :spec, :rdoc, :package]
 ### Task the local Rakefile can append to -- no-op by default
 task :local
 
-
 ### Task: clean
-CLEAN.include 'coverage'
-CLOBBER.include 'artifacts', 'coverage.info', PKGDIR
-
-# Target to hinge on ChangeLog updates
-file SVN_ENTRIES
+CLEAN.include 'coverage', '**/*.orig', '**/*.rej'
+CLOBBER.include 'artifacts', 'coverage.info', 'ChangeLog', PKGDIR
 
 ### Task: changelog
-file 'ChangeLog' => SVN_ENTRIES.to_s do |task|
+file 'ChangeLog' do |task|
 	log "Updating #{task.name}"
 
-	changelog = make_svn_changelog()
+	changelog = make_changelog()
 	File.open( task.name, 'w' ) do |fh|
 		fh.print( changelog )
 	end
@@ -296,13 +327,13 @@ task :cruise => [:clean, 'spec:quiet', :package] do |task|
 	raise "Artifacts dir not set." if ARTIFACTS_DIR.to_s.empty?
 	artifact_dir = ARTIFACTS_DIR.cleanpath + (CC_BUILD_LABEL || Time.now.strftime('%Y%m%d-%T'))
 	artifact_dir.mkpath
-	
+
 	coverage = BASEDIR + 'coverage'
 	if coverage.exist? && coverage.directory?
 		$stderr.puts "Copying coverage stats..."
 		FileUtils.cp_r( 'coverage', artifact_dir )
 	end
-	
+
 	$stderr.puts "Copying packages..."
 	FileUtils.cp_r( FileList['pkg/*'].to_a, artifact_dir )
 end
@@ -311,7 +342,7 @@ end
 desc "Update the build system to the latest version"
 task :update_build do
 	log "Updating the build system"
-	sh 'svn', 'up', RAKE_TASKDIR
+	run 'hg', '-R', RAKE_TASKDIR, 'pull', '-u'
 	log "Updating the Rakefile"
 	sh 'rake', '-f', RAKE_TASKDIR + 'Metarakefile'
 end

data/Rakefile.local

@@ -1,5 +1,7 @@
 #!rake
 
+require 'rake/extensiontask'
+
 # C extension constants
 EXT_MAKEFILE       = EXTDIR + 'Makefile'
 EXT_SOURCES        = FileList[ EXTDIR + '*.c' ]
@@ -14,50 +16,28 @@ DOCFILES << 'LICENSE.discount'
 #####################################################################
 
 # Make both the default task and the spec task depend on building the extension
-task :local => :build
-task :spec => :build
+task :local => :compile
+task :spec => :compile
 namespace :spec do
-	task :doc   => [ :build ]
-	task :quiet => [ :build ]
-	task :html  => [ :build ]
-	task :text  => [ :build ]
+	task :doc   => [ :compile ]
+	task :quiet => [ :compile ]
+	task :html  => [ :compile ]
+	task :text  => [ :compile ]
 end
 
-desc "Make the Makefile for the C extension"
-file EXT_MAKEFILE.to_s => EXT_SOURCES do
-	log "Configuring BlueCloth C extension"
-	in_subdirectory( EXTDIR ) do
-		ruby 'extconf.rb'
-	end
-end
-CLOBBER.include( EXTDIR + 'mkmf.log', EXTDIR + 'conftest.dSYM', EXT_SO )
-
-desc "Build the C extension"
-task :build => EXT_SO
-file EXT_SO => [ EXT_MAKEFILE.to_s, *EXT_SOURCES ] do
-	in_subdirectory( EXTDIR ) do
-		sh 'make'
-	end
+ENV['RUBY_CC_VERSION'] = '1.8.6:1.9.1'
+
+Rake::ExtensionTask.new do |ext|
+	ext.name = 'bluecloth_ext'
+	ext.gem_spec = GEMSPEC
+	ext.ext_dir = 'ext'
+	ext.lib_dir = 'lib'
+	ext.source_pattern = "*.{c,h}"
+	ext.cross_compile = true
+	ext.cross_platform = %w[i386-mswin32 i386-mingw32]
 end
 
-desc "Rebuild the C extension"
-task :rebuild => [ :clobber, :build ]
-
-
-task :clean do
-	if EXT_MAKEFILE.exist?
-		in_subdirectory( EXTDIR ) do
-			sh 'make clean'
-		end
-	end
-end	
-
-task :clobber do
-	if EXT_MAKEFILE.exist?
-		in_subdirectory( EXTDIR ) do
-			sh 'make distclean'
-		end
-	end
-end	
-CLOBBER.include( EXT_MAKEFILE )
+WINFAT_DIRS = Rake::FileList[ LIBDIR + '{1.8,1.9}' ]
+
+CLEAN.include( WINFAT_DIRS )
 

data/ext/VERSION

@@ -1 +1 @@
-1.4.4
+1.5.8

data/ext/bluecloth.c

@@ -1,6 +1,6 @@
 /* 
  * BlueCloth -- a Ruby implementation of Markdown
- * $Id: bluecloth.c 123 2009-06-15 13:15:54Z deveiant $
+ * $Id$
  * 
  * = Authors
  * 
@@ -22,8 +22,7 @@
  * 
  */
 
-#include "mkdio.h"
-#include "ruby.h"
+#include "bluecloth.h"
 
 VALUE bluecloth_cBlueCloth;
 VALUE bluecloth_default_opthash;
@@ -146,7 +145,12 @@ bluecloth_s_allocate( VALUE klass ) {
  */
 static VALUE
 bluecloth_s_discount_version( VALUE klass ) {
+#ifdef HAVE_RUBY_ENCODING_H
+	return rb_external_str_new_with_enc( markdown_version, strlen(markdown_version),
+		rb_default_external_encoding() );
+#else
 	return rb_str_new2( markdown_version );
+#endif
 }
 
 /* --------------------------------------------------------------
@@ -201,6 +205,9 @@ bluecloth_initialize( int argc, VALUE *argv, VALUE self ) {
 			opthash = text;
 			text = rb_str_new( "", 0 );
 		}
+		else {
+			text = rb_obj_as_string( text );
+		}
 
 		/* Merge the options hash with the defaults and turn it into a flags int */
 		if ( NIL_P(opthash) ) opthash = rb_hash_new();
@@ -217,6 +224,9 @@ bluecloth_initialize( int argc, VALUE *argv, VALUE self ) {
 		rb_iv_set( self, "@text", textcopy );
 		OBJ_FREEZE( fullhash );
 		rb_iv_set( self, "@options", fullhash );
+#ifdef HAVE_RUBY_ENCODING_H
+		rb_enc_copy( self, text );
+#endif
 
 		OBJ_INFECT( self, text );
 	}
@@ -245,6 +255,9 @@ bluecloth_to_html( VALUE self ) {
 		bluecloth_debug( "Pointer to results: %p, length = %d", output, length );
 		result = rb_str_new( output, length );
 
+#ifdef HAVE_RUBY_ENCODING_H
+		rb_enc_copy( result, self );
+#endif
 		OBJ_INFECT( result, self );
 		return result;
 	} else {
@@ -325,7 +338,8 @@ void Init_bluecloth_ext( void ) {
 	
 	/* The options hash that describes the options in effect when the object was created */
 	rb_define_attr( bluecloth_cBlueCloth, "options", 1, 0 );
-	
+
+
 	/* --- Constants ----- */
 
 	/* Do not process `[]' and remove A tags from the output. */