Merge branch 'master' into 11-stable

3 files changed, 0 insertions, 74 deletions

diff --git a/Gemfile b/Gemfile
index d4b7ce83f5..295f1781a0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,6 @@ gemspec :name => "chef"
 gem "activesupport", "< 4.0.0", :group => :compat_testing, :platform => "ruby"
 
 group(:docgen) do
-  gem "ronn"
   gem "yard"
 end
 
diff --git a/Rakefile b/Rakefile
index 7e4d5bc14f..7005c0168d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -34,23 +34,6 @@ Dir[File.expand_path("../*gemspec", __FILE__)].reverse.each do |gemspec_path|
   Gem::PackageTask.new(gemspec).define
 end
 
-begin
-  require 'sdoc'
-
-  Rake::RDocTask.new do |rdoc|
-    rdoc.title = "Chef Ruby API Documentation"
-    rdoc.main = "README.rdoc"
-    rdoc.options << '--fmt' << 'shtml' # explictly set shtml generator
-    rdoc.template = 'direct' # lighter template
-    rdoc.rdoc_files.include("README.rdoc", "LICENSE", "spec/tiny_server.rb", "lib/**/*.rb")
-    rdoc.rdoc_dir = "rdoc"
-  end
-rescue LoadError
-  puts "sdoc is not available. (sudo) gem install sdoc to generate rdoc documentation."
-rescue TypeError
-  puts "sdoc is not working on ruby-2.0.0 and throwing an odd TypeError, rdoc generation will be disabled on ruby 2.0 until that gets fixed."
-end
-
 task :install => :package do
   sh %{gem install pkg/#{GEM_NAME}-#{Chef::VERSION}.gem --no-rdoc --no-ri}
 end
@@ -68,61 +51,6 @@ task :ship => :gem do
   end
 end
 
-RONN_OPTS = "--manual='Chef Manual' --organization='Chef #{Chef::VERSION}' --date='#{Time.new.strftime('%Y-%m-%d')}'"
-
-namespace :docs do
-  desc "Regenerate HTML manual from markdown"
-  task :html
-
-  desc "Regenerate help topics from man pages"
-  task :list do
-    topics = Array.new
-
-    Dir['distro/common/man/man1/*.1'].each do |man|
-      topics << File.basename(man, '.1')
-    end
-
-    File.open('lib/chef/knife/help_topics.rb', 'w') do |f|
-      f.puts "# Do not edit this file by hand"
-      f.puts "# This file is autogenerated by the docs:list rake task from the available manpages\n\n"
-
-      f.puts "HELP_TOPICS = #{topics.inspect}"
-    end
-  end
-
-  # we can have ronn in the path, but not in the bundle, require both
-  ronn_in_bundle = true
-  begin
-    require 'ronn'
-  rescue LoadError
-    ronn_in_bundle = false
-  end
-
-  if ronn_in_bundle && system('which ronn > /dev/null')
-    ['distro/common/markdown/man1/*.mkd', 'distro/common/markdown/man8/*.mkd'].each do |dir|
-      Dir[dir].each do |mkd|
-        basename = File.basename(mkd, '.mkd')
-        if dir =~ /man1/
-          htmlfile = "distro/common/html/#{basename}.1.html"
-        elsif dir =~ /man8/
-          htmlfile = "distro/common/html/#{basename}.8.html"
-        end
-
-         file(htmlfile => [mkd, 'lib/chef/version.rb']) do
-           sh "ronn -5 #{RONN_OPTS} --style=toc #{mkd} --pipe > #{htmlfile}"
-         end
-         task :html => htmlfile
-      end
-    end
-  else
-    puts "get with the program and install ronn"
-  end
-
-  task :all => [:list, :html]
-end
-
-task :docs => "docs:all"
-
 begin
   require 'yard'
   DOC_FILES = [ "README.rdoc", "LICENSE", "spec/tiny_server.rb", "lib/**/*.rb" ]
diff --git a/chef.gemspec b/chef.gemspec
index d378dfc182..fcc585c363 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -41,7 +41,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency "pry", "~> 0.9"
 
-  s.add_development_dependency "sdoc", "~> 0.3.0"
   %w(rake rack rspec_junit_formatter).each { |gem| s.add_development_dependency gem }
   %w(rspec-core rspec-expectations rspec-mocks).each { |gem| s.add_development_dependency gem, "~> 2.14.0" }