todotxt 0.0.3 → 0.1.0

data/lib/todotxt/todolist.rb

@@ -1,6 +1,7 @@
 require "todotxt/todo"
 
 module Todotxt
+  #@TODO merge with TodoFile, both overlap too much
   class TodoList
     include Enumerable
 
@@ -10,7 +11,7 @@ module Todotxt
       @todos = []
       @file  = file
 
-      File.open(file).read.each_line do |l|
+      File.open(file.path).read.each_line do |l|
         add l.strip unless l.empty?
       end
     end
@@ -27,6 +28,11 @@ module Todotxt
       @todos.reject! { |t| t.line.to_s == line.to_s }
     end
 
+    def move line, other_list
+      other_list.add find_by_line(line).to_s
+      remove line
+    end
+
     def projects
       map { |t| t.projects }.flatten.uniq.sort
     end
@@ -40,7 +46,7 @@ module Todotxt
     end
 
     def save
-      File.open(@file, "w") { |f| f.write to_txt }
+      File.open(@file.path, "w") { |f| f.write to_txt }
     end
 
     def each &block
@@ -71,10 +77,22 @@ module Todotxt
       self
     end
 
+    def on_date date
+      @todos.select { |t| t.due == date }
+    end
+
+    def before_date date
+      @todos.reject { |t| t.due.nil? || t.due >= date }
+    end
+
     def to_txt
       @todos.sort { |a,b| a.line <=> b.line }.map { |t| t.to_s.strip }.join("\n")
     end
 
+    def to_s
+      @file.basename
+    end
+
     def to_a
       map { |t| ["#{t.line}. ", t.to_s] }
     end

data/lib/todotxt/version.rb

@@ -1,3 +1,3 @@
 module Todotxt
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lib/todotxt.rb

@@ -5,8 +5,10 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 module Todotxt
   autoload :Todo,       "todotxt/todo"
   autoload :TodoList,   "todotxt/todolist"
+  autoload :TodoFile,   "todotxt/todofile"
   autoload :CLI,        "todotxt/cli"
   autoload :CLIHelpers, "todotxt/clihelpers"
+  autoload :Config,     "todotxt/config"
 end
 
 require "todotxt/regex"

data/spec/cli_spec.rb

@@ -0,0 +1,6 @@
+require "spec_helper"
+require "todotxt/clihelpers"
+require "todotxt/cli"
+
+describe Todotxt::CLI do
+end

data/spec/config_spec.rb

@@ -0,0 +1,52 @@
+require "spec_helper"
+require "todotxt/config"
+
+describe Todotxt::Config do
+  before(:each) do
+    ENV["HOME"] = File.join "/", "tmp"
+    @config_file = File.join ENV["HOME"], ".todotxt.cfg"
+  end
+
+  context "valid config" do
+    before(:each) do
+      @cfg = Todotxt::Config.new "spec/fixtures/config_new.cfg"
+    end
+
+    it 'should have a "files"' do
+      @cfg.files.keys.should include "todo"
+    end
+
+    it 'should not be deprecated' do
+      @cfg.should_not be_deprecated
+    end
+  end
+
+  context "old style config" do
+    before(:each) do
+      @cfg = Todotxt::Config.new "spec/fixtures/config_old.cfg"
+    end
+
+    it 'should place "todo_txt_path" under files' do
+      @cfg.files.keys.should include "todo"
+    end
+
+    it 'should be deprecated' do
+      @cfg.should be_deprecated
+    end
+  end
+
+  it 'not allow both "files" and "todo_txt_path"' do
+    expect do
+      Todotxt::Config.new "spec/fixtures/config_both.cfg"
+    end.to raise_error "Bad configuration file: use either files or todo_txt_path"
+  end
+
+  context "#generate!" do
+    it 'should create a template' do
+      File.delete @config_file if File.exists? @config_file
+      todo = Todotxt::Config.new
+      todo.generate!
+      File.exists?(@config_file).should be_true
+    end
+  end
+end

data/spec/fixtures/config_both.cfg

@@ -0,0 +1,4 @@
+todo_txt_path = "/tmp/todo.txt"
+
+[files]
+  todo = "/tmp/todo.txt"

data/spec/fixtures/config_new.cfg

@@ -0,0 +1,2 @@
+[files]
+  todo = "/tmp/todo.txt"

data/spec/fixtures/config_old.cfg

@@ -0,0 +1 @@
+todo_txt_path = "/tmp/todo.txt"

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+require 'chronic'
+require 'simplecov'
+SimpleCov.start

data/spec/todo_spec.rb

@@ -1,3 +1,4 @@
+require "spec_helper"
 require "todotxt/todo"
 
 describe Todotxt::Todo do
@@ -27,6 +28,17 @@ describe Todotxt::Todo do
     todo.done.should eql true
   end
 
+  it "parses a due date" do
+    todo = Todotxt::Todo.new "(A) x 2012-12-12 an item +project1 +project2 @context1 @context2"
+    todo.due.should eql Chronic.parse("12 December 2012").to_date
+
+    todo = Todotxt::Todo.new "2012-1-2 an item +project1 +project2 @context1 @context2"
+    todo.due.should eql Chronic.parse("2 January 2012").to_date
+
+    todo = Todotxt::Todo.new "42 folders"
+    todo.due.should be_nil
+  end
+
   it "stores line number when creating an item" do
     todo = Todotxt::Todo.new "an item", "2"
 

data/spec/todofile_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+require "todotxt/config"
+require "todotxt/todofile"
+
+describe Todotxt::TodoFile do
+  before(:each) do
+    @todo_path = "/tmp/todo.txt"
+    Todotxt::Config.any_instance.stub(:files) do
+      {todo:@todo_path}
+    end
+  end
+  after(:each) do
+    File.delete @todo_path if File.exists? @todo_path
+  end
+
+  it 'should create a new file when initializing' do
+    file = Todotxt::TodoFile.new(@todo_path)
+    file.class.should == Todotxt::TodoFile
+  end
+
+  it 'should create a new file via the key in config' do
+    file = Todotxt::TodoFile.from_key(:todo)
+    file.class.should == Todotxt::TodoFile
+  end
+
+  it 'should throw an error for undefined keys' do
+    expect { 
+      Todotxt::TodoFile.from_key(:does_not_exist)
+    }.to raise_error "Key not found in config"
+  end
+end

data/spec/todolist_spec.rb

@@ -1,10 +1,13 @@
+require "spec_helper"
 require "todotxt/todolist"
+require "todotxt/todofile"
 
 describe Todotxt::TodoList do
 
   describe "with simple list" do
     before :each do
-      @list = Todotxt::TodoList.new File.join(File.dirname(__FILE__), "fixtures", "simple_todo.txt")
+      @file = Todotxt::TodoFile.new File.join(File.dirname(__FILE__), "fixtures", "simple_todo.txt")
+      @list = Todotxt::TodoList.new @file
     end
 
     it "parses a file on creation" do
@@ -50,6 +53,20 @@ describe Todotxt::TodoList do
       @list.todos.count.should eql 1
     end
 
+    it "fetches items for a certain date" do
+      @list.add "2012-12-12 item"
+      date = DateTime.parse("2012-12-12")
+      @list.on_date(date).count.should eql 1
+      @list.on_date(date).should eql [@list.todos.last]
+    end
+
+    it "fetchs items before a cereain date" do
+      @list.add "2012-11-11 item"
+      @list.add "2012-12-12 item"
+      date = DateTime.parse("2012-12-12")
+      @list.before_date(date).count.should eql 1
+    end
+
     it "includes done items in search when told to do so" do
       @list.filter "first", :with_done => true
 
@@ -75,7 +92,8 @@ EOF
 
   describe "with complex list" do
     before :each do
-      @list = Todotxt::TodoList.new File.join(File.dirname(__FILE__), "fixtures", "complex_todo.txt")
+      @file = Todotxt::TodoFile.new File.join(File.dirname(__FILE__), "fixtures", "complex_todo.txt")
+      @list = Todotxt::TodoList.new @file
     end
 
     it "sorts itself automatically on parse" do

data/todotxt.gemspec

@@ -21,7 +21,11 @@ Gem::Specification.new do |s|
   s.add_dependency "thor", "~> 0.15.4"
   s.add_dependency "rainbow", "~> 1.1.4"
   s.add_dependency "parseconfig", "~> 1.0.2"
+  s.add_dependency "chronic", "~> 0.9.1"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 2.11.0"
+  s.add_development_dependency "simplecov"
+  s.add_development_dependency "aruba", "~> 0.5.1"
+  s.add_development_dependency "debugger"
 end

metadata

@@ -1,71 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: todotxt
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Johan Sahlén
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70177769396400 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.15.4
   type: :runtime
   prerelease: false
-  version_requirements: *70177769396400
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.15.4
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &70177769395640 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70177769395640
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &70177769394860 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70177769394860
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70177769394140 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177769394140
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70177769393240 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.1
   type: :development
   prerelease: false
-  version_requirements: *70177769393240
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Interact with your todo.txt using a Ruby-base command-line tool
 email:
 - johan@monospace.se
@@ -82,50 +152,106 @@ files:
 - bin/todotxt
 - conf/todo.txt
 - conf/todotxt.cfg
+- cucumber.yml
+- features/add.feature
+- features/append.feature
+- features/backwards.feature
+- features/colors.feature
+- features/del.feature
+- features/depri.feature
+- features/do.feature
+- features/due.feature
+- features/edit.feature
+- features/generate_config.feature
+- features/generate_txt.feature
+- features/initialize.feature
+- features/list.feature
+- features/move.feature
+- features/prepend.feature
+- features/pri.feature
+- features/replace.feature
+- features/step_definitions/environment_steps.rb
+- features/step_definitions/list_steps.rb
+- features/support/ansi.rb
+- features/support/aruba.rb
+- features/support/debugger.rb
+- features/undo.feature
 - lib/todotxt.rb
 - lib/todotxt/cli.rb
 - lib/todotxt/clihelpers.rb
+- lib/todotxt/config.rb
 - lib/todotxt/regex.rb
 - lib/todotxt/todo.rb
+- lib/todotxt/todofile.rb
 - lib/todotxt/todolist.rb
 - lib/todotxt/version.rb
+- spec/cli_spec.rb
+- spec/config_spec.rb
 - spec/fixtures/complex_todo.txt
+- spec/fixtures/config_both.cfg
+- spec/fixtures/config_new.cfg
+- spec/fixtures/config_old.cfg
 - spec/fixtures/simple_todo.txt
+- spec/spec_helper.rb
 - spec/todo_spec.rb
+- spec/todofile_spec.rb
 - spec/todolist_spec.rb
 - todotxt.gemspec
 homepage: http://github.com/jsahlen/todotxt
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -265984123705521099
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -265984123705521099
 requirements: []
 rubyforge_project: todotxt
-rubygems_version: 1.8.10
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: todo.txt with a Ruby flair
 test_files:
+- features/add.feature
+- features/append.feature
+- features/backwards.feature
+- features/colors.feature
+- features/del.feature
+- features/depri.feature
+- features/do.feature
+- features/due.feature
+- features/edit.feature
+- features/generate_config.feature
+- features/generate_txt.feature
+- features/initialize.feature
+- features/list.feature
+- features/move.feature
+- features/prepend.feature
+- features/pri.feature
+- features/replace.feature
+- features/step_definitions/environment_steps.rb
+- features/step_definitions/list_steps.rb
+- features/support/ansi.rb
+- features/support/aruba.rb
+- features/support/debugger.rb
+- features/undo.feature
+- spec/cli_spec.rb
+- spec/config_spec.rb
 - spec/fixtures/complex_todo.txt
+- spec/fixtures/config_both.cfg
+- spec/fixtures/config_new.cfg
+- spec/fixtures/config_old.cfg
 - spec/fixtures/simple_todo.txt
+- spec/spec_helper.rb
 - spec/todo_spec.rb
+- spec/todofile_spec.rb
 - spec/todolist_spec.rb