posto 0.3.2 → 0.3.3

data/lib/posto/application.rb

@@ -3,69 +3,56 @@ require 'posto/file'
 
 module Posto
   class Application
-    def initialize(arguments)
-      @arguments = arguments
-      @list_utility = List
-      @io = STDOUT
-      @file = Posto::File.new(@arguments.filename)
-    end
-
-    def list(todos)
-      todos
-    end
+    attr_accessor :todos, :io, :file
+    alias :list :todos
 
-    def run(todos)
-      @io.puts send(@arguments.command, todos, *@arguments.params)
-    end
-
-    def sort(todos)
-      @file.write @list_utility.sort(todos)
-    end
-
-    def resort(todos)
-      @file.write @list_utility.resort(todos)
+    def initialize(arguments, todos, options = {})
+      @io = options[:io] || STDOUT
+      @list_utility = options[:list_utility] || List
+      @file = options[:file] || Posto::File.new(arguments.filename)
+      @arguments = arguments
+      @todos = todos
     end
 
-    def unsort(todos, n = 1)
-      @file.write @list_utility.unsort(todos, n.to_i)
-      lookup_todo(todos, n)
+    def run
+      @io.puts send(@arguments.command, *@arguments.params)
     end
 
-    def done(todos, n = 1)
-      @file.write @list_utility.done(todos, n.to_i)
-      lookup_todo(todos, n)
+    [:sort, :resort].each do |method|
+      define_method method do
+        @file.write(@list_utility.send(method, todos))
+      end
     end
 
-    def top(todos, n = 1)
-      @file.write @list_utility.top(todos, n.to_i)
-      lookup_todo(todos, n)
+    [:unsort, :done, :delete, :do, :top, :quick].each do |method|
+      define_method method do |n = 1|
+        @file.write @list_utility.send(method, todos, n.to_i)
+        @list_utility.lookup(todos, n)
+      end
     end
 
-    def quick(todos, n = 1)
-      @file.write @list_utility.quick(todos, n.to_i)
-      lookup_todo(todos, n)
+    def add(todo)
+      @file.write @todos = @list_utility.add(todos, todo)
+      todo
     end
 
-    def add(todos, todo)
-      @file.write @list_utility.add(todos, todo)
-      todo
+    def start(todo)
+      add(todo)
+      sort
+      @file.commit_alone("[posto] scheduled '#{todo}'")
     end
 
-    def commit(todos, n = 1)
-      @file.commit(done(todos, n))
+    def commit(n = 1)
+      @file.commit("[posto] finished '#{done(n)}'")
     end
 
-    def init(todos)
+    def init
       @file.touch
       nil
     end
 
-    def lookup_todo(todos, n)
-      Posto::Todo.hide_markdown(todos[n.to_i - 1])
-    end
-
     def method_missing(symbol, *args)
-      STDERR.puts "Unsupported operation '#{symbol} #{args.join " "}'"
+      STDERR.puts "Unsupported operation '#{symbol} #{args.join "\n"}'"
     end
   end
 end

data/lib/posto/file.rb

@@ -1,4 +1,4 @@
-require 'posto/template'
+require 'posto/list'
 
 module Posto
   class File
@@ -7,7 +7,7 @@ module Posto
     end
 
     def write(todos)
-      IO.write(@filename, Template.todo_list(todos))
+      IO.write(@filename, template(todos))
     end
 
     def commit(msg)
@@ -15,16 +15,24 @@ module Posto
       `git commit -m "#{msg}"`
     end
 
+    def commit_alone(msg)
+      `git commit -m "#{msg}" #@filename`
+    end
+
     def touch
       `touch #@filename`
     end
 
-    def lines
+    def todos
       if ::File.exists? @filename
-        IO.read(@filename).split("\n")
+        List.choose_todo_lines(IO.read(@filename).split("\n"))
       else
         []
       end
     end
+
+    def template(todos)
+      "todo\n----\n\n#{todos.join("\n")}\n"
+    end
   end
 end

data/lib/posto/human_comparison.rb

@@ -0,0 +1,19 @@
+require 'posto/todo'
+
+module Posto
+  class HumanComparison
+    def self.template(x, y)
+      "\n================\n\n1. #{x}\n\n2. #{y}\n\n" +
+          "which one is more important? (1, 2 or just hit enter if you don't care): "
+    end
+
+    def self.ask_human(x, y)
+      while true do
+        response = ask(template(Todo.hide_markdown(x), Todo.hide_markdown(y))).to_i
+        return 0 if response == 0
+        return -1 if response == 1
+        return 1 if response == 2
+      end
+    end
+  end
+end

data/lib/posto/list.rb

@@ -1,19 +1,21 @@
 require 'posto/todo'
 require 'posto/monkeypatch_array'
+require 'posto/human_comparison'
 
 module Posto
   class List
     class << self
       def number_todos(todos)
-        todos.each_with_index.map { |todo, i| Todo.number(todo, i + 1) }
+        todos.each_with_index.map { |todo, i| Posto::Todo.number(todo, i + 1) }
       end
 
       def choose_todo_lines(lines)
-        lines.select { |line| Todo.todo?(line) }
+        todos, backlog = lines.slice_before(/^backlog$/).to_a
+        todos.select { |todo| Todo.todo?(todo) }
       end
 
       def sort(todos)
-        number_todos(todos.sort { |x, y| Todo.compare_sorted_todos(x, y) or Todo.ask_human_to_compare(x, y) })
+        number_todos(todos.sort { |x, y| Todo.compare_sorted_todos(x, y) or HumanComparison.ask_human(x, y) })
       end
 
       def starred_group(todos)
@@ -27,6 +29,7 @@ module Posto
       def done(todos, n)
         unsort(todos, n)[0..-2]
       end
+      alias :delete :done
 
       def unsort(todos, n)
         numbered_group(todos.reject_at(n - 1)) + starred_group(todos.reject_at(n - 1)) + [Todo.star(todos[n - 1])]
@@ -51,6 +54,11 @@ module Posto
         array = [todos[n - 1]]
         number_todos(array + numbered_group) + starred_group
       end
+      alias :do :top
+
+      def lookup(todos, n)
+        Posto::Todo.hide_markdown(todos[n.to_i - 1])
+      end
     end
   end
 end

data/lib/posto/todo.rb

@@ -1,19 +1,8 @@
-require 'posto/template'
-
 module Posto
   class Todo
     class << self
       MD_LIST_TODO = /^(\*|\d+\.) /
 
-      def ask_human_to_compare(x, y)
-        while true do
-          response = ask(Template.human_comparison(hide_markdown(x), hide_markdown(y))).to_i
-          return 0 if response == 0
-          return -1 if response == 1
-          return 1 if response == 2
-        end
-      end
-
       def compare_sorted_todos(x, y)
         x = x.to_i
         y = y.to_i

data/lib/posto.rb

@@ -8,8 +8,8 @@ module Posto
   class << self
     def main(args)
       arguments = Arguments.new(args)
-      todos = List.choose_todo_lines(File.new(arguments.filename).lines)
-      Application.new(arguments).run(todos)
+      todos = Posto::File.new(arguments.filename).todos
+      Application.new(arguments, todos).run
     end
   end
 end

data/test/application_test.rb

@@ -0,0 +1,48 @@
+require 'test_helper'
+require 'posto/application'
+require 'grasshopper'
+
+describe Posto::Application do
+  describe "#list" do
+    it "shows todo items" do
+      args = Stub.like(:command => "list", :params => [])
+      app = Posto::Application.new(args, ["* foo", "* bar"], :io => Mock.new)
+
+      app.run
+
+      Mock.verify(app.io).puts(["* foo", "* bar"])
+    end
+  end
+
+  [:sort, :resort].each do |method|
+    describe "##{method}" do
+      it "calls #{method} on the list_utility given" do
+        args = Stub.like(:command => method, :params => [])
+        file = Mock.new
+        list_utility = Mock.new
+
+        app = Posto::Application.new(args, [], :file => file, :list_utility => list_utility, :io => Stub.new)
+        app.run
+
+        Mock.verify(list_utility).send(method, [])
+        Mock.verify(file).write(nil)
+      end
+    end
+  end
+
+  [:unsort, :done, :delete, :do, :top, :quick].each do |method|
+    describe "##{method}" do
+      it "calls #{method} on the list_utility given" do
+        args = Stub.like(:command => method, :params => ["4"])
+        list_utility = Mock.new
+
+        file = Mock.new
+        app = Posto::Application.new(args, [], :list_utility => list_utility, :file => file, :io => Stub.new)
+        app.run
+
+        Mock.verify(list_utility).send(method, [], 4)
+        Mock.verify(file).write(nil)
+      end
+    end
+  end
+end

data/test/list_test.rb

@@ -9,7 +9,10 @@ class ListTest < MiniTest::Unit::TestCase
 
   def test_choose_todo_lines
     assert_equal(["99. bottles", "* unsorted todo"],
-                 Posto::List.choose_todo_lines(["TODO", "======", "99. bottles", "* unsorted todo", "END", ""]))
+                 Posto::List.choose_todo_lines(["TODO", "----", "99. bottles", "* unsorted todo", ""]))
+    assert_equal(["99. bottles", "* unsorted todo"],
+                 Posto::List.choose_todo_lines(["TODO", "----", "99. bottles", "* unsorted todo", "",
+                                                "backlog", "-------","","* nada", "* none"]))
   end
 
   def test_starred_group

data/test/monkeypatch_array_test.rb

@@ -3,7 +3,6 @@ require 'posto/monkeypatch_array'
 
 class MonkeypatchArrayTest < MiniTest::Unit::TestCase
   def test_reject_at_returns_a_modified_array_doesnt_modify_original
-    remainder = [1, 2, 3].freeze.reject_at(2)
-    assert_equal([1, 2], remainder)
+    assert_equal([1, 2], [1, 2, 3].freeze.reject_at(2))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: posto
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -55,16 +55,17 @@ files:
 - LICENSE.txt
 - bin/posto
 - lib/posto/monkeypatch_array.rb
-- lib/posto/template.rb
 - lib/posto/application.rb
 - lib/posto/list.rb
 - lib/posto/todo.rb
 - lib/posto/file.rb
 - lib/posto/arguments.rb
+- lib/posto/human_comparison.rb
 - lib/posto.rb
 - test/list_test.rb
 - test/arguments_test.rb
 - test/test_helper.rb
+- test/application_test.rb
 - test/monkeypatch_array_test.rb
 - test/todo_test.rb
 homepage: http://github.com/mattraibert/posto
@@ -82,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2327369408914751837
+      hash: 3530876056305707581
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -99,5 +100,6 @@ test_files:
 - test/list_test.rb
 - test/arguments_test.rb
 - test/test_helper.rb
+- test/application_test.rb
 - test/monkeypatch_array_test.rb
 - test/todo_test.rb

data/lib/posto/template.rb

@@ -1,11 +0,0 @@
-module Posto
-  module Template
-    def self.todo_list(todos)
-      "todo\n----\n\n#{todos.join("\n")}\n"
-    end
-
-    def self.human_comparison(x, y)
-      "\n================\n\n1. #{x}\n\n2. #{y}\n\nwhich one is more important? (1, 2 or just hit enter if you don't care): "
-    end
-  end
-end