posto 0.3.4 → 0.3.5

data/README.md

@@ -12,7 +12,7 @@ To add a task, `posto add "an example task"`
 
 To see current tasks, `posto`
 
-To see a full list of commands, click [here](https://github.com/mattraibert/posto/blob/master/lib/posto/help.md).
+To see a full list of commands, try `posto help` or click [here](https://github.com/mattraibert/posto/blob/master/lib/posto/help.md).
 
 ## Naming
 

data/lib/posto.rb

@@ -1,4 +1,3 @@
-require 'highline/import'
 require 'posto/arguments'
 require 'posto/application'
 require 'posto/file'

data/lib/posto/application.rb

@@ -43,14 +43,18 @@ module Posto
 
     def start(todo)
       add(todo)
-      sort
       @file.commit_alone("[posto] scheduled '#{todo}'")
     end
+    alias :schedule :start
 
     def commit(n = 1)
       @file.commit("[posto] finished '#{done(n)}'")
     end
 
+    def oops
+      @file.oops
+    end
+
     def init
       @file.touch
       nil

data/lib/posto/file.rb

@@ -19,6 +19,15 @@ module Posto
       `git commit -m "#{msg}" #@filename`
     end
 
+    def oops
+      commit_msg = `git log --pretty=format:'%s' -n 1`
+      if /^\[posto\]/ =~ commit_msg
+        `git reset --soft HEAD^`
+      else
+        "last commit was not made by posto: #{commit_msg}"
+      end
+    end
+
     def touch
       `touch #@filename`
     end

data/lib/posto/help.md

@@ -13,14 +13,16 @@
 
 `add '<todo>'`: add <todo> unsorted to the bottom of the todo list.
 
-`start '<todo>'`: add, sort and commit with a message based on <todo>.
+`schedule '<todo>'`: add and commit with a message based on <todo>.
 
 `done [n = 1]`, `delete [n]`: remove the nth todo from the list.
 
-`commit [n]`: remove the nth todo; commit with a message based on the todo.
+`commit [n = 1]`: remove the nth todo; commit with a relevant message.
 
 `do`, `top`: displays the top todo.
 
 `do [n]`, `top [n]`: move the nth todo to the top.
 
 `unsort [n]`: unsort the nth todo and place it at the bottom.
+
+`oops`: if HEAD is a posto commit, reset --soft HEAD^.

data/lib/posto/help.rb

@@ -47,7 +47,7 @@ module Posto
       end
 
       def format_command(command_alias)
-        ' ' * 3 + command_alias.ljust(15)
+        ' ' * 3 + command_alias.ljust(18)
       end
     end
   end

data/lib/posto/human_comparison.rb

@@ -1,4 +1,5 @@
 require 'posto/todo'
+require 'highline/import'
 
 module Posto
   class HumanComparison

data/lib/posto/list.rb

@@ -10,8 +10,7 @@ module Posto
       end
 
       def choose_todo_lines(lines)
-        todos, backlog = lines.slice_before(/^backlog$/).to_a
-        todos.select { |todo| Todo.todo?(todo) }
+        lines.select { |todo| Todo.todo?(todo) }
       end
 
       def sort(todos)

data/test/help_test.rb

@@ -3,15 +3,15 @@ require 'posto/help'
 
 class HelpTest < MiniTest::Unit::TestCase
   def test_command_without_aliases
-    assert_equal "   init           create a 'posto.md' file in the working directory.",
+    assert_equal "   init              create a 'posto.md' file in the working directory.",
                  Posto::Help.format_command_definition("init", "create a 'posto.md' file in the working directory.")
   end
 
   def test_command_with_aliases
     expected = <<EOF.chomp
-   list           display the todo list.
-   todos          alias for 'list'
-   [default]      alias for 'list'
+   list              display the todo list.
+   todos             alias for 'list'
+   [default]         alias for 'list'
 EOF
     assert_equal expected, Posto::Help.format_command_definition("list, todos, [default]", "display the todo list.")
   end
@@ -20,24 +20,25 @@ EOF
     help_text = <<EOF.chomp
 
 List Commands:
-   init           create a 'posto.md' file in the working directory.
-   list           display the todo list.
-   todos          alias for 'list'
-   [default]      alias for 'list'
-   sort           ask the user about priorities to sort todos.
-   resort         reset sort order and sort again (can be time consuming).
+   init              create a 'posto.md' file in the working directory.
+   list              display the todo list.
+   todos             alias for 'list'
+   [default]         alias for 'list'
+   sort              ask the user about priorities to sort todos.
+   resort            reset sort order and sort again (can be time consuming).
 
 Single Todo Commands:
-   add '<todo>'   add <todo> unsorted to the bottom of the todo list.
-   start '<todo>' add, sort and commit with a message based on <todo>.
-   done [n = 1]   remove the nth todo from the list.
-   delete [n]     alias for 'done [n = 1]'
-   commit [n]     remove the nth todo; commit with a message based on the todo.
-   do             displays the top todo.
-   top            alias for 'do'
-   do [n]         move the nth todo to the top.
-   top [n]        alias for 'do [n]'
-   unsort [n]     unsort the nth todo and place it at the bottom.
+   add '<todo>'      add <todo> unsorted to the bottom of the todo list.
+   schedule '<todo>' add and commit with a message based on <todo>.
+   done [n = 1]      remove the nth todo from the list.
+   delete [n]        alias for 'done [n = 1]'
+   commit [n = 1]    remove the nth todo; commit with a relevant message.
+   do                displays the top todo.
+   top               alias for 'do'
+   do [n]            move the nth todo to the top.
+   top [n]           alias for 'do [n]'
+   unsort [n]        unsort the nth todo and place it at the bottom.
+   oops              if HEAD is a posto commit, reset --soft HEAD^.
 EOF
     assert_equal(help_text, Posto::Help.help_text)
   end

data/test/list_test.rb

@@ -8,11 +8,9 @@ class ListTest < MiniTest::Unit::TestCase
   end
 
   def test_choose_todo_lines
+    assert_equal([],Posto::List.choose_todo_lines([]))
     assert_equal(["99. bottles", "* unsorted todo"],
                  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/todo_test.rb

@@ -26,4 +26,34 @@ class TodoTest < MiniTest::Unit::TestCase
     assert_equal "99. bottles", Posto::Todo.number("* bottles", 99)
     assert_equal "99. cents", Posto::Todo.number("50. cents", 99)
   end
+
+  def test_todo?
+    assert Posto::Todo.todo?("* bottles")
+    assert Posto::Todo.todo?("50. cents")
+    assert !Posto::Todo.todo?("todo")
+    assert !Posto::Todo.todo?("----")
+  end
+
+  def test_numbered?()
+    assert !Posto::Todo.numbered?("* bottles")
+    assert Posto::Todo.numbered?("50. cents")
+    assert !Posto::Todo.numbered?("todo")
+    assert !Posto::Todo.numbered?("----")
+  end
+
+  def test_starred?
+    assert Posto::Todo.starred?("* bottles")
+    assert !Posto::Todo.starred?("50. cents")
+    assert !Posto::Todo.starred?("todo")
+    assert !Posto::Todo.starred?("----")
+  end
+
+  def test_mark_quick
+    assert_equal "* bottles (quick)", Posto::Todo.mark_quick("* bottles")
+    assert_equal "50. cents (quick)", Posto::Todo.mark_quick("50. cents")
+  end
+
+  def test_create
+    assert_equal "* bottles", Posto::Todo.create("bottles")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: posto
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -43,6 +43,86 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: five_leaves
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: grasshopper
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Sort your todo list from the command line.
 email: mattraibert@gmail.com
 executables:
@@ -86,13 +166,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3524327587989594064
+      hash: -1910736030221862158
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1910736030221862158
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24