jota 0.9.0dev5 → 0.9.0.dev7

data/lib/jota.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-# $Id: jota.rb 287 2010-11-21 17:31:39Z dz $
+# $Id: jota.rb 296 2011-01-31 10:39:18Z dz $
 
 
 require 'getoptlong'
 require 'helper'
-require 'immediate'
+
 require 'version'
 
 class Jota
@@ -51,15 +51,17 @@ def usage
 	puts("\t--update or -U \t\tchange clip from stdin ('regexp' required)")
 	puts("\t--delete or -D \t\tdelete a clip ('regexp' required)")
 	puts("\t--list or -L\t\tlist all clips ('regexp' ignored)")
+        puts("\t  'regexp' are Perl Regexps, may be like '#5' to select clip number 5")
 	puts
 	puts("GUI MODE")
-	puts("\t--size 'WxH' or -s\tset window width and height to W and H")
+	puts("\t--size 'WxH' or -s\tset window width and height to W and H in pixels")
 	puts
 	puts("HELPING")
 	puts("\t--help or -h\t\tthis help")
 	puts("\t--version or -V\t\tshow version")
 	puts("\t--verbose or -v\t\tset verbose mode, -vv is more verbose ")
 	puts("\t--logfile or -f 'file'\twrite verbose output to 'file'")
+        puts
 end
 
 def error(msg)
@@ -197,7 +199,7 @@ def start_gui
 	glade = Gui.new
 	if @filename then
 		open_or_fail(glade,@filename)
-		if @regexp
+		if @regexp then
 			goto_or_fail(glade,@regexp)
 		end
 	end
@@ -217,7 +219,7 @@ def start_gui
 
 	begin
 		Gtk.main
-	rescue Interrupt
+	rescue Interrupt, SignalException
 		glade.close
 	rescue Exception => e
 		print_verbose "crashing, #{e.class}: #{e.message}"
@@ -278,33 +280,36 @@ public
 def run
 	parse_args
 
-	begin
+	if @force == :immediate then
+                require 'immediate'
+		start_immediate
+        else
+                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
+                        require 'gui'
+                        gui_ok = true
+                rescue Exception
+                        gui_ok = false
+                end
 
-	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 'Curses', try '--gui'")
-			else
-				error("Cannot load 'GTK+' nor 'Curses'")
-			end
-		end
-		start_curses
-	else
-		start_gui
-	end
+                if @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 'Curses', try '--gui'")
+                                else
+                                        error("Cannot load 'GTK+' nor 'Curses'")
+                                end
+                        end
+                        start_curses
+                else
+                        start_gui
+                end
+        end
 
 	if $VERBOSE then
 		print_verbose "stopped at #{Time.now}"

data/lib/jota_curses.rb

@@ -1,5 +1,5 @@
 
-# $Id: jota_curses.rb 287 2010-11-21 17:31:39Z dz $
+# $Id: jota_curses.rb 296 2011-01-31 10:39:18Z dz $
 
 require "curses"
 require 'tempfile'
@@ -58,33 +58,6 @@ def initialize
 	@editor_running = false
 
         default_focus
-
-	Curses.init_screen
-	Curses.cbreak
-	Curses.noecho
-	Curses.nonl
-
-	set_terminal
-	@top_win_height = @lines/2
-	set_windows
-
-
-	begin
-		# set SIGgnal handler if terminal WINdow CHanged
-		Signal.trap("SIGWINCH") do
-			print_debug "terminal size changed"
-			set_terminal
-			# ruby 1.9 can't cope with curses initializing and closing in fast succession
-			# and the "sleep" makes fast resizing smoother
-			sleep 0.1
-			if not @editor_running then
-				set_windows
-			end
-		end
-	rescue ArgumentError
-		# for example with Windows
-		print_verbose "Cannot set trap for 'SIGWINCH'"
-	end
 end 
 
 def finish
@@ -106,7 +79,6 @@ def open(filename)
 	@data = new_data
 	@data.current_index = 0
 	@top_win_first = 0
-	draw_bars
 	return @data
 end 
 
@@ -152,6 +124,32 @@ def delete
 end 
 
 def run
+	Curses.init_screen
+	Curses.cbreak
+	Curses.noecho
+	Curses.nonl
+
+	set_terminal
+	@top_win_height = @lines/2
+	set_windows
+
+	begin
+		# set SIGgnal handler if terminal WINdow CHanged
+		Signal.trap("SIGWINCH") do
+			print_debug "terminal size changed"
+			set_terminal
+			# ruby 1.9 can't cope with curses initializing and closing in fast succession
+			# and the "sleep" makes fast resizing smoother
+			sleep 0.1
+			if not @editor_running then
+				set_windows
+			end
+		end
+	rescue ArgumentError
+		# for example with Windows
+		print_verbose "Cannot set trap for 'SIGWINCH'"
+	end
+
 	draw_bars
 	adjust_top_win_first
 	adjust_bot_win_first

data/lib/version.rb

@@ -1,5 +1,5 @@
 
-# $Id: version.rb 285 2010-11-21 09:26:46Z dz $
+# $Id: version.rb 298 2011-02-23 14:44:55Z dz $
 
 
 class Version
@@ -29,13 +29,14 @@ MAJOR = 0
 MINOR = 9
 PATCH = 0
 STATE = "dev"	# "dev", "beta", "rc", "" (for final)
-STATEVER = 5
+STATEVER = 7
 
 STRING = "%d.%d.%d%s" % [MAJOR, MINOR,PATCH,Version.state]
+GEM_STRING = "%d.%d.%d.%s" % [MAJOR, MINOR,PATCH,Version.state]
 
 PROGRAM_NAME = "Jota"
 PROGRAM_NAMELC = PROGRAM_NAME.downcase
-YEARS = "2008-2010"
+YEARS = "2008-2011"
 
 AUTHOR = "Derik van Zuetphen"
 AUTHOR_EMAIL = "dz@426.ch"

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: jota
 version: !ruby/object:Gem::Version 
-  hash: 470221477
+  hash: 1641194486
   prerelease: true
   segments: 
   - 0
   - 9
-  - 0dev5
-  version: 0.9.0dev5
+  - 0
+  - dev7
+  version: 0.9.0.dev7
 platform: ruby
 authors: 
 - Derik van Zuetphen
@@ -15,11 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-22 08:22:25 +01:00
+date: 2011-02-27 20:40:19 +01:00
 default_executable: 
 dependencies: []
 
-description: ""
+description: A jotter application
 email: dz@426.ch
 executables: 
 - jota
@@ -71,12 +72,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 31
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      - 0
+      - 0
+      version: 0.0.0
 requirements: []
 
 rubyforge_project: jota