jota 0.9.0 → 0.9.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ee214349016008f404c9966b9f83e418d1eeb88a
+  data.tar.gz: 76b0575c605a2dee7bf57a639d59009512db8845
+SHA512:
+  metadata.gz: 798f6e9dde5ce32311e83c6429f285b07b73310821116f023a9fb304e3f168f54d220d7f8798f451c0d3d5edb33ade9d16012d8e9a4958ae12840919853e7a78
+  data.tar.gz: 05123f07dd8269d10c32a0715f36fe1cdf7b3a561526c34462a03197182bd9e3cc02cfc80f9337742458d3a526c083edbc0aa8e13751b7259aa6a2bbf83e5132

data/INSTALL

@@ -1,20 +1,23 @@
 
-Jota is a written in the Ruby programming language and uses GTK+ Widgets.
+Jota is a written in the Ruby programming language and uses GTK+
+Widgets.
 
-Before you can install Jota you must install the Ruby programming language
-and the GTK+ widget set.
+Before you can install Jota you must install the Ruby programming
+language and the GTK+ widget set.
 
 You need:
 
  - The Ruby language: compiler, runtime, libraries
- - Gem: The Ruby package manager. Sometimes included in the Ruby package
- - Build tools (optional): If you want to install the GTK+ bindings with Ruby's
-   package manager 'gem', you need the so called build tools, like 
-   C-compiler, linker, make-tools, and so on. The build tools are needed,
-   because the system dependent parts of the GTK+ gem are compiled during
-   installation.
- - GTK+: The graphics library and widget set, known from Gnome and Gimp
- - GTK+ Bindings for Ruby: A library so that you can access GTK+ from Ruby
+
+ - Build tools (optional): If you want to install the GTK+ bindings
+   with Ruby's package manager 'gem', you need the so called build
+   tools, like C-compiler, linker, make-tools, and so on. The build
+   tools are needed, because the system dependent parts of the GTK+
+   gem are compiled during installation.
+ - GTK+: The graphics library and widget set, known from Gnome and
+   Gimp
+ - GTK+ Bindings for Ruby: A library so that you can access GTK+ from
+   Ruby
  - Jota: Finally Jota itself. This is also a Ruby gem.
 
 
@@ -23,61 +26,34 @@ INSTALLING
 
 For the most common operating systems the steps are as follows:
 
-Ubuntu/Debian Linux
--------------------
-(Tested with Ubuntu 11.04 and Debian 6.0 (squeeze))
+Mint/Ubuntu/Debian Linux
+------------------------
+(Tested with Mint 17, Ubuntu 14.04 LTS and Debian 7 (wheezy))
 
-Install Ruby + Gems:
-  apt-get install ruby rubygems
+Install Ruby + GTK+:
+  apt-get install ruby ruby-gtk2
 
-Install GTK+ + Ruby bindings:
-  apt-get install libgtk2-ruby          # (recommended)
-or
-  apt-get install build-essential    
-  gem install gtk2
-  
 Install Jota:
-  gem install jota                      # (recommended)
-or
-  Download a jota-VER.gem from http://rubygems.org/gems/jota. VER stand
-  for the version you are looking for.
-  gem install jota-VER.gem
+  gem install jota
 
 Call Jota:
-or
-  /var/lib/gems/1.8/bin/jota
-or
-  Append the line
-    PATH="$PATH:/var/lib/gems/1.8/bin"
-  to $HOME/.bashrc (or consult your shell's manpage for the correct file
-  and/or syntax)
-
-  Then you can invoke Jota by calling jota
-
-  (Please see https://launchpad.net/bugs/145267 for details, why invoking
-  a gem is not straight forward on Ubuntu)
+  jota
 
 
 Fedora Linux
 ------------
-(Tested with Fedora 14)
+(Tested with Fedora 21)
 
-Install Ruby + Gems:
-  yum install ruby rubygems
+Install Ruby + GTK+:
+  yum install ruby ruby-gtk2
 
-Install GTK+ + Ruby bindings:
-  yum install ruby-gtk2                 # (recommended)
-or
-  yum groupinstall "Development Tools" "Legacy Software Development"
-  yum install gtk2-devel
-  gem install gtk2
+You need to install the curses (text-mode) library seperately:
+  yum groups install 'Development Tools'
+  yum install ruby-devel ncurses-devel
+  gem install curses
 
 Install Jota:
-  gem install jota                      # (recommended)
-or
-  Download a jota-VER.gem from http://rubygems.org/gems/jota. VER stand
-  for the version you are looking for.
-  gem install jota-VER.gem
+  gem install jota
 
 Call Jota:
   jota
@@ -85,23 +61,23 @@ Call Jota:
 
 OpenSUSE Linux
 --------------
-(Tested with OpenSUSE 11.4)
+(Tested with OpenSUSE 13.2)
 
-Install Ruby + Gems:
-  zypper install ruby rubygems
+Install Ruby:
+  zypper install ruby ruby-devel
 
 Install GTK+ + Ruby bindings:
   zypper install -t pattern devel_C_C++
-    (There is no prebuild ruby-gtk package, therefore we need this 
+    (There is no prebuild ruby-gtk package, therefore we need this
     cumbersome way to install the Ruby bindings for GTK+.)
   gem install gtk2
 
+You need to install the curses (text-mode) library seperately:
+  gem install curses
+
 Install Jota:
-  gem install jota			# (recommended)
-or
-  Download a jota-VER.gem from http://rubygems.org/gems/jota. VER stand
-  for the version you are looking for.
-  gem install jota-VER.gem
+  gem install jota
+  ln -s `gem contents jota|grep bin/jota` /usr/local/bin/
 
 Call Jota:
   jota
@@ -109,23 +85,16 @@ Call Jota:
 
 FreeBSD
 -------
-(Tested with FreeBSD 8.2)
-
-Install Ruby + Gems:
-  cd /usr/ports/lang/ruby18; make install # (Select OK)
-  cd /usr/ports/devel/ruby-gems; make install
+(Tested with FreeBSD 10.1)
 
-Install GTK+ + Ruby bindings:
-  cd /usr/ports/x11-toolkits/ruby-gem2; make install  # (recommended)
-or
-  gem install gtk2
+Install Ruby + GTK+:
+  pkg install ruby rubygem-gtk2
 
 Install Jota:
-  gem install jota			# (recommended)
-or
-  Download a jota-VER.gem from http://rubygems.org/gems/jota. VER stand
-  for the version you are looking for.
-  gem install jota-VER.gem
+  gem install jota
+
+You need to install the curses (text-mode) library seperately:
+  gem install curses
 
 Call Jota:
   jota
@@ -133,44 +102,43 @@ Call Jota:
 
 Windows
 -------
-(Tested with Windows XP)
+(Tested with Windows 7)
 
 Install Ruby + Gems:
   Goto http://rubyinstaller.org
-  Download the latest 1.8.x version (at least 1.8.7)
-  Install 
-    Install into default folder (like c:\Ruby187)
-    Check box: Add Ruby executable to your PATH
-    Check box: Associate .rb and .rbw files with this Ruby installation
+  Download the latest 2.0.x version, 32 bit
+    (the 64 bit versions and rubies prior to 2.0 don't have a
+    precompiled gtk2 gem, and 2.1.x not yet)
+  Install
+    Install into default folder (like C:\Ruby200)
+    Check: Add Ruby executable to your PATH
+    Check: Associate .rb and .rbw files with this Ruby installation
 
 Install GTK+ + Ruby bindings:
-  Execute (1): gem install gtk2
+  Execute (1,3): gem install gtk2
 
 Install Jota:
-  Execute (1): gem install jota		# (recommended)
-or
-  Download a jota-VER.gem from http://rubygems.org/gems/jota. VER stands
-  for the version you are looking for.
-  Execute (1): gem install jota-VER.gem
+  Execute (1,3): gem install jota
 
 Call Jota:
   Execute(1): jota
 or
-  Create a shortcut and point it to 
-  "C:\Ruby187\bin\rubyw C:\Ruby187\bin\jota" (2)
-
-When you call jota with rubyw instead of ruby, you won't get a command
-window hanging around.
+  Create a shortcut of "C:\Ruby200\bin\jota" (2)
 
+Optimize batch script:
+  Edit (2) "C:\Ruby200\bin\jota.bat" and change the calls of
+  "ruby.exe" to "rubyw.exe" (2 times), then you don't get a cmd window
 
 (1) Execute either by
-    - clicking Start->Run on Windows XP
     - hitting Win-R
     - opening a command prompt window (cmd.exe) and entering a command
 
-(2) Use the install path from the first step instead of c:\Ruby187,
-    if different.
+(2) Use the install path from the first step instead of C:\Ruby200, if
+different.
 
+(3) If you get an "SSL Connect" Error, append
+"--source=http://rubygems.org" to the command line. Ignore the errors
+after "Installing ri documentation" and "Parsing documention" then.
 
 
 UPDATING
@@ -194,4 +162,3 @@ tools:
 
 - rake		"make" alternative with ruby syntax
 - rdoc		inline documentation generator
-- rtags		"tags" for ruby code

data/LICENSE

@@ -1,5 +1,5 @@
 
-  Copyright (c) 2008-2011 Derik van Zuetphen <dz@426.ch>
+  Copyright (c) 2008-2015 Derik van Zuetphen <dz@426.ch>
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without

data/bin/jota

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-# $Id: jota 68 2010-01-04 14:23:45Z dz $
 begin
   require 'jota'
 rescue LoadError

data/lib/app_error.rb

@@ -1,5 +1,3 @@
 
-# $Id: app_error.rb 68 2010-01-04 14:23:45Z dz $
-
 class AppError < StandardError
 end

data/lib/clip.rb

@@ -1,6 +1,4 @@
 
-# $Id: clip.rb 296 2011-01-31 10:39:18Z dz $
-
 require 'time'
 require 'version'
 
@@ -18,35 +16,36 @@ class Clip
 
 attr_accessor :wrap, :title, :created, :pos, :type, :data
 
-def initialize 
+def initialize
 	@data = ""	# no lines at all, "\n" would be 1 empty line
 	@wrap = false
 	@type = :text
 	@title = ""
 	@created = Time.now
 	@pos = 0
-end 
+end
 
 def Clip.from_mbox(str)
 	# "From_" line already removed
 	cl = Clip.new
 	in_header = true
-	charset = nil
+	charset = "UTF-8"
 	str.each_line do | line  |
+                line.encode!(charset)
 		if in_header then
 			if line == "\n" then
 				in_header = false
 				next
 			end
-			#(key, value) = line.split(/\s*:\s*/,2)	
+			#(key, value) = line.split(/\s*:\s*/,2)
 			# stricter pattern to preserve leading spaces
-			(key, value) = line.split(/\s*: /,2)	
+			(key, value) = line.split(/\s*: /,2)
 			value.chomp!
 			case key.downcase
 			when "flags", "x-flags"
 				cl.wrap = value.downcase.include?("w")
 			when "subject"
-				cl.title,charset = value
+				cl.title = value
 			when "created-at", "date"
 				cl.created = Time.parse(value)
 			when "content-type"
@@ -64,7 +63,7 @@ def Clip.from_mbox(str)
 		end
 	end
 	return cl
-end 
+end
 
 def to_mbox
 	str = ""
@@ -73,7 +72,7 @@ def to_mbox
 	str << "Created-At: %s\n" % @created.ctime
 
 	str << "Subject: %s\n" % @title
-	
+
 	case @type
 	when :text
 		str << "Content-Type: text/plain; charset=#{charset}\n"
@@ -92,7 +91,7 @@ def to_mbox
 	str << @data
 
 	return str
-end 
+end
 
 def Clip.from_hash(hash)
 	cl = Clip.new
@@ -104,7 +103,7 @@ def Clip.from_hash(hash)
 		cl.created = hash["created"]
 	end
 	return cl
-end 
+end
 
 def to_hash
 	hash = Hash.new
@@ -114,17 +113,17 @@ def to_hash
 	hash["title"] = @title
 	hash["created"] = @created
 	return hash
-end 
+end
 
 
 def empty?
 	# strip also removes LFs
 	return @data.strip == "" && @title.strip == ""
-end 
+end
 
 def ==(clip)
 	return self.to_hash == clip.to_hash
-end 
+end
 
 # POSSIBLE CASES FOR TEXT <-> TITLE/DATA CONVERSION
 #       text                                    title   data
@@ -144,18 +143,18 @@ def text
 		# map (2) to (b) and (3) to (d)
 		return "%s\n%s" % [@title,@data]
 	end
-end 
+end
 
 def text=(str)
 	# 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 
+end
 
 # Return modified title for easier readabiliy
 # - empty string is replaced with "..."
@@ -164,7 +163,7 @@ def title!
 	if @title.strip == "" then
 		return "..."
 	else
-		
+
 		return expand_tabs(@title)
 	end
 end

data/lib/clip_array.rb

@@ -1,8 +1,4 @@
 
-# $Id: clip_array.rb 273 2010-08-01 11:46:58Z dz $
-
-
-
 require 'app_error'
 require 'clip'
 require 'helper'
@@ -41,20 +37,20 @@ def initialize
 	@filename = nil
 	@pref = Preferences.defaults
 	print_verbose "initializing clip array"
-end 
+end
 
 def <<(clip)
 	push(clip)
 	@current_index = length-1
 	return self
-end 
+end
 
 def set_file(file,file_and_path)
 	@file = file
 	@file_and_path = file_and_path
 	@filename = File.basename(file_and_path)
 	@dirname = File.dirname(file_and_path)
-end 
+end
 
 def goto_regexp(re)
 	return nil if re.nil?
@@ -76,7 +72,7 @@ def goto_regexp(re)
 		end
 		return nil
 	end
-end 
+end
 
 def current_index=(num)
 	if num < 0 then
@@ -87,7 +83,7 @@ def current_index=(num)
 		@current_index = num
 	end
 	print_verbose "going to clip #{@current_index+1}"
-end 
+end
 
 def next
 	if @current_index < length-1 then
@@ -95,7 +91,7 @@ def next
 		print_verbose "going to next clip #{@current_index+1}"
 	end
 	return self
-end 
+end
 
 def prev
 	if @current_index > 0 then
@@ -103,7 +99,7 @@ def prev
 		print_verbose "going to previous clip #{@current_index+1}"
 	end
 	return self
-end 
+end
 
 def delete
 	if @current_index == length-1 then
@@ -120,8 +116,8 @@ def delete
 	else
 		@current_index = new_current_index
 	end
-	
-end 
+
+end
 
 def new
 	if length > 0 and self[length-1].empty? then
@@ -133,11 +129,11 @@ def new
 		@current_index = length-1
 		print_verbose "creating new clip #{@current_index+1}"
 	end
-end 
+end
 
 def current
 	return self[@current_index]
-end 
+end
 
 #
 #	Locking
@@ -152,23 +148,31 @@ def ClipArray.obtain_shared_lock(file)
 		print_debug "  cannot lock"
 		#file.flock(File::LOCK_SH)		TODO
 	end
-end 
+end
 
 def ClipArray.obtain_exclusive_lock(file)
 	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
+	begin
+		# 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
+	rescue Exception => e
+		print_debug "#{e}";
 	end
-end 
+end
 
 def ClipArray.release_lock(file)
-	print_debug "releasing LOCK from '#{file.path}'"
-	file.flock(File::LOCK_UN)
-end 
+        begin
+	        print_debug "releasing LOCK from '#{file.path}'"
+	        file.flock(File::LOCK_UN)
+	rescue Exception => e
+		print_debug "#{e}"
+        end
+end
 
 def ClipArray.create(file_and_path)
 	print_verbose "creating file '#{file_and_path}'"
@@ -181,7 +185,7 @@ def ClipArray.create(file_and_path)
 		file = File.open(file_and_path,"w+")
 		ca = ClipArray.new.clear1
 		ca.set_file(file,file_and_path)
-		
+
 		# test if writable
 		ClipArray.obtain_exclusive_lock(file)
 
@@ -192,7 +196,7 @@ def ClipArray.create(file_and_path)
 	end
 
 	return ca
-end 
+end
 
 def ClipArray.open(file_and_path)
 	print_verbose "opening file '#{file_and_path}'"
@@ -200,6 +204,7 @@ def ClipArray.open(file_and_path)
 	begin
 		file = File.open(file_and_path,"r+")
 		ca = ClipArray.read_mbox(file)
+                ca.clear1 if ca == []
 		ca.set_file(file,file_and_path)
 
 		# test if writable
@@ -212,7 +217,7 @@ def ClipArray.open(file_and_path)
 	end
 
 	return ca
-end 
+end
 
 def save
 	if @file.nil? then
@@ -227,17 +232,17 @@ def save
 	write_mbox(@file)
 	@file.flush
 	ClipArray.obtain_shared_lock(@file)
-end 
+end
 
 def append(file)
 	print_verbose "append to mbox '#{file}'"
 	File.open(file,"a") do | f |
-		f.print "From %s@localhost %s\n" % 
+		f.print "From %s@localhost %s\n" %
 			[Version::PROGRAM_NAMELC, Time.now.ctime]
 		f.print(escape_from(self[@current_index].to_mbox.chomp))
 		f.print("\n")
 	end
-end 
+end
 
 def close
 	save
@@ -249,9 +254,9 @@ def close
 	@file = nil
 	@filename = nil
 	clear
-end 
+end
 
-private 
+private
 
 
 def ClipArray.read_mbox(file)
@@ -302,7 +307,7 @@ def ClipArray.read_mbox(file)
 
 	ca.current_index = ca.length - 1
 	return ca
-end 
+end
 
 def write_mbox(file)
 	print_debug "writing clips, mbox format"
@@ -315,13 +320,13 @@ def write_mbox(file)
 	pc.data = @pref.write
 
 	([pc]+self).each do | clip |
-		file.print "From %s@localhost %s\n" % 
+		file.print "From %s@localhost %s\n" %
 			[Version::PROGRAM_NAMELC, Time.now.ctime]
 		file.print(escape_from(clip.to_mbox.chomp))
 		file.print("\n")
 		print_debug "  #{i}: '#{clip.title}'"
 		i += 1
 	end
-end 
+end
 
 end # class