Pimki 1.7.092 → 1.8.092

data/libraries/madeleine_service.rb

@@ -1,163 +1,163 @@
-require 'madeleine'
-require 'madeleine/automatic'
-require 'madeleine/zmarshal'
-require 'singleton'
-require 'yaml'
-
-class MadeleineService
-  include Madeleine::Automatic::Interceptor
-
-  @@storage_path = self.name.downcase + "_storage"
-  automatic_read_only :snapshot_interval_hours, :take_snapshot, :clean_old_snapshots,
-                      :restart, :request_stop
-
-  class << self
-    def storage_path
-      @@storage_path
-    end
-  
-    def storage_path=(storage_path)
-      @@storage_path = storage_path
-    end
-
-    def instance
-      if @system.nil?
-        @madeleine_server = MadeleineServer.new(self) 
-        @system = @madeleine_server.system
-      end
-      @system
-    end
-    
-    def restart
-      MadeleineServer.delete_storage(self)
-      @system = nil
-      instance
-    end
-
-    def clean_old_snapshots
-      instance
-      @madeleine_server.clean_storage(self)
-    end
-    
-    def take_snapshot
-      instance
-      @madeleine_server.force_snapshot
-    end
-    
-    def snapshot_interval_hours
-      instance
-      @madeleine_server.snapshot_interval.div MadeleineServer::ONE_HOUR rescue 1
-    end
-    
-    def snapshot_interval_hours= hours
-      instance
-      @madeleine_server.snapshot_interval = hours.to_i * MadeleineServer::ONE_HOUR rescue MadeleineServer::ONE_HOUR
-    end
-
-    def request_stop
-      instance
-      @madeleine_server.request_stop
-    end
-    
-  end
-end
-
-require 'fileutils'
-class MadeleineServer
-
-  attr_reader :storage_path
-  attr_accessor :snapshot_interval
-
-  # Clears all the command_log and snapshot files located in the storage directory, so the
-  # database is essentially dropped and recreated as blank. Used in tests.
-  def self.delete_storage(service)
-    if (File.directory?(service.storage_path))
-      FileUtils.rm_rf(Dir[service.storage_path + '/*.command_log'])
-      FileUtils.rm_rf(Dir[service.storage_path + '/*.snapshot'])
-    else
-      FileUtils.mkdir_p(service.storage_path)
-    end
-  end
-  
-  def clean_storage(service)
-    force_snapshot
-    command_logs = Dir[service.storage_path + '/*.command_log']
-    raise 'Error: existing command_logs after snapshot' unless command_logs.empty?
-
-    snapshots = Dir[service.storage_path + '/*.snapshot']
-    FileUtils.rm_rf(snapshots.sort[0..-2])
-  end
-  
-
-  def initialize(service)
-    @storage_path = service.storage_path
-    @snapshot_interval = ONE_HOUR
-    marshaller = Madeleine::ZMarshal.new()
-    @server = Madeleine::Automatic::AutomaticSnapshotMadeleine.new(service.storage_path, 
-        marshaller) { service.new }
-    start_snapshot_thread
-  end
-
-  def system
-    @server.system
-  end
-
-  def command_log_present?
-    not Dir[File.join(File.expand_path(storage_path), '*.command_log')].empty?
-  end
-
-  def force_snapshot
-    begin
-      hours_since_last_snapshot = 0
-      @server.take_snapshot
-    rescue => e
-      sleep(ONE_MINUTE)
-      retry
-    end
-  end
-  
-  
-  ONE_MINUTE = 60
-  ONE_HOUR   = ONE_MINUTE * 60
-  MAX_INTERVAL_HOURS = 24 * 2
-
-  def start_snapshot_thread
-    @snapshot_thread = Thread.new(@server) {
-      hours_since_last_snapshot = 0
-      while not @request_stop
-        sleep(snapshot_interval)
-        hours_since_last_snapshot += snapshot_interval.div ONE_HOUR
-        begin
-          # Take a snapshot if there is a command log
-          if command_log_present? or hours_since_last_snapshot > MAX_INTERVAL_HOURS
-            #  'Taking a Madeleine snapshot'
-            @server.take_snapshot
-            hours_since_last_snapshot = 0
-            puts "[#{DateTime.now.strftime '%F %T'}] INFO Taking snapshot"
-          else
-            puts "[#{DateTime.now.strftime '%F %T'}] INFO Skipping snapshot (no command logs)"
-          end
-        rescue => e
-          # wait for a minute (not to spoof the log with the same error)
-          # and go back into the loop, to keep trying
-          sleep(ONE_MINUTE)
-          retry
-        end
-      end
-    }
-  end
-  
-  def request_stop
-    begin
-      @request_stop = true
-      if @snapshot_thread and @snapshot_thread.alive?
-        @snapshot_thread.wakeup
-        @snapshot_thread.join
-      end
-      @server.take_snapshot if command_log_present?
-    rescue => detail
-      puts detail
-    end
-  end
-
+require 'madeleine'
+require 'madeleine/automatic'
+require 'madeleine/zmarshal'
+require 'singleton'
+require 'yaml'
+
+class MadeleineService
+  include Madeleine::Automatic::Interceptor
+
+  @@storage_path = self.name.downcase + "_storage"
+  automatic_read_only :snapshot_interval_hours, :take_snapshot, :clean_old_snapshots,
+                      :restart, :request_stop
+
+  class << self
+    def storage_path
+      @@storage_path
+    end
+  
+    def storage_path=(storage_path)
+      @@storage_path = storage_path
+    end
+
+    def instance
+      if @system.nil?
+        @madeleine_server = MadeleineServer.new(self) 
+        @system = @madeleine_server.system
+      end
+      @system
+    end
+    
+    def restart
+      MadeleineServer.delete_storage(self)
+      @system = nil
+      instance
+    end
+
+    def clean_old_snapshots
+      instance
+      @madeleine_server.clean_storage(self)
+    end
+    
+    def take_snapshot
+      instance
+      @madeleine_server.force_snapshot
+    end
+    
+    def snapshot_interval_hours
+      instance
+      @madeleine_server.snapshot_interval.div MadeleineServer::ONE_HOUR rescue 1
+    end
+    
+    def snapshot_interval_hours= hours
+      instance
+      @madeleine_server.snapshot_interval = hours.to_i * MadeleineServer::ONE_HOUR rescue MadeleineServer::ONE_HOUR
+    end
+
+    def request_stop
+      instance
+      @madeleine_server.request_stop
+    end
+    
+  end
+end
+
+require 'fileutils'
+class MadeleineServer
+
+  attr_reader :storage_path
+  attr_accessor :snapshot_interval
+
+  # Clears all the command_log and snapshot files located in the storage directory, so the
+  # database is essentially dropped and recreated as blank. Used in tests.
+  def self.delete_storage(service)
+    if (File.directory?(service.storage_path))
+      FileUtils.rm_rf(Dir[service.storage_path + '/*.command_log'])
+      FileUtils.rm_rf(Dir[service.storage_path + '/*.snapshot'])
+    else
+      FileUtils.mkdir_p(service.storage_path)
+    end
+  end
+  
+  def clean_storage(service)
+    force_snapshot
+    command_logs = Dir[service.storage_path + '/*.command_log']
+    raise 'Error: existing command_logs after snapshot' unless command_logs.empty?
+
+    snapshots = Dir[service.storage_path + '/*.snapshot']
+    FileUtils.rm_rf(snapshots.sort[0..-2])
+  end
+  
+
+  def initialize(service)
+    @storage_path = service.storage_path
+    @snapshot_interval = ONE_HOUR
+    marshaller = Madeleine::ZMarshal.new()
+    @server = Madeleine::Automatic::AutomaticSnapshotMadeleine.new(service.storage_path, 
+        marshaller) { service.new }
+    start_snapshot_thread
+  end
+
+  def system
+    @server.system
+  end
+
+  def command_log_present?
+    not Dir[File.join(File.expand_path(storage_path), '*.command_log')].empty?
+  end
+
+  def force_snapshot
+    begin
+      hours_since_last_snapshot = 0
+      @server.take_snapshot
+    rescue => e
+      sleep(ONE_MINUTE)
+      retry
+    end
+  end
+  
+  
+  ONE_MINUTE = 60
+  ONE_HOUR   = ONE_MINUTE * 60
+  MAX_INTERVAL_HOURS = 24 * 2
+
+  def start_snapshot_thread
+    @snapshot_thread = Thread.new(@server) {
+      hours_since_last_snapshot = 0
+      while not @request_stop
+        sleep(snapshot_interval)
+        hours_since_last_snapshot += snapshot_interval.div ONE_HOUR
+        begin
+          # Take a snapshot if there is a command log
+          if command_log_present? or hours_since_last_snapshot > MAX_INTERVAL_HOURS
+            #  'Taking a Madeleine snapshot'
+            @server.take_snapshot
+            hours_since_last_snapshot = 0
+            puts "[#{DateTime.now.strftime '%F %T'}] INFO Taking snapshot"
+          else
+            puts "[#{DateTime.now.strftime '%F %T'}] INFO Skipping snapshot (no command logs)"
+          end
+        rescue => e
+          # wait for a minute (not to spoof the log with the same error)
+          # and go back into the loop, to keep trying
+          sleep(ONE_MINUTE)
+          retry
+        end
+      end
+    }
+  end
+  
+  def request_stop
+    begin
+      @request_stop = true
+      if @snapshot_thread and @snapshot_thread.alive?
+        @snapshot_thread.wakeup
+        @snapshot_thread.join
+      end
+      @server.take_snapshot if command_log_present?
+    rescue => detail
+      puts detail
+    end
+  end
+
 end

data/pimki.rb

@@ -1,182 +1,182 @@
-#!/usr/local/bin/ruby
-
-if RUBY_VERSION < "1.8.1" 
-  puts "Pimki requires Ruby 1.8.1+" 
-  exit
-end
-
-# Handle rubygems support & loading libraries: {{{
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), "libraries")
-begin
-  require 'rubygems'
-  require_gem 'madeleine'
-  require_gem 'BlueCloth'
-  require_gem 'rubyzip'
-  require 'zip/zip'
-
-rescue LoadError => detail
-  # no rubygems, so load from the libraries directory
-  p detail if $DEBUG
-  puts 'Unable to load libraries through RubyGems. Loading from ./libraries directory'
-  require 'bluecloth'
-  require 'zip/zip'
-end
-# }}}
-
-# Handle command-line options: {{{
-require 'optparse'
-
-cdir = File.expand_path(File.dirname(__FILE__))
-%w( /libraries/ /app/models /app/controllers ).each { |dir| $:.unshift(cdir + dir) }
-%w( web_controller_server action_controller_servlet wiki_service wiki ).each { |lib| require lib }
-
-fork_available = true
-begin
-  exit unless fork
-rescue NotImplementedError
-  fork_available = false
-end
-
-begin
-  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',
-  :graphviz_available => graphviz_available
-}
-
-ARGV.options do |opts|
-  script_name = File.basename($0)
-  opts.banner = "Usage: ruby #{script_name} [options]"
-
-  opts.separator ""
-
-  opts.on("-p", "--port=port", Integer,
-          "Runs Instiki on the specified port.",
-          "Default: 2500\n") { |OPTIONS[:port]| }
-  opts.on("-s", "--simple", "--simple-server",
-          "Forces Instiki not to run as a Daemon if fork is available.\n"
-          ) { OPTIONS[:server_type] = SimpleServer }
-  opts.on("-t", "--storage=storage", String,
-          "Makes Instiki use the specified directory for storage.",
-          "Default: [cwd]/storage/[port]\n") { |OPTIONS[:storage]| }
-  opts.on("-r", "--redcloth VERSION", String,
-          "Makes Instiki use the specified RedCloth version.",
-          "You can specify major version only (2 or 3)",
-          "Default: 2.0.11\n") { |OPTIONS[:redcloth]| }
-          
-
-  opts.separator ""
-
-  opts.on("-h", "--help",
-          "Show this help message.") { puts opts; exit }
-
-  opts.parse!
-end
-
-Socket.do_not_reverse_lookup = true
-#}}}
-
-# RedCloth + Modifications: {{{
-begin
-  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, NoMethodError => detail
-  if OPTIONS[:redcloth] < '3'
-    require 'redcloth_2.0.11'
-  else
-    require 'redcloth'
-  end
-end
-
-# Remove the "caps" spanning:
-RedCloth::GLYPHS.delete_if { |glyph| glyph[1] =~ /class=\"caps\"/ }
-
-# Fix missing hard_break in RedCloth 3.0.0/1
-if ['3.0.0', '3.0.1'].include? RedCloth::VERSION
-  class RedCloth #{{{
-    # Attempts at fixing the list blocks recognition:
-    #BLOCKS_GROUP_RE = /(^([#*> ])(?:[^\n]|\n+|\n(?!\n|\Z))+)|((?:[^\n]+|\n+ +|\n(?![#*\n]|\Z))+)/m
-
-    def to_html( *rules ) #{{{
-        rules = @rules if rules.empty?
-        # make our working copy
-        text = self.dup
-        
-        @urlrefs = {}
-        @shelf = []
-        textile_rules = [:refs_textile, :block_textile_table, :block_textile_lists,
-                         :block_textile_prefix, :inline_textile_image, :inline_textile_link,
-                         :inline_textile_code, :inline_textile_span, :inline_textile_glyphs]
-        markdown_rules = [:refs_markdown, :block_markdown_setext, :block_markdown_atx, :block_markdown_rule,
-                          :block_markdown_bq, :block_markdown_lists, 
-                          :inline_markdown_reflink, :inline_markdown_link]
-        @rules = rules.collect do |rule|
-            case rule
-            when :markdown
-                markdown_rules
-            when :textile
-                textile_rules
-            else
-                rule
-            end
-        end.flatten
-
-        # standard clean up
-        incoming_entities text 
-        clean_white_space text 
-
-        # start processor
-        pre_list = rip_offtags text
-        refs text
-        blocks text
-        inline text
-        smooth_offtags text, pre_list
-
-        retrieve text
-        hard_break text # PIMKI: this is the missing bit!
-
-        text.gsub!( /<\/?notextile>/, '' )
-        text.gsub!( /x%x%/, '&#38;' )
-        text.strip!
-        text
-    end #}}}
-  end #}}}
-end #}}}
-
-# Start the application: {{{
-storage_dir = OPTIONS[:storage] + "/" + OPTIONS[:port].to_s
-require 'fileutils'
-FileUtils.mkdir_p(storage_dir)
-WikiService.storage_path = storage_dir
-
-WikiController.template_root = "#{cdir}/app/views/"
-
-on_exit = lambda {
-  WebControllerServer::the_active_server.shutdown
-  WikiService.request_stop
-}
-
-trap "INT", on_exit
-trap "TERM", on_exit
-
-WebControllerServer.new(OPTIONS[:port], OPTIONS[:server_type], "#{cdir}/app/controllers/")
-
-# }}}
-
+#!/usr/local/bin/ruby
+
+if RUBY_VERSION < "1.8.1" 
+  puts "Pimki requires Ruby 1.8.1+" 
+  exit
+end
+
+# Handle rubygems support & loading libraries: {{{
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), "libraries")
+begin
+  require 'rubygems'
+  require_gem 'madeleine'
+  require_gem 'BlueCloth'
+  require_gem 'rubyzip'
+  require 'zip/zip'
+
+rescue LoadError => detail
+  # no rubygems, so load from the libraries directory
+  p detail if $DEBUG
+  puts 'Unable to load libraries through RubyGems. Loading from ./libraries directory'
+  require 'bluecloth'
+  require 'zip/zip'
+end
+# }}}
+
+# Handle command-line options: {{{
+require 'optparse'
+
+cdir = File.expand_path(File.dirname(__FILE__))
+%w( /libraries/ /app/models /app/controllers ).each { |dir| $:.unshift(cdir + dir) }
+%w( web_controller_server action_controller_servlet wiki_service wiki ).each { |lib| require lib }
+
+fork_available = true
+begin
+  exit unless fork
+rescue NotImplementedError
+  fork_available = false
+end
+
+begin
+  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',
+  :graphviz_available => graphviz_available
+}
+
+ARGV.options do |opts|
+  script_name = File.basename($0)
+  opts.banner = "Usage: ruby #{script_name} [options]"
+
+  opts.separator ""
+
+  opts.on("-p", "--port=port", Integer,
+          "Runs Instiki on the specified port.",
+          "Default: 2500\n") { |OPTIONS[:port]| }
+  opts.on("-s", "--simple", "--simple-server",
+          "Forces Instiki not to run as a Daemon if fork is available.\n"
+          ) { OPTIONS[:server_type] = SimpleServer }
+  opts.on("-t", "--storage=storage", String,
+          "Makes Instiki use the specified directory for storage.",
+          "Default: [cwd]/storage/[port]\n") { |OPTIONS[:storage]| }
+  opts.on("-r", "--redcloth VERSION", String,
+          "Makes Instiki use the specified RedCloth version.",
+          "You can specify major version only (2 or 3)",
+          "Default: 2.0.11\n") { |OPTIONS[:redcloth]| }
+          
+
+  opts.separator ""
+
+  opts.on("-h", "--help",
+          "Show this help message.") { puts opts; exit }
+
+  opts.parse!
+end
+
+Socket.do_not_reverse_lookup = true
+#}}}
+
+# RedCloth + Modifications: {{{
+begin
+  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, NoMethodError => detail
+  if OPTIONS[:redcloth] < '3'
+    require 'redcloth_2.0.11'
+  else
+    require 'redcloth'
+  end
+end
+
+# Remove the "caps" spanning:
+RedCloth::GLYPHS.delete_if { |glyph| glyph[1] =~ /class=\"caps\"/ }
+
+# Fix missing hard_break in RedCloth 3.0.0/1
+if ['3.0.0', '3.0.1'].include? RedCloth::VERSION
+  class RedCloth #{{{
+    # Attempts at fixing the list blocks recognition:
+    #BLOCKS_GROUP_RE = /(^([#*> ])(?:[^\n]|\n+|\n(?!\n|\Z))+)|((?:[^\n]+|\n+ +|\n(?![#*\n]|\Z))+)/m
+
+    def to_html( *rules ) #{{{
+        rules = @rules if rules.empty?
+        # make our working copy
+        text = self.dup
+        
+        @urlrefs = {}
+        @shelf = []
+        textile_rules = [:refs_textile, :block_textile_table, :block_textile_lists,
+                         :block_textile_prefix, :inline_textile_image, :inline_textile_link,
+                         :inline_textile_code, :inline_textile_span, :inline_textile_glyphs]
+        markdown_rules = [:refs_markdown, :block_markdown_setext, :block_markdown_atx, :block_markdown_rule,
+                          :block_markdown_bq, :block_markdown_lists, 
+                          :inline_markdown_reflink, :inline_markdown_link]
+        @rules = rules.collect do |rule|
+            case rule
+            when :markdown
+                markdown_rules
+            when :textile
+                textile_rules
+            else
+                rule
+            end
+        end.flatten
+
+        # standard clean up
+        incoming_entities text 
+        clean_white_space text 
+
+        # start processor
+        pre_list = rip_offtags text
+        refs text
+        blocks text
+        inline text
+        smooth_offtags text, pre_list
+
+        retrieve text
+        hard_break text # PIMKI: this is the missing bit!
+
+        text.gsub!( /<\/?notextile>/, '' )
+        text.gsub!( /x%x%/, '&#38;' )
+        text.strip!
+        text
+    end #}}}
+  end #}}}
+end #}}}
+
+# Start the application: {{{
+storage_dir = File.join(OPTIONS[:storage], OPTIONS[:port].to_s)
+require 'fileutils'
+FileUtils.mkdir_p(storage_dir)
+WikiService.storage_path = storage_dir
+
+WikiController.template_root = "#{cdir}/app/views/"
+
+on_exit = lambda {
+  WebControllerServer::the_active_server.shutdown
+  WikiService.request_stop
+}
+
+trap "INT", on_exit
+trap "TERM", on_exit
+
+WebControllerServer.new(OPTIONS[:port], OPTIONS[:server_type], "#{cdir}/app/controllers/")
+
+# }}}
+
 # jEdit :folding=explicit:collapseFolds=1: