do_stuff 0.3.1 → 0.4.0

data/lib/do_stuff/runner.rb

@@ -15,6 +15,9 @@ module DoStuff
       # This will be set by options if we are to change the text of a task.
       edit_target = nil
 
+      # This will be set by options if we are to renumber the tasks.
+      renumber_tasks = false
+
       taskfile = File.expand_path(File.read(dostuffrc).chomp)
       unless File.exists?(taskfile)
         FileUtils.mkdir_p(File.dirname(taskfile))
@@ -31,6 +34,10 @@ module DoStuff
           end
         end
 
+        opts.on('-r') do
+          renumber_tasks = true
+        end
+
         opts.on('--standalone FILE') do |file|
           if defined?(::DoStuff::Standalone)
             Standalone.save(file)
@@ -62,7 +69,6 @@ module DoStuff
       if edit_target
         before_text = tasklist[edit_target]
         tasklist[edit_target] = argv.join(' ')
-        tasklist.write!
 
         if !before_text
           puts "Added ##{edit_target}: #{tasklist[edit_target]}"
@@ -72,27 +78,45 @@ module DoStuff
           puts "#{GREEN}+#{tasklist[edit_target]}#{RESET}"
         end
 
+        write! tasklist, renumber_tasks
         exit
       end
 
       if argv.length == 0
-        tasklist.tasks.sort.each do |num, task|
-          puts "#{num}. #{task}"
+        if renumber_tasks
+          write! tasklist, true
+        else
+          tasklist.tasks.sort.each do |num, task|
+            puts "#{num}. #{task}"
+          end
         end
       elsif argv.length == 1 && argv[0] =~ /^\d+$/
         task_num = argv[0].to_i
         abort "There is no task ##{task_num}." unless tasklist.tasks.key?(task_num)
         task = tasklist[task_num]
         tasklist.delete(task_num)
-        tasklist.write!
         puts "Erased ##{task_num}: #{task}"
+        write! tasklist, renumber_tasks
       else
         # If nothing else matches, treat the arguments as a task description.
         task = argv.join(' ')
         task_num = tasklist.add(task)
-        tasklist.write!
         puts "Added ##{task_num}: #{task}"
+        write! tasklist, renumber_tasks
+      end
+    end
+
+    def self.write!(tasklist, renumber = false)
+      if renumber
+        tasklist.renumber!
+
+        puts "Renumbered tasks:"
+        tasklist.tasks.sort.each do |num, task|
+          puts "#{num}. #{task}"
+        end
       end
+
+      tasklist.write!
     end
 
     def self.edit(file, task_num=nil)
@@ -152,22 +176,15 @@ module DoStuff
     end
 
     def self.run_editor(file, task_num=nil)
-      editor = ENV['EDITOR']
-
-      unless editor
-        $stderr.puts "The EDITOR environment variable isn't set (defaulting to vim)."
-        editor = 'vim'
-      end
-
       if task_num
         target = File.readlines(file).find_index do |line|
           line.start_with?("#{task_num}. ")
         end
 
         abort "Could not find task ##{task_num}." unless target
-        system(editor, file, "+#{target + 1}")
+        system(ENV['EDITOR'], file, "+#{target + 1}")
       else
-        system(editor, file)
+        system(ENV['EDITOR'], file)
       end
     end
 
@@ -180,6 +197,7 @@ usage: #{program}                      list unfinished tasks
        #{program} <task num>           erase task
        #{program} -e [task num]        edit task file [and jump to given task]
        #{program} -e<task num> <text>  replace task with given text
+       #{program} -r                   renumber tasks, removing gaps
        #{program} -h, --help           show this message
       EOS
 

data/lib/do_stuff/tasklist.rb

@@ -30,6 +30,19 @@ module DoStuff
       @tasks.delete(task_num.to_i)
     end
 
+    def renumber!
+      old_tasks = @tasks
+      @tasks = {}
+
+      i = 1
+      old_tasks.sort.each do |_, task|
+        @tasks[i] = task
+        i += 1
+      end
+
+      @tasks
+    end
+
     def write!
       File.open(@file, 'w') do |f|
         tasks.sort.each{|num, task| f.puts("#{num}. #{task}") }

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: do_stuff
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
+  prerelease: 
 platform: ruby
 authors:
 - Scott Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies: []
 description: A minimalistic command-line todo list
 email: scott@scott-olson.org
@@ -17,36 +18,35 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/do_stuff/runner.rb
 - lib/do_stuff/standalone.rb
+- lib/do_stuff/runner.rb
 - lib/do_stuff/tasklist.rb
 - lib/do_stuff.rb
 - bin/do_stuff
 - README.md
 - LICENSE
 homepage: https://github.com/tsion/do_stuff
-licenses:
-- ISC
-metadata: {}
+licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.17
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A minimalistic command-line todo list
 test_files: []
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 85af10253b4970cc931c5cd870e5e922e2480df0
-  data.tar.gz: a538411c071a7c98cf0922ae983828a6b1818ce9
-SHA512:
-  metadata.gz: 2336514b9aef27392c46c6cd7910522af37cf46a37a336c40f8064433bfd9b58ee6ea39df42ce1b0443790a638c8c1a6ccedfff83fcaf3c40b64c4cf055ce4cb
-  data.tar.gz: 068df5a79c1e51e87cbc33f4baa8f237d0831266befc9a0b65a599ac23b9912a858af3165e64f4c8ff57b7858a5b1346bd8d69e826e46502b7f0aa633f3dfbe8