jota 0.9.0 → 0.9.1

data/lib/helper.rb

@@ -1,5 +1,6 @@
 
-# $Id: helper.rb 296 2011-01-31 10:39:18Z dz $
+require 'objspace'
+require 'time'
 
 def escape_from(str)
 	str.gsub!(/\n(>*)From /,"\n\\1>From ")
@@ -30,7 +31,16 @@ def expand_filename(str, dirname, filename)
 end
 
 def expand_tabs(str)
-        return str.gsub(/([^\t]{8})|([^\t]*)\t/n){[$+].pack("A8")}
+        # see http://www.rootr.net/rubyfaq-9.html, Sec. 9.17
+
+        # The pack-A version does not work, because A expects a binary/ASCII
+        # string, not a Unicode string
+
+        #return str.gsub(/([^\t]{8})|([^\t]*)\t/n){[$+].pack("A8")}
+
+        s = str.clone
+        while s.sub!(/(^[^\t]*)\t(\t*)/){$1+' '*(8-$1.size%8+8*$2.size)};end
+        return s
 end
 
 def debug_file
@@ -48,7 +58,7 @@ def debug_file
 			print_verbose "logging to '#{$debug_filename}' "+
 				      "not possible: #{msg}, using stdout"
 		end
-		
+
 	end
 	return $debug_file
 end
@@ -58,7 +68,7 @@ def print_verbose(msg)
 		# do not write to $debug_file, this can be nil
 		debug_file.puts "#{Process.pid}-1# #{msg}"
 		debug_file.flush
-	end	
+	end
 end
 
 def print_debug(msg)
@@ -66,7 +76,7 @@ def print_debug(msg)
 		# do not write to $debug_file, this can be nil
 		debug_file.puts "#{Process.pid}-2# #{msg}"
 		debug_file.flush
-	end	
+	end
 end
 
 def editor(str)
@@ -98,3 +108,31 @@ def editor(str)
 
 	return lines
 end
+
+# for debugging only, normally not referenced
+
+class Class
+  def <=>(x)
+    self.to_s <=> x.to_s
+  end
+end
+
+def dump_objectspace
+  GC.start
+  sleep 60
+
+  count = Hash.new 0
+  ObjectSpace.each_object do |o|
+    count[o.class] += 1
+  end
+
+  File.open "objectspace-#{Time.now.iso8601}","w" do |f|
+    f.puts "ObjectSpace.memsize_of_all = #{ObjectSpace.memsize_of_all.to_s}"
+    f.puts "ps -o rss = #{`ps -o rss= -p #{Process.pid}`.to_i} kB"
+    f.puts
+
+    count.keys.sort.each do |k|
+      f.puts "#{k} #{count[k]}"
+    end
+  end
+end

data/lib/immediate.rb

@@ -1,6 +1,4 @@
 
-# $Id: $
-
 require 'clip_array'
 require 'version'
 
@@ -61,5 +59,4 @@ def list
 	@data.close
 end
 
-
 end # class Immediate

data/lib/jota.rb

@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 
-# $Id: jota.rb 296 2011-01-31 10:39:18Z dz $
-
-
 require 'getoptlong'
 require 'helper'
 
@@ -184,7 +181,7 @@ def start_curses
 	curses = JotaCurses.new
 
 	if @filename then
-		open_or_fail(curses,@filename) 
+		open_or_fail(curses,@filename)
 		if @regexp then
 			goto_or_fail(curses,@regexp)
 		end
@@ -235,7 +232,7 @@ def start_gui
 		msgbox.secondary_text = "I'm terribly sorry."+
 			"\n\nDetails:\n#{e.class}: #{e.message}"
 		msgbox.add_button("Crash",Gtk::Dialog::RESPONSE_OK)
-		
+
 		msgbox.run do | response |
 			case response
 			when Gtk::Dialog::RESPONSE_OK
@@ -285,7 +282,7 @@ def run
 		start_immediate
         else
                 begin
-		# this 'require' must be after the command line is parsed, 
+		# this 'require' must be after the command line is parsed,
 		# because 'require libglade2' parses the commandline too.
                         require 'gui'
                         gui_ok = true

data/lib/jota_curses.rb

@@ -1,6 +1,4 @@
 
-# $Id: jota_curses.rb 296 2011-01-31 10:39:18Z dz $
-
 require "curses"
 require 'tempfile'
 
@@ -40,7 +38,7 @@ def set_terminal
 	@columns = Curses.stdscr.maxx
 	@lines = Curses.stdscr.maxy
 	print_debug "setting terminal: lines=#{@lines}, columns=#{@columns}"
-end 
+end
 
 def initialize
 	@data = nil
@@ -58,7 +56,7 @@ def initialize
 	@editor_running = false
 
         default_focus
-end 
+end
 
 def finish
         Curses.close_screen
@@ -80,7 +78,7 @@ def open(filename)
 	@data.current_index = 0
 	@top_win_first = 0
 	return @data
-end 
+end
 
 def clip_array
 	return @data
@@ -101,7 +99,7 @@ def create(filename)
 	@data.current_index = 0
 	@top_win_first = 0
 	draw_bars
-end 
+end
 
 
 def delete
@@ -121,7 +119,7 @@ def delete
 	end
 
 	@data.delete
-end 
+end
 
 def run
 	Curses.init_screen
@@ -158,7 +156,7 @@ def run
 		@bot_win_lines = draw_bottom_window
 		handle_key
 	end
-end 
+end
 
 
 
@@ -168,7 +166,7 @@ end
 
 def get_bot_win_height
 	rows = @lines - @top_win_height - 3
-	
+
 	# some error checking if the terminal window is made too small
 	if rows < 3 then
 		# first try to adjust the windows
@@ -189,7 +187,7 @@ def get_bot_win_height
 	else
 		return rows
 	end
-end 
+end
 
 private
 
@@ -232,7 +230,7 @@ def draw_bars
 		@bot_bar.addstr("h=help, q=quit")
 	end
 	@bot_bar.refresh
-end 
+end
 
 def draw_top_window
 	@top_win.clear
@@ -244,13 +242,13 @@ def draw_top_window
 				marker = " "
 			end
 			if i < @data.length then
-				@top_win.addstr("%s %s\n" % 
+				@top_win.addstr("%s %s\n" %
                                    [marker, @data[i].title![@left_margin_top..@left_margin_top+@columns-4]])
 			end
 		end
 	end
 	@top_win.refresh
-end 
+end
 
 def draw_bottom_window
 	print_debug "drawing text in #{@mode} mode"
@@ -285,7 +283,7 @@ def draw_bottom_window
 	@bot_win.refresh
 
 	return result
-end 
+end
 
 def help_text
 	return <<-EOT
@@ -313,14 +311,14 @@ Jota #{Version::STRING}, (C) #{Version::YEARS} #{Version::AUTHOR} <#{Version::AU
     EDITOR		#{ENV["EDITOR"]}
     SHELL		#{ENV["SHELL"]}
 	EOT
-end 
+end
 
 def redraw_all
 	print_debug "redrawing"
 	draw_bars
 	draw_top_window
 	@bot_win_lines = draw_bottom_window
-end 
+end
 
 def set_windows
 	bot_win_height = get_bot_win_height
@@ -352,7 +350,7 @@ def set_windows
 	@bot_bar.keypad = true
 
 	redraw_all
-end 
+end
 
 def app_quit
 	if @data then
@@ -365,7 +363,7 @@ def app_quit
                 finish
 		exit
 	end
-end 
+end
 
 def call_editor(text)
 	Curses.close_screen
@@ -387,7 +385,7 @@ def handle_key
 	@bot_bar.move(0,79)
 	@bot_bar.refresh
 	# Ruby 1.8: getch return alway a Fixnum
-	# Ruby 1.9: getch return a String if char is printable (between " " 
+	# Ruby 1.9: getch return a String if char is printable (between " "
         # and "~"), Fixnum otherwise
 	begin
 		ch = @bot_bar.getch
@@ -492,7 +490,7 @@ def handle_key
 			if command == "" then
 				command = ENV["SHELL"]
 			end
-						
+
 			Curses.stdscr.clear
 			Curses.close_screen
 			puts "\nJota executing '#{command}'"
@@ -561,7 +559,7 @@ def handle_key
 
 	adjust_top_win_first
 	adjust_bot_win_first
-end 
+end
 
 def adjust_top_win_first
 	return if not @data
@@ -570,7 +568,7 @@ def adjust_top_win_first
 	elsif @data.current_index > @top_win_first+@top_win_height-1 then
 		@top_win_first = @data.current_index-@top_win_height+1
 	end
-end 
+end
 
 def adjust_bot_win_first
 	return if not @data
@@ -579,13 +577,13 @@ def adjust_bot_win_first
 	elsif @bot_win_lines and @bot_win_first > @bot_win_lines-1 then
 		@bot_win_first = @bot_win_lines-1
 	end
-end 
+end
 
 def message(str)
 	@bot_bar.clear
 	@bot_bar.addstr(str)
 	@bot_bar.refresh
-end 
+end
 
 def prompt(str,type=:string)
 	@bot_bar.clear
@@ -608,7 +606,7 @@ def prompt(str,type=:string)
 	Curses.noecho
 	draw_bars
 	return result
-end 
+end
 
 def prompt_filename(str)
 	loop do
@@ -618,7 +616,7 @@ def prompt_filename(str)
                         @bot_win.addstr File.expand_path(".")
                         @bot_win.addstr(":\n")
                         ent = (Dir.entries ".").sort
-			ent.each  do | f | 
+			ent.each  do | f |
                                 next if f =~ /^\./
 				@bot_win.addstr(f)
                                 if File.directory? f then
@@ -631,14 +629,14 @@ def prompt_filename(str)
 			return filename
 		end
 	end
-end 
+end
 
 def error(msg)
 	@bot_bar.clear
 	@bot_bar.addstr("ERROR: ")
 	@bot_bar.addstr(msg.to_s)
 	@bot_bar.refresh
-end 
+end
 
 def really?(prefstr,promptstr)
 	if @data.nil? then
@@ -656,6 +654,6 @@ def really?(prefstr,promptstr)
 	else
 		return false
 	end
-end 
+end
 
 end # class

data/lib/mbox_storage-tmail.rb

@@ -0,0 +1,258 @@
+
+
+# from page.rb
+
+    # def Page.from_mbox(str)
+    #   # "From_" line already removed
+    #   cl = Page.new
+    #   in_header = true
+    #   charset = "UTF-8"
+    #   str.each_line do | line  |
+    #     line.encode!(charset)
+    #     if in_header then
+    #       if line == "\n" then
+    #         in_header = false
+    #         next
+    #       end
+    #       #(key, value) = line.split(/\s*:\s*/,2)
+    #       # stricter pattern to preserve leading spaces
+    #       (key, value) = line.split(/\s*: /,2)
+    #       value.chomp!
+    #       case key.downcase
+    #       when "flags", "x-flags"
+    #         cl.wrap = value.downcase.include?("w")
+    #       when "subject"
+    #         cl.title = value
+    #       when "created-at", "date"
+    #         cl.created = Time.parse(value)
+    #       when "content-type"
+    #         case value
+    #         when "text/plain"
+    #           cl.type = :text
+    #         when "application/x-jota-pref"
+    #           cl.type = :pref
+    #         else
+    #           cl.type = :text		# safe fallback type
+    #         end
+    #       end
+    #     else
+    #       cl.data << line
+    #     end
+    #   end
+    #   return cl
+    # end
+
+    # def to_mbox
+    #   str = ""
+    #   charset = "UTF-8"
+
+    #   str << "Created-At: %s\n" % @created.ctime
+
+    #   str << "Subject: %s\n" % @title
+
+    #   case @type
+    #   when :text
+    #     str << "Content-Type: text/plain; charset=#{charset}\n"
+    #   when :pref
+    #     str << "Content-Type: application/x-jota-pref\n"
+    #   end
+
+    #   str << "Flags: "
+    #   str << "w" if @wrap
+    #   str << "\n"
+
+    #   if type == :pref then
+    #     str << "Originating-Client: %s %s\n" %
+    #       [Jota::Version::PROGRAM_NAME, Jota::Version::STRING]
+    #   end
+
+    #   str << "\n"
+
+    #   str << @data
+
+    #   return str
+# end
+
+
+# from book.rb
+
+    # def Book.read_mbox(file)
+    #   ca = self.new
+    #   first_line = true
+    #   str = ""
+    #   i = 1
+
+    #   Log.debug "reading pages, mbox format"
+
+    #   if file.eof? or file.readline =~ /^From / then
+    #     # valid
+    #   else
+    #     raise Jota::AppError, "Not an Mbox file"
+    #   end
+
+    #   file.each_line do | line |
+    #     line.chomp!
+    #     if line =~ /^From / then
+    #       if not first_line then
+    #         page = Jota::Page.from_mbox(unescape_from(str))
+    #         if page.type == :pref then
+    #           ca.pref = Jota::Preferences.read(page.data)
+    #           Log.debug "  #{i}: Preferences"
+    #         else
+    #           ca << page
+    #           Log.debug "  #{i}: '#{page.title}'"
+    #         end
+    #         i += 1
+    #       end
+    #       str = ""
+    #     else
+    #       str << line << "\n"
+    #     end
+    #     first_line = false
+    #   end
+
+    #   if str != "" then
+    #     page = Jota::Page.from_mbox(unescape_from(str))
+    #     if page.type == :pref then
+    #       ca.pref = Jota::Preferences.read(page.data)
+    #       Log.debug "  #{i}: Preferences"
+    #     else
+    #       ca << page
+    #       Log.debug "  #{i}: '#{page.title}'"
+    #     end
+    #   end
+
+    #   ca.current_index = ca.length - 1
+    #   return ca
+    # end
+
+    # def write_mbox(file)
+    #   Log.debug "writing pages, mbox format"
+    #   i = 1
+
+    #   # Pref page first
+    #   pc = Jota::Page.new
+    #   pc.type = :pref
+    #   pc.title = "Preferences"
+    #   pc.data = @pref.write
+
+    #   ([pc]+self).each do | page |
+    #     file.print "From %s@localhost %s\n" %
+    #       [Jota::Version::PROGRAM_NAMELC, Time.now.ctime]
+    #     file.print(escape_from(page.to_mbox.chomp))
+    #     file.print("\n")
+    #     Log.debug "  #{i}: '#{page.title}'"
+    #     i += 1
+    #   end
+    # end
+
+require 'log'
+require 'tmail'                 # gem install tmail, needs ruby > 1.9.1; does not work with
+                                # ruby-2.1.1 "has a non escaped non ASCII character in non
+                                # ASCII-8BIT script (RegexpError)"
+
+# ... since everybody should now use the new gem "mail".
+# https://rubygems.org/gems/mail
+
+#http://www.rubydoc.info/gems/mbox
+
+mb =Mbox.open "mbox.jota"
+mb.each do |x|
+  x.to_s
+end
+
+require 'yaml'
+
+
+module Jota
+
+  class Storage; end
+
+  class MboxStorage < Storage
+
+    attr_reader :book, :filename, :is_rw
+
+    def initialize book, filename=nil
+      @book = book
+      @filename = File.expand_path filename
+      @is_rw = true
+    end
+
+    def self.load filename, mode = :rw
+      Log.info "loading Mbox file '#{filename}' with mode '#{mode}'"
+      array = []
+      pref = nil
+      TMail::UNIXMbox.new(filename,nil,true).each_port do |port|
+        mail = TMail::Mail.new(port)
+        Log.debug "MboxStorage.load: '#{mail.inspect}'"
+        type = parse_type(mail.content_type)
+        data = mail.body
+        hash = {
+                "created" => Date.parse(mail["created-at"]),
+                "data" => data,
+                "title" => mail.subject,
+                "type" => type,
+                "wrap" => mail["flags"].downcase.include?("w"),
+               }
+        if type == :pref then
+          pref = YAML.load data
+        else
+          page = Page.from_hash hash
+          array << page
+        end
+      end
+
+      storage = self.new (Book.from_array(array, pref)), filename
+      return storage
+    end
+
+    def save_as filename
+      return if ! @book
+      Log.info "saving Mbox file '#{filename}'"
+      # mailbox = UNIXMbox.new(filename,nil,true)
+      array = @book.map{|page|page.to_hash}
+
+      File.open(@filename, "w")  do |file|
+        # preferences
+        mail = TMail::Mail.new
+        mail["created-at"] = Time.now.to_s
+        mail["flags"] = ""
+        mail.subject = "Preferences"
+        mail.body = YAML.dump @book.pref
+        mail.set_content_type "application", "x-jota-pref"
+        Log.debug "MboxStorage.save_as: pref '#{mail.inspect}'"
+        file.print mail.encoded
+
+        # pages
+        array.each do |hash|
+          mail = TMail::Mail.new
+          mail["created-at"] = hash["created"].to_s
+          mail["flags"] = hash["wrap"]? "w" : "" # the only flag for now
+          mail.subject = hash["title"]
+          mail.body = hash["data"]
+          mail.set_content_type "text", "plain" # all non-:pref pages are :text for now
+          Log.debug "MboxStorage.save_as: page '#{mail.inspect}'"
+          file.print mail.encoded
+        end
+      end
+    end
+
+    def save
+      save_as @filename if @filename
+    end
+
+    private
+
+    def parse_type content_type
+      case content_type
+      when "text/plain"
+        return :text
+      when "application/x-jota-pref"
+        return :pref
+      else
+        return :text
+      end
+    end
+
+  end # class
+end # module