./pimki.rb in Pimki-1.6.092 vs ./pimki.rb in Pimki-1.7.092

@@ -41,16 +41,19 @@
   pdflatex_available = system "pdflatex -version"
 rescue Errno::ENOENT
   pdflatex_available = false
 end
 
+graphviz_available = (`dot -V 2>&1` =~ /dot version/)
+
 OPTIONS = {
   :server_type => fork_available ? Daemon : SimpleServer,
   :port        => 2500,
   :storage     => "#{Dir.pwd}/storage",
   :pdflatex    => pdflatex_available,
-  :redcloth    => '3'
+  :redcloth    => '3',
+  :graphviz_available => graphviz_available
 }
 
 ARGV.options do |opts|
   script_name = File.basename($0)
   opts.banner = "Usage: ruby #{script_name} [options]"
@@ -83,17 +86,19 @@
 Socket.do_not_reverse_lookup = true
 #}}}
 
 # RedCloth + Modifications: {{{
 begin
-  if Gem.source_index.search('redcloth').map { |s| s.version.version }.include? OPTIONS[:redcloth]
-    require_gem 'RedCloth', "#{OPTIONS[:redcloth]}"
-  else
-    require_gem 'RedCloth', "~> #{OPTIONS[:redcloth]}"
+  if defined? Gem
+    if Gem.source_index.search('redcloth').map { |s| s.version.version }.include? OPTIONS[:redcloth]
+      require_gem 'RedCloth', "#{OPTIONS[:redcloth]}"
+    else
+      require_gem 'RedCloth', "~> #{OPTIONS[:redcloth]}"
+    end
   end
 
-rescue LoadError => detail
+rescue LoadError, NoMethodError => detail
   if OPTIONS[:redcloth] < '3'
     require 'redcloth_2.0.11'
   else
     require 'redcloth'
   end
@@ -151,10 +156,9 @@
         text.strip!
         text
     end #}}}
   end #}}}
 end #}}}
-puts RedCloth::VERSION
 
 # Start the application: {{{
 storage_dir = OPTIONS[:storage] + "/" + OPTIONS[:port].to_s
 require 'fileutils'
 FileUtils.mkdir_p(storage_dir)
\ No newline at end of file