Rakefile in rpeg-markdown-0.2.0 vs Rakefile in rpeg-markdown-1.0

@@ -3,28 +3,28 @@
 require 'rake/gempackagetask'
 
 task :default => :test
 
 DLEXT = Config::CONFIG['DLEXT']
-VERS = '0.2.0'
+VERS = '1.0'
 
 spec =
   Gem::Specification.new do |s|
     s.name              = "rpeg-markdown"
     s.version           = VERS
-    s.summary           = "Ruby extension library for peg-markdown"
+    s.summary           = "Fast Markdown implementation"
     s.files             = FileList[
-                            'README','LICENSE','Rakefile',
+                            'README.markdown','LICENSE','Rakefile',
                             '{lib,ext,test}/**.rb','ext/*.{c,h}',
                             'test/MarkdownTest*/**/*',
                             'bin/rpeg-markdown'
                           ]
     s.bindir            = 'bin'
     s.executables       << 'rpeg-markdown'
     s.require_path      = 'lib'
     s.has_rdoc          = true
-    s.extra_rdoc_files  = ['README', 'LICENSE']
+    s.extra_rdoc_files  = ['LICENSE']
     s.test_files        = FileList['test/markdown_test.rb']
     s.extensions        = ['ext/extconf.rb']
 
     s.author            = 'Ryan Tomayko'
     s.email             = '[e-mail]'
@@ -76,41 +76,45 @@
 file 'ext/Makefile' => FileList['ext/{extconf.rb,*.c,*.h,*.rb}'] do
   chdir('ext') { ruby 'extconf.rb' }
 end
 CLEAN.include 'ext/Makefile'
 
-file "ext/markdown.#{DLEXT}" => FileList['ext/Makefile', 'ext/*.{c,h,rb}'] do |f|
+file "ext/peg_markdown.#{DLEXT}" => FileList['ext/Makefile', 'ext/*.{c,h,rb}'] do |f|
   sh 'cd ext && make'
 end
 CLEAN.include 'ext/*.{o,bundle,so}'
 
-file "lib/markdown.#{DLEXT}" => "ext/markdown.#{DLEXT}" do |f|
+file "lib/peg_markdown.#{DLEXT}" => "ext/peg_markdown.#{DLEXT}" do |f|
   cp f.prerequisites, "lib/", :preserve => true
 end
+CLEAN.include "lib/*.{so,bundle}"
 
-desc 'Build the peg-markdown extension'
-task :build => "lib/markdown.#{DLEXT}"
+desc 'Build the peg_markdown extension'
+task :build => "lib/peg_markdown.#{DLEXT}"
 
 desc 'Run unit and conformance tests'
 task :test => [ 'test:unit', 'test:conformance' ]
 
 desc 'Run unit tests'
 task 'test:unit' => [:build] do |t|
   ruby 'test/markdown_test.rb'
 end
 
-desc 'Run conformance tests (MARKDOWN_TEST_VER=1.0)'
+desc "Run conformance tests (MARKDOWN_TEST_VER=#{ENV['MARKDOWN_TEST_VER'] ||= '1.0.3'})"
 task 'test:conformance' => [:build] do |t|
   script = "#{pwd}/bin/rpeg-markdown"
-  test_version = ENV['MARKDOWN_TEST_VER'] || '1.0'
+  test_version = ENV['MARKDOWN_TEST_VER']
   chdir("test/MarkdownTest_#{test_version}") do
     sh "./MarkdownTest.pl --script='#{script}' --tidy"
   end
 end
 
 desc 'Run version 1.0 conformance suite'
-task 'test:conformance:1.0' => 'test:conformance'
+task 'test:conformance:1.0' => [:build] do
+  ENV['MARKDOWN_TEST_VER'] = '1.0'
+  Rake::Task['test:conformance'].invoke
+end
 
 desc 'Run 1.0.3 conformance suite'
 task 'test:conformance:1.0.3' => [:build] do |t|
   ENV['MARKDOWN_TEST_VER'] = '1.0.3'
   Rake::Task['test:conformance'].invoke
@@ -127,10 +131,10 @@
 
 desc "See how much memory we're losing"
 task 'test:mem' => %w[submodule:exist build] do |t|
   $: << File.join(File.dirname(__FILE__), "lib")
   require 'markdown'
-  FileList['test.txt', 'peg-markdown/MarkdownTest_1.0.3/Tests/*.text'].each do |file|
+  FileList['test/mem.txt', 'peg-markdown/MarkdownTest_1.0.3/Tests/*.text'].each do |file|
     printf "%s: \n", file
     markdown = Markdown.new(File.read(file))
     iterations = (ENV['N'] || 100).to_i
     total, growth = [], []
     iterations.times do |i|