Merge remote branch 'danlucraft/master'

Conflicts (trivial):
	spec/spec_helpers.rb

bin/rak

@@ -39,7 +39,7 @@ class Rak
   VERSION_INFO=<<END
 rak #{VERSION}
 
-Copyright 2008 Daniel Lucraft, all rights reserved. 
+Copyright 2008-#{Time.now.year} Daniel Lucraft, all rights reserved. 
 Based on the perl tool 'ack' by Andy Lester.
 
 This program is free software; you can redistribute it and/or modify it

spec/help_spec.rb

@@ -11,10 +11,10 @@
   end
 
   it "--version prints version information" do
-    strip_ansi(%x{rak --version}).should == t=<<END
-rak 0.9
+    strip_ansi(rak "--version").should == t=<<END
+rak #{Rak::VERSION}
 
-Copyright 2008 Daniel Lucraft, all rights reserved. 
+Copyright 2008-#{Time.now.year} Daniel Lucraft, all rights reserved. 
 Based on the perl tool 'ack' by Andy Lester.
 
 This program is free software; you can redistribute it and/or modify it
@@ -23,28 +23,28 @@
   end
 
   it "prints unknown type errors" do
-    %x{rak Virg --type=pyth}.should == t=<<END
+    rak("Virg --type=pyth").should == t=<<END
 rak: Unknown --type "pyth"
 rak: See rak --help types
 END
   end
 
   it "--help prints help information" do
-    %x{rak Virg --help}.split("\n")[0].should == "Usage: rak [OPTION]... PATTERN [FILES]"
+    rak("Virg --help").split("\n")[0].should == "Usage: rak [OPTION]... PATTERN [FILES]"
   end
 
   it "--help types prints type information" do
-    %x{rak --help types}.split("\n")[2].should == "The following is the list of filetypes supported by rak.  You can"
+    rak("--help types").split("\n")[2].should == "The following is the list of filetypes supported by rak.  You can"
   end
 
   it "no options or patterns prints the usage info" do
-    %x{rak}.split("\n")[0].should == "Usage: rak [OPTION]... PATTERN [FILES]"
+    rak.split("\n")[0].should == "Usage: rak [OPTION]... PATTERN [FILES]"
   end
 
   it "prints a nice message for unknown options" do
     t=<<END
 rak: see rak --help for usage.
 END
-    %x{rak foo --asfdasfd 2>/dev/null}.include?(t).should be_true
+    rak("foo --asfdasfd 2>/dev/null").include?(t).should be_true
   end
 end

spec/spec_helpers.rb

@@ -10,6 +10,7 @@ def shell_escape
 end
 
 HERE = Pathname(__FILE__).parent.expand_path
+require(HERE.join("../lib/rak"))
 
 def ruby_bin
   File.join(
@@ -34,7 +35,7 @@ def asterize_ansi(str)
   replace_ansi(str, '*')
 end
 
-def rak(args, opts={})
+def rak(args="", opts={})
   begin
     unless args.is_a?(String)
       args = args.map{|str| str.shell_escape}.join(" ")