Signed-off-by: James Turnbull <[email protected]>
---
lib/puppet/application/doc.rb | 12 ++----------
lib/puppet/util/reference.rb | 25 +------------------------
tasks/rake/tracdocs.rake | 8 --------
3 files changed, 3 insertions(+), 42 deletions(-)
delete mode 100644 tasks/rake/tracdocs.rake
diff --git a/lib/puppet/application/doc.rb b/lib/puppet/application/doc.rb
index 66aa6c8..6ebb475 100644
--- a/lib/puppet/application/doc.rb
+++ b/lib/puppet/application/doc.rb
@@ -56,7 +56,7 @@ class Puppet::Application::Doc < Puppet::Application
end
def run_command
- return[:rdoc, :trac, :markdown].include?(options[:mode]) ?
send(options[:mode]) : other
+ return[:rdoc, :markdown].include?(options[:mode]) ? send(options[:mode]) :
other
end
def rdoc
@@ -72,7 +72,7 @@ class Puppet::Application::Doc < Puppet::Application
Puppet.settings.setdefaults(
"puppetdoc",
-
+
"document_all" => [false, "Document all resources"]
)
Puppet.settings[:document_all] = options[:all] || false
@@ -92,14 +92,6 @@ class Puppet::Application::Doc < Puppet::Application
exit exit_code
end
- def trac
- require 'puppet/util/reference'
- options[:references].each do |name|
- section = Puppet::Util::Reference.reference(name) or raise "Could not
find section #{name}"
- section.trac unless options[:mode] == :pdf
- end
- end
-
def markdown
text = ""
with_contents = false
diff --git a/lib/puppet/util/reference.rb b/lib/puppet/util/reference.rb
index 62bab64..3fdd37f 100644
--- a/lib/puppet/util/reference.rb
+++ b/lib/puppet/util/reference.rb
@@ -15,7 +15,7 @@ class Puppet::Util::Reference
end
def self.modes
- %w{pdf trac text markdown}
+ %w{pdf text markdown}
end
def self.newreference(name, options = {}, &block)
@@ -181,27 +181,4 @@ class Puppet::Util::Reference
def to_text(withcontents = true)
strip_trac(to_rest(withcontents))
end
-
- def to_trac(with_contents = true)
- "{{{\n#!rst\n#{self.to_rest(with_contents)}\n}}}"
- end
-
- def trac
- Puppet::Util.secure_open("/tmp/puppetdoc.txt", "w") do |f|
- f.puts self.to_trac
- end
-
- puts "Writing #...@name} reference to trac as #...@page}"
- cmd = %{sudo trac-admin /opt/rl/trac/puppet wiki import %s
/tmp/puppetdoc.txt} % self.page
- output = %x{#{cmd}}
- unless $CHILD_STATUS == 0
- $stderr.puts "trac-admin failed"
- $stderr.puts output
- exit(1)
- end
- unless output =~ /^\s+/
- $stderr.puts output
- end
- end
end
-
diff --git a/tasks/rake/tracdocs.rake b/tasks/rake/tracdocs.rake
deleted file mode 100644
index d26d8fc..0000000
--- a/tasks/rake/tracdocs.rake
+++ /dev/null
@@ -1,8 +0,0 @@
-task :tracdocs do
- require 'puppet'
- require 'puppet/util/reference'
- Puppet::Util::Reference.references.each do |ref|
- sh "puppetdoc -m trac -r #{ref.to_s}"
- end
-end
-
--
1.7.2
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
