jota 0.9.0dev4 → 0.9.0dev5

data/lib/clip.rb

@@ -1,5 +1,5 @@
 
-# $Id: clip.rb 278 2010-08-08 19:44:10Z dz $
+# $Id: clip.rb 287 2010-11-21 17:31:39Z dz $
 
 require 'time'
 require 'version'
@@ -158,11 +158,14 @@ def text=(str)
 end 
 
 # Return modified title for easier readabiliy
+# - empty string is replaced with "..."
+# - tabs are replaced with 4 spaces
 def title!
 	if @title.strip == "" then
 		return "..."
 	else
-		return @title
+		
+		return expand_tabs(@title)
 	end
 end
 

data/lib/helper.rb

@@ -1,5 +1,5 @@
 
-# $Id: helper.rb 257 2010-05-02 19:47:26Z dz $
+# $Id: helper.rb 287 2010-11-21 17:31:39Z dz $
 
 def escape_from(str)
 	str.gsub!(/\n(>*)From /,"\n\\1>From ")
@@ -12,17 +12,27 @@ def unescape_from(str)
 end
 
 # expand strftime() time in str and expand %s to 'filename'
+
 def expand_filename(str, dirname, filename)
+        # test on $RUBY_PLATFORM is less reliable, can be mswin, mingw, java
+        if ENV["HOMEDRIVE"] then
+                homedir = ENV["HOMEDRIVE"]+"\\"+ENV["HOMEPATH"]
+        else
+                homedir = ENV["HOME"]
+        end
 	result = Time.now.strftime(str)
 	result = result.gsub(/\$f/,filename)
-	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(/\$h/,homedir)
 	result = result.gsub(/\$\$/,"$")
 	print_debug "expanding '#{filename}' to '#{result}'"
 	return result
 end
 
+def expand_tabs(str)
+        return str.gsub(/([^\t]{8})|([^\t]*)\t/n){[$+].pack("A8")}
+end
+
 def debug_file
 	if $debug_file.nil? then
 		begin

data/lib/immediate.rb

@@ -13,6 +13,7 @@ def open(filename)
 	begin
 		new_data = ClipArray.open(filename)
 	rescue AppError, SystemCallError => msg
+                puts msg
 		return nil
 	end
 
@@ -53,8 +54,9 @@ end
 
 def list
 	print_verbose "immediately listing #{@data.length} clips"
-	@data.each do | c |
-		puts c.title! if c.type != :pref
+	@data.each_index do | i |
+                c = @data[i]
+                print "%d\t%s\t%s\n" % [i,c.type,c.title!]
 	end
 	@data.close
 end

data/lib/jota.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# $Id: jota.rb 278 2010-08-08 19:44:10Z dz $
+# $Id: jota.rb 287 2010-11-21 17:31:39Z dz $
 
 
 require 'getoptlong'
@@ -130,7 +130,8 @@ def parse_args
 				error("Illegal argument '#{opt}'")
 			end
 		end
-	rescue GetoptLong::InvalidOption
+	rescue GetoptLong::InvalidOption, GetoptLong::MissingArgument
+                puts "type #{$0} -h for help"
 		exit(EX_USAGE)
 	end
 
@@ -163,18 +164,23 @@ end
 
 def goto_or_fail(object,re)
 	if not object.clip_array.goto_regexp(re) then
+                if object.respond_to? :finish then
+                        object.finish   # some objects needs to be tidied up
+                end
 		error("Clip with title matching /#{re}/ not found.")
 	end
 end
 
 def open_or_fail(object,filename)
 	if not object.open(filename) then
-		error("File '#{filename}' not found.")
+                # error message should be written in object.open
+                error("")
 	end
 end
 
 def start_curses
 	curses = JotaCurses.new
+
 	if @filename then
 		open_or_fail(curses,@filename) 
 		if @regexp then
@@ -299,7 +305,7 @@ def run
 	else
 		start_gui
 	end
-	
+
 	if $VERBOSE then
 		print_verbose "stopped at #{Time.now}"
 	end

data/lib/jota_curses.rb

@@ -1,5 +1,5 @@
 
-# $Id: jota_curses.rb 257 2010-05-02 19:47:26Z dz $
+# $Id: jota_curses.rb 287 2010-11-21 17:31:39Z dz $
 
 require "curses"
 require 'tempfile'
@@ -55,9 +55,10 @@ def initialize
 	@bot_bar = nil
 
 	@mode = :normal
-
 	@editor_running = false
 
+        default_focus
+
 	Curses.init_screen
 	Curses.cbreak
 	Curses.noecho
@@ -67,6 +68,7 @@ def initialize
 	@top_win_height = @lines/2
 	set_windows
 
+
 	begin
 		# set SIGgnal handler if terminal WINdow CHanged
 		Signal.trap("SIGWINCH") do
@@ -85,11 +87,16 @@ def initialize
 	end
 end 
 
+def finish
+        Curses.close_screen
+end
+
 def open(filename)
 	begin
 		new_data = ClipArray.open(filename)
 	rescue AppError, SystemCallError => msg
-		error(msg)
+                finish
+                puts msg
 		return nil
 	end
 
@@ -205,18 +212,24 @@ def draw_bars
 	@top_bar.refresh
 
 	@mid_bar.clear
-	@mid_bar.addstr("="*@columns)
+        @mid_bar.addstr("==")
+        if @top_focus then
+                @mid_bar.addstr("^^^")
+        else
+                @mid_bar.addstr("vvv")
+        end
+	@mid_bar.addstr("="*(@columns-5))
 	@mid_bar.refresh
 
 	@bot_bar.clear
 	case @mode
 	when :normal
-		@bot_bar.addstr("Crsr=le/ri/up/dn, e=edit, n=new, d=del, o=open, +/-=resize win, h=help, q=quit")
+		@bot_bar.addstr("Crsr=le/ri/up/dn, Tab=focus, e=edit, n=new, d=del, +/-=resize, h=help, q=quit")
 	when :help
-		@bot_bar.addstr("Crsr=up/dn, +/-=resize win, h/q=quit help")
+		@bot_bar.addstr("Crsr=up/dn, Tab=focus, +/-=resize win, h/q=quit help")
 
 	when :pref
-		@bot_bar.addstr("Crsr=up/dn, e=edit pref, +/-=resize win, p/q=quit pref")
+		@bot_bar.addstr("Crsr=up/dn, Tab=focus, e=edit pref, +/-=resize win, p/q=quit pref")
 	else
 		@bot_bar.addstr("h=help, q=quit")
 	end
@@ -234,7 +247,7 @@ def draw_top_window
 			end
 			if i < @data.length then
 				@top_win.addstr("%s %s\n" % 
-					[marker,@data[i].title![0..@columns-4]])
+                                   [marker, @data[i].title![@left_margin_top..@left_margin_top+@columns-4]])
 			end
 		end
 	end
@@ -244,7 +257,7 @@ end
 def draw_bottom_window
 	print_debug "drawing text in #{@mode} mode"
 	case @mode
-	when :normal
+        when :normal
 		if @data then
 			text = @data.current.text
 		else
@@ -266,10 +279,9 @@ def draw_bottom_window
 	arr = text.split(/\n/)
 	@bot_win_first.upto @bot_win_first+self.get_bot_win_height-1 do | i |
 		str = arr[i] || ""
-		# expand tabs to spaces
-		str.gsub!(/([^\t]{8})|([^\t]*)\t/n){[$+].pack("A8")}
-		@bot_win.addstr(str[0..@columns-2])
-		@bot_win.addstr("\n")
+		str = expand_tabs(str)
+                @bot_win.addstr(str[@left_margin_bot..@left_margin_bot+@columns-2])
+                @bot_win.addstr("\n")
 	end
 	result = arr.length
 	@bot_win.refresh
@@ -283,7 +295,8 @@ Jota #{Version::STRING}, (C) #{Version::YEARS} #{Version::AUTHOR} <#{Version::AU
 
  Keys:
     Cursor up/down	Scroll up/down
-    Cursor left/right	Show previous/next clip
+    Cursor left/right	Scroll left/right
+    Tab                 toggle focus between top and bottom window
     e, ENTER		Edit current clip (with $EDITOR)
     n			Append new clip
     d			Delete current clip
@@ -292,7 +305,7 @@ Jota #{Version::STRING}, (C) #{Version::YEARS} #{Version::AUTHOR} <#{Version::AU
     c			Create new file
     C			Close file
 
-    +			Grow top window
+    +,=			Grow top window
     -			Shrink top window
     p			Preferences
     !			Execute command (default $SHELL)
@@ -347,9 +360,11 @@ def app_quit
 	if @data then
 		if really?("confirm_quit","Really quit?") then
 			@data.close
-			exit
+                        finish
+		exit
 		end
 	else
+                finish
 		exit
 	end
 end 
@@ -364,11 +379,18 @@ def call_editor(text)
 	return text
 end
 
+def default_focus
+        @top_focus = 0
+        @left_margin_top = 0
+        @left_margin_bot = 0
+end
+
 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 " " and "~"), Fixnum otherwise
+	# Ruby 1.9: getch return a String if char is printable (between " " 
+        # and "~"), Fixnum otherwise
 	begin
 		ch = @bot_bar.getch
 		ch = 0 if ch.nil?
@@ -381,7 +403,10 @@ def handle_key
 		case ch.chr
 		when "\f" 	# Ctrl-L
 			redraw_all
-		when "c"
+                when "\t"       # Tab
+                        @top_focus = ! @top_focus
+                        draw_bars
+                when "c"
 			filename = prompt_filename("Create File (?=list): ")
 			if filename and filename != "" then
 				create(filename)
@@ -403,19 +428,23 @@ def handle_key
 			when :normal
 				if @data then
 					@data.current.text = call_editor(@data.current.text)
+                                        default_focus
 					@data.save
 				end
 			when :pref
 				if @data
 					newpref = call_editor(@data.pref.write)
 					@data.pref = Preferences.read(newpref)
+                                        default_focus
 				end
 			end
 		when "h"
 			if @mode == :help then
 				@mode = :normal
+                                @top_focus = true
 			else
 				@mode = :help
+                                @top_focus = false
 			end
 			redraw_all
 			@bot_win_first = 0
@@ -424,6 +453,7 @@ def handle_key
 				@data.new
 				@mode = :normal
 				@data.current.text = call_editor(@data.current.text)
+                                default_focus
 				@data.save
 			end
 		when "o"
@@ -435,8 +465,10 @@ def handle_key
 		when "p"
 			if @mode == :pref then
 				@mode = :normal
+                                @top_focus = true
 			else
 				@mode = :pref
+                                @top_focus = false
 			end
 			@bot_win_first = 0
 			redraw_all
@@ -446,7 +478,8 @@ def handle_key
 			else
 				@mode = :normal
 			end
-		when "+"	# grow top window
+		when "+","="	# grow top window
+                                # = is on the same key as + on us-layout
 			if @top_win_height + 5 <= @lines then
 				@top_win_height += 1
 				set_windows
@@ -479,33 +512,52 @@ def handle_key
 		end
 	else
 		case ch
-		when Curses::Key::LEFT, Curses::Key::RIGHT
-			if @data then
-				@data.current.pos = @bot_win_first
-				if ch == Curses::Key::LEFT then
-					@data.prev
-				else
-					@data.next
-				end
-				if @data.current.pos then
-					@bot_win_first = @data.current.pos
-				else
-					@bot_win_first = 0
-				end
-				@mode = :normal
-			end
+		when Curses::Key::LEFT
+                        if @top_focus then
+                                @left_margin_top -= 1 if @left_margin_top >= 1
+                        else
+                                @left_margin_bot -= 1 if @left_margin_bot >= 1
+                        end
+                when Curses::Key::RIGHT
+                        if @top_focus then
+                                @left_margin_top += 1
+                        else
+                                @left_margin_bot += 1
+                                end
 		when Curses::Key::UP, Curses::Key::DOWN
-			if @data then
-				if ch == Curses::Key::UP then
-					@bot_win_first -= 1
-				else
-					@bot_win_first += 1
-				end
-			end
+                        if @data then
+                                if @top_focus then
+                                        @data.current.pos = @bot_win_first
+                                        if ch == Curses::Key::UP then
+                                                @data.prev
+                                        else
+                                                @data.next
+                                        end
+                                        if @data.current.pos then
+                                                @bot_win_first = @data.current.pos
+                                        else
+                                                @bot_win_first = 0
+                                        end
+                                        @mode = :normal
+                                else
+                                        if ch == Curses::Key::UP then
+                                                @bot_win_first -= 1
+                                        else
+                                                @bot_win_first += 1
+                                        end
+
+                                end
+                        end
 		when Curses::Key::HOME
 			if @data then
 				@bot_win_first = 0
 			end
+		when Curses::Key::END
+                        # XXX
+		when Curses::Key::NPAGE
+                        # XXX
+		when Curses::Key::PPAGE
+                        # XXX
 		end
 	end
 
@@ -565,8 +617,16 @@ def prompt_filename(str)
 		filename = prompt(str)
 		if filename == "?" then
 			@bot_win.clear
-			Dir.foreach(".") do | f | 
-				@bot_win.addstr(f+"\t") if f !~ /^\./
+                        @bot_win.addstr File.expand_path(".")
+                        @bot_win.addstr(":\n")
+                        ent = (Dir.entries ".").sort
+			ent.each  do | f | 
+                                next if f =~ /^\./
+				@bot_win.addstr(f)
+                                if File.directory? f then
+                                        @bot_win.addstr("/")
+                                end
+                                @bot_win.addstr("\t")
 			end
 			@bot_win.refresh
 		else

data/lib/version.rb

@@ -1,5 +1,5 @@
 
-# $Id: version.rb 278 2010-08-08 19:44:10Z dz $
+# $Id: version.rb 285 2010-11-21 09:26:46Z dz $
 
 
 class Version
@@ -29,7 +29,7 @@ MAJOR = 0
 MINOR = 9
 PATCH = 0
 STATE = "dev"	# "dev", "beta", "rc", "" (for final)
-STATEVER = 4
+STATEVER = 5
 
 STRING = "%d.%d.%d%s" % [MAJOR, MINOR,PATCH,Version.state]
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jota
 version: !ruby/object:Gem::Version 
-  hash: 470221476
+  hash: 470221477
   prerelease: true
   segments: 
   - 0
   - 9
-  - 0dev4
-  version: 0.9.0dev4
+  - 0dev5
+  version: 0.9.0dev5
 platform: ruby
 authors: 
 - Derik van Zuetphen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-09 09:11:00 +02:00
+date: 2010-11-22 08:22:25 +01:00
 default_executable: 
 dependencies: []
 
@@ -23,7 +23,6 @@ description: ""
 email: dz@426.ch
 executables: 
 - jota
-- jota.bat
 extensions: []
 
 extra_rdoc_files: