Pulled gemspec out of Rakefile and fucked with Rakefile a bunch so th…

…at it wasn't so fucking deprecated

.gitignore

@@ -2,3 +2,4 @@
 site/public/index.html
 pkg/
 **.gem
+rdoc/

Rakefile

@@ -1,9 +1,9 @@
 require 'rubygems'
 require 'rake'
+require "rake/task"
 require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
+require 'rdoc/task'
+require 'rubygems/package_task'
 
 require File.dirname(__FILE__) + '/lib/aws/s3'
 
@@ -19,7 +19,7 @@ Rake::TestTask.new do |test|
 end
 
 namespace :doc do
-  Rake::RDocTask.new do |rdoc|  
+  RDoc::Task.new do |rdoc|  
     rdoc.rdoc_dir = 'doc'  
     rdoc.title    = "AWS::S3 -- Support for Amazon S3's REST api"  
     rdoc.options << '--line-numbers' << '--inline-source'
@@ -36,7 +36,7 @@ namespace :doc do
   end
 
   task :readme do
-    require 'support/rdoc/code_info'
+    require './support/rdoc/code_info'
     RDoc::CodeInfo.parse('lib/**/*.rb')
 
     strip_comments = lambda {|comment| comment.gsub(/^# ?/, '')}
@@ -81,8 +81,8 @@ namespace :dist do
   end
 
   # Regenerate README before packaging
-  task :package => 'doc:readme'
-  Rake::GemPackageTask.new(spec) do |pkg|
+  task :package
+  Gem::PackageTask.new(spec) do |pkg|
     pkg.need_tar_gz = true
     pkg.package_files.include('{lib,script,test,support}/**/*')
     pkg.package_files.include('README')
@@ -292,8 +292,6 @@ end if File.exists?(File.join(library_root, 'TODO'))
 
 namespace :site do
   require 'erb'
-  require 'rdoc/markup/simple_markup'
-  require 'rdoc/markup/simple_markup/to_html'
 
   readme    = lambda { IO.read('README')[/^== Getting started\n(.*)/m, 1] }
 

aws-s3.gemspec

@@ -1,20 +1,23 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-
 Gem::Specification.new do |s|
-	s.name = "aws-s3"
-	s.version = "0.6.3"
-	s.authors = ["Chris Small", "Marcel Molina (original)"]
-	s.email = "[email protected]"
-	s.homepage = "https://github.com/metasoarous/aws-s3"
-	s.summary = "The standard AWS::S3 with improved support for expiration dates"
-	s.description = "Enables the user to connect to Amazon Web Services using a rest interface."
-
-	s.add_dependency "builder", ">=3.0"
-
-	s.files = `git ls-files`.split("\n")
-	s.test_files = `git ls-files -- {test,spec}/*`.split("\n")
-	s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-	s.require_paths = ["lib"]
-
+	s.name              = 'aws-s3'
+	s.version           = Gem::Version.new(AWS::S3::Version)
+	s.summary           = "Client library for Amazon's Simple Storage Service's REST API"
+	s.description       = s.summary
+	s.email             = '[email protected]'
+	s.author            = 'Marcel Molina Jr.'
+	s.has_rdoc          = true
+	s.extra_rdoc_files  = %w(README COPYING INSTALL)
+	s.homepage          = 'http://amazon.rubyforge.org'
+	s.rubyforge_project = 'amazon'
+	s.files             = FileList['Rakefile', 'lib/**/*.rb', 'bin/*', 'support/**/*.rb']
+	s.executables       << 's3sh'
+	s.test_files        = Dir['test/**/*']
+
+	s.add_dependency 'xml-simple'
+	s.add_dependency 'builder'
+	s.add_dependency 'mime-types'
+	s.rdoc_options  = ['--title', "AWS::S3 -- Support for Amazon S3's REST api",
+				   '--main',  'README',
+				   '--line-numbers', '--inline-source']
 end
+