From 8e3f0c122e420fb97e365f49d196bd32f1d1a419 Mon Sep 17 00:00:00 2001
From: Jonathan Rudenberg <jonathan@shopify.com>
Date: Sat, 15 Oct 2011 19:56:03 -0400
Subject: [PATCH] Clean up Rakefile and gemspec

---
 Manifest.txt   | 34 ----------------------------------
 Rakefile       | 14 ++++++--------
 liquid.gemspec | 16 +++++++---------
 3 files changed, 13 insertions(+), 51 deletions(-)
 delete mode 100644 Manifest.txt

diff --git a/Manifest.txt b/Manifest.txt
deleted file mode 100644
index cbc3e89..0000000
--- a/Manifest.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-CHANGELOG
-History.txt
-MIT-LICENSE
-Manifest.txt
-README.md
-Rakefile
-init.rb
-lib/extras/liquid_view.rb
-lib/liquid.rb
-lib/liquid/block.rb
-lib/liquid/condition.rb
-lib/liquid/context.rb
-lib/liquid/document.rb
-lib/liquid/drop.rb
-lib/liquid/errors.rb
-lib/liquid/extensions.rb
-lib/liquid/file_system.rb
-lib/liquid/htmltags.rb
-lib/liquid/module_ex.rb
-lib/liquid/standardfilters.rb
-lib/liquid/strainer.rb
-lib/liquid/tag.rb
-lib/liquid/tags/assign.rb
-lib/liquid/tags/capture.rb
-lib/liquid/tags/case.rb
-lib/liquid/tags/comment.rb
-lib/liquid/tags/cycle.rb
-lib/liquid/tags/for.rb
-lib/liquid/tags/if.rb
-lib/liquid/tags/ifchanged.rb
-lib/liquid/tags/include.rb
-lib/liquid/tags/unless.rb
-lib/liquid/template.rb
-lib/liquid/variable.rb
diff --git a/Rakefile b/Rakefile
index 2bcba2d..0fe61d1 100755
--- a/Rakefile
+++ b/Rakefile
@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
-$:.unshift File.join(File.dirname(__FILE__), 'test') unless $:.include? File.join(File.dirname(__FILE__), 'test')
 
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 task :default => 'test'
 
@@ -15,21 +14,22 @@ Rake::TestTask.new(:test) do |t|
 end
 
 gemspec = eval(File.read('liquid.gemspec'))
-Rake::GemPackageTask.new(gemspec) do |pkg|
+Gem::PackageTask.new(gemspec) do |pkg|
   pkg.gem_spec = gemspec
 end
 
-desc "build the gem and release it to rubygems.org"
+desc "Build the gem and release it to rubygems.org"
 task :release => :gem do
   sh "gem push pkg/liquid-#{gemspec.version}.gem"
 end
 
-namespace :benchmark do 
+namespace :benchmark do
 
   desc "Run the liquid benchmark"
-  task :run do 
+  task :run do
     ruby "performance/benchmark.rb"
   end
+
 end
 
 
@@ -37,9 +37,7 @@ namespace :profile do
 
   desc "Run the liquid profile/performance coverage"
   task :run do
-
     ruby "performance/profile.rb"
-
   end
 
   desc "Run KCacheGrind"
diff --git a/liquid.gemspec b/liquid.gemspec
index 14e4ea5..66c1c37 100644
--- a/liquid.gemspec
+++ b/liquid.gemspec
@@ -1,23 +1,21 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 
 Gem::Specification.new do |s|
-  s.platform    = Gem::Platform::RUBY
-
   s.name        = "liquid"
-  s.version     = '2.2.2'
+  s.version     = "2.2.2"
+  s.platform    = Gem::Platform::RUBY
   s.summary     = "A secure, non-evaling end user template engine with aesthetic markup."
-
   s.authors     = ["Tobias Luetke"]
   s.email       = ["tobi@leetsoft.com"]
   s.homepage    = "http://www.liquidmarkup.org"
-
   s.description = "A secure, non-evaling end user template engine with aesthetic markup."
 
   s.required_rubygems_version = ">= 1.3.7"
 
-  s.files             = Dir.glob("{lib}/**/*") + %w(MIT-LICENSE README.md)
+  s.test_files  = Dir.glob("{test}/**/*")
+  s.files       = Dir.glob("{lib}/**/*") + %w(MIT-LICENSE README.md)
 
-  s.extra_rdoc_files  = ["History.txt", "Manifest.txt", "README.md"]
+  s.extra_rdoc_files  = ["History.txt", "README.md"]
 
-  s.require_path = 'lib'
+  s.require_path = "lib"
 end