jota 0.8.0 → 0.8.1

data/lib/jota.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# $Id: jota.rb 37 2009-02-09 10:06:02Z dz $
+# $Id: jota.rb 53 2009-09-24 14:22:04Z dz $
 
 # if you use vim and don't like folds type zR
 
@@ -27,6 +27,10 @@ def usage
         puts("usage: #{$0} -dhv 'file' [ 'regular-expression' ]")
         puts("\t-v\t\tset verbose mode")
         puts("\t-d\t\tset debug mode")
+
+        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
 
@@ -36,9 +40,16 @@ def parse_args
 	opts = GetoptLong.new(
 	      [ '--verbose', '-v', GetoptLong::NO_ARGUMENT ],
 	      [ '--debug', '-d', GetoptLong::NO_ARGUMENT ],
+	      [ '--debug-file', '-D', GetoptLong::REQUIRED_ARGUMENT ],
+	      [ '--text', '-t', GetoptLong::NO_ARGUMENT ],
+	      [ '--gui', '-g', GetoptLong::NO_ARGUMENT ],
 	      [ '--help', '-h', GetoptLong::NO_ARGUMENT ]
 	    )
 
+	@force = nil
+	$debug_filename = nil
+	$debug_file = nil
+
 	begin
 		opts.each do |opt, arg|
 			case opt
@@ -47,6 +58,12 @@ def parse_args
 			when '--debug'
 				$VERBOSE = true
 				$DEBUG = true
+			when '--debug-file'
+				$debug_filename = arg
+			when '--text'
+				@force = :text
+			when '--gui'
+				@force = :gui
 			when '--help'
 				usage
 				exit(EX_OK)
@@ -75,6 +92,7 @@ def parse_args
 	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}"
@@ -83,21 +101,50 @@ def parse_args
 	end
 end #}}}1
 
-
-def run_gui
+def run
 #{{{1
 	parse_args
 
-	# this 'require' must be after the command line is parsed, because 
-	# 'require libglade2' parses the commandline too.
-	require 'gui'
+	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
 
-	glade = Gui.new
+	if @force == :text or gui_ok == false then
+		require 'jota_curses'
+		start_curses
+	else
+		start_gui
+	end
+
+end #}}}1
+
+def start_curses
+#{{{1
+	curses = JotaCurses.new
+	if @filename then
+		curses.open(@filename) 
+		if @regexp then
+			curses.goto_regexp(@regexp)
+		end
+	end
+
+	print_verbose "entering curses main loop"
 
+	curses.run
+end # start_curses }}}1
+
+def start_gui
+#{{{1
+	glade = Gui.new
 	if @filename then
 		glade.open(@filename)
 		if @regexp
-			glade.set_current(@regexp)
+			glade.goto_regexp(@regexp)
 		end
 	end
 
@@ -140,9 +187,7 @@ def run_gui
 			end
 		end
 	end
-
-end # run_gui }}}1
-
+end # start_gui }}}1
 
 def run_cli
 #{{{1
@@ -173,4 +218,4 @@ end # run_cli }}}1
 
 end # class Jota
 
-# vim600: set foldmethod=marker:
+# vim: set foldmethod=marker:

data/lib/preferences.rb

@@ -1,5 +1,5 @@
 
-# $Id: preferences.rb 37 2009-02-09 10:06:02Z dz $
+# $Id: preferences.rb 46 2009-05-08 09:27:55Z dz $
 
 # if you use vim and don't like folds type zR
 
@@ -25,7 +25,7 @@ def Preferences.read(str)
 			p[key] = value
 		end
 	rescue SystemCallError
-		print_debug "#   failed, setting default preferences'"
+		print_debug " failed, setting default preferences"
 	end
 
 	return p
@@ -80,4 +80,4 @@ end #}}}1
 
 end # class
 
-# vim600: set foldmethod=marker:
+# vim: set foldmethod=marker:

data/lib/svn_info.rb

@@ -1,4 +1,4 @@
-# This file is creataed by './make_svn_info.rb'
+# This file is created by './make_svn_info.rb'
 
 module SVN_Info
 
@@ -6,11 +6,11 @@ SVN_PATH="."
 SVN_URL="svn+ssh://solaria.426.ch/svn/jota/trunk"
 SVN_REPOSITORY_ROOT="svn+ssh://solaria.426.ch/svn"
 SVN_REPOSITORY_UUID="ff64bd42-7924-4c15-ba74-d98c4559417c"
-SVN_REVISION="35"
+SVN_REVISION="55"
 SVN_NODE_KIND="directory"
 SVN_SCHEDULE="normal"
 SVN_LAST_CHANGED_AUTHOR="dz"
-SVN_LAST_CHANGED_REV="35"
-SVN_LAST_CHANGED_DATE="2009-01-26 10:30:05 +0100 (Mon, 26 Jan 2009)"
+SVN_LAST_CHANGED_REV="55"
+SVN_LAST_CHANGED_DATE="2009-10-11 15:02:40 +0200 (Sun, 11 Oct 2009)"
 
 end

data/lib/version.rb

@@ -1,5 +1,5 @@
 
-# $Id: version.rb 35 2009-01-26 09:30:05Z dz $
+# $Id: version.rb 40 2009-03-14 10:19:43Z dz $
 
 require "svn_info"
 
@@ -9,7 +9,7 @@ include SVN_Info
 
 MAJOR = 0
 MINOR = 8
-REVISION = 0
+REVISION = 1
 
 STRING = "%d.%d.%d" % [MAJOR, MINOR,REVISION]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jota
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - Derik van Zuetphen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-09 11:11:02 +01:00
+date: 2009-10-11 16:38:01 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,20 +33,20 @@ extra_rdoc_files:
 - INSTALL
 files: 
 - lib/app_error.rb
-- lib/cli.rb
-- lib/version.rb
-- lib/preferences.rb
-- lib/jota.rb
-- lib/helper.rb
-- lib/gui.rb
-- lib/clip.rb
 - lib/clip_array.rb
+- lib/clip.rb
+- lib/gui.rb
+- lib/helper.rb
+- lib/jota.rb
+- lib/preferences.rb
+- lib/version.rb
+- lib/cli.rb
 - lib/svn_info.rb
 - lib/jota.glade
-- tests/test_preferences.rb
-- tests/test_clip_array.rb
-- tests/test_clip.rb
 - tests/test_all.rb
+- tests/test_clip.rb
+- tests/test_clip_array.rb
+- tests/test_preferences.rb
 - INSTALL
 has_rdoc: true
 homepage: http://426.ch/jota
@@ -70,12 +70,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jota
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A simple but powerful jotter in the style of xclipboard
 test_files: 
-- tests/test_preferences.rb
-- tests/test_clip_array.rb
-- tests/test_clip.rb
 - tests/test_all.rb
+- tests/test_clip.rb
+- tests/test_clip_array.rb
+- tests/test_preferences.rb