Permalink
Browse files

[NEW] Updated rdoc task definition in attempt to fix build under 1.9

  • Loading branch information...
crafterm committed Nov 18, 2012
1 parent 81076bf commit dbdfce8b38077fded815d493ff7368b70bc90c7b
Showing with 15 additions and 25 deletions.
  1. +6 −0 Gemfile.lock
  2. +3 −4 Rakefile
  3. +6 −21 sprinkle.gemspec
View
@@ -21,6 +21,7 @@ GEM
diff-lcs (1.1.3)
highline (1.6.15)
i18n (0.6.1)
+ json (1.7.5)
multi_json (1.3.7)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
@@ -29,6 +30,9 @@ GEM
net-ssh (2.6.1)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
+ rake (10.0.1)
+ rdoc (3.12)
+ json (~> 1.4)
rspec (2.12.0)
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
@@ -42,5 +46,7 @@ PLATFORMS
ruby
DEPENDENCIES
+ rake (>= 0.8.7)
+ rdoc (>= 3.12)
rspec (>= 2.5)
sprinkle!
View
@@ -1,6 +1,7 @@
require 'rubygems'
require 'rake'
require 'rspec/core/rake_task'
+require 'rdoc/task'
task "inst" => [:clobber, :build] do
puts `gem install pkg/sprinkle-*.gem`
@@ -22,13 +23,11 @@ RSpec::Core::RakeTask.new(:coverage) do |t|
t.rcov_opts = ['--exclude', 'spec']
end
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+RDoc::Task.new do |rdoc|
version = File.exist?('VERSION') ? File.read('VERSION') : ""
rdoc.rdoc_dir = 'rdoc'
rdoc.title = "sprinkle #{version}"
rdoc.rdoc_files.include('README*')
rdoc.rdoc_files.include('lib/**/*.rb')
-end
+end
View
@@ -140,26 +140,11 @@ Gem::Specification.new do |s|
s.rubygems_version = %q{1.4.2}
s.summary = %q{Ruby DSL based software provisioning tool}
- if s.respond_to? :specification_version then
- s.specification_version = 3
-
- if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_development_dependency(%q<rspec>, [">= 2.5"])
- s.add_development_dependency(%q<rake>, [">= 0.8.7"])
- s.add_runtime_dependency(%q<activesupport>, [">= 2.0.2"])
- s.add_runtime_dependency(%q<highline>, [">= 1.4.0"])
- s.add_runtime_dependency(%q<capistrano>, [">= 2.5.5"])
- else
- s.add_dependency(%q<rspec>, [">= 2.5"])
- s.add_dependency(%q<activesupport>, [">= 2.0.2"])
- s.add_dependency(%q<highline>, [">= 1.4.0"])
- s.add_dependency(%q<capistrano>, [">= 2.5.5"])
- end
- else
- s.add_dependency(%q<rspec>, [">= 2.5"])
- s.add_dependency(%q<activesupport>, [">= 2.0.2"])
- s.add_dependency(%q<highline>, [">= 1.4.0"])
- s.add_dependency(%q<capistrano>, [">= 2.5.5"])
- end
+ s.add_development_dependency(%q<rspec>, [">= 2.5"])
+ s.add_development_dependency(%q<rake>, [">= 0.8.7"])
+ s.add_development_dependency(%q<rdoc>, [">= 3.12"])
+ s.add_runtime_dependency(%q<activesupport>, [">= 2.0.2"])
+ s.add_runtime_dependency(%q<highline>, [">= 1.4.0"])
+ s.add_runtime_dependency(%q<capistrano>, [">= 2.5.5"])
end

0 comments on commit dbdfce8

Please sign in to comment.