mark v0.2.pre, use RDoc 2.5, cleanup gemspec

Rakefile

@@ -1,42 +1,3 @@
-require 'lib/hanna/version'
-
-desc "generates .gemspec file"
-task :gemspec do
-  spec = Gem::Specification.new do |p|
-    p.name = 'hanna'
-    p.version = Hanna::VERSION
-
-    p.summary     = "An RDoc template that scales"
-    p.description = "Hanna is an RDoc implemented in Haml, making its source clean and maintainable. It's built with simplicity, beauty and ease of browsing in mind."
-
-    p.author = 'Mislav Marohnić'
-    p.email  = 'mislav.marohnic@gmail.com'
-    p.homepage = 'http://github.com/mislav/hanna'
-
-    p.add_dependency 'rdoc', Hanna::RDOC_VERSION_REQUIREMENT
-    p.add_dependency 'haml', '~> 2.0.4'
-    p.add_dependency 'rake', '~> 0.8.2'
-
-    p.files = FileList.new('Rakefile', '{bin,lib,sample}/**/*', 'README*', 'LICENSE*').
-                exclude('sample/rhythm.png', 'sample/output').reject { |f| File.directory?(f) }
-
-    p.executables = Dir['bin/*'].map { |f| File.basename(f) }
-
-    p.rubyforge_project = nil
-    p.has_rdoc = false
-  end
-
-  spec_string = spec.to_ruby
-
-  begin
-    Thread.new { eval("$SAFE = 3\n#{spec_string}", binding) }.join 
-  rescue
-    abort "unsafe gemspec: #{$!}"
-  else
-    File.open("#{spec.name}.gemspec", 'w') { |file| file.write spec_string }
-  end
-end
-
 namespace :sample do
   task :doc do
     puts "generating sample output"

hanna.gemspec

@@ -1,40 +1,22 @@
-# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/hanna/version', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = %q{hanna}
-  s.version = "0.1.7"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Mislav Marohni\304\207"]
-  s.date = %q{2009-02-17}
-  s.default_executable = %q{hanna}
-  s.description = %q{Hanna is an RDoc implemented in Haml, making its source clean and maintainable. It's built with simplicity, beauty and ease of browsing in mind.}
-  s.email = %q{mislav.marohnic@gmail.com}
-  s.executables = ["hanna"]
-  s.extra_rdoc_files = ["bin/hanna", "lib/hanna/hanna.rb", "lib/hanna/rdoc_version.rb", "lib/hanna/rdoctask.rb", "lib/hanna/template_files/class_index.haml", "lib/hanna/template_files/file_index.haml", "lib/hanna/template_files/index.haml", "lib/hanna/template_files/layout.haml", "lib/hanna/template_files/method_index.haml", "lib/hanna/template_files/method_list.haml", "lib/hanna/template_files/page.haml", "lib/hanna/template_files/sections.haml", "lib/hanna/template_files/styles.sass", "lib/hanna/template_files/prototype-1.6.0.3.js", "lib/hanna/template_files/method_search.js", "lib/hanna/template_helpers.rb", "lib/hanna/template_page_patch.rb", "lib/hanna.rb", "README.markdown"]
-  s.files = ["bin/hanna", "hanna.gemspec", "lib/hanna/hanna.rb", "lib/hanna/rdoc_version.rb", "lib/hanna/rdoctask.rb", "lib/hanna/template_files/class_index.haml", "lib/hanna/template_files/file_index.haml", "lib/hanna/template_files/index.haml", "lib/hanna/template_files/layout.haml", "lib/hanna/template_files/method_index.haml", "lib/hanna/template_files/method_list.haml", "lib/hanna/template_files/page.haml", "lib/hanna/template_files/sections.haml", "lib/hanna/template_files/styles.sass", "lib/hanna/template_files/prototype-1.6.0.3.js", "lib/hanna/template_files/method_search.js", "lib/hanna/template_helpers.rb", "lib/hanna/template_page_patch.rb", "lib/hanna.rb", "Manifest", "Rakefile", "README.markdown"]
-  s.homepage = %q{http://github.com/mislav/hanna}
-  s.rdoc_options = ["--line-numbers", "--title", "Hanna", "--main", "README.markdown"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{An RDoc template that scales}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rdoc>, ["~> 2.3.0"])
-      s.add_runtime_dependency(%q<haml>, ["~> 2.0.4"])
-      s.add_runtime_dependency(%q<rake>, ["~> 0.8.2"])
-    else
-      s.add_dependency(%q<rdoc>, ["~> 2.3.0"])
-      s.add_dependency(%q<haml>, ["~> 2.0.4"])
-      s.add_dependency(%q<rake>, ["~> 0.8.2"])
-    end
-  else
-    s.add_dependency(%q<rdoc>, ["~> 2.3.0"])
-    s.add_dependency(%q<haml>, ["~> 2.0.4"])
-    s.add_dependency(%q<rake>, ["~> 0.8.2"])
-  end
+Gem::Specification.new do |gem|
+  gem.name    = 'hanna'
+  gem.version = Hanna::VERSION
+  gem.date    = Date.today.to_s
+
+  gem.add_dependency 'rdoc', Hanna::RDOC_VERSION_REQUIREMENT
+  gem.add_dependency 'haml', '~> 2.2.22'
+
+  gem.summary = "An RDoc template that scales"
+  gem.description = "Hanna is an RDoc implemented in Haml, making its source clean and maintainable. It's built with simplicity, beauty and ease of browsing in mind."
+
+  gem.authors  = ['Mislav Marohnić']
+  gem.email    = 'mislav.marohnic@gmail.com'
+  gem.homepage = 'http://github.com/mislav/hanna'
+
+  gem.rubyforge_project = nil
+  gem.has_rdoc = true
+
+  gem.files = Dir['Rakefile', '{bin,lib,man,test,spec}/**/*', 'README*', 'LICENSE*'] & `git ls-files -z`.split("\0")
 end

lib/hanna/version.rb

@@ -1,13 +1,14 @@
 class Hanna
-  VERSION = '0.2.0'
-  RDOC_VERSION = '2.4.2'
+  VERSION = '0.2.pre'
+  RDOC_VERSION = '2.5.0'
   RDOC_VERSION_REQUIREMENT = "~> #{RDOC_VERSION}"
 
   def self.activate_rdoc_gem
     begin
       gem 'rdoc', RDOC_VERSION_REQUIREMENT
     rescue Gem::LoadError
       $stderr.puts "Error: Hanna requires the RDoc #{RDOC_VERSION} gem"
+      $stderr.puts "  [sudo] gem install rdoc -v '#{RDOC_VERSION_REQUIREMENT}'"
       exit 1
     end 
   end