jota 0.8.1 → 0.9.0dev2

data/lib/helper.rb

@@ -1,146 +1,65 @@
 
-# $Id: helper.rb 52 2009-09-24 14:17:25Z dz $
-
-# if you use vim and don't like folds type zR
-
-def get_filename(filename, mode)
-#{{{1
-	if filename.class == Symbol and filename == :ask then
-		case mode
-		when :save
-			action = Gtk::FileChooser::ACTION_SAVE
-			ok_button = Gtk::Stock::SAVE
-		when :open
-			action = Gtk::FileChooser::ACTION_OPEN
-			ok_button = Gtk::Stock::OPEN
-		else
-			raise "Wrong mode #{mode} in helper:get_filename"
-		end
-
-		title = "Select Filename"
-
-		dialog = Gtk::FileChooserDialog.new(
-			title,
-			nil,
-			action,
-			nil,
-			[Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL],
-			[ok_button, Gtk::Dialog::RESPONSE_ACCEPT])
-
-		case dialog.run
-		when Gtk::Dialog::RESPONSE_ACCEPT
-			filename = dialog.filename
-		else
-			filename = nil
-		end
-		dialog.destroy
-	end
-
-	if filename.nil? then
-		return
-	end
-
-	return filename
-end #}}}1
-
-
-def array_to_color(arr)
-#{{{1
-	return Gdk::Color.new(arr[0],arr[1],arr[2])
-end #}}}1
-
-def color_to_array(gdk_color)
-#{{{1
-        return [gdk_color.red, gdk_color.green, gdk_color.blue]
-end #}}}1
+# $Id: helper.rb 257 2010-05-02 19:47:26Z dz $
 
 def escape_from(str)
-#{{{1
 	str.gsub!(/\n(>*)From /,"\n\\1>From ")
 	return str
-end #}}}1
+end
 
 def unescape_from(str)
-#{{{1
 	str.gsub!(/\n(>*)>From /,"\n\\1From ")
 	return str
-end #}}}1
+end
 
 # expand strftime() time in str and expand %s to 'filename'
 def expand_filename(str, dirname, filename)
-#{{{1
 	result = Time.now.strftime(str)
 	result = result.gsub(/\$f/,filename)
-	result = result.gsub(/\$d/,dirname)
+	result = result.gsub(/\$d/,dirname.gsub(/[^a-z0-9._-]+/i,"_"))
 	result = result.gsub(/\$p/,Process::pid.to_s)
+	result = result.gsub(/\$h/,ENV["HOME"]?ENV["HOME"]:"/")	# TODO on windows?
 	result = result.gsub(/\$\$/,"$")
 	print_debug "expanding '#{filename}' to '#{result}'"
 	return result
-end #}}}1
-
-#
-#	Locking
-#
-
-def obtain_shared_lock(file)
-#{{{1
-	release_lock(file)	# necessary for win32
-
-	# a shared, non-blocking lock
-	print_debug "obtaining SHARED LOCK on '#{file.path}'"
-	if not file.flock(File::LOCK_SH|File::LOCK_NB) then
-		print_debug "  cannot lock"
-		#file.flock(File::LOCK_SH)		TODO
-	end
-end #}}}1
-
-def obtain_exclusive_lock(file)
-#{{{1
-	release_lock(file)	# necessary for win32
-
-	# an exclusive, non-blocking lock
-	print_debug "obtaining EXCLUSIVE LOCK on '#{file.path}'"
-	if not file.flock(File::LOCK_EX|File::LOCK_NB) then
-		print_debug "  cannot lock"
-		#file.flock(File::LOCK_EX)		TODO
-	end
-end #}}}1
-
-def release_lock(file)
-#{{{1
-	print_debug "releasing LOCK from '#{file.path}'"
-	file.flock(File::LOCK_UN)
-end #}}}1
-
-def print_verbose(msg)
-#{{{1
-	if $VERBOSE then
-		debug_file.puts "#{Process.pid}# #{msg}"
-	end	
-end #}}}1
+end
 
 def debug_file
 	if $debug_file.nil? then
 		begin
-			$debug_file = File.open($debug_filename,"w+")
+			if $debug_filename then
+				$debug_file = File.open($debug_filename,"a")
+				print_verbose "logging to #{$debug_filename}"
+			else
+				$debug_file = $stdout
+				print_verbose "logging to stdout"
+			end
 		rescue Exception => msg
 			$debug_file = $stdout
-			print_verbose "logging to '#{$debug_filename}' not possible: #{msg}"
+			print_verbose "logging to '#{$debug_filename}' "+
+				      "not possible: #{msg}, using stdout"
 		end
 		
 	end
 	return $debug_file
 end
 
+def print_verbose(msg)
+	if $VERBOSE then
+		# do not write to $debug_file, this can be nil
+		debug_file.puts "#{Process.pid}-1# #{msg}"
+		debug_file.flush
+	end	
+end
+
 def print_debug(msg)
-#{{{1
 	if $DEBUG then
-		debug_file.puts "#{Process.pid}- #{msg}"
+		# do not write to $debug_file, this can be nil
+		debug_file.puts "#{Process.pid}-2# #{msg}"
+		debug_file.flush
 	end	
-end #}}}1
+end
 
 def editor(str)
-#{{{1
 	file = Tempfile.new("jota")
 	filename = file.path
 	print_verbose "creating temporary file '#{filename}'"
@@ -151,7 +70,7 @@ def editor(str)
 	if ENV["EDITOR"] then
 		cmdline = ENV["EDITOR"]
 	else
-		cmdline = "/usr/bin/vi"
+		cmdline = "vi"
 	end
 	cmdline = "%s %s" % [cmdline, filename]
 	print_verbose "executing '#{cmdline}'"
@@ -168,10 +87,9 @@ def editor(str)
 	File.unlink(filename)
 
 	return lines
-end #}}}1
+end
 
 def q_encode(charset,str)
-#{{{1
         #if str =~ /^[ -<>@-^`-~]*$/ then	# all printable except "=?_"
         if str =~ /[ -~]*/ then
 		result = str
@@ -184,10 +102,9 @@ def q_encode(charset,str)
 	end
 
 	return result
-end #}}}1
+end
 
 def q_decode(str)
-#{{{1
 	md = /^=\?(.*)?\?Q\?(.*?)\?=/i.match(str)
 	if md then
 		charset = md[1]
@@ -198,6 +115,4 @@ def q_decode(str)
 	end
 
 	return str,charset
-end #}}}1
-
-# vim: set foldmethod=marker:
+end

data/lib/immediate.rb

@@ -0,0 +1,63 @@
+
+# $Id: $
+
+require 'clip_array'
+require 'version'
+
+class Immediate
+
+# Variables
+# 	@data		Clip_Array		the clip array
+
+def open(filename)
+	begin
+		new_data = ClipArray.open(filename)
+	rescue AppError, SystemCallError => msg
+		return nil
+	end
+
+	@data = new_data
+	return @data
+end
+
+def clip_array
+	return @data
+end
+
+def create
+	new = STDIN.readlines.join($/)
+	@data.new
+	@data.current.text = new
+	print_verbose "immediately creating clip '#{@data.current.title}'"
+	@data.close
+end
+
+def retrieve
+	puts @data.current.text
+	print_verbose "immediately retrieving clip '#{@data.current.title}'"
+	@data.close
+end
+
+def update
+	new = STDIN.readlines.join($/)
+	@data.current.text = new
+	print_verbose "immediately updating clip '#{@data.current.title}'"
+	@data.close
+end
+
+def delete
+	print_verbose "immediately deleting clip '#{@data.current.title}'"
+	@data.delete
+	@data.close
+end
+
+def list
+	print_verbose "immediately listing #{@data.length} clips"
+	@data.each do | c |
+		puts c.title! if c.type != :pref
+	end
+	@data.close
+end
+
+
+end # class Immediate

data/lib/jota.rb

@@ -1,12 +1,11 @@
 #!/usr/bin/env ruby
 
-# $Id: jota.rb 53 2009-09-24 14:22:04Z dz $
-
-# if you use vim and don't like folds type zR
+# $Id: jota.rb 270 2010-06-02 16:00:02Z dz $
 
 
 require 'getoptlong'
 require 'helper'
+require 'immediate'
 require 'version'
 
 class Jota
@@ -14,36 +13,71 @@ class Jota
 # from sysexits(3)
 EX_OK = 0
 EX_USAGE = 64
-EX_SOFTWARE = 70
 
-def usage
-#{{{1
-        puts("%s Version %s, (C) %s %s" % [
+private
+
+def puts_version(full)
+	puts("%s Version %s, (C) %s %s <%s>" % [
 		Version::PROGRAM_NAME,
 		Version::STRING,
 		Version::YEARS,
-		Version::AUTHOR])
-	puts
-        puts("usage: #{$0} -dhv 'file' [ 'regular-expression' ]")
-        puts("\t-v\t\tset verbose mode")
-        puts("\t-d\t\tset debug mode")
+		Version::AUTHOR,
+		Version::AUTHOR_EMAIL])
+	if (full) then
+		print "  using #{Version.ruby_version}"
+		begin
+			require "gui"
+			print " and #{Gui.gtk_version}"
+		rescue Exception
+		end
+		print " on #{Version.platform}"
+		puts
+	end
+end
 
-        puts("\t-D 'file'\twrite debug and verbose output to 'file'")
-        puts("\t-t\t\tforce text mode")
-        puts("\t-g\t\tforce graphical mode")
-        puts("\t-h\t\tthis help")
-end #}}}1
+def usage
+	puts_version(false)
 
+	puts
+	puts("usage: #{$0} 'options' 'file' [ 'regular-expression' ]")
+	puts
+	puts("MODES")
+	puts("\t--text or -t\t\t\tforce text mode")
+	puts("\t--gui or -g\t\t\tforce graphical mode")
+	puts
+	puts("IMMEDIATE MODE")
+	puts("\t--create or -C\t\t\tcreate a new clip from stdin ('regexp' ignored)")
+	puts("\t--retrieve or -R\t\twrite clip to stdout ('regexp' required)")
+	puts("\t--update or -U \t\t\tchange clip from stdin ('regexp' required)")
+	puts("\t--delete or -D \t\t\tdelete a clip ('regexp' required)")
+	puts("\t--list or -L\t\t\tlist all clips ('regexp' ignored)")
+	puts
+	puts("HELPING")
+	puts("\t--help or -h\t\t\tthis help")
+	puts("\t--version or -V\t\t\tshow version")
+	puts("\t--verbose or -v\t\t\tset verbose mode, -vv is more verbose ")
+	puts("\t--logfile or -f 'file'\t\twrite verbose output to 'file'")
+end
+
+def error(msg)
+	puts msg
+	puts
+	exit(EX_USAGE)
+end
 
 def parse_args
-#{{{1
 	opts = GetoptLong.new(
 	      [ '--verbose', '-v', GetoptLong::NO_ARGUMENT ],
-	      [ '--debug', '-d', GetoptLong::NO_ARGUMENT ],
-	      [ '--debug-file', '-D', GetoptLong::REQUIRED_ARGUMENT ],
+	      [ '--logfile', '-f', GetoptLong::REQUIRED_ARGUMENT ],
 	      [ '--text', '-t', GetoptLong::NO_ARGUMENT ],
 	      [ '--gui', '-g', GetoptLong::NO_ARGUMENT ],
-	      [ '--help', '-h', GetoptLong::NO_ARGUMENT ]
+	      [ '--create', '-C', GetoptLong::NO_ARGUMENT ],
+	      [ '--retrieve', '-R', GetoptLong::NO_ARGUMENT ],
+	      [ '--update', '-U', GetoptLong::NO_ARGUMENT ],
+	      [ '--delete', '-D', GetoptLong::NO_ARGUMENT ],
+	      [ '--list', '-L', GetoptLong::NO_ARGUMENT ],
+	      [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
+		  [ '--version', '-V', GetoptLong::NO_ARGUMENT ]
 	    )
 
 	@force = nil
@@ -54,11 +88,11 @@ def parse_args
 		opts.each do |opt, arg|
 			case opt
 			when '--verbose'
+				if $VERBOSE then
+					$DEBUG = true
+				end
 				$VERBOSE = true
-			when '--debug'
-				$VERBOSE = true
-				$DEBUG = true
-			when '--debug-file'
+			when '--logfile'
 				$debug_filename = arg
 			when '--text'
 				@force = :text
@@ -67,9 +101,26 @@ def parse_args
 			when '--help'
 				usage
 				exit(EX_OK)
+			when '--version'
+				puts_version(true)
+				exit(EX_OK)
+			when '--create'
+				@force = :immediate
+				@immediate_cmd = :create
+			when '--retrieve'
+				@force = :immediate
+				@immediate_cmd = :retrieve
+			when '--update'
+				@force = :immediate
+				@immediate_cmd = :update
+			when '--delete'
+				@force = :immediate
+				@immediate_cmd = :delete
+			when '--list'
+				@force = :immediate
+				@immediate_cmd = :list
 			else
-				usage
-				exit(EX_USAGE)
+				error("Illegal argument '#{opt}'")
 			end
 		end
 	rescue GetoptLong::InvalidOption
@@ -87,64 +138,54 @@ def parse_args
 		@filename = ARGV[0]
 		@regexp = ARGV[1]
 	else
-		usage
-		exit(EX_USAGE)
+		error("Illegal number of arguments")
 	end
 
 	if $VERBOSE then
 		print_verbose "started at #{Time.now}"
-		print_verbose "running version #{Version::STRING}, build #{Version::build}"
-		print_verbose "verbose set to #{$VERBOSE}"
-		print_verbose "debug set to #{$DEBUG}"
+		print_verbose "running version #{Version::STRING}"
+		print_verbose "verbose set to level 1" if $VERBOSE
+		print_verbose "verbose set to level 2" if $DEBUG
+		print_verbose "logfile set to '#{$debug_filename}'" if $VERBOSE and $debug_filename
 		print_verbose "filename set to '#{@filename}'"
 		print_verbose "regexp set to '#{@regexp}'"
+		print_verbose "forcing #{@force.to_s} mode"
+		print_verbose "using immediate command :#{@immediate_cmd.to_s}" if @force == :immediate
 	end
-end #}}}1
+end
 
-def run
-#{{{1
-	parse_args
-
-	begin
-		# this 'require' must be after the command line is parsed, 
-		# because 'require libglade2' parses the commandline too.
-		require 'gui'
-		gui_ok = true
-	rescue Exception
-		gui_ok = false
+def goto_or_fail(object,re)
+	if not object.clip_array.goto_regexp(re) then
+		error("Clip with title matching /#{re}/ not found.")
 	end
+end
 
-	if @force == :text or gui_ok == false then
-		require 'jota_curses'
-		start_curses
-	else
-		start_gui
+def open_or_fail(object,filename)
+	if not object.open(filename) then
+		error("File '#{filename}' not found.")
 	end
-
-end #}}}1
+end
 
 def start_curses
-#{{{1
 	curses = JotaCurses.new
 	if @filename then
-		curses.open(@filename) 
+		open_or_fail(curses,@filename) 
 		if @regexp then
-			curses.goto_regexp(@regexp)
+			goto_or_fail(curses,@regexp)
 		end
 	end
 
 	print_verbose "entering curses main loop"
 
 	curses.run
-end # start_curses }}}1
+end # start_curses
 
 def start_gui
-#{{{1
 	glade = Gui.new
 	if @filename then
-		glade.open(@filename)
+		open_or_fail(glade,@filename)
 		if @regexp
-			glade.goto_regexp(@regexp)
+			goto_or_fail(glade,@regexp)
 		end
 	end
 
@@ -165,57 +206,87 @@ def start_gui
 			Gtk::Dialog::MODAL,
 			Gtk::MessageDialog::ERROR,
 			Gtk::MessageDialog::BUTTONS_NONE,
-			"Oops! I am about to crash")
+			"Oops! I crashed")
 		msgbox.title = "Internal Error"
-		msgbox.secondary_text = "You are strongly advised to save your data "+
-			"as soon as possible and restart the program."+
+		msgbox.secondary_text = "I'm terribly sorry."+
 			"\n\nDetails:\n#{e.class}: #{e.message}"
-		msgbox.add_button("Crash",Gtk::Dialog::RESPONSE_CANCEL)
-		msgbox.add_button("Recover",Gtk::Dialog::RESPONSE_OK)
-
+		msgbox.add_button("Crash",Gtk::Dialog::RESPONSE_OK)
+		
 		msgbox.run do | response |
 			case response
 			when Gtk::Dialog::RESPONSE_OK
 				msgbox.destroy
-				sleep 2
-				print_verbose "recovering"
-				puts "recovering"
-				retry
-			when Gtk::Dialog::RESPONSE_CANCEL
-				msgbox.destroy
-				exit(EX_SOFTWARE)
+				exit(EX_OK)
+			end
+		end
+	end
+end # start_gui
+
+def start_immediate
+	im = Immediate.new
+	regexp_necessary = {	:create	=> false,
+				:retrieve => true,
+				:update => true,
+				:delete => true,
+				:list 	=> false}
+	if @filename then
+		open_or_fail(im,@filename)
+		if regexp_necessary[@immediate_cmd] then
+			if @regexp then
+				goto_or_fail(im,@regexp)	# @regexp may be nil
+			else
+				error("Illegal number of arguments")
+			end
+		else
+			if @regexp then
+				puts "Regexp /#{@regexp}/ ignored."
+				print_verbose "ignoring regexp /#{@regexp}/"
 			end
 		end
+	else
+		error("Illegal number of arguments")
 	end
-end # start_gui }}}1
 
-def run_cli
-#{{{1
-	require 'cli'
+	print_verbose "executing #{@immediate_cmd} immediately"
+	im.send(@immediate_cmd)
+end # start_immediate
 
+public
+
+def run
 	parse_args
 
-	cli = JotaCli.new
-	if @filename then
-		cli.do_open(@filename) 
-		if @regexp then
-			cli.do_edit(@regexp)
-		end
+	begin
+		# this 'require' must be after the command line is parsed, 
+		# because 'require libglade2' parses the commandline too.
+		require 'gui'
+		gui_ok = true
+	rescue Exception
+		gui_ok = false
 	end
 
-	# If ARGV is empty, Cmd runs in a loop, otherwise it runs only once.
-	
-	# in short:	no arg		-> loop
-	# 		only filename	-> loop
-	# 		filename + re	-> once
+	if @force == :immediate then
+		start_immediate
+	elsif @force == :gui and not gui_ok then
+		puts "GUI not available (leave out the option '-g' or '--gui')"
+	elsif @force == :text or not gui_ok then
+		begin
+			require "jota_curses"
+		rescue LoadError
+			if :gui_ok then
+				error("Cannot load 'ncurses', try '--gui'")
+			else
+				error("Cannot load 'GTK+' nor 'ncurses'")
+			end
+		end
+		start_curses
+	else
+		start_gui
+	end
 	
-	if @filename and @regexp.nil? then  # i.e. only one arg
-		ARGV.clear
+	if $VERBOSE then
+		print_verbose "stopped at #{Time.now}"
 	end
-
-	cli.run
-end # run_cli }}}1
+end
 
 end # class Jota
-
-# vim: set foldmethod=marker: