Streamline package and spec files

Gemfile

@@ -1,8 +1,2 @@
-source "http://rubygems.org"
-
-group :test do
-   gem "rspec", "~> 2.0.0.beta12" 
-   gem "rack-test", :require => "rack/test"
-end
-
-gem "rake"
+source :rubygems
+gemspec

Rakefile

@@ -1,14 +1,4 @@
-require "bundler"
-Bundler.setup
+require "bundler/gem_tasks"
 
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
-
-gemspec = eval(File.read("rack-no-www.gemspec"))
-
-task :build => "#{gemspec.full_name}.gem"
-
-file "#{gemspec.full_name}.gem" => gemspec.files + ["rack-no-www.gemspec"] do
-  system "gem build rack-no-www.gemspec"
-  system "gem install rack-no-www-#{Rack::NoWWW::VERSION}.gem"
-end

rack-no-www.gemspec

@@ -1,9 +1,10 @@
-require File.expand_path("../lib/rack/no-www/version", __FILE__)
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "rack/no-www/version"
 
 Gem::Specification.new do |s|
   s.name        = "rack-no-www"
   s.version     = Rack::NoWWW::VERSION
-  s.platform    = Gem::Platform::RUBY
   s.authors     = ["logicaltext"]
   s.email       = ["logicaltext@logicaltext.com"]
   s.homepage    = "http://github.com/logicaltext/rack-no-www"
@@ -15,7 +16,10 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "rack-no-www"
 
-  s.files        = Dir[ 'lib/**/*', 'LICENSE']
-  s.require_path = 'lib'
+  s.add_development_dependency "rspec", "~> 2.0"
+  s.add_development_dependency "rack-test"
 
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths = ["lib"]
 end

spec/spec_helper.rb

@@ -1,6 +1,4 @@
 require "rubygems"
-require "bundler"
-require 'rack/mock'
-require 'rack/no-www'
-Bundler.setup
-Bundler.require(:test)
+require "bundler/setup"
+require "rack/test"
+require "rack/no-www"