[api] fix "make apidocs" with ruby 1.9

openSUSE · May 14, 2012 · 673f6cb · 673f6cb
1 parent 1cfb5c0
commit 673f6cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/docs/api/restility/bin/rest_doc b/docs/api/restility/bin/rest_doc
@@ -3,16 +3,15 @@
 require 'optparse'
 require 'rubygems'
 require 'active_support'
+require 'builder'
 
 require 'erb'
 include ERB::Util
 
-require "ftools"
-
 $LOAD_PATH << "#{File.dirname(__FILE__)}/../lib"
 
-require "rest.rb"
-require "rest_htmlprinter.rb"
+require "rest"
+require "rest_htmlprinter"
 
 class Options
 

diff --git a/docs/api/restility/lib/rest.rb b/docs/api/restility/lib/rest.rb
@@ -1,5 +1,7 @@
 #!/usr/bin/ruby
 
+require 'fileutils'
+
 class XmlFile
 
   @@include_dir = ""
@@ -39,7 +41,7 @@ def XmlFile.copy file_name, output_dir
       end
     end
 
-    File.copy( find_file( file_name ), output_dir )
+    FileUtils.copy( find_file( file_name ), output_dir )
 
   end