jota 0.8.0 → 0.8.1

data/INSTALL

@@ -1,5 +1,5 @@
 
-$Id: INSTALL 37 2009-02-09 10:06:02Z dz $
+$Id: INSTALL 39 2009-02-17 10:19:31Z dz $
 
 Jota is a written in the Ruby programming language and uses GTK+ Widgets.
 
@@ -79,11 +79,11 @@ For the common operating systems you can use the following command:
   Windows of course has no sophisticated package management. You have to
   download and install the following by hand.
 
-  Go to http://ruby-gnome2.sourceforge.jp/#Ruby-GNOME2+Win32+GUI+Installer
+  Go to http://ruby-gnome2.sourceforge.jp/hiki.cgi?Install+Guide+for+Windows
   and follow the three steps. In short:
 
   1. install http://rubyforge.org/frs/download.php/17357/ruby185-22.exe
-     (enable RubyGems)
+     (enable RubyGems). Install into default installation diectory.
   2. install http://prdownloads.sourceforge.net/ruby-gnome2/ruby-gnome2-0.16.0-1-i386-mswin32.exe?download
 
 
@@ -98,6 +98,10 @@ alternatively, download jota-$VERSION.gem and install it with
 
 	gem install jota-$VERSION.gem
 
+On Windows Vista you must execute gem as administrator. To do so enter
+"gem install jota" in the run box (Start menu, at the bottom) and hit
+Ctrl-Shift-Enter. Then accept the UAC dialog with "Continue".
+
 If you get the error "ERROR:  While executing gem ... (RuntimeError)" and 
 "jota requires cmd >= 0.7.2", you have an older version of gems that does not
 resolve dependencies on its own.

data/bin/jota

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# $Id: jota 28 2009-01-22 09:20:48Z dz $
+# $Id: jota 45 2009-05-08 09:27:26Z dz $
 
 begin
   require 'jota'
@@ -9,4 +9,4 @@ rescue LoadError
   require 'jota'
 end
 
-Jota.new.run_gui
+Jota.new.run

data/lib/cli.rb

@@ -1,5 +1,5 @@
 
-# $Id: cli.rb 37 2009-02-09 10:06:02Z dz $
+# $Id: cli.rb 46 2009-05-08 09:27:55Z dz $
 
 # if you use vim and don't like folds type zR
 
@@ -57,7 +57,7 @@ def do_create(args)
 	@data.close if @data
 	begin
 		@data = ClipArray.create(filename)
-	rescue AppError => msg
+	rescue SystemCallError, AppError => msg
 		puts msg
 		@data = nil
 	end
@@ -80,33 +80,7 @@ def do_edit(args)
 	index = get_index(args)
 	return if index.nil?
 
-	file = Tempfile.new("jotacli")
-	filename = file.path
-	print_verbose "creating temporary file '#{filename}'"
-
-	file.puts @data[index].title
-	file.puts @data[index].data
-	file.close
-
-	if ENV["EDITOR"] then
-		cmdline = ENV["EDITOR"]
-	else
-		cmdline = "/usr/bin/vi"
-	end
-	cmdline = "%s %s" % [cmdline, filename]
-	print_verbose "executing '#{cmdline}'"
-
-	if system(cmdline) then
-		file = File.open(filename,"r")
-		lines = file.readlines
-		@data[index].title = lines[0].chomp
-		@data[index].data = lines[1..lines.length-1].join("")
-		file.close
-	else
-		puts "Error executing '#{cmdline}' with exit code #{$?}"
-	end
-
-	File.unlink(filename)
+	@data[index].text = editor(@data[index].text)
 
 	# because of this save we do not not need autosave for the cli version
 	@data.save
@@ -131,12 +105,11 @@ def do_delete(args)
 	if pref("deletesave_enable") and not @data.current.empty? then
 		deletefile = expand_filename(pref("deletesave_file"),
 			@data.dirname, @data.filename)
-	end
-
-	begin
-		@data.current.append_as_mbox(deletefile)
-	rescue SystemCallError => msg
-		puts msg
+		begin
+			@data.current.append_as_mbox(deletefile)
+		rescue SystemCallError => msg
+			puts msg
+		end
 	end
 
 	@data.delete
@@ -196,7 +169,7 @@ def setup
 	puts "Type 'help' for commands"
 
 	@data = nil
-	@default_command = "page"
+	@default_command = "edit"
 end #}}}1
 
 def command_missing(command, args)
@@ -274,4 +247,4 @@ end #}}}1
 
 end # class
 
-# vim600: set foldmethod=marker:
+# vim: set foldmethod=marker:

data/lib/clip.rb

@@ -1,5 +1,5 @@
 
-# $Id: clip.rb 37 2009-02-09 10:06:02Z dz $
+# $Id: clip.rb 46 2009-05-08 09:27:55Z dz $
 
 # if you use vim and don't like folds type zR
 
@@ -35,6 +35,7 @@ def Clip.from_mbox(str)
 	# "From_" line already removed
 	cl = Clip.new
 	in_header = true
+	charset = nil
 	str.each_line do | line  |
 		if in_header then
 			if line == "\n" then
@@ -46,10 +47,10 @@ def Clip.from_mbox(str)
 			(key, value) = line.split(/\s*: /,2)	
 			value.chomp!
 			case key.downcase
-			when "x-wrap"
-				cl.wrap = (value.downcase == "true")
+			when "x-flags"
+				cl.wrap = value.downcase.include?("w")
 			when "subject"
-				cl.title = value
+				cl.title,charset = q_decode(value)
 			when "date"
 				cl.created = Time.parse(value)
 			when "content-type"
@@ -72,19 +73,29 @@ end #}}}1
 def to_mbox
 #{{{1
 	str = ""
+	charset = "UTF-8"
+
 	str << "Date: %s\n" % @created.ctime
-	str << "Subject: %s\n" % @title
+
+	str << "Subject: %s\n" % [q_encode(charset,@title)]
+	
 	case @type
 	when :text
-		str << "Content-Type: text/plain\n"
+		str << "Content-Type: text/plain; charset=#{charset}\n"
 	when :pref
 		str << "Content-Type: application/x-jota-pref\n"
 	end
-	str << "X-Wrap: %s\n" % @wrap.to_s
-	str << "X-Saved-By: %s %s\n" % [
+
+	str << "X-Flags: "
+	str << "w" if @wrap
+	str << "\n"
+
+	str << "Originating-Client: %s %s\n" % [
 		Version::PROGRAM_NAME, Version::STRING]
 	str << "\n"
+
 	str << @data
+
 	return str
 end #}}}1
 
@@ -114,6 +125,7 @@ end #}}}1
 
 def append_as_mbox(file_and_path)
 #{{{1
+	print_verbose "append to mbox '#{file_and_path}'"
 	File.open(file_and_path,"a") do | f |
 		f.print "From %s@localhost %s\n" % 
 			[Version::PROGRAM_NAME, Time.now.ctime]
@@ -132,6 +144,42 @@ def ==(clip)
 	return self.to_hash == clip.to_hash
 end #}}}1
 
+# POSSIBLE CASES FOR TEXT <-> TITLE/DATA CONVERSION
+# # {{{1
+# #       text                                    title   data
+# # a)    ""                              1)      ""      ""
+# # b)    abc                             2)      abc     ""
+# # c)    abc\n                           2)      abc     ""
+# # d)    abc\n                           3)      abc     def\n
+# #       def
+# # e)    abc\n                           3)      abc     def\n
+# #       def\n
+# # }}}1
+
+def text
+#{{{1
+	if @title == "" and @data == "" then
+		# map (1) to (a)
+		return ""
+	else
+		# map (2) to (b) and (3) to (d)
+		return "%s\n%s" % [@title,@data]
+	end
+end #}}}1
+
+def text=(str)
+# {{{1
+	# map (a),(b) to (c) and (d) to (e)
+	str = str.chomp + "\n"
+	
+	# map (c) to (2) and (e) to (3)
+	arr = str.split("\n",-1)	# arr has at least 2 elems
+					# the last elem is empty
+	@title = arr[0]			# first elem = first line
+	@data = arr[1..-1].join("\n")	# second to last elem
+end #}}}1
+
+
 end #class
 
-# vim600: set foldmethod=marker:
+# vim: set foldmethod=marker:

data/lib/clip_array.rb

@@ -1,5 +1,5 @@
 
-# $Id: clip_array.rb 37 2009-02-09 10:06:02Z dz $
+# $Id: clip_array.rb 53 2009-09-24 14:22:04Z dz $
 
 # if you use vim and don't like folds type zR
 
@@ -111,6 +111,20 @@ end #}}}1
 #	end
 #end #}}}1
 
+def goto_regexp(re)
+#{{{1
+	if re =~ /^\s*\d+\s*$/ then
+		self.current_index = re.to_i-1
+	else
+		self.each_index do | i |
+			if self[i].title.match(re) then
+				@current_index = i
+				break
+			end
+		end
+	end
+end #}}}1
+
 def current_index=(num)
 #{{{1
 	if num < 0 then
@@ -214,7 +228,7 @@ end #}}}1
 
 def ClipArray.create(file_and_path)
 #{{{1
-	print_verbose "creating file '#{file_and_path}"
+	print_verbose "creating file '#{file_and_path}'"
 
 	if File.exists?(file_and_path) then
 		raise AppError, "File '#{file_and_path}' already exists"
@@ -292,13 +306,13 @@ def autosave(seconds)
 #{{{1
 	print_debug "autosave(#{seconds}) called"
 	if @autosave_thread then
-		print_debug "  killing old thread"
+		print_debug " killing old thread"
 		@autosave_thread.kill
 		@autosave_thread = nil
 	end
 
 	if seconds == 0 then
-		print_debug "  returning because seconds==0"
+		print_debug " returning because seconds==0"
 		return
 	end
 
@@ -390,4 +404,4 @@ end #}}}1
 
 end # class
 
-# vim600: set foldmethod=marker:
+# vim: set foldmethod=marker:

data/lib/gui.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# $Id: gui.rb 37 2009-02-09 10:06:02Z dz $
+# $Id: gui.rb 53 2009-09-24 14:22:04Z dz $
 
 # if you use vim and don't like folds type zR
 
@@ -71,14 +71,10 @@ def close
 	end
 end #}}}1
 
-def set_current(regexp)
+def goto_regexp(regexp)
 #{{{1
-	return if @data.nil?
-	@data.each_index do | i |
-		if @data[i].title.match(regexp) then
-			@data.current_index = i
-			break
-		end
+	if @data then
+		@data.goto_regexp(regexp)
 	end
 end #}}}1
 
@@ -92,7 +88,7 @@ def create_gui
 
 	bindtextdomain(domain, localedir, nil, "UTF-8")
 
-	print_verbose "loading glade spec from '#{glade_file}'"
+	print_verbose " loading glade spec from '#{glade_file}'"
 	@glade = GladeXML.new(glade_file,
 			nil, 
 			domain, 
@@ -106,14 +102,15 @@ def create_gui
 	@top_window = @glade.get_widget("top")
 	@clip_widget = @glade.get_widget("clip")
 
+	clip_to_widget(@clip_widget,@data)
+
 # Show
+	print_debug " showing widgets"
 	@top_window.show    
 	set_buttons
 	set_style
 	set_about_dialog
 
-# Show the first clip
-	clip_to_widget(@clip_widget,@data)
 end #}}}1
 
 
@@ -414,6 +411,7 @@ end #}}}
 
 def on_edit_text_wrap_activate(widget)
 #{{{1
+	print_debug "on_edit_text_wrap_activate called"
 	widget_to_clip(@clip_widget,@data)
 	@data.current.wrap = @glade["edit_text_wrap"].active?
 	clip_to_widget(@clip_widget,@data)
@@ -488,17 +486,36 @@ def set_goto_menu
 
 	goto_menu = Gtk::Menu.new
 	@data.each_index do | i |
+
+		if @data[i].title.length > 37 then
+			title = @data[i].title[0..36]+"..."
+		else
+			title = @data[i].title
+		end
+
+		# Using markup in a MenuItems is not implemented before
+		# GTK+ 2.16. Ruby GTK is 2.12 at the moment (2009-07).
+		
+		#la = Gtk::Label.new
 		if i == @data.current_index then
-			marker = "<"
+			#title.gsub!(/</,"&lt;")
+			#title.gsub!(/>/,"&gt;")
+			#title.gsub!(/&/,"&amp;")
+			#la.markup = "<b>%2d: %s</b>" % [i, title]
+			marker = ">"
 		else
-			marker = ""
+			#la.text = "%2d: %s" % [i, title]
+			marker = "  "
 		end
 
-		mi = Gtk::MenuItem.new("%2d: %s%s" % 
-			[i+1, @data[i].title, marker])
+		#mi = Gtk::MenuItem.new
+		#mi.label = la
+		mi = Gtk::MenuItem.new("%s%2d: %s" % 
+			[marker, i+1, title])
 		mi.signal_connect("activate") do
 			on_menu_goto(i)
 		end
+
 		mi.show
 		goto_menu.append(mi)
 	end
@@ -552,6 +569,9 @@ end #}}}1
 
 def set_buttons
 #{{{1
+#
+# CAUTION: set_buttons may trigger callback functions "on_*"
+#
 	if @data.nil? then
 		@glade["but_delete"].sensitive = false
 		@glade["but_new"].sensitive = false
@@ -570,8 +590,9 @@ def set_buttons
 		@glade["menu_export"].sensitive = false
 		@glade["menu_import"].sensitive = false
 		
-		@top_window.title = "%s %s" % 
-			[Version::PROGRAM_NAME, Version::STRING]
+		@top_window.title = "%s %s" % [
+			Version::PROGRAM_NAME.capitalize, 
+			Version::STRING]
 	else
 		@glade["but_delete"].sensitive = true
 		@glade["but_new"].sensitive = true
@@ -602,10 +623,13 @@ def set_buttons
 		@glade["menu_import"].sensitive = true
 
 		if @data.current.title.strip.empty? then
-			@top_window.title = "%s %s" % 
-				[Version::PROGRAM_NAME, Version::STRING]
+			@top_window.title = "%s %s" % [
+				Version::PROGRAM_NAME.capitalize, 
+				Version::STRING]
 		else
-			@top_window.title = "%s" % [@data.current.title]
+			@top_window.title = "%s: %s" % [
+				Version::PROGRAM_NAME.capitalize,
+				@data.current.title]
 		end
 
 		set_goto_menu
@@ -696,40 +720,18 @@ def set_about_dialog
 
 end #}}}1
 
-
-# POSSIBLE CASES FOR CLIP TO/FROM WIDGET CONVERSION
-# {{{1
-#	textview				title	data
-# a)	""				1)	""	""
-# b)	abc				2)	abc	""
-# c)	abc\n				2)	abc	""
-# d)	abc\n				3)	abc	def\n
-# 	def
-# e)	abc\n				3)	abc	def\n
-# 	def\n
-# }}}1
-
 def clip_to_widget(textview, clip_array)
 #{{{1
 	print_debug "clip_to_widget"
 	if clip_array.nil? then
-		str = "#{Version::PROGRAM_NAME} #{Version::STRING} ready\n\n"+
+		str = "#{Version::PROGRAM_NAME.capitalize} #{Version::STRING} ready\n\n"+
 		       "Use Menu->New or Menu->Open\n"
 		textview.buffer.text = str
 		textview.editable = false
 	else
 		clip = clip_array.current
-		print_debug " title='#{clip.title}'"
-		print_debug " data='#{clip.data}'"
-		if clip.title == "" and clip.data == "" then	# map (1)
-			str = ""				# to (a)
-		else
-			# map (2) and (3) to (c) and (e) resp.
-			str = "#{clip.title}\n#{clip.data}"
-		print_debug " str='#{str}'"
-		end
 
-		textview.buffer.text = str
+		textview.buffer.text = clip.text
 	
 		if clip.pos then
 			#mark = textview.buffer.get_insert
@@ -753,23 +755,7 @@ def widget_to_clip(textview, clip_array)
 #{{{1
 	print_debug "widget_to_clip"
 	if clip_array then
-		str = textview.buffer.text
-		print_debug " str='#{str}'"
-
-		# map (a),(b) to (c) and (d) to (e)
-		str = str.chomp + "\n"
-		print_debug " str='#{str}'"
-
-		# map (c) to (2) and (e) to (3)
-		arr = str.split("\n",-1)	# arr has at least 2 elems
-						# the last elem is empty
-		title = arr[0]			# first elem = first line
-		print_debug " title='#{title}'"
-		data = arr[1..-1].join("\n")	# second to last elem
-		print_debug " data='#{data}'"
-
-		clip_array.current.title = title
-		clip_array.current.data = data
+		clip_array.current.text = textview.buffer.text
 		clip_array.current.pos = textview.buffer.cursor_position
 
 		if textview.wrap_mode == Gtk::TextTag::WRAP_NONE then
@@ -789,4 +775,4 @@ end #}}}1
 
 end # Class
 
-# vim600: set foldmethod=marker:
+# vim: set foldmethod=marker:

data/lib/helper.rb

@@ -1,5 +1,5 @@
 
-# $Id: helper.rb 37 2009-02-09 10:06:02Z dz $
+# $Id: helper.rb 52 2009-09-24 14:17:25Z dz $
 
 # if you use vim and don't like folds type zR
 
@@ -14,7 +14,7 @@ def get_filename(filename, mode)
 			action = Gtk::FileChooser::ACTION_OPEN
 			ok_button = Gtk::Stock::OPEN
 		else
-			raise "Wrong mode #{mode} in helper:get_filenamen"
+			raise "Wrong mode #{mode} in helper:get_filename"
 		end
 
 		title = "Select Filename"
@@ -40,8 +40,6 @@ def get_filename(filename, mode)
 		return
 	end
 
-	filename = Time.now.strftime(filename)
-
 	return filename
 end #}}}1
 
@@ -74,7 +72,9 @@ def expand_filename(str, dirname, filename)
 	result = Time.now.strftime(str)
 	result = result.gsub(/\$f/,filename)
 	result = result.gsub(/\$d/,dirname)
+	result = result.gsub(/\$p/,Process::pid.to_s)
 	result = result.gsub(/\$\$/,"$")
+	print_debug "expanding '#{filename}' to '#{result}'"
 	return result
 end #}}}1
 
@@ -115,15 +115,89 @@ end #}}}1
 def print_verbose(msg)
 #{{{1
 	if $VERBOSE then
-		puts "#{Process.pid}# #{msg}"
+		debug_file.puts "#{Process.pid}# #{msg}"
 	end	
 end #}}}1
 
+def debug_file
+	if $debug_file.nil? then
+		begin
+			$debug_file = File.open($debug_filename,"w+")
+		rescue Exception => msg
+			$debug_file = $stdout
+			print_verbose "logging to '#{$debug_filename}' not possible: #{msg}"
+		end
+		
+	end
+	return $debug_file
+end
+
 def print_debug(msg)
 #{{{1
 	if $DEBUG then
-		puts "#{Process.pid}- #{msg}"
+		debug_file.puts "#{Process.pid}- #{msg}"
 	end	
 end #}}}1
 
-# vim600: set foldmethod=marker:
+def editor(str)
+#{{{1
+	file = Tempfile.new("jota")
+	filename = file.path
+	print_verbose "creating temporary file '#{filename}'"
+
+	file.puts str
+	file.close
+
+	if ENV["EDITOR"] then
+		cmdline = ENV["EDITOR"]
+	else
+		cmdline = "/usr/bin/vi"
+	end
+	cmdline = "%s %s" % [cmdline, filename]
+	print_verbose "executing '#{cmdline}'"
+
+	if system(cmdline) then
+		file = File.open(filename,"r")
+		lines = file.readlines.join("")
+		file.close
+	else
+		puts "Error executing '#{cmdline}' with exit code #{$?}"
+		lines = str
+	end
+
+	File.unlink(filename)
+
+	return lines
+end #}}}1
+
+def q_encode(charset,str)
+#{{{1
+        #if str =~ /^[ -<>@-^`-~]*$/ then	# all printable except "=?_"
+        if str =~ /[ -~]*/ then
+		result = str
+	else
+		encoded = [str].pack("M")
+		encoded.gsub!(/ /,"_")
+		encoded.gsub!(/\?/,"=3F")
+		encoded.sub!(/=$/,"")
+		result = "=?%s?Q?%s?=" % [charset, encoded]
+	end
+
+	return result
+end #}}}1
+
+def q_decode(str)
+#{{{1
+	md = /^=\?(.*)?\?Q\?(.*?)\?=/i.match(str)
+	if md then
+		charset = md[1]
+		str.gsub!(/_/," ")
+		str = md[2].unpack("M").first
+	else
+		charset = nil
+	end
+
+	return str,charset
+end #}}}1
+
+# vim: set foldmethod=marker: