bluecloth 2.0.5 → 2.0.6.pre120

data/ext/markdown.h

@@ -37,7 +37,7 @@ typedef struct paragraph {
     char *ident;		/* %id% tag for QUOTE */
     enum { WHITESPACE=0, CODE, QUOTE, MARKUP,
 	   HTML, STYLE, DL, UL, OL, AL, LISTITEM,
-	   HDR, HR } typ;
+	   HDR, HR, TABLE, SOURCE } typ;
     enum { IMPLICIT=0, PARA, CENTER} align;
     int hnumber;		/* <Hn> for typ == HDR */
 } Paragraph;
@@ -74,11 +74,12 @@ typedef struct mmiot {
 #define INSIDE_TAG	0x0020
 #define NO_PSEUDO_PROTO	0x0040
 #define CDATA_OUTPUT	0x0080
+#define NOTABLES	0x0400
 #define TOC		0x1000
 #define MKD_1_COMPAT	0x2000
 #define AUTOLINK	0x4000
 #define SAFELINK	0x8000
-#define USER_FLAGS	0xF0FF
+#define USER_FLAGS	0xFCFF
 #define EMBEDDED	DENY_A|DENY_IMG|NO_PSEUDO_PROTO|CDATA_OUTPUT
     char *base;
 } MMIOT;

data/ext/mkdio.h

@@ -63,6 +63,7 @@ extern char markdown_version[];
 				 * <em>, no <bold>, no html or [] expansion */
 #define MKD_NO_EXT	0x0040	/* don't allow pseudo-protocols */
 #define MKD_CDATA	0x0080	/* generate code for xml ![CDATA[...]] */
+#define MKD_NOTABLES	0x0400	/* disallow tables */
 #define MKD_TOC		0x1000	/* do table-of-contents processing */
 #define MKD_1_COMPAT	0x2000	/* compatability with MarkdownTest_1.0 */
 #define MKD_AUTOLINK	0x4000	/* make http://foo.com link even without <>s */

data/lib/bluecloth.rb

@@ -18,7 +18,7 @@
 # 
 # == Version
 #
-#  $Id: bluecloth.rb 132 2009-07-16 00:18:30Z deveiant $
+#  $Id$
 # 
 # == License
 # 
@@ -29,13 +29,7 @@
 class BlueCloth
 
 	# Release Version
-	VERSION = '2.0.5'
-
-	# SVN Revision
-	SVNREV = %q$Rev: 132 $
-
-	# SVN Id tag
-	SVNID = %q$Id: bluecloth.rb 132 2009-07-16 00:18:30Z deveiant $
+	VERSION = '2.0.6'
 
 	# The defaults for all supported options.
 	DEFAULT_OPTIONS = {
@@ -153,7 +147,16 @@ class BlueCloth
 
 end # class BlueCloth
 
-require 'bluecloth_ext'
+# Load the correct version if it's a Windows binary gem
+if RUBY_PLATFORM =~/(mswin|mingw)/i
+	major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
+		raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
+	require "#{major_minor}/nokogiri"
+else
+	require 'bluecloth_ext'
+end
+
+
 
 # Set the top-level 'Markdown' constant if it isn't already set
 ::Markdown = ::BlueCloth unless defined?( ::Markdown )

data/rake/dependencies.rb

@@ -1,6 +1,6 @@
 # 
 # Dependency-checking and Installation Rake Tasks
-# $Id: dependencies.rb 43 2008-09-05 18:19:16Z deveiant $
+
 # 
 
 require 'rubygems/dependency_installer'

data/rake/helpers.rb

@@ -68,13 +68,19 @@ def trace( *msg )
 end
 
 
+### Return the specified args as a string, quoting any that have a space.
+def quotelist( *args )
+	return args.flatten.collect {|part| part =~ /\s/ ? part.inspect : part}
+end
+
+
 ### Run the specified command +cmd+ with system(), failing if the execution
 ### fails.
 def run( *cmd )
 	cmd.flatten!
 
 	if cmd.length > 1
-		trace( cmd.collect {|part| part =~ /\s/ ? part.inspect : part} ) 
+		trace( quotelist(*cmd) )
 	else
 		trace( cmd )
 	end
@@ -90,6 +96,15 @@ def run( *cmd )
 end
 
 
+### Run the given +cmd+ with the specified +args+ without interpolation by the shell and
+### return anything written to its STDOUT.
+def read_command_output( cmd, *args )
+	trace "Reading output from: %s" % [ cmd, quotelist(cmd, *args) ]
+	output = IO.read( '|-' ) or exec cmd, *args
+	return output
+end
+
+
 ### Run a subordinate Rake process with the same options and the specified +targets+.
 def rake( *targets )
 	opts = ARGV.select {|arg| arg[0,1] == '-' }
@@ -387,7 +402,7 @@ end
 def edit( filename )
 	editor = ENV['EDITOR'] || ENV['VISUAL'] || DEFAULT_EDITOR
 	system editor, filename
-	unless $?.success?
+	unless $?.success? || editor =~ /vim/i
 		fail "Editor exited uncleanly."
 	end
 end
@@ -410,3 +425,10 @@ def in_subdirectory( subdir )
 end
 
 
+### Make an easily-comparable version vector out of +ver+ and return it.
+def vvec( ver )
+	return ver.split('.').collect {|char| char.to_i }.pack('N*')
+end
+
+
+

data/rake/hg.rb

@@ -0,0 +1,273 @@
+# 
+# Mercurial Rake Tasks
+
+require 'enumerator'
+
+# 
+# Authors:
+# * Michael Granger <ged@FaerieMUD.org>
+# 
+
+unless defined?( HG_DOTDIR )
+
+	# Mercurial constants
+	HG_DOTDIR = BASEDIR + '.hg'
+	HG_STORE  = HG_DOTDIR + 'store'
+
+	IGNORE_FILE = BASEDIR + '.hgignore'
+
+
+	### 
+	### Helpers
+	### 
+
+	module MercurialHelpers
+
+		###############
+		module_function
+		###############
+
+		### Generate a commit log from a diff and return it as a String.
+		def make_commit_log
+			diff = read_command_output( 'hg', 'diff' )
+			fail "No differences." if diff.empty?
+
+			return diff
+		end
+
+		### Generate a commit log and invoke the user's editor on it.
+		def edit_commit_log
+			diff = make_commit_log()
+
+			File.open( COMMIT_MSG_FILE, File::WRONLY|File::TRUNC|File::CREAT ) do |fh|
+				fh.print( diff )
+			end
+
+			edit( COMMIT_MSG_FILE )
+		end
+
+		### Generate a changelog.
+		def make_changelog
+			log = read_command_output( 'hg', 'log', '--style', 'compact' )
+			return log
+		end
+
+		### Get the 'tip' info and return it as a Hash
+		def get_tip_info
+			data = read_command_output( 'hg', 'tip' )
+			return YAML.load( data )
+		end
+
+		### Return the ID for the current rev
+		def get_current_rev
+			id = read_command_output( 'hg', '-q', 'identify' )
+			return id.chomp
+		end
+
+		### Read the list of existing tags and return them as an Array
+		def get_tags
+			taglist = read_command_output( 'hg', 'tags' )
+			return taglist.split( /\n/ )
+		end
+
+
+		### Read any remote repo paths known by the current repo and return them as a hash.
+		def get_repo_paths
+			paths = {}
+			pathspec = read_command_output( 'hg', 'paths' )
+			pathspec.split.each_slice( 3 ) do |name, _, url|
+				paths[ name ] = url
+			end
+			return paths
+		end
+
+		### Return the list of files which are of status 'unknown'
+		def get_unknown_files
+			list = read_command_output( 'hg', 'status', '-un', '--no-color' )
+			list = list.split( /\n/ )
+
+			trace "New files: %p" % [ list ]
+			return list
+		end
+
+		### Returns a human-scannable file list by joining and truncating the list if it's too long.
+		def humanize_file_list( list, indent=FILE_INDENT )
+			listtext = list[0..5].join( "\n#{indent}" )
+			if list.length > 5
+				listtext << " (and %d other/s)" % [ list.length - 5 ]
+			end
+
+			return listtext
+		end
+
+
+		### Add the list of +pathnames+ to the .hgignore list.
+		def hg_ignore_files( *pathnames )
+			patterns = pathnames.flatten.collect do |path|
+				'^' + Regexp.escape(path) + '$'
+			end
+			trace "Ignoring %d files." % [ pathnames.length ]
+
+			IGNORE_FILE.open( File::CREAT|File::WRONLY|File::APPEND, 0644 ) do |fh|
+				fh.puts( patterns )
+			end
+		end
+
+
+		### Delete the files in the given +filelist+ after confirming with the user.
+		def delete_extra_files( filelist )
+			description = humanize_file_list( filelist, '  ' )
+			log "Files to delete:\n ", description
+			ask_for_confirmation( "Really delete them?", false ) do
+				filelist.each do |f|
+					rm_rf( f, :verbose => true )
+				end
+			end
+		end
+
+	end # module MercurialHelpers
+
+
+	### Rakefile support
+	def get_vcs_rev( dir='.' )
+		return MercurialHelpers.get_current_rev
+	end
+	def make_changelog
+		return MercurialHelpers.make_changelog
+	end
+
+
+	###
+	### Tasks
+	###
+
+	desc "Mercurial tasks"
+	namespace :hg do
+		include MercurialHelpers
+
+		desc "Prepare for a new release"
+		task :prep_release do
+			tags = get_tags()
+			rev = get_current_rev()
+
+			# Look for a tag for the current release version, and if it exists abort
+			if tags.include?( PKG_VERSION )
+				error "Version #{PKG_VERSION} already has a tag. Did you mean " +
+					"to increment the version in #{VERSION_FILE}?"
+				fail
+			end
+
+			# Sign the current rev
+			log "Signing rev #{rev}"
+			run 'hg', 'sign'
+
+			# Tag the current rev
+			log "Tagging rev #{rev} as #{PKG_VERSION}"
+			run 'hg', 'tag', PKG_VERSION
+
+			# Offer to push
+			Rake::Task['hg:push'].invoke
+		end
+
+		desc "Check for new files and offer to add/ignore/delete them."
+		task :newfiles do
+			log "Checking for new files..."
+
+			entries = get_unknown_files()
+
+			unless entries.empty?
+				files_to_add = []
+				files_to_ignore = []
+				files_to_delete = []
+
+				entries.each do |entry|
+					action = prompt_with_default( "  #{entry}: (a)dd, (i)gnore, (s)kip (d)elete", 's' )
+					case action
+					when 'a'
+						files_to_add << entry
+					when 'i'
+						files_to_ignore << entry
+					when 'd'
+						files_to_delete << entry
+					end
+				end
+
+				unless files_to_add.empty?
+					run 'hg', 'add', *files_to_add
+				end
+
+				unless files_to_ignore.empty?
+					hg_ignore_files( *files_to_ignore )
+				end
+
+				unless files_to_delete.empty?
+					delete_extra_files( files_to_delete )
+				end
+			end
+		end
+		task :add => :newfiles
+
+
+		desc "Pull and update from the default repo"
+		task :pull do
+			paths = get_repo_paths()
+			if origin_url = paths['default']
+				ask_for_confirmation( "Pull and update from '#{origin_url}'?", false ) do
+					run 'hg', 'pull', '-u'
+				end
+			else
+				trace "Skipping pull: No 'default' path."
+			end
+		end
+
+		desc "Check the current code in if tests pass"
+		task :checkin => ['hg:pull', 'hg:newfiles', 'test', COMMIT_MSG_FILE] do
+			targets = get_target_args()
+			$stderr.puts '---', File.read( COMMIT_MSG_FILE ), '---'
+			ask_for_confirmation( "Continue with checkin?" ) do
+				run 'hg', 'ci', '-l', COMMIT_MSG_FILE, targets
+				rm_f COMMIT_MSG_FILE
+			end
+			Rake::Task['hg:push'].invoke
+		end
+		task :commit => :checkin
+		task :ci => :checkin
+
+		CLEAN.include( COMMIT_MSG_FILE )
+
+		desc "Push to the default origin repo (if there is one)"
+		task :push do
+			paths = get_repo_paths()
+			if origin_url = paths['default']
+				ask_for_confirmation( "Push to '#{origin_url}'?", false ) do
+					run 'hg', 'push'
+				end
+			else
+				trace "Skipping push: No 'default' path."
+			end
+		end
+
+	end
+
+	if HG_DOTDIR.exist?
+		trace "Defining mercurial VCS tasks"
+
+		desc "Check in all the changes in your current working copy"
+		task :ci => 'hg:ci'
+		desc "Check in all the changes in your current working copy"
+		task :checkin => 'hg:ci'
+
+		desc "Tag and sign revision before a release"
+		task :prep_release => 'hg:prep_release'
+
+		file COMMIT_MSG_FILE do
+			edit_commit_log()
+		end
+
+	else
+		trace "Not defining mercurial tasks: no #{HG_DOTDIR}"
+	end
+
+end
+
+

data/rake/manual.rb

@@ -1,6 +1,6 @@
 # 
 # Manual-generation Rake tasks and classes
-# $Id: manual.rb 110 2009-07-06 23:34:04Z deveiant $
+
 # 
 # Authors:
 # * Michael Granger <ged@FaerieMUD.org>
@@ -69,7 +69,7 @@ module Manual
 		DEFAULT_CONFIG = {
 			'filters' => [ 'erb', 'links', 'textile' ],
 			'layout'  => 'default.page',
-			'cleanup' => true,
+			'cleanup' => false,
 		  }.freeze
 
 		# Pattern to match a source page with a YAML header
@@ -674,7 +674,7 @@ module Manual
 
 		### Set up a rule for copying files from the resources directory to the output dir.
 		def setup_resource_copy_tasks( resourcedir, outputdir )
-			resources = FileList[ resourcedir + '**/*.{js,css,png,gif,jpg,html}' ]
+			resources = FileList[ resourcedir + '**/*.{js,css,png,gif,jpg,html,svg,svgz,swf}' ]
 			resources.exclude( /\.svn/ )
 			target_pathmap = "%%{%s,%s}p" % [ resourcedir, outputdir ]
 			targets = resources.pathmap( target_pathmap )

data/rake/packaging.rb

@@ -1,11 +1,11 @@
-# 
-# Packaging Rake Tasks
-# $Id: packaging.rb 102 2009-05-23 21:40:00Z deveiant $
-# 
+#####################################################################
+###	P A C K A G I N G   T A S K S
+#####################################################################
 
 require 'rbconfig'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
+require 'pathname'
+require 'rubygems/package_task'
+
 
 include Config
 
@@ -22,34 +22,23 @@ task :package => [:gem]
 
 
 ### Task: gem
-gempath = PKGDIR + GEM_FILE_NAME
-
-desc "Build a RubyGem package (#{GEM_FILE_NAME})"
-task :gem => gempath.to_s
-file gempath.to_s => [PKGDIR.to_s] + GEMSPEC.files do
-	when_writing( "Creating GEM" ) do
-		Gem::Builder.new( GEMSPEC ).build
-		verbose( true ) do
-			mv GEM_FILE_NAME, gempath
-		end
-	end
-end
+# gempath = PKGDIR + GEM_FILE_NAME
+# 
+# desc "Build a RubyGem package (#{GEM_FILE_NAME})"
+# task :gem => gempath.to_s
+# file gempath.to_s => [PKGDIR.to_s] + GEMSPEC.files do
+# 	when_writing( "Creating GEM" ) do
+# 		Gem::Builder.new( GEMSPEC ).build
+# 		verbose( true ) do
+# 			mv GEM_FILE_NAME, gempath
+# 		end
+# 	end
+# end
+# 
 
-svnrev = get_svn_rev()
-prerelease_gem_file_name = "#{PKG_FILE_NAME}.#{svnrev}.gem"
-prerelease_gempath = PKGDIR + prerelease_gem_file_name
-
-desc "Build a pre-release RubyGem package"
-task :prerelease_gem => prerelease_gempath.to_s
-file prerelease_gempath.to_s => [PKGDIR.to_s] + GEMSPEC.files do
-	when_writing( "Creating prerelease GEM" ) do
-		gemspec = GEMSPEC.clone
-		gemspec.version = Gem::Version.create( "%s.%d" % [GEMSPEC.version, svnrev] )
-		Gem::Builder.new( gemspec ).build
-		verbose( true ) do
-			mv prerelease_gem_file_name, prerelease_gempath
-		end
-	end
+Gem::PackageTask.new( GEMSPEC ) do |pkg|
+	pkg.need_zip = true
+	pkg.need_tar = true
 end
 
 
@@ -60,7 +49,7 @@ task :install => "spec:quiet" do
 	sitelib = Pathname.new( CONFIG['sitelibdir'] )
 	sitearch = Pathname.new( CONFIG['sitearchdir'] )
 	Dir.chdir( LIBDIR ) do
-		LIB_FILES.each do |libfile|
+		LIB_FILES.collect {|path| Pathname(path) }.each do |libfile|
 			relpath = libfile.relative_path_from( LIBDIR )
 			target = sitelib + relpath
 			FileUtils.mkpath target.dirname,
@@ -101,7 +90,7 @@ task :uninstall do
 	sitearch = Pathname.new( CONFIG['sitearchdir'] )
 
 	Dir.chdir( LIBDIR ) do
-		LIB_FILES.each do |libfile|
+		LIB_FILES.collect {|path| Pathname(path) }.each do |libfile|
 			relpath = libfile.relative_path_from( LIBDIR )
 			target = sitelib + relpath
 			FileUtils.rm_f target, :verbose => true, :noop => $dryrun
@@ -131,3 +120,12 @@ end
 
 
 
+desc "Add development depdendencies to the gemspec -- this is meant to be chained " +
+     "together with :gem"
+task :include_dev_dependencies do
+	DEVELOPMENT_DEPENDENCIES.each do |name, version|
+		version = '>= 0' if version.length.zero?
+		GEMSPEC.add_development_dependency( name, version )
+	end
+end
+