todorb 1.0.0 → 1.1.0

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+= todorb 1.0.0, 2010-06-22 16:16
+* using subcommand gem
+* suboptions will come *after* command but before arguments
+
+
 = todorb 0.2.2, 2010-06-15
 * Added subtask addition. One may add subtasks under a task.
 * This effects everything! Deleting a task, you may wanna delete all

data/Makefile

@@ -1,10 +1,11 @@
-DISTFILES := README.markdown get_serial_number colors.sh todoapp.sh
-VERSION := `cat VERSION_FILE`
+#DISTFILES := README.markdown get_serial_number colors.sh todoapp.sh
+#VERSION := `cat VERSION`
  
 all: install
 
 install:
 
+#	sed -i.bk 's/^VERSION = .*/VERSION = \"'$(VERSION)'\"/g' lib/todorb.rb
 	rake build && sudo rake install
 	
 #

data/Rakefile

@@ -5,13 +5,14 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "todorb"
-    gem.summary = %Q{command-line todo list manager }
-    gem.description = %Q{command-line program that manages a todo list text file }
+    gem.summary = %Q{comprehensive command-line todo list manager with subtasks and more }
+    gem.description = %Q{command-line program that manages a todo list text file, incl subtasks }
     gem.email = "sentinel1879@gmail.com"
     gem.homepage = "http://github.com/rkumar/todorb"
     gem.authors = ["Rahul Kumar"]
     gem.rubyforge_project = "todorb"
     #gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    gem.add_development_dependency "subcommand", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -52,3 +53,12 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+begin
+  require 'yard'
+  YARD::Rake::YardocTask.new
+rescue LoadError
+  task :yardoc do
+    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
+  end
+end
+

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/common/cmdapp.rb

@@ -5,8 +5,7 @@
   *               : Moving some methods from todorb.rb here
   * Author        : rkumar
   * Date          : 2010-06-20 11:18 
-  * License       :
-    Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
+  * License:       Ruby License
 
 =end
 require 'common/sed'
@@ -22,12 +21,13 @@ module Cmdapp
   #  @app_serial_path - serial_number file
   ##
   # check whether this action is mapped to some alias and *changes*
-  # @action and @argv if true.
+  # variables@action and @argv if true.
   # @param [String] action asked by user
   # @param [Array] rest of args on command line
   # @return [Boolean] whether it is mapped or not.
   #
   def check_aliases action, args
+    return false unless @aliases
     ret = @aliases[action]
     if ret
       a = ret.shift
@@ -46,13 +46,11 @@ module Cmdapp
   def run
     @action = @argv[0] || @app_default_action
     @action = @action.downcase
-    @action.sub!('priority', 'pri')
-    @action.sub!(/^del$/, 'delete')
 
 
     ret = 0
     @argv.shift
-    if @actions.include? @action
+    if respond_to? @action
       ret = send(@action, @argv)
     else
       # check aliases
@@ -67,14 +65,26 @@ module Cmdapp
     ret = 0 if ret != ERRCODE
     return ret
   end
+  # not required if using Subcommand
   def help args
-    puts "Actions are "
-    @actions.each_pair { |name, val| puts "#{name}\t#{val}" }
+    if @actions
+      puts "Actions are "
+      @actions.each_pair { |name, val| puts "#{name}\t#{val}" }
+    end
     puts " "
     puts "Aliases are "
     @aliases.each_pair { |name, val| puts "#{name}:\t#{val.join(' ')}" }
     0
   end
+  ## 
+  def alias_command name, *args
+    @aliases ||= {}
+    @aliases[name.to_s] = args
+  end
+  def add_action name, descr
+    @actions ||= {}
+    @actions[name.to_s] = desc
+  end
 
   ##
   # reads serial_number file, returns serialno for this app
@@ -109,6 +119,10 @@ module Cmdapp
     appname = @appname
     pattern = Regexp.new "^#{appname}:.*$"
     filename = @app_serial_path || "serial_numbers"
+    # during testing redo this file does not exist, so i get errors
+    if !File.exists? filename
+      _get_serial_number
+    end
     _backup filename
     change_row filename, pattern, "#{appname}:#{number}"
   end
@@ -150,6 +164,7 @@ module Cmdapp
     $valid_array = false
     @data = []
     File.open(@app_file_path).each do |line|
+      # FIXME: use @app_delim
       row = line.chomp.split "\t"
       @data << row
     end
@@ -162,9 +177,27 @@ module Cmdapp
     raise "Cannot save array! Please use load_array to load" if $valid_array == false
 
     File.open(@app_file_path, "w") do |file| 
+      # FIXME: use join with @app_delim
       @data.each { |row| file.puts "#{row[0]}\t#{row[1]}" }
     end
   end
+  ##
+  # retrieve version info updated by jeweler.
+  # Typically used by --version option of any command.
+  # @return [String, nil] version as string, or nil if file not found
+  def version_info
+    # thanks to Roger Pack on ruby-forum for how to get to the version
+    # file
+    filename = File.open(File.dirname(__FILE__) + "/../../VERSION")
+    v = nil
+    if File.exists?(filename)
+      v = File.open(filename).read.chomp if File.exists?(filename)
+    #else
+      #$stderr.puts "could not locate file #{filename}. " 
+      #puts `pwd`
+    end
+    v
+  end
 
 
 end

data/lib/common/sed.rb

@@ -1,10 +1,13 @@
 #!/usr/bin/env ruby -w
-#*************************************************************
-# Sed like operations - just change row and delete row
-# While converting some shell scripts in which i have used
-# sed extensively, I need this kind of functionality
-#
-#*************************************************************
+=begin
+  * Name:          sed.rb
+  * Description:   Sed like operations
+  * Author:        rkumar
+  * Date:          2010-06-10 20:10 
+  * License:       Ruby License
+
+=end
+
 ##
 # changes one or more rows based on pattern and replacement
 # Also if replacement is not given, expects a block and yields