Commit 2233246b32a3420cfc780390dd26015aa979b1c3
Fix Rakefile deprecation warnings
John Firebaugh committed on 7/19/2012, 9:36:36 PMParent: 5f6b74ee8438ee2b911a21d93d6f9b3e89f55474
Files changed
| Gemfile.lock | changed |
| Rakefile | changed |
| bcrypt-ruby.gemspec | changed |
| Gemfile.lock | ||
|---|---|---|
| @@ -1,16 +1,20 @@ | ||
| 1 | 1 | PATH |
| 2 | 2 | remote: . |
| 3 | 3 | specs: |
| 4 | - bcrypt-ruby (3.0.0) | |
| 4 | + bcrypt-ruby (3.0.1) | |
| 5 | 5 | |
| 6 | 6 | GEM |
| 7 | 7 | remote: http://rubygems.org/ |
| 8 | 8 | specs: |
| 9 | 9 | diff-lcs (1.1.2) |
| 10 | + json (1.7.3) | |
| 11 | + json (1.7.3-java) | |
| 10 | 12 | rake (0.8.7) |
| 11 | 13 | rake-compiler (0.7.5) |
| 12 | 14 | rake |
| 15 | + rdoc (3.12) | |
| 16 | + json (~> 1.4) | |
| 13 | 17 | rspec (2.5.0) |
| 14 | 18 | rspec-core (~> 2.5.0) |
| 15 | 19 | rspec-expectations (~> 2.5.0) |
| 16 | 20 | rspec-mocks (~> 2.5.0) |
| @@ -25,5 +29,6 @@ | ||
| 25 | 29 | |
| 26 | 30 | DEPENDENCIES |
| 27 | 31 | bcrypt-ruby! |
| 28 | 32 | rake-compiler |
| 33 | + rdoc | |
| 29 | 34 | rspec |
| Rakefile | ||
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| 1 | 1 | require 'rspec/core/rake_task' |
| 2 | -require 'rake/gempackagetask' | |
| 2 | +require 'rubygems/package_task' | |
| 3 | 3 | require 'rake/extensiontask' |
| 4 | 4 | require 'rake/javaextensiontask' |
| 5 | 5 | require 'rake/contrib/rubyforgepublisher' |
| 6 | 6 | require 'rake/clean' |
| 7 | -require 'rake/rdoctask' | |
| 7 | +require 'rdoc/task' | |
| 8 | 8 | require 'benchmark' |
| 9 | 9 | |
| 10 | 10 | CLEAN.include( |
| 11 | 11 | "ext/mri/*.o", |
| @@ -36,16 +36,16 @@ | ||
| 36 | 36 | t.rcov_opts = ['--exclude', 'rspec,diff-lcs,rcov,_spec,_helper'] |
| 37 | 37 | end |
| 38 | 38 | |
| 39 | 39 | desc 'Generate RDoc' |
| 40 | -rd = Rake::RDocTask.new do |rdoc| | |
| 40 | +RDoc::Task.new do |rdoc| | |
| 41 | 41 | rdoc.rdoc_dir = 'doc/rdoc' |
| 42 | 42 | rdoc.options += GEMSPEC.rdoc_options |
| 43 | 43 | rdoc.template = ENV['TEMPLATE'] if ENV['TEMPLATE'] |
| 44 | 44 | rdoc.rdoc_files.include(*GEMSPEC.extra_rdoc_files) |
| 45 | 45 | end |
| 46 | 46 | |
| 47 | -Rake::GemPackageTask.new(GEMSPEC) do |pkg| | |
| 47 | +Gem::PackageTask.new(GEMSPEC) do |pkg| | |
| 48 | 48 | pkg.need_zip = true |
| 49 | 49 | pkg.need_tar = true |
| 50 | 50 | end |
| 51 | 51 | |
| bcrypt-ruby.gemspec | ||
|---|---|---|
| @@ -13,8 +13,9 @@ | ||
| 13 | 13 | s.require_path = 'lib' |
| 14 | 14 | |
| 15 | 15 | s.add_development_dependency 'rake-compiler' |
| 16 | 16 | s.add_development_dependency 'rspec' |
| 17 | + s.add_development_dependency 'rdoc' | |
| 17 | 18 | |
| 18 | 19 | s.has_rdoc = true |
| 19 | 20 | s.rdoc_options += ['--title', 'bcrypt-ruby', '--line-numbers', '--inline-source', '--main', 'README.md'] |
| 20 | 21 | s.extra_rdoc_files += ['README.md', 'COPYING', 'CHANGELOG', *Dir['lib/**/*.rb']] |
Built with git-ssb-web