posto 0.3.1 → 0.3.2

data/lib/posto/application.rb

@@ -10,57 +10,58 @@ module Posto
       @file = Posto::File.new(@arguments.filename)
     end
 
-    def list(items)
-      items
+    def list(todos)
+      todos
     end
 
-    def run(items)
-      @io.puts send(@arguments.command, items, *@arguments.params)
+    def run(todos)
+      @io.puts send(@arguments.command, todos, *@arguments.params)
     end
 
-    def sort(items)
-      @file.write @list_utility.sort(items)
+    def sort(todos)
+      @file.write @list_utility.sort(todos)
     end
 
-    def resort(items)
-      @file.write @list_utility.resort(items)
+    def resort(todos)
+      @file.write @list_utility.resort(todos)
     end
 
-    def unsort(items, n = 1)
-      @file.write @list_utility.unsort(items, n.to_i)
-      lookup_item(items, n)
+    def unsort(todos, n = 1)
+      @file.write @list_utility.unsort(todos, n.to_i)
+      lookup_todo(todos, n)
     end
 
-    def done(items, n = 1)
-      @file.write @list_utility.done(items, n.to_i)
-      lookup_item(items, n)
+    def done(todos, n = 1)
+      @file.write @list_utility.done(todos, n.to_i)
+      lookup_todo(todos, n)
     end
 
-    def top(items, n = nil)
-      if n.nil?
-        lookup_item(items, 1)
-      else
-        @file.write @list_utility.top(items, n.to_i)
-        lookup_item(items, n)
-      end
+    def top(todos, n = 1)
+      @file.write @list_utility.top(todos, n.to_i)
+      lookup_todo(todos, n)
     end
 
-    def quick(items, n = 1)
-      @file.write @list_utility.quick(items, n.to_i)
-      lookup_item(items, n)
+    def quick(todos, n = 1)
+      @file.write @list_utility.quick(todos, n.to_i)
+      lookup_todo(todos, n)
     end
 
-    def add(items, item)
-      @file.write @list_utility.add(items, item)
-      item
+    def add(todos, todo)
+      @file.write @list_utility.add(todos, todo)
+      todo
     end
 
-    def commit(items)
-      @file.commit(done(items))
+    def commit(todos, n = 1)
+      @file.commit(done(todos, n))
     end
 
-    def lookup_item(items, n)
-      Posto::Item.hide_markdown(items[n.to_i - 1])
+    def init(todos)
+      @file.touch
+      nil
+    end
+
+    def lookup_todo(todos, n)
+      Posto::Todo.hide_markdown(todos[n.to_i - 1])
     end
 
     def method_missing(symbol, *args)

data/lib/posto/file.rb

@@ -6,17 +6,25 @@ module Posto
       @filename = filename
     end
 
-    def write(items)
-      IO.write(@filename, Template.todo_list(items))
+    def write(todos)
+      IO.write(@filename, Template.todo_list(todos))
     end
 
     def commit(msg)
-      `git add #{@filename}`
+      `git add #@filename`
       `git commit -m "#{msg}"`
     end
 
+    def touch
+      `touch #@filename`
+    end
+
     def lines
-      IO.read(@filename).split("\n")
+      if ::File.exists? @filename
+        IO.read(@filename).split("\n")
+      else
+        []
+      end
     end
   end
 end

data/lib/posto/list.rb

@@ -1,55 +1,55 @@
-require 'posto/item'
+require 'posto/todo'
 require 'posto/monkeypatch_array'
 
 module Posto
   class List
     class << self
-      def number_items(items)
-        items.each_with_index.map { |item, i| Item.number(item, i + 1) }
+      def number_todos(todos)
+        todos.each_with_index.map { |todo, i| Todo.number(todo, i + 1) }
       end
 
-      def choose_item_lines(lines)
-        lines.select { |line| Item.item?(line) }
+      def choose_todo_lines(lines)
+        lines.select { |line| Todo.todo?(line) }
       end
 
-      def sort(items)
-        number_items(items.sort { |x, y| Item.compare_sorted_items(x, y) or Item.ask_human_to_compare(x, y) })
+      def sort(todos)
+        number_todos(todos.sort { |x, y| Todo.compare_sorted_todos(x, y) or Todo.ask_human_to_compare(x, y) })
       end
 
-      def starred_group(items)
-        items.select { |item| Item.starred?(item) }
+      def starred_group(todos)
+        todos.select { |todo| Todo.starred?(todo) }
       end
 
-      def numbered_group(items)
-        sort items.select { |item| Item.numbered?(item) }
+      def numbered_group(todos)
+        sort todos.select { |todo| Todo.numbered?(todo) }
       end
 
-      def done(items, n)
-        unsort(items, n)[0..-2]
+      def done(todos, n)
+        unsort(todos, n)[0..-2]
       end
 
-      def unsort(items, n)
-        numbered_group(items.reject_at(n - 1)) + starred_group(items.reject_at(n - 1)) + [Item.star(items[n - 1])]
+      def unsort(todos, n)
+        numbered_group(todos.reject_at(n - 1)) + starred_group(todos.reject_at(n - 1)) + [Todo.star(todos[n - 1])]
       end
 
-      def resort(items)
-        sort items.map { |item| Item.star(item) }
+      def resort(todos)
+        sort todos.map { |todo| Todo.star(todo) }
       end
 
-      def add(items, item)
-        items + [Item.create(item)]
+      def add(todos, todo)
+        todos + [Todo.create(todo)]
       end
 
-      def quick(items, n)
-        items[n -1] = Item.mark_quick(items[n - 1])
-        items
+      def quick(todos, n)
+        todos[n -1] = Todo.mark_quick(todos[n - 1])
+        todos
       end
 
-      def top(items, n)
-        starred_group = starred_group(items.reject_at(n - 1))
-        numbered_group = numbered_group(items.reject_at(n - 1))
-        array = [items[n - 1]]
-        number_items(array + numbered_group) + starred_group
+      def top(todos, n)
+        starred_group = starred_group(todos.reject_at(n - 1))
+        numbered_group = numbered_group(todos.reject_at(n - 1))
+        array = [todos[n - 1]]
+        number_todos(array + numbered_group) + starred_group
       end
     end
   end

data/lib/posto/template.rb

@@ -1,7 +1,7 @@
 module Posto
   module Template
-    def self.todo_list(items)
-      "todo\n----\n\n#{items.join("\n")}\n"
+    def self.todo_list(todos)
+      "todo\n----\n\n#{todos.join("\n")}\n"
     end
 
     def self.human_comparison(x, y)

data/lib/posto/todo.rb

@@ -0,0 +1,57 @@
+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
+        return nil if (x == 0 or y == 0)
+        x <=> y
+      end
+
+      def hide_markdown(todo)
+        todo.sub(MD_LIST_TODO, "")
+      end
+
+      def star(todo)
+        todo.sub MD_LIST_TODO, "* "
+      end
+
+      def number(todo, n)
+        todo.sub MD_LIST_TODO, "#{n}. "
+      end
+
+      def todo?(line)
+        MD_LIST_TODO =~ line
+      end
+
+      def create(todo)
+        todo.sub(/^(\* )?/, "* ")
+      end
+
+      def mark_quick(todo)
+        todo.sub(/( \(quick\))?$/, " (quick)")
+      end
+
+      def starred?(todo)
+        /^\* / =~ todo
+      end
+
+      def numbered?(todo)
+        /^\d+\. / =~ todo
+      end
+    end
+  end
+end

data/lib/posto.rb

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

data/test/list_test.rb

@@ -4,12 +4,12 @@ require 'posto/list'
 class ListTest < MiniTest::Unit::TestCase
   def test_replace_stars
     assert_equal(["1. this is one", "2. this is another", "3. card molly"],
-                 Posto::List.number_items(["* this is one", "* this is another", "99. card molly"]))
+                 Posto::List.number_todos(["* this is one", "* this is another", "99. card molly"]))
   end
 
-  def test_choose_item_lines
-    assert_equal(["99. bottles", "* unsorted item"],
-                 Posto::List.choose_item_lines(["TODO", "======", "99. bottles", "* unsorted item", "END", ""]))
+  def test_choose_todo_lines
+    assert_equal(["99. bottles", "* unsorted todo"],
+                 Posto::List.choose_todo_lines(["TODO", "======", "99. bottles", "* unsorted todo", "END", ""]))
   end
 
   def test_starred_group

data/test/todo_test.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+require 'posto/todo'
+
+class TodoTest < MiniTest::Unit::TestCase
+  def test_hide_markdown
+    assert_equal "bottles", Posto::Todo.hide_markdown("99. bottles")
+    assert_equal "unsorted todo", Posto::Todo.hide_markdown("* unsorted todo")
+    assert_equal "funky * todo with 99. junk", Posto::Todo.hide_markdown("* funky * todo with 99. junk")
+  end
+
+  def test_compare_sorted_todos
+    assert_equal(1, Posto::Todo.compare_sorted_todos("99. bottles", "50. cents"))
+    assert_equal(-1, Posto::Todo.compare_sorted_todos("1. lonliest number", "50. cents"))
+    assert_equal(0, Posto::Todo.compare_sorted_todos("1. lonliest number", "1. The Only One"))
+    assert_equal(nil, Posto::Todo.compare_sorted_todos("* kleene", "* twinkle twinkle"))
+    assert_equal(nil, Posto::Todo.compare_sorted_todos("* twinkle twinkle", "1. The Only One"))
+    assert_equal(nil, Posto::Todo.compare_sorted_todos("99. bottles", "* twinkle twinkle"))
+  end
+
+  def test_star
+    assert_equal "* bottles", Posto::Todo.star("99. bottles")
+    assert_equal "* fruit", Posto::Todo.star("* fruit")
+  end
+
+  def test_number
+    assert_equal "99. bottles", Posto::Todo.number("* bottles", 99)
+    assert_equal "99. cents", Posto::Todo.number("50. cents", 99)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: posto
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -58,15 +58,15 @@ files:
 - lib/posto/template.rb
 - lib/posto/application.rb
 - lib/posto/list.rb
+- lib/posto/todo.rb
 - lib/posto/file.rb
-- lib/posto/item.rb
 - lib/posto/arguments.rb
 - lib/posto.rb
 - test/list_test.rb
-- test/item_test.rb
 - test/arguments_test.rb
 - test/test_helper.rb
 - test/monkeypatch_array_test.rb
+- test/todo_test.rb
 homepage: http://github.com/mattraibert/posto
 licenses:
 - GPLv3
@@ -82,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3448850985226509015
+      hash: -2327369408914751837
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -97,7 +97,7 @@ specification_version: 3
 summary: CLI to sort your todo list.
 test_files:
 - test/list_test.rb
-- test/item_test.rb
 - test/arguments_test.rb
 - test/test_helper.rb
 - test/monkeypatch_array_test.rb
+- test/todo_test.rb

data/lib/posto/item.rb

@@ -1,57 +0,0 @@
-require 'posto/template'
-
-module Posto
-  class Item
-    class << self
-      MD_LIST_ITEM = /^(\*|\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_items(x, y)
-        x = x.to_i
-        y = y.to_i
-        return nil if (x == 0 or y == 0)
-        x <=> y
-      end
-
-      def hide_markdown(item)
-        item.sub(MD_LIST_ITEM, "")
-      end
-
-      def star(item)
-        item.sub MD_LIST_ITEM, "* "
-      end
-
-      def number(item, n)
-        item.sub MD_LIST_ITEM, "#{n}. "
-      end
-
-      def item?(line)
-        MD_LIST_ITEM =~ line
-      end
-
-      def create(item)
-        item.sub(/^(\* )?/, "* ")
-      end
-
-      def mark_quick(item)
-        item.sub(/( \(quick\))?$/, " (quick)")
-      end
-
-      def starred?(item)
-        /^\* / =~ item
-      end
-
-      def numbered?(item)
-        /^\d+\. / =~ item
-      end
-    end
-  end
-end

data/test/item_test.rb

@@ -1,29 +0,0 @@
-require 'test_helper'
-require 'posto/item'
-
-class ItemTest < MiniTest::Unit::TestCase
-  def test_hide_markdown
-    assert_equal "bottles", Posto::Item.hide_markdown("99. bottles")
-    assert_equal "unsorted item", Posto::Item.hide_markdown("* unsorted item")
-    assert_equal "funky * item with 99. junk", Posto::Item.hide_markdown("* funky * item with 99. junk")
-  end
-
-  def test_compare_sorted_items
-    assert_equal(1, Posto::Item.compare_sorted_items("99. bottles", "50. cents"))
-    assert_equal(-1, Posto::Item.compare_sorted_items("1. lonliest number", "50. cents"))
-    assert_equal(0, Posto::Item.compare_sorted_items("1. lonliest number", "1. The Only One"))
-    assert_equal(nil, Posto::Item.compare_sorted_items("* kleene", "* twinkle twinkle"))
-    assert_equal(nil, Posto::Item.compare_sorted_items("* twinkle twinkle", "1. The Only One"))
-    assert_equal(nil, Posto::Item.compare_sorted_items("99. bottles", "* twinkle twinkle"))
-  end
-
-  def test_star
-    assert_equal "* bottles", Posto::Item.star("99. bottles")
-    assert_equal "* fruit", Posto::Item.star("* fruit")
-  end
-
-  def test_number
-    assert_equal "99. bottles", Posto::Item.number("* bottles", 99)
-    assert_equal "99. cents", Posto::Item.number("50. cents", 99)
-  end
-end