Rakefile in iniparse-1.1.3 vs Rakefile in iniparse-1.1.4

@@ -1,73 +1,128 @@
+require 'rubygems'
+require 'rake'
+require 'date'
+
 require 'rake/clean'
 require 'rake/rdoctask'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 ##############################################################################
+# Helpers
+##############################################################################
+
+def name
+  @name ||= Dir['*.gemspec'].first.split('.').first
+end
+
+def version
+  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
+  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
+end
+
+def date
+  Date.today.to_s
+end
+
+def rubyforge_project
+  name
+end
+
+def gemspec_file
+  "#{name}.gemspec"
+end
+
+def gem_file
+  "#{name}-#{version}.gem"
+end
+
+def replace_header(head, header_name)
+  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
+end
+
+##############################################################################
 # Packaging & Installation.
 ##############################################################################
 
 CLEAN.include ['pkg', '*.gem', 'doc', 'coverage']
 
-begin
-  require 'jeweler'
+desc 'Build the gem, and push to Github'
+task :release => :build do
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
+    exit!
+  end
+  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git tag v#{version}"
+  sh "git push origin master"
+  sh "git push origin v#{version}"
 
-  Jeweler::Tasks.new do |gem|
-    gem.name        = 'iniparse'
-    gem.platform    = Gem::Platform::RUBY
-    gem.summary     = 'A pure Ruby library for parsing INI documents.'
-    gem.description = gem.summary
-    gem.author      = 'Anthony Williams'
-    gem.email       = '[e-mail]'
-    gem.homepage    = 'http://github.com/antw/iniparse'
+  puts "Push to Rubygems.org with"
+  puts "  gem push pkg/#{name}-#{version}.gem"
+end
 
-    gem.files       = %w(LICENSE README.rdoc Rakefile VERSION) +
-                      Dir.glob("{lib,spec}/**/*")
+desc 'Builds the IniParse gem'
+task :build => :gemspec do
+  sh "mkdir -p pkg"
+  sh "gem build #{gemspec_file}"
+  sh "mv #{gem_file} pkg"
+end
 
-    # rdoc
-    gem.has_rdoc = true
-    gem.extra_rdoc_files = %w(README.rdoc History LICENSE VERSION)
+desc 'Creates a fresh gemspec'
+task :gemspec => :validate do
+  # read spec file and split out manifest section
+  spec = File.read(gemspec_file)
+  head, manifest, tail = spec.split("  # = MANIFEST =\n")
 
-    # Dependencies
-    gem.add_development_dependency 'rspec', '>= 1.2.0'
-  end
+  # replace name version and date
+  replace_header(head, :name)
+  replace_header(head, :version)
+  replace_header(head, :date)
+  #comment this out if your rubyforge_project has a different name
+  replace_header(head, :rubyforge_project)
 
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts 'Jeweler (or a dependency) not available. Install it with: gem ' \
-       'install jeweler'
+  # determine file list from git ls-files
+  files = `git ls-files`.
+    split("\n").
+    sort.
+    reject { |file| file =~ /^\./ }.
+    reject { |file| file =~ /^(rdoc|pkg)/ }.
+    map { |file| "    #{file}" }.
+    join("\n")
+
+  # piece file back together and write
+  manifest = "  s.files = %w[\n#{files}\n  ]\n"
+  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
+  File.open(gemspec_file, 'w') { |io| io.write(spec) }
+  puts "Updated #{gemspec_file}"
 end
 
+task :validate do
+  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
+  unless libfiles.empty?
+    puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
+    exit!
+  end
+  unless Dir['VERSION*'].empty?
+    puts "A `VERSION` file at root level violates Gem best practices."
+    exit!
+  end
+end
+
 ##############################################################################
 # Documentation
 ##############################################################################
 
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "iniparse #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
 ##############################################################################
 # Tests & Metrics.
 ##############################################################################
 
-desc "Run all examples"
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-  spec.spec_opts = ['-c -f p']
-end
-
-desc "Run all examples with RCov"
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new('spec') do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
-  spec.spec_opts = ['-c -f s']
-  spec.rcov = true
-  spec.rcov_opts = ['--exclude', 'spec']
 end
-
-task :spec => :check_dependencies