linkparser 1.0.3 → 1.0.4

data/rake/rdoc.rb

@@ -1,22 +1,15 @@
 # 
-# RDoc Rake tasks for ThingFish
-# $Id: rdoc.rb 78 2008-12-18 22:04:10Z deveiant $
+# RDoc Rake tasks
+# $Id: rdoc.rb 93 2009-03-20 13:02:30Z deveiant $
 # 
 
-gem 'rdoc'
+gem 'rdoc', '>= 2.4.1'
 
+require 'rubygems'
 require 'rdoc/rdoc'
 require 'rake/clean'
 
 
-if RDoc::RDoc::GENERATORS.key?( 'darkfish' )
-	$have_darkfish = true
-else
-	trace "No darkfish generator."
-	$have_darkfish = false
-end
-
-
 # Append docs/lib to the load path if it exists for a locally-installed Darkfish
 DOCSLIB = DOCSDIR + 'lib'
 $LOAD_PATH.unshift( DOCSLIB.to_s ) if DOCSLIB.exist?
@@ -32,7 +25,7 @@ desc "Build API documentation in #{RDOCDIR}"
 task :rdoc => [ Rake.application.rakefile, *DOCFILES ] do
 	args = RDOC_OPTIONS 
 	args += [ '-o', RDOCDIR.to_s ]
-	args += [ '-f', 'darkfish' ] if $have_darkfish
+	args += [ '-f', 'darkfish' ]
 	args += DOCFILES.collect {|pn| pn.to_s }
 
 	trace "Building docs with arguments: %s" % [ args.join(' ') ]

data/rake/svn.rb

@@ -1,18 +1,16 @@
 # 
 # Subversion Rake Tasks
-# $Id: svn.rb 77 2008-12-18 16:35:24Z deveiant $
+# $Id: svn.rb 105 2009-06-01 19:20:12Z deveiant $
 # 
 # Authors:
 # * Michael Granger <ged@FaerieMUD.org>
 # 
 
-require 'rubygems'
-gem 'rake', '>= 0.8.3'
-
 require 'pp'
 require 'yaml'
 require 'date'
 require 'time'
+require 'abbrev'
 
 # Strftime format for tags/releases
 TAG_TIMESTAMP_FORMAT = '%Y%m%d-%H%M%S'
@@ -25,9 +23,9 @@ DEFAULT_KEYWORDS = %w[Date Rev Author URL Id]
 KEYWORDED_FILEDIRS = %w[applets spec bin etc ext experiments examples lib misc docs]
 KEYWORDED_FILEPATTERN = /
 	^(?:
-		(?:meta)?rakefile.*							# Rakefiles
+		(?:meta)?rakefile.*									# Rakefiles
 		|
-		.*\.(?:rb|c|h|js|html|css|template|erb)		# Source file extensions
+		.*\.(?:rb|c|h|js|html|css|template|erb|page)		# Source file extensions
 		|
 		readme|install|todo
 	)$/ix
@@ -58,8 +56,11 @@ end
 ### a hash.
 def get_svn_info( dir='.' )
 	return {} unless File.directory?( File.join(dir, '.svn') )
-	info = IO.read( '|-' ) or exec 'svn', 'info', dir
+	info = IO.read( '|-' ) or exec 'svn', 'info', dir.to_s
 	return YAML.load( info ) # 'svn info' outputs valid YAML! Yay!
+rescue NotImplementedError
+	trace "No fork(), proceeding without svn info..."
+	return {}
 end
 
 
@@ -204,6 +205,15 @@ def get_latest_release_tag
 end
 
 
+### Return the names of all existing branches.
+def get_branch_names
+	rooturl     = get_svn_repo_root()
+	branchesurl = rooturl + "/#{SVN_BRANCHES_DIR}"
+	
+	return svn_ls( branchesurl )
+end
+
+
 ### Extract a diff from the specified subversion working +dir+ and return it.
 def make_svn_commit_log( dir='.' )
 	diff = IO.read( '|-' ) or exec 'svn', 'diff'
@@ -382,14 +392,15 @@ namespace :svn do
 	desc "Copy the HEAD revision of the current #{SVN_TRUNK_DIR}/ to #{SVN_BRANCHES_DIR} with a " +
 	     "user-specified name."
 	task :branch, [:name] do |task, args|
-		unless args.name
-			args.name = prompt( "Branch name" ) or abort
+		branchname = args.name
+		unless branchname
+			branchname = prompt( "Branch name" ) or abort
 		end
 		
 		svninfo      = get_svn_info()
 		svntrunk     = Pathname.new( svninfo['Repository Root'] ) + SVN_TRUNK_DIR
 		svnbranchdir = Pathname.new( svninfo['Repository Root'] ) + SVN_BRANCHES_DIR
-		svnbranch    = svnbranchdir + args.name
+		svnbranch    = svnbranchdir + branchname
 
 		desc = "Making a new branch: #{svnbranch}"
 		ask_for_confirmation( desc ) do
@@ -401,6 +412,33 @@ namespace :svn do
 		end
 	end
 	
+	
+	desc "Switch the working copy to the named branch"
+	task :switch, [:name] do |task, args|
+		branches = get_branch_names().collect {|name| name.chomp('/') }
+
+		unless args.name
+			log "Branches are:\n" + branches.collect {|br| "  #{br}" }.join( "\n" )
+			
+			begin
+				oldproc = Readline.completion_proc
+				abbrev = branches.abbrev 
+				Readline.completion_proc = lambda{|string| abbrev[string] }
+			
+				name = prompt( "Branch to switch to" ) or abort
+				args.with_defaults( :name => name )
+			ensure
+				Readline.completion_proc = oldproc unless oldproc.nil?
+			end
+		end
+
+		svninfo = get_svn_info()
+		abort "Branch '#{args.name}' does not exist" unless branches.include?( args.name )
+		branchuri = Pathname.new( svninfo['Repository Root'] ) + SVN_BRANCHES_DIR + args.name
+		run 'svn', 'sw', branchuri
+	end
+	task :sw => :switch
+	
 
 	desc "Switch to the trunk if the working copy isn't there already."
 	task :trunk do
@@ -529,7 +567,7 @@ namespace :svn do
 	desc "Check in all the changes in your current working copy"
 	task :checkin => ['svn:update', 'svn:newfiles', 'test', 'svn:fix_keywords', COMMIT_MSG_FILE] do
 		targets = get_target_args()
-		$deferr.puts '---', File.read( COMMIT_MSG_FILE ), '---'
+		$stderr.puts '---', File.read( COMMIT_MSG_FILE ), '---'
 		ask_for_confirmation( "Continue with checkin?" ) do
 			run 'svn', 'ci', '-F', COMMIT_MSG_FILE, targets
 			rm_f COMMIT_MSG_FILE
@@ -562,7 +600,7 @@ namespace :svn do
 		end
 		
 		unless files_needing_fixups.empty?
-			$deferr.puts "Files needing keyword fixes: ",
+			$stderr.puts "Files needing keyword fixes: ",
 				files_needing_fixups.collect {|f|
 					"  %s: %s" % [f, kwmap[f] ? kwmap[f].join(' ') : "(no keywords)"]
 				}

data/rake/testing.rb

@@ -1,6 +1,6 @@
 # 
 # Rake tasklib for testing tasks
-# $Id: testing.rb 80 2008-12-20 19:50:19Z deveiant $
+# $Id: testing.rb 99 2009-04-14 13:03:03Z deveiant $
 # 
 # Authors:
 # * Michael Granger <ged@FaerieMUD.org>
@@ -45,6 +45,7 @@ begin
 	require 'spec/rake/spectask'
 
 	### Task: spec
+	desc "Run specs"
 	task :spec => 'spec:doc'
 
 	namespace :spec do

data/rake/win32.rb

@@ -0,0 +1,186 @@
+# 
+# Win32-specific tasks (cross-compiling, etc.)
+# 
+# Thanks to some people that understand this stuff better than me for
+# posting helpful blog posts. This stuff is an amalgam of stuff they did:
+# 
+# * Mauricio Fernandez
+#   http://eigenclass.org/hiki/cross+compiling+rcovrt
+# 
+# * Jeremy Hinegardner
+#   http://www.copiousfreetime.org/articles/2008/10/12/building-gems-for-windows.html
+# 
+# * Aaron Patterson
+#   http://tenderlovemaking.com/2008/11/21/cross-compiling-ruby-gems-for-win32/
+
+require 'rake'
+require 'pathname'
+require 'rubygems/platform'
+require 'rbconfig'
+require 'uri'
+require 'net/ftp'
+
+HOMEDIR        = Pathname( '~' ).expand_path
+RUBYVERSION    = '1.8.6-p287'
+RUBYVERSION_MAJORMINOR = RUBYVERSION[/^\d+\.\d+/]
+
+RUBY_DL_BASE   = "ftp://ftp.ruby-lang.org/pub/ruby/#{RUBYVERSION_MAJORMINOR}/"
+RUBY_DL_URI    = URI( RUBY_DL_BASE + "ruby-#{RUBYVERSION}.tar.gz" )
+
+XCOMPILER_DIR  = HOMEDIR + '.ruby_mingw32'
+
+XCOMPILER_DL   = XCOMPILER_DIR + "ruby-#{RUBYVERSION}.tar.gz"
+XCOMPILER_SRC  = XCOMPILER_DIR + "ruby-#{RUBYVERSION}"
+
+XCOMPILER_BIN  = XCOMPILER_DIR + 'bin'
+XCOMPILER_LIB  = XCOMPILER_DIR + 'lib'
+XCOMPILER_RUBY = XCOMPILER_BIN + 'ruby.exe'
+
+XCOMPILER_LOAD_PATH = XCOMPILER_LIB + "ruby/#{RUBYVERSION_MAJORMINOR}/i386-mingw32"
+
+TAR_OPTS = { :compression => :gzip }
+
+WIN32_GEMSPEC = GEMSPEC.dup
+WIN32_GEMSPEC.files += FileList[ EXTDIR + '**.{dll,so}' ]
+WIN32_GEMSPEC.platform = Gem::Platform.new( 'i386-mingw32' )
+WIN32_GEMSPEC.extensions = []
+
+
+CONFIGURE_CMD = %W[
+	env
+		ac_cv_func_getpgrp_void=no
+		ac_cv_func_setpgrp_void=yes
+		rb_cv_negative_time_t=no
+		ac_cv_func_memcmp_working=yes
+		rb_cv_binary_elf=no
+    ./configure
+	    --host=i386-mingw32
+	    --target=i386-mingw32
+	    --build=#{Config::CONFIG['build']}
+	    --prefix=#{XCOMPILER_DIR}
+]
+
+### Archive::Tar::Reader#extract (as of 0.9.0) is broken w.r.t.
+### permissions, so we have to do this ourselves.
+def untar( tarfile, targetdir )
+	targetdir = Pathname( targetdir )
+	raise "No such directory: #{targetdir}" unless targetdir.directory?
+
+	reader = Archive::Tar::Reader.new( tarfile.to_s, TAR_OPTS )
+	
+	mkdir_p( targetdir )
+	reader.each( true ) do |header, body|
+		path = targetdir + header[:path]
+		# trace "Header is: %p" % [ header ]
+
+		case header[:type]
+		when :file
+			trace "  #{path}"
+			path.open( File::WRONLY|File::EXCL|File::CREAT|File::TRUNC, header[:mode] ) do |fio|
+				bytesize = header[:size]
+				fio.write( body[0,bytesize] )
+			end
+
+		when :directory
+			trace "  #{path}"
+			path.mkpath
+			
+		when :link
+			linktarget = targetdir + header[:dest]
+			trace "  #{path} => #{linktarget}"
+			path.make_link( linktarget.to_s )
+
+		when :symlink
+			linktarget = targetdir + header[:dest]
+			trace "  #{path} -> #{linktarget}" 
+			path.make_symlink( linktarget )
+		end
+	end
+	
+end
+
+
+begin
+	require 'archive/tar'
+	
+	namespace :win32 do
+		directory XCOMPILER_DIR.to_s
+		
+		file XCOMPILER_DL => XCOMPILER_DIR do
+			# openuri can't handle this -- passive ftp required?
+			# run 'wget', '-O', XCOMPILER_DL, RUBY_DL_URI
+			log "Downloading ruby distro from %s" % [ RUBY_DL_URI ]
+			ftp = Net::FTP.new( RUBY_DL_URI.host )
+			ftp.login
+			ftp.getbinaryfile( RUBY_DL_URI.path, XCOMPILER_DL, 4096 )
+			ftp.close
+		end
+
+		directory XCOMPILER_SRC.to_s
+		task XCOMPILER_SRC => [ XCOMPILER_DIR, XCOMPILER_DL ] do
+			if XCOMPILER_SRC.exist?
+				trace "Rake fails. #{XCOMPILER_SRC} already exists."
+			else
+				untar( XCOMPILER_DL, XCOMPILER_DIR )
+			end
+		end
+
+		file XCOMPILER_RUBY => XCOMPILER_SRC do
+			Dir.chdir( XCOMPILER_SRC ) do
+				unless File.exist?( 'Makefile.in.orig' )
+					File.open( 'Makefile.in.new', IO::CREAT|IO::WRONLY|IO::EXCL ) do |ofh|
+						IO.readlines( 'Makefile.in' ).each do |line|
+							next if line.include?( 0.chr )
+							trace "  copying line: %p" % [ line ]
+							line.sub!( /ALT_SEPARATOR = ".*?"/, "ALT_SEPARATOR = 92.chr" )
+							ofh.write( line )
+						end
+					end
+
+					mv 'Makefile.in', 'Makefile.in.orig'
+					mv 'Makefile.in.new', 'Makefile.in'
+				end
+				
+				run *CONFIGURE_CMD
+				run 'make', 'ruby'
+				run 'make', 'rubyw.exe'
+				run 'make', 'install'
+			end
+		end
+
+		file XCOMPILER_LOAD_PATH => XCOMPILER_RUBY
+
+		desc "Cross-compile the library for Win32 systems, installing a cross-" +
+		     "compiled Ruby if necessary"
+		task :build => [ EXTDIR, XCOMPILER_LOAD_PATH.to_s ] do
+			in_subdirectory( EXTDIR ) do
+				ruby "-I#{XCOMPILER_LOAD_PATH}", 'extconf.rb'
+				sh 'make'
+			end
+		end
+		
+		desc "Build a binary gem for win32 systems"
+		task :gem => ['win32:build', PKGDIR.to_s] + WIN32_GEMSPEC.files do
+			when_writing( "Creating win32 GEM" ) do
+				pkgname = WIN32_GEMSPEC.file_name
+				builder = Gem::Builder.new( WIN32_GEMSPEC )
+				builder.build
+				mv pkgname, PKGDIR + pkgname, :verbose => $trace
+			end
+		end
+	end
+
+rescue LoadError => err
+	task :no_win32_build do
+		abort "No win32 build: %s: %s" % [ err.class.name, err.message ]
+	end
+	
+	namespace :win32 do
+		desc "Build a binary Gem for Win32 systems, installing a cross " +
+		     "compiled Ruby if necessary"
+		task :build => :no_win32_build
+	end
+			
+end
+
+

data/spec/linkparser/parseoptions_spec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -w
 #
 # Specification for the LinkParser::ParseOptions class
-# $Id: parseoptions_spec.rb 48 2008-12-19 18:30:33Z deveiant $
+# $Id: parseoptions_spec.rb 53 2009-06-03 12:52:13Z deveiant $
 #
 # See the LICENSE file in the distribution for information about copyright and licensing.
 #
@@ -73,6 +73,20 @@ describe LinkParser::ParseOptions do
 			@opts.reset_resources
 		}.should_not raise_error()
 	end
+
+
+	describe "in versions of link-grammar >= 4.5.0" do
+	
+		before( :each ) do
+			version_vec = LinkParser.link_grammar_version[/(\d+\.\d+\.\d+)/, 1].
+				split('.').collect {|v| v.to_i }.pack('n*')
+			pending "the underlying library is %s" unless version_vec >= [4,5,0].pack('n*')
+		end
+
+		it "knows whether spell_guessing is enabled or not" do
+			@opts.spell_guessing_enabled?.should == true
+		end
+	end
 	
 end
 

data/spec/linkparser/sentence_spec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -w
 #
 # Specification for the LinkParser::Sentence class
-# $Id: sentence_spec.rb 48 2008-12-19 18:30:33Z deveiant $
+# $Id: sentence_spec.rb 53 2009-06-03 12:52:13Z deveiant $
 #
 # See the LICENSE file in the distribution for information about copyright and licensing.
 #
@@ -33,8 +33,18 @@ describe LinkParser::Sentence do
 		@sentence = LinkParser::Sentence.new( "The cat runs.", @dict )
 	end
 	
-	
-	it "returns an informational string when inspected" do
+	it "returns an informational string when inspected before it's been parsed" do
+		@sentence.inspect.should =~ %r{
+			<
+				LinkParser::Sentence:0x[[:xdigit:]]+
+				\s
+				\(unparsed\)
+			>
+		}x
+	end
+
+	it "returns an informational string when inspected after it's been parsed" do
+		@sentence.parse
 		@sentence.inspect.should =~ %r{
 			<
 				LinkParser::Sentence:0x[[:xdigit:]]+
@@ -69,12 +79,12 @@ describe LinkParser::Sentence do
 	it "delegates linkage methods to its first linkage" do
 		@sentence.num_links.should == 5
 	end
-
+	
 
 	it "knows whether or not it's been parsed" do
-		@sentence.parsed?.should be_false()
+		@sentence.should_not be_parsed()
 		@sentence.parse
-		@sentence.parsed?.should be_true()
+		@sentence.should be_parsed()
 	end
 
 
@@ -113,5 +123,20 @@ describe LinkParser::Sentence do
 		end
 	end
 
+
+	describe "parsed from a sentence that yields no linkages" do
+	
+		before( :each ) do
+			@sentence = @dict.parse( "The event that he smiled at me gives me hope" )
+		end
+	
+		it "raises a descriptive exception if a delegated method is called" do
+			expect {
+				@sentence.constituent_tree_string
+			}.to raise_error( LinkParser::Error, /sentence has no linkages/i )
+		end
+
+	end
+
 end