medo 0.1.1 → 0.1.3

data/README.md

@@ -6,6 +6,9 @@ Simple console app for managing todos on the fly :)
 
 ## The Changelog ##
 
+### v0.1.3 (28.06.2012) ###
+* Add support for editing notes
+
 ### v0.1.1 (15.06.2012) ###
 * Add support for ree-1.8.7
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.3

data/bin/medo

@@ -1,62 +1,13 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'fileutils'
-
-begin
-  require 'gli'
-  require 'medo'
-  require 'medo/support'
-  require 'medo/file_task_storage'
-rescue LoadError => e #development
-  raise if $loaded
-  $:.unshift File.expand_path('../../lib', __FILE__) #load what we work on, even if gem installed
-  require 'bundler'
-  Bundler.setup(:default)
-  $loaded = true
-  retry
-end
-
-include GLI::App
-include Medo
-
-program_desc 'Simple CLI To-Do manager'
-version VERSION
-
-commands_from 'medo/commands'
-
-default_command :list
-
-desc "A file with tasks"
-flag [:f, "tasks-file"], :default_value => File.join(ENV['HOME'], '.medo-tasks')
-
-desc "Do not use colorful output"
-switch "no-color", :negatable => false
+require 'medo/cli'
 
 Signal.trap("SIGINT") do
   puts "Terminating"
   exit 1
 end
 
-around do |global_options, command, options, arguments, cmd|
-  FileTaskStorage.using_storage(global_options.fetch(:"tasks-file")) do |the_storage|
-    instance_eval do
-      eigen = class << self; self; end
-      eigen.send(:define_method, :storage) { the_storage }
-    end
-
-    def self.choose_task(argv, tasks)
-      input = argv.shift
-      number = Integer(input) rescue 
-        raise(ArgumentError, "Invalid task #: #{input}")
-      task = tasks.reject(&:done?).sort[number - 1] or raise RuntimeError, 
-        "No such task!"
-      [task, number]
-    end
-
-    cmd.call
-  end
-end
-
-run(ARGV)
+app = Medo::CLI
+app.run(ARGV)
 

data/features/add_task.feature

@@ -1,5 +1,5 @@
 Feature: Add todo
-  In order to be able to keep my in focus
+  In order to be able to keep myself focused
   As a user
   I want to add tasks to lists
 

data/features/edit_task.feature

@@ -0,0 +1,14 @@
+Feature: Edit todo
+  In order to be able to correct a mistake
+  As a user
+  I want to be able to edit task description
+
+  Background:
+    Given there's no file "/tmp/test-medo-tasks"
+
+  Scenario: Add todo
+    When I successfully run `medo --tasks-file=/tmp/test-medo-tasks new Hello World`
+    When I successfully run `medo --tasks-file=/tmp/test-medo-tasks edit Goodbye World`
+    And I successfully run `medo --tasks-file=/tmp/test-medo-tasks ls`
+    Then the output should contain "Goodbye World"
+    And the output should not contain "Hello World"

data/features/{add_notes.feature → notes.feature}

@@ -1,18 +1,27 @@
-Feature: Add note to task
+Feature: Manage task notes
   In order to be able to sketch some ideas
   As a user
-  I want to add notes to my tasks
+  I want to add and edit notes to my tasks
 
   Background:
     Given there's no file "/tmp/test-medo-tasks"
 
-  Scenario: Add todo
+  Scenario: Add todo note
     When I successfully run `medo --tasks-file=/tmp/test-medo-tasks new Hello World`
     And I successfully run `medo --tasks-file=/tmp/test-medo-tasks new Goodbye Windows`
-    And I successfully run `medo --tasks-file=/tmp/test-medo-tasks note 1 "Trash the PC"`
-    And I successfully run `medo --tasks-file=/tmp/test-medo-tasks note 2 The Note`
-    And I successfully run `medo --tasks-file=/tmp/test-medo-tasks show 1`
+    And I successfully run `medo --tasks-file=/tmp/test-medo-tasks note add -n 1 "Trash the PC"`
+    And I successfully run `medo --tasks-file=/tmp/test-medo-tasks note add -n 2 The Note`
+    And I successfully run `medo --tasks-file=/tmp/test-medo-tasks show`
     Then the output should contain "Trash the PC"
     And the output should not contain "The Note"
-    When I successfully run `medo --tasks-file=/tmp/test-medo-tasks show 2`
+    When I successfully run `medo --tasks-file=/tmp/test-medo-tasks show -n 2`
     Then the output should contain "The Note"
+
+  Scenario: Edit todo note
+    When I successfully run `medo --tasks-file=/tmp/test-medo-tasks new Hello World`
+    And I successfully run `medo --tasks-file=/tmp/test-medo-tasks note add "Trash the PC"`
+    When I successfully run `medo --tasks-file=/tmp/test-medo-tasks note edit boom`
+    And I successfully run `medo --tasks-file=/tmp/test-medo-tasks show`
+    Then the output should not contain "Trash the PC"
+    And the output should contain "boom"
+

data/features/step_definitions/generic_steps.rb

@@ -0,0 +1,4 @@
+When /^I see tasks stored in (.*?)$/ do |filename|
+  puts File.readlines(filename)
+end
+

data/features/support/env.rb

@@ -5,7 +5,7 @@ require 'fileutils'
 
 ENV['PATH'] = "#{File.expand_path('../../../bin', __FILE__)}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
 ENV['GLI_DEBUG'] = "true"
-
+ENV['RUBYLIB'] = File.expand_path('../../../lib', __FILE__)
 After do
   if defined? @tasks_file_path and File.exist?(@tasks_file_path)
     FileUtils.rm(@tasks_file_path)

data/lib/medo.rb

@@ -1,6 +1,5 @@
-require 'medo/task'
-
 module Medo
   version_file = File.expand_path('../VERSION', File.dirname(__FILE__))
   VERSION = File.read(version_file).freeze
 end
+

data/lib/medo/cli.rb

@@ -0,0 +1,48 @@
+require 'rubygems'
+require 'fileutils'
+require 'tempfile'
+
+require 'gli'
+require 'medo'
+require 'medo/support'
+require 'medo/file_task_storage'
+require 'medo/cli_support'
+
+module Medo
+  class CLI
+    extend GLI::App
+    extend Medo
+    extend CLISupport
+
+    program_desc 'Simple CLI To-Do manager'
+    version VERSION
+
+    load_commands
+    default_command :list
+
+    desc "A file with tasks"
+    flag [:f, "tasks-file"], :default_value => File.join(ENV['HOME'], '.medo-tasks')
+
+    desc "Do not use colorful output"
+    switch "no-color", :negatable => false
+
+    around do |global_options, command, options, arguments, cmd|
+      FileTaskStorage.using_storage(global_options.fetch(:"tasks-file")) do |storage|
+        instance_eval do
+          eigen = class << self; self; end
+          { 
+            :storage        => storage,
+            :global_options => global_options,
+            :options        => options,
+            :arguments      => arguments
+          }.each do |method, value|
+            eigen.send(:define_method, method) { value }
+          end
+        end
+
+        cmd.call
+      end
+    end
+  end
+end
+

data/lib/medo/cli_support.rb

@@ -0,0 +1,68 @@
+module Medo
+  module CLISupport
+    def load_commands
+      Dir.glob(File.expand_path('../commands/*', __FILE__)).each do |f|
+        contents = File.read(f)
+        class_eval contents, f, 1
+      end
+    end
+
+    def tasks
+      @tasks ||= storage.read
+      @original_tasks ||= @tasks.map(&:dup)
+      @tasks
+    end
+
+    def tasks_changed?
+      defined? @tasks and @tasks != @original_tasks
+    end
+
+    def committing_tasks
+      yield
+
+      if tasks_changed?
+        storage.write(tasks)
+        storage.commit
+      end
+    end
+
+    def colorize
+      yield unless global_options[:"no-color"] == false
+    end
+
+    def choose_task(select_options = {})
+      task_number = Integer(options[:number] || 1) rescue
+        raise(ArgumentError, "Invalid task #: #{task_number}")
+      task = tasks.reject { |t| select_options[:done] ^ t.done? }.sort[task_number - 1] or
+        raise(RuntimeError, "No such task!")
+      [task, task_number]
+    end
+
+    def get_input
+      process_input
+    end
+
+    def edit_input(value)
+      process_input do |path|
+        File.open(path, "w") { |f| f.write(value) }
+      end
+    end
+
+    def process_input
+      result = nil
+      if options[:editor]
+        path = File.join(Dir::Tmpname.tmpdir, "taketo-input-#{Time.now.to_i}")
+        yield path if block_given?
+        status = system("$EDITOR #{path}")
+        if status && File.exists?(path)
+          result = File.read(path)
+          FileUtils.rm(path)
+        end
+      else
+        result = arguments.join(" ").strip
+      end
+      result.to_s
+    end
+  end
+end
+

data/lib/medo/commands/clear.rb

@@ -1,9 +1,7 @@
 desc "Clear done todos"
 command :clear do |c|
   c.action do |global_options, options, args|
-    tasks = storage.read.reject(&:done?)
-    storage.write(tasks)
-    storage.commit
+    committing_tasks { tasks.reject!(&:done?) }
     puts "Done tasks cleared"
   end
 end

data/lib/medo/commands/delete.rb

@@ -1,13 +1,12 @@
 desc "Delete a todo"
 command [:delete, :rm] do |c|
-  c.action do |global_options, options, args|
-    tasks = storage.read
-
-    task, number = choose_task(args, tasks)
-    tasks -= [task]
+  c.desc "Number of the task to delete"
+  c.flag [:n, :number]
+  c.default_value 1
 
-    storage.write(tasks)
-    storage.commit
+  c.action do |global_options, options, args|
+    task, number = choose_task
+    committing_tasks { tasks.delete(task) }
     puts "Task #{number} removed"
   end
 end

data/lib/medo/commands/done.rb

@@ -1,13 +1,12 @@
 desc "Mark todo as done"
 command :done do |c|
-  c.action do |global_options, options, args|
-    tasks = storage.read
-
-    task, number = choose_task(args, tasks)
-    task.done
+  c.desc "Number of the task to mark as done"
+  c.flag [:n, :number]
+  c.default_value 1
 
-    storage.write(tasks)
-    storage.commit
+  c.action do |global_options, options, args|
+    task, number = choose_task
+    committing_tasks { task.done }
     puts "Task #{number} done"
   end
 end

data/lib/medo/commands/edit.rb

@@ -0,0 +1,16 @@
+desc "Edit a todo"
+command :edit do |c|
+  c.desc "Use EDITOR"
+  c.switch [:e, :editor]
+
+  c.desc "Number of the task to edit"
+  c.flag [:n, :number]
+  c.default_value 1
+
+  c.action do |global_options, options, args|
+    task, number = choose_task
+    task_description = get_input
+    committing_tasks { task.description = task_description }
+    puts "Task #{number} edited"
+  end
+end

data/lib/medo/commands/list.rb

@@ -2,15 +2,16 @@ require 'medo/text_task_writer'
 
 desc "List all todos"
 command [:list, :ls] do |c|
-  c.action do |global_options, options, args|
-    tasks = storage.read
+  c.desc "Number only done tasks"
+  c.switch ["number-done"], :negatable => false
 
+  c.action do |global_options, options, args|
     include TextTaskWriter::Decorators
-    writer = NumbersDecorator.decorate(TextTaskWriter.new)
-
-    #waiting for fix of https://github.com/davetron5000/gli/pull/90
-    ColorsDecorator.decorate(writer) unless global_options[:"no-color"] == false
+    writer = NumbersDecorator.decorate(TextTaskWriter.new,
+      :done => options[:"number-done"] == false)
+    colorize { ColorsDecorator.decorate(writer) }
     writer.add_tasks(tasks)
     writer.write
   end
 end
+

data/lib/medo/commands/new.rb

@@ -1,15 +1,12 @@
 desc "Create a todo"
 command :new do |c|
-  c.action do |global_options, options, args|
-    tasks = storage.read
+  c.desc "Use EDITOR"
+  c.switch [:e, :editor]
 
-    task_description = args.join(" ")
+  c.action do |global_options, options, args|
+    task_description = get_input
     task, number = Task.new(task_description)
-
-    tasks << task
-
-    storage.write(tasks)
-    storage.commit
+    committing_tasks { tasks << task }
     puts "Task added"
   end
 end

data/lib/medo/commands/note.rb

@@ -1,18 +1,29 @@
 desc "Add note to a todo"
 command :note do |c|
-  c.action do |global_options, options, args|
-    tasks = storage.read
+  c.desc "Number of the task to add note to"
+  c.flag [:n, :number]
+  c.default_value 1
 
-    task, number = choose_task(args, tasks)
+  c.desc "Use EDITOR"
+  c.switch [:e, :editor]
 
-    note = args.join(" ").strip
-    raise ArgumentError, "No note given" if note.empty?
-
-    task.notes << note
+  c.command :add do |ca|
+    ca.action do |global_options, options, args|
+      task, number = choose_task
+      note = get_input
+      raise ArgumentError, "No note given" if note.empty?
+      committing_tasks { task.notes << note }
+      puts "Note for task #{number} added"
+    end
+  end
 
-    storage.write(tasks)
-    storage.commit
-    puts "Note for task #{number} added"
+  c.command :edit do |ce|
+    ce.action do |global_options, options, args|
+      task, number = choose_task
+      note = edit_input(task.notes)
+      committing_tasks { task.notes = note }
+      puts "Note for task #{number} edited"
+    end
   end
 end
 

data/lib/medo/commands/reset.rb

@@ -0,0 +1,12 @@
+desc "Reset task"
+command :reset do |c|
+  c.desc "Number of the task to mark reset"
+  c.flag [:n, :number]
+  c.default_value 1
+
+  c.action do |global_options, options, args|
+    task, number = choose_task(:done => true)
+    committing_tasks { task.reset }
+    puts "Task #{number} was reset"
+  end
+end