'showoff serve' can take an argument to specify presentation directory

bin/showoff

@@ -66,9 +66,13 @@ command :serve do |c|
   c.desc 'Host or ip to run on'
   c.default_value "localhost"
   c.flag [:h,:host]
+
+  c.desc 'Presentation directory'
+  c.default_value "."
+  c.arg_name "pres_dir"
 
   c.action do |global_options,options,args|
-    ShowOff.run! :host => options[:h], :port => options[:p].to_i
+    ShowOff.run! :host => options[:h], :port => options[:p].to_i, :pres_dir => args[0]
   end
 end
 

lib/showoff.rb

@@ -37,20 +37,20 @@ class ShowOff < Sinatra::Application
 
   set :views, File.dirname(__FILE__) + '/../views'
   set :public, File.dirname(__FILE__) + '/../public'
-  set :pres_dir, 'example'
 
   def initialize(app=nil)
     super(app)
-    puts dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-    if Dir.pwd == dir
-      options.pres_dir = dir + '/example'
+    showoff_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+    if Dir.pwd == showoff_dir
+      options.pres_dir = "#{showoff_dir}/example"
       @root_path = "."
     else
-      options.pres_dir = Dir.pwd
+      options.pres_dir ||= Dir.pwd
       @root_path = ".."
     end
+    options.pres_dir = File.expand_path(options.pres_dir)
+    puts "Serving presentation from #{options.pres_dir}"
     @cached_image_size = {}
-    puts options.pres_dir
     @pres_name = options.pres_dir.split('/').pop
     require_ruby_files
   end
@@ -107,9 +107,6 @@ def process_markdown(name, content, static=false, pdf=false)
         # extract id, defaulting to none
         id = nil
         content_classes.delete_if { |x| x =~ /^#([\w-]+)/ && id = $1 }
-        puts "id: #{id}" if id
-        puts "classes: #{content_classes.inspect}"
-        puts "transition: #{transition}"
         # create html
         md += "<div"
         md += " id=\"#{id}\"" if id