do_stuff 0.2.3 → 0.2.4

data/lib/do_stuff/runner.rb

@@ -12,66 +12,15 @@ module DoStuff
       abort "Error: Couldn't find #{dostuffrc}.\nPlease create it and put " +
         "the path to your todo.txt file in it." unless File.exists?(dostuffrc)
 
-      todofile = File.expand_path(File.read(dostuffrc).chomp)
-      FileUtils.mkdir_p(File.dirname(todofile))
-      FileUtils.touch(todofile)
+      taskfile = File.expand_path(File.read(dostuffrc).chomp)
+      unless File.exists?(taskfile)
+        FileUtils.mkdir_p(File.dirname(taskfile))
+        FileUtils.touch(taskfile)
+      end
 
       opts = OptionParser.new do |opts|
         opts.on('-e [TASK NUM]') do |task_num|
-          begin
-            pre_todolist = Tasklist.new(todofile)
-          rescue Tasklist::ParseError => e
-            pre_error = e
-          end
-
-          run_editor(todofile, task_num)
-
-          begin
-            post_todolist = Tasklist.new(todofile)
-          rescue Tasklist::ParseError => e
-            post_error = e
-          end
-
-          if post_error
-            if pre_error
-              if pre_error.message == post_error.message
-                puts "Syntax error unchanged by edit.\n#{pre_error.message}"
-              else
-                puts "Pre-edit syntax error: #{pre_error.message}"
-                puts "Post-edit syntax error: #{post_error.message}"
-              end
-            else
-              puts "New syntax error introduced.\n#{post_error.message}"
-            end
-            abort
-          end
-
-          if pre_error && !post_error
-            puts "Syntax error fixed by edit."
-            exit
-          end
-
-          # If there were no errors, compare the old todolist with the new
-          # one, finding what was added, removed, and changed.
-          added_keys = post_todolist.tasks.keys - pre_todolist.tasks.keys
-          added_keys.each do |task_num|
-            puts "Added ##{task_num}: #{post_todolist[task_num]}"
-          end
-
-          removed_keys = pre_todolist.tasks.keys - post_todolist.tasks.keys
-          removed_keys.each do |task_num|
-            puts "Erased ##{task_num}: #{pre_todolist[task_num]}"
-          end
-
-          old_keys = pre_todolist.tasks.keys & post_todolist.tasks.keys
-          old_keys.each do |task_num|
-            if pre_todolist[task_num] != post_todolist[task_num]
-              puts "Changed ##{task_num}:"
-              puts "#{RED}-#{pre_todolist[task_num]}#{RESET}"
-              puts "#{GREEN}+#{post_todolist[task_num]}#{RESET}"
-            end
-          end
-
+          edit(taskfile, task_num)
           exit
         end
 
@@ -98,40 +47,95 @@ module DoStuff
       end
 
       begin
-        todolist = Tasklist.new(todofile)
+        tasklist = Tasklist.new(taskfile)
       rescue Tasklist::ParseError => e
         abort e.message
       end
 
       if argv.length == 0
-        todolist.tasks.sort.each do |num, task|
+        tasklist.tasks.sort.each do |num, task|
           puts "#{num}. #{task}"
         end
       elsif argv.length == 1 && argv[0] =~ /^\d+$/
         task_num = argv[0].to_i
-        abort "There is no task ##{task_num}." unless todolist.tasks.key?(task_num)
-        task = todolist[task_num]
-        todolist.delete(task_num)
-        todolist.write!
+        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}"
       else
         # If nothing else matches, treat the arguments as a task description.
         task = argv.join(' ')
-        task_num = todolist.add(task)
-        todolist.write!
+        task_num = tasklist.add(task)
+        tasklist.write!
         puts "Added ##{task_num}: #{task}"
       end
     end
 
-    def self.run_editor(file, task_num)
-      target_line = nil
+    def self.edit(file, task_num=nil)
+      begin
+        pre_tasklist = Tasklist.new(file)
+      rescue Tasklist::ParseError => e
+        pre_error = e
+      end
+
+      run_editor(file, task_num)
+
+      begin
+        post_tasklist = Tasklist.new(file)
+      rescue Tasklist::ParseError => e
+        post_error = e
+      end
+
+      if post_error
+        if pre_error
+          if pre_error.message == post_error.message
+            puts "Syntax error unchanged by edit.\n#{pre_error.message}"
+          else
+            puts "Pre-edit syntax error: #{pre_error.message}"
+            puts "Post-edit syntax error: #{post_error.message}"
+          end
+        else
+          puts "New syntax error introduced.\n#{post_error.message}"
+        end
+        return
+      end
+
+      if pre_error && !post_error
+        puts "Syntax error fixed by edit."
+        return
+      end
+
+      # If there were no errors, compare the old tasklist with the new
+      # one, finding what was added, removed, and changed.
+      added_keys = post_tasklist.tasks.keys - pre_tasklist.tasks.keys
+      added_keys.each do |task_num|
+        puts "Added ##{task_num}: #{post_tasklist[task_num]}"
+      end
+
+      removed_keys = pre_tasklist.tasks.keys - post_tasklist.tasks.keys
+      removed_keys.each do |task_num|
+        puts "Erased ##{task_num}: #{pre_tasklist[task_num]}"
+      end
 
-      File.readlines(file).each_with_index do |line, line_num|
-        target_line = line_num + 1 if line.start_with?("#{task_num}. ")
+      old_keys = pre_tasklist.tasks.keys & post_tasklist.tasks.keys
+      old_keys.each do |task_num|
+        if pre_tasklist[task_num] != post_tasklist[task_num]
+          puts "Changed ##{task_num}:"
+          puts "#{RED}-#{pre_tasklist[task_num]}#{RESET}"
+          puts "#{GREEN}+#{post_tasklist[task_num]}#{RESET}"
+        end
       end
+    end
+
+    def self.run_editor(file, task_num=nil)
+      if task_num
+        target = File.readlines(file).find_index do |line|
+          line.start_with?("#{task_num}. ")
+        end
 
-      if target_line
-        system(ENV['EDITOR'], file, "+#{target_line}")
+        abort "Could not find task ##{task_num}." unless target
+        system(ENV['EDITOR'], file, "+#{target + 1}")
       else
         system(ENV['EDITOR'], file)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: do_stuff
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors: