jota 0.8.1 → 0.9.0dev2

data/lib/version.rb

@@ -1,20 +1,41 @@
 
-# $Id: version.rb 40 2009-03-14 10:19:43Z dz $
+# $Id: version.rb 270 2010-06-02 16:00:02Z dz $
 
-require "svn_info"
 
 class Version
 
-include SVN_Info
+def Version.state
+	result = ""
+	if STATE != "" then
+		result = "#{STATE}"
+		if STATEVER > 0 then
+			result += ("%d" % STATEVER)
+		end
+	end
+	return result	
+end
+
+def Version.ruby_version
+	return "Ruby #{RUBY_VERSION}"
+end
+
+def Version.platform
+	return "#{RUBY_PLATFORM}"
+end
+
+# Semantic versioning used. See http://semver.org for details
 
 MAJOR = 0
-MINOR = 8
-REVISION = 1
+MINOR = 9
+PATCH = 0
+STATE = "dev"	# "dev", "beta", "rc", "" (for final)
+STATEVER = 2
 
-STRING = "%d.%d.%d" % [MAJOR, MINOR,REVISION]
+STRING = "%d.%d.%d%s" % [MAJOR, MINOR,PATCH,Version.state]
 
-PROGRAM_NAME = "jota"
-YEARS = "2008-2009"
+PROGRAM_NAME = "Jota"
+PROGRAM_NAMELC = PROGRAM_NAME.downcase
+YEARS = "2008-2010"
 
 AUTHOR = "Derik van Zuetphen"
 AUTHOR_EMAIL = "dz@426.ch"
@@ -48,12 +69,4 @@ LICENSE = "
   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 "
 
-def Version.build
-	date,time = SVN_LAST_CHANGED_DATE.split(/ /)
-	date.gsub!(/[^0-9]/,"")
-	time.gsub!(/[^0-9]/,"")
-	rev = SVN_REVISION
-	return "#{rev}/#{date}T#{time}"
-end
-
 end # class

data/tests/test_all.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# $Id: test_all.rb 28 2009-01-22 09:20:48Z dz $
+# $Id: test_all.rb 68 2010-01-04 14:23:45Z dz $
 
 # http://www.ruby-doc.org/stdlib/libdoc/test/unit/rdoc/classes/Test/Unit.html
 

data/tests/test_clip.rb

@@ -1,5 +1,5 @@
 
-# $Id: test_clip.rb 28 2009-01-22 09:20:48Z dz $
+# $Id: test_clip.rb 68 2010-01-04 14:23:45Z dz $
 
 require 'test/unit'
 require 'clip'

data/tests/test_clip_array.rb

@@ -1,5 +1,5 @@
 
-# $Id: test_clip_array.rb 28 2009-01-22 09:20:48Z dz $
+# $Id: test_clip_array.rb 68 2010-01-04 14:23:45Z dz $
 
 require 'test/unit'
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jota
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  hash: 470221478
+  prerelease: true
+  segments: 
+  - 0
+  - 9
+  - 0dev2
+  version: 0.9.0dev2
 platform: ruby
 authors: 
 - Derik van Zuetphen
@@ -9,73 +15,77 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-11 16:38:01 +02:00
+date: 2010-07-30 11:28:16 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: cmd
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.7.2
-    version: 
+dependencies: []
+
 description: ""
 email: dz@426.ch
 executables: 
 - jota
-- jotacli
 extensions: []
 
 extra_rdoc_files: 
 - INSTALL
+- LICENSE
 files: 
 - lib/app_error.rb
 - lib/clip_array.rb
 - lib/clip.rb
 - lib/gui.rb
 - lib/helper.rb
+- lib/jota_curses.rb
 - lib/jota.rb
 - lib/preferences.rb
 - lib/version.rb
-- lib/cli.rb
-- lib/svn_info.rb
+- lib/immediate.rb
 - lib/jota.glade
-- tests/test_all.rb
-- tests/test_clip.rb
+- bin/jota
+- bin/jota.bat
 - tests/test_clip_array.rb
+- tests/test_clip.rb
+- tests/test_all.rb
 - tests/test_preferences.rb
 - INSTALL
+- LICENSE
 has_rdoc: true
 homepage: http://426.ch/jota
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: jota
-rubygems_version: 1.3.1
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A simple but powerful jotter in the style of xclipboard
 test_files: 
-- tests/test_all.rb
-- tests/test_clip.rb
 - tests/test_clip_array.rb
+- tests/test_clip.rb
+- tests/test_all.rb
 - tests/test_preferences.rb

data/bin/jotacli

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-# $Id: jotacli 28 2009-01-22 09:20:48Z dz $
-
-begin
-  require 'jota'
-rescue LoadError
-  require 'rubygems'
-  require 'jota'
-end
-
-Jota.new.run_cli

data/lib/cli.rb

@@ -1,250 +0,0 @@
-
-# $Id: cli.rb 46 2009-05-08 09:27:55Z dz $
-
-# if you use vim and don't like folds type zR
-
-require 'clip'
-require 'clip_array'
-require 'preferences'
-
-begin
-	require 'cmd'
-rescue LoadError
-	require 'rubygems'
-	require 'cmd'
-end
-
-class JotaCli < Cmd
-
-require 'tempfile'
-prompt_with :prompt_command
-
-doc :open,	"Open clip file"
-doc :close,	"Close clip file"
-doc :create,	"Create a new empty clip file"
-doc :list,	"List clips with type, index number and title"
-doc :edit,	"Edit clip with $EDITOR (or /usr/bin/vi if not set)"
-doc :show,	"Show contents of clip"
-doc :new,	"Create a new clip"
-doc :delete,	"Delete a clip"
-doc :default,	"Set default command"
-doc :page,	"Show content of clip through $PAGER"
-
-
-def do_open(args)
-#{{{1
-	filename = args.to_s
-	@data.close if @data
-	begin
-		@data = ClipArray.open(filename)
-	rescue SystemCallError, AppError => msg
-		puts msg
-		@data = nil
-	end
-end #}}}1
-
-def do_close
-#{{{1
-	return if @data.nil?
-
-	@data.close
-	@data = nil
-end #}}}1
-
-def do_create(args)
-#{{{1
-	filename = args.to_s
-	@data.close if @data
-	begin
-		@data = ClipArray.create(filename)
-	rescue SystemCallError, AppError => msg
-		puts msg
-		@data = nil
-	end
-end #}}}1
-
-def do_list
-#{{{1
-	return if @data.nil?
-
-	@data.each_index do | i |
-		print "%2d %s %s\n" % [
-			i+1, 
-			type_to_char(@data[i].type),
-			@data[i].title]
-	end
-end #}}}1
-
-def do_edit(args)
-#{{{1
-	index = get_index(args)
-	return if index.nil?
-
-	@data[index].text = editor(@data[index].text)
-
-	# because of this save we do not not need autosave for the cli version
-	@data.save
-end #}}}1
-
-def do_show(args)
-#{{{1
-	index = get_index(args)
-	return if index.nil?
-
-	puts @data[index].title
-	puts @data[index].data
-end #}}}1
-
-def do_delete(args)
-#{{{1
-	index = get_index(args)
-	return if index.nil?
-
-	@data.current_index = index
-
-	if pref("deletesave_enable") and not @data.current.empty? then
-		deletefile = expand_filename(pref("deletesave_file"),
-			@data.dirname, @data.filename)
-		begin
-			@data.current.append_as_mbox(deletefile)
-		rescue SystemCallError => msg
-			puts msg
-		end
-	end
-
-	@data.delete
-end #}}}1
-
-def do_new
-#{{{1
-	return if @data.nil?
-
-	@data.new
-end #}}}1
-
-def do_page(args)
-#{{{1
-	index = get_index(args)
-	return if index.nil?
-
-	file = Tempfile.new("jotacli")
-	filename = file.path
-	print_verbose "creating temporary file '#{filename}'"
-
-	file.puts @data[index].title
-	file.puts @data[index].data
-	file.close
-
-	if ENV["PAGER"] then
-		cmdline = ENV["PAGER"]
-	else
-		cmdline = "/bin/more"
-	end
-	cmdline = "%s %s" % [cmdline, filename]
-	print_verbose "executing '#{cmdline}'"
-
-	if not system(cmdline) then
-		puts "Error executing '#{cmdline}' with exit code #{$?}"
-	end
-
-	File.unlink(filename)
-end #}}}1
-
-def do_default(args)
-#{{{1
-	if args.nil? or args == "" then
-		puts "Default command is '#{@default_command}'"
-	elsif args =~ /^(show|edit|page)$/ then
-		@default_command = args
-	else
-		puts "Illegal default command. Valid are show, edit, and page"
-	end
-end #}}}1
-
-private
-
-def setup
-#{{{1
-	puts "#{Version::PROGRAM_NAME} #{Version::STRING} ready"
-	puts "Type 'help' for commands"
-
-	@data = nil
-	@default_command = "edit"
-end #}}}1
-
-def command_missing(command, args)
-#{{{1
-	case @default_command
-	when "show"
-		do_show(command)
-	when "edit"
-		do_edit(command)
-	when "page"
-		do_page(command)
-	end
-end #}}}1
-
-def prompt_command
-#{{{1
-	if @data.nil? then
-		"> "
-	else
-		@data.filename+"> "
-	end
-end #}}}1
-
-def postloop
-#{{{1
-	@data.save if @data
-end #}}}1
-
-def type_to_char(t)
-#{{{1
-	case t
-	when :text
-		return "t"
-	when :pref
-		return "p"
-	else
-		return "?"
-	end	
-end #}}}1
-
-def get_index(str)
-#{{{1
-	return nil if @data.nil? or str.nil?
-
-	if str =~ /^\d+$/ then
-		result = str.to_i - 1
-	else
-		result = nil
-		re = Regexp.new(str,Regexp::IGNORECASE)
-		@data.each_index do | i |
-			if @data[i].title.match(re) then
-				result = i
-				break
-			end
-		end
-		if result.nil? then
-			return nil
-		end
-	end
-	if result < 0 or result >= @data.length then
-		return nil
-	else
-		return result
-	end
-end #}}}1
-
-def pref(key)
-#{{{1
-	if @data.nil? then
-		return Preferences.defaults[key]
-	else
-		@data.pref[key]
-	end
-end #}}}1
-
-end # class
-
-# vim: set foldmethod=marker:

data/lib/svn_info.rb

@@ -1,16 +0,0 @@
-# This file is created by './make_svn_info.rb'
-
-module SVN_Info
-
-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="55"
-SVN_NODE_KIND="directory"
-SVN_SCHEDULE="normal"
-SVN_LAST_CHANGED_AUTHOR="dz"
-SVN_LAST_CHANGED_REV="55"
-SVN_LAST_CHANGED_DATE="2009-10-11 15:02:40 +0200 (Sun, 11 Oct 2009)"
-
-end