todo-txt 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5ea0833c5149c1d21070734169a778a83ed3f7b
-  data.tar.gz: 724cb858a02a59ad571fc995b8a178192de40241
+  metadata.gz: 87c3206db6b8a924eeedaaee0699cbaa9a63ea0f
+  data.tar.gz: ba6c31c870bd51c7a191a250bf20c9e1a8fbb5ea
 SHA512:
-  metadata.gz: 73a69125b40e283c7df6e4498ca590b99b515d7f4ea1494de09be3fe73a1c0cd0ac6c71e45c83685c87fe5dfcb04c8e263f36012cf0e75cde0e8ae7d9e0006d9
-  data.tar.gz: 1fc66ed9062ce514ac6e15140f8035ac1ab9d0a955ebc34f51bea1643765e1beedbe11f97389f28171c8554d4edd0eb0c2fe2157f09d9d75c587a7d5bc90d82f
+  metadata.gz: 0ee77ef0490c7b423a52f779b810af66521ed1ed253560cd08c5a1b207102fcf36e4ab6d3f78666039c49d748c27e9d96d2149e28eeb0d2b3ad60e7cc6307760
+  data.tar.gz: 82050a6db87b76ef1c3ab51c428d26b7f045242628eeebbd3817b1c884634f73f159004435db20b9967bf40feb99a0d043afb4dab5502d9d7389417ba32909f9

data/.gitignore

@@ -1,3 +1,4 @@
 .rvmrc
 pkg/
 coverage/
+Gemfile.lock

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 group :test do
-  gem 'rspec'
+  gem 'rspec', '~> 3.4'
   gem 'rake'
   gem 'timecop'
   gem 'simplecov', :require => false

data/Rakefile

@@ -5,6 +5,4 @@ require 'rspec/core/rake_task'
 task :default => [:test]
 
 desc "Run all tests"
-RSpec::Core::RakeTask.new(:test) do |t|
-  t.rspec_opts = '-cfs'
-end
+RSpec::Core::RakeTask.new(:test)

data/lib/todo-txt.rb

@@ -3,5 +3,6 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'logger'
 require 'todo-txt/logger'
+require 'todo-txt/syntax'
 require 'todo-txt/list'
 require 'todo-txt/task'

data/lib/todo-txt/syntax.rb

@@ -0,0 +1,33 @@
+module Todo
+  module Syntax
+    # The regular expression used to match contexts.
+    def contexts_regex
+       /(?:\s+|^)@[^\s]+/
+    end
+
+    # The regex used to match projects.
+    def projects_regex
+       /(?:\s+|^)\+[^\s]+/
+    end
+
+    # The regex used to match priorities.
+    def priority_regex
+      /(?:^|\s+)\(([A-Za-z])\)\s+/
+    end
+
+    # The regex used to match creation date.
+    def created_on_regex
+      /(?:^|-\d{2}\s|\)\s)(\d{4}-\d{2}-\d{2})\s/
+    end
+
+    # The regex used to match completion.
+    def done_regex
+      /^x\s+(\d{4}-\d{2}-\d{2})\s+/
+    end
+
+    # The regex used to match due date.
+    def due_on_regex
+      /(?:due:)(\d{4}-\d{2}-\d{2})(?:\s+|$)/i
+    end
+  end
+end

data/lib/todo-txt/task.rb

@@ -4,36 +4,7 @@ module Todo
   class Task
     include Comparable
     include Todo::Logger
-
-    # The regular expression used to match contexts.
-    def self.contexts_regex
-       /(?:\s+|^)@\w+/
-    end
-
-    # The regex used to match projects.
-    def self.projects_regex
-       /(?:\s+|^)\+\w+/
-    end
-
-    # The regex used to match priorities.
-    def self.priority_regex
-      /(?:^|\s+)\(([A-Za-z])\)\s+/
-    end
-
-    # The regex used to match creation date.
-    def self.created_on_regex
-      /(?:^|-\d{2}\s|\)\s)(\d{4}-\d{2}-\d{2})\s/
-    end
-
-    # The regex used to match completion.
-    def self.done_regex
-      /^x\s+(\d{4}-\d{2}-\d{2})\s+/
-    end
-
-    # The regex used to match due date.
-    def self.due_on_regex
-      /(?:due:)(\d{4}-\d{2}-\d{2})(?:\s+|$)/i
-    end
+    include Todo::Syntax
 
     # Creates a new task. The argument that you pass in must be the string
     # representation of a task.
@@ -46,8 +17,8 @@ module Todo
       @completed_on = get_completed_date #orig.scan(self.class.done_regex)[1] ||= nil
       @priority, @created_on = orig_priority, orig_created_on
       @due_on = get_due_on_date
-      @contexts ||= orig.scan(self.class.contexts_regex).map { |item| item.strip }
-      @projects ||= orig.scan(self.class.projects_regex).map { |item| item.strip }
+      @contexts ||= orig.scan(contexts_regex).map { |item| item.strip }
+      @projects ||= orig.scan(projects_regex).map { |item| item.strip }
     end
 
     # Returns the original content of the task.
@@ -133,12 +104,12 @@ module Todo
     #   task.text #=> "Testing!"
     def text
       @text ||= orig.
-        gsub(self.class.done_regex, '').
-        gsub(self.class.priority_regex, '').
-        gsub(self.class.created_on_regex, '').
-        gsub(self.class.contexts_regex, '').
-        gsub(self.class.projects_regex, '').
-        gsub(self.class.due_on_regex, '').
+        gsub(done_regex, '').
+        gsub(priority_regex, '').
+        gsub(created_on_regex, '').
+        gsub(contexts_regex, '').
+        gsub(projects_regex, '').
+        gsub(due_on_regex, '').
         strip
     end
 
@@ -169,8 +140,7 @@ module Todo
     #   task.overdue?
     #   #=> true
     def overdue?
-      return true if !due_on.nil? && due_on < Date.today
-      false
+      !due_on.nil? && due_on < Date.today
     end
 
     # Returns if the task is done.
@@ -294,13 +264,13 @@ module Todo
     private
 
     def orig_priority
-      @orig.match(self.class.priority_regex)[1] if @orig =~ self.class.priority_regex
+      @orig.match(priority_regex)[1] if @orig =~ priority_regex
     end
 
     def orig_created_on
       begin
-        if @orig =~ self.class.created_on_regex
-          date = @orig.match self.class.created_on_regex
+        if @orig =~ created_on_regex
+          date = @orig.match created_on_regex
           return Date.parse(date[1]) unless date.nil?
         end
       rescue; end
@@ -309,14 +279,14 @@ module Todo
 
     def get_completed_date
       begin
-        return Date.parse(self.class.done_regex.match(@orig)[1])
+        return Date.parse(done_regex.match(@orig)[1])
       rescue; end
       nil
     end
 
     def get_due_on_date
       begin
-        return Date.parse(self.class.due_on_regex.match(@orig)[1])
+        return Date.parse(due_on_regex.match(@orig)[1])
       rescue; end
       nil
     end

data/spec/spec_helper.rb

@@ -1,4 +1,13 @@
+require 'date'
+require 'timecop'
 require 'simplecov'
+
 SimpleCov.start
 
 require File.join(File.dirname(__FILE__), "../lib/todo-txt.rb")
+
+RSpec.configure do |config|
+  config.expect_with(:rspec) do |c|
+    c.syntax = :expect
+  end
+end

data/spec/todo-txt/list_spec.rb

@@ -1,47 +1,47 @@
-require File.join(File.dirname(__FILE__), "../spec_helper.rb")
+require 'spec_helper'
 
 describe Todo::List do
   let(:path) { File.dirname(__FILE__) + '/../data/todo.txt' }
   let(:list) { Todo::List.new(path) }
 
   it 'should have the correct path' do
-    list.path.should == path
+    expect(list.path).to eq(path)
   end
 
   it 'should grab a list of Todo::Tasks' do
     list.each do |task|
-      task.class.should == Todo::Task
+      expect(task.class).to eq(Todo::Task)
     end
 
     # This is a little bit fragile but it helps me sleep at night.
-    list[0].priority.should == "A"
+    expect(list[0].priority).to eq("A")
   end
 
   it 'should be able to filter by priority' do
     list.by_priority("A").each do |task|
-      task.priority.should == "A"
+      expect(task.priority).to eq("A")
     end
 
     # Make sure some data was actually checked
-    list.by_priority("A").length.should be > 0
+    expect(list.by_priority("A").length).to be > 0
   end
 
   it 'should be able to filter by context' do
     list.by_context("@context").each do |task|
-      task.contexts.should include "@context"
+      expect(task.contexts).to include "@context"
     end
 
     # Make sure some data was actually checked
-    list.by_context("@context").length.should be > 0
+    expect(list.by_context("@context").length).to be > 0
   end
 
   it 'should be able to filter by project' do
     list.by_project("+project").each do |task|
-      task.projects.should include "+project"
+      expect(task.projects).to include "+project"
     end
 
     # Make sure some data was actually checked
-    list.by_project("+project").length.should be > 0
+    expect(list.by_project("+project").length).to be > 0
   end
 
   it 'should be able to filter by project, context and priority' do
@@ -50,38 +50,38 @@ describe Todo::List do
                     by_priority("C")
 
     filtered.each do |task|
-      task.projects.should include "+project"
-      task.contexts.should include "@context"
-      task.priority.should == "C"
+      expect(task.projects).to include "+project"
+      expect(task.contexts).to include "@context"
+      expect(task.priority).to eq("C")
     end
 
     # Make sure some data was actually checked
-    filtered.length.should be > 0
+    expect(filtered.length).to be > 0
   end
 
   it 'should be able to filter by done' do
     list.by_done.each do |task|
-      task.text.should include 'This task is completed'
+      expect(task.text).to include 'This task is completed'
     end
 
-    list.by_done.length.should be == 2    
+    expect(list.by_done.length).to eq(2)
   end
 
   it 'should be able to filter by not done' do
     list.by_not_done.each do |task|
-      task.text.should_not include 'This task is completed'
+      expect(task.text).not_to include 'This task is completed'
     end
 
-    list.by_not_done.length.should be == 9    
+    expect(list.by_not_done.length).to eq(9)
   end
 
   it 'should be sortable' do
     list.sort.each_cons(2) do |task_a, task_b|
-      task_a.should be <= task_b
+      expect(task_a).to be <= task_b
     end
 
     # Make sure some data was actually checked
-    list.sort.length.should be > 0
+    expect(list.sort.length).to be > 0
 
     # Class should still be Todo::List
     # This assertion currently fails. TODO.
@@ -95,7 +95,7 @@ describe Todo::List do
         Todo::Task.new("Another task!"),
       ])
 
-      l.length.should == 2
+      expect(l.length).to eq(2)
     end
   end
 end

data/spec/todo-txt/task_spec.rb

@@ -1,267 +1,275 @@
-require File.join(File.dirname(__FILE__), "../spec_helper.rb")
-require 'date'
-require 'timecop'
+require 'spec_helper'
 
 describe Todo::Task do
   describe "Descriptions:" do
     it 'should convert to a string' do
       task = Todo::Task.new "(A) 2012-12-08 My task @test +test2"
-      task.to_s.should == "(A) 2012-12-08 My task @test +test2"
+      expect(task.to_s).to eq("(A) 2012-12-08 My task @test +test2")
     end
-  
+
     it 'should keep track of the original string after changing the task' do
       task = Todo::Task.new "(A) 2012-12-08 My task @test +test2"
       Timecop.freeze(2013, 12, 8) do
         task.do!
-        task.orig.should == "(A) 2012-12-08 My task @test +test2"
+        expect(task.orig).to eq("(A) 2012-12-08 My task @test +test2")
       end
     end
-  
+
     it 'should be modifiable' do
       task = Todo::Task.new "2012-12-08 My task @test +test2"
       task.projects.clear
       task.contexts << ["@test3"]
       Timecop.freeze(2013, 12, 8) do
         task.do!
-        task.to_s.should == "x 2013-12-08 2012-12-08 My task @test @test3"
+        expect(task.to_s).to eq("x 2013-12-08 2012-12-08 My task @test @test3")
       end
     end
 
     it 'should be able to get just the text, no due date etc.' do
       task = Todo::Task.new "x 2012-09-11 (B) 2012-03-04 This is a sweet task. @context due:2012-01-01 +project"
-      task.text.should == "This is a sweet task."
+      expect(task.text).to eq("This is a sweet task.")
     end
 
     it 'should retain the original task creation string' do
       task = Todo::Task.new "(A) This is an awesome task, yo. +winning"
-      task.orig.should == "(A) This is an awesome task, yo. +winning"
+      expect(task.orig).to eq("(A) This is an awesome task, yo. +winning")
     end
 
     it 'should be able to get just the text, no contexts etc.' do
       task = Todo::Task.new "x 2012-09-11 (B) 2012-03-04 This is a sweet task. @context +project"
-      task.text.should == "This is a sweet task."
+      expect(task.text).to eq("This is a sweet task.")
     end
   end
-  
+
   describe "Priorities:" do
     it 'should recognise priorities' do
       task = Todo::Task.new "(A) Hello world!"
-      task.priority.should == "A"
+      expect(task.priority).to eq("A")
     end
 
     it 'should only recognise priorities at the start of a task' do
       task = Todo::Task.new "Hello, world! (A)"
-      task.priority.should == nil
+      expect(task.priority).to eq(nil)
     end
 
     it 'should recognize priorities around dates' do
       task = Todo::Task.new "x 2012-09-11 (B) 2012-03-04 This is a sweet task. @context +project"
-      task.priority.should == "B"
+      expect(task.priority).to eq("B")
     end
 
     it 'should remove the priority when calling Task#do!' do
       task = Todo::Task.new "(A) Task"
       task.do!
-      task.priority.should be_nil
+      expect(task.priority).to be_nil
     end
 
     it 'should reset to the original priority when calling Task#undo!' do
       task = Todo::Task.new "(A) Task"
       task.do!
       task.undo!
-      task.priority.should == "A"
+      expect(task.priority).to eq("A")
     end
   end
 
   describe "Completion:" do
     it 'should be not done with missing date' do
       task = Todo::Task.new "x This is not done"
-      task.done?.should be false
+      expect(task.done?).to be false
     end
 
     it 'should be not done with malformed date' do
       task = Todo::Task.new "x 01-01-2013 This is not done"
-      task.done?.should be false
-      task.completed_on.should be nil
+      expect(task.done?).to be false
+      expect(task.completed_on).to be nil
     end
 
     it 'should be not done with an invalid date' do
       task = Todo::Task.new "x 2013-02-31 This is not done"
-      task.done?.should be false
-      task.completed_on.should be nil
+      expect(task.done?).to be false
+      expect(task.completed_on).to be nil
     end
 
     it 'should be done on 2013-04-22' do
       task = Todo::Task.new "x 2013-04-22 This is really done"
-      task.done?.should be true
-      task.completed_on.should == Date.parse('22th April 2013')
+      expect(task.done?).to be true
+      expect(task.completed_on).to eq(Date.parse('22th April 2013'))
     end
-    
+
     it 'should be able to recognise completed tasks' do
       task = Todo::Task.new "x 2012-12-08 This is done!"
-      task.done?.should be_true
+      expect(task.done?).to be true
     end
 
     it 'should not recognize incomplete tasks as done' do
       task = Todo::Task.new "2012-12-08 This ain't done!"
-      task.done?.should be_false
+      expect(task.done?).to be false
     end
 
     it 'should be completable' do
       task = Todo::Task.new "2012-12-08 This ain't done!"
       task.do!
-      task.done?.should be_true
+      expect(task.done?).to be true
     end
 
     it 'should be marked as incomplete' do
       task = Todo::Task.new "x 2012-12-08 This is done!"
       task.undo!
-      task.done?.should be_false
+      expect(task.done?).to be false
     end
 
     it 'should be marked as incomplete without any date' do
       task = Todo::Task.new "x 2012-12-08 This is done!"
       task.undo!
-      task.completed_on.should be_nil
-      task.created_on.should be_nil
+      expect(task.completed_on).to be_nil
+      expect(task.created_on).to be_nil
     end
 
     it 'should be toggable' do
       task = Todo::Task.new "2012-12-08 This ain't done!"
       task.toggle!
-      task.done?.should be_true
+      expect(task.done?).to be true
       task.toggle!
-      task.done?.should be_false
+      expect(task.done?).to be false
     end
   end
-  
+
   describe "Contexts:" do
     it 'should recognise contexts' do
       task = Todo::Task.new "Hello, world! @test"
-      task.contexts.should == ["@test"]
+      expect(task.contexts).to eq(["@test"])
     end
 
     it 'should recognise multiple contexts' do
       task = Todo::Task.new "Hello, world! @test @test2"
-      task.contexts.should == ["@test", "@test2"]
+      expect(task.contexts).to eq(["@test", "@test2"])
+    end
+
+    it 'should recognise contexts with dashes and underscores' do
+      task = Todo::Task.new "Hello, world! @test-me @test2_me"
+      expect(task.contexts).to eq(["@test-me", "@test2_me"])
     end
   end
-  
+
   describe "Projects:" do
     it 'should recognise projects' do
       task = Todo::Task.new "Hello, world! +test"
-      task.projects.should == ["+test"]
+      expect(task.projects).to eq(["+test"])
     end
 
     it 'should recognise multiple projects' do
       task = Todo::Task.new "Hello, world! +test +test2"
-      task.projects.should == ["+test", "+test2"]
+      expect(task.projects).to eq(["+test", "+test2"])
+    end
+
+    it 'should recognise projects with dashes and underscores' do
+      task = Todo::Task.new "Hello, world! +test-me +test2_me"
+      expect(task.projects).to eq(["+test-me", "+test2_me"])
     end
   end
-  
+
   describe "Creation dates:" do
     it 'should be able to recognise creation dates' do
       task = Todo::Task.new "(C) 2012-03-04 This has a date!"
-      task.created_on.should == Date.parse("4th March 2012")
+      expect(task.created_on).to eq(Date.parse("4th March 2012"))
     end
 
     it 'should be able to recognise creation dates without priority' do
       task = Todo::Task.new "2012-03-04 This has a date!"
-      task.created_on.should == Date.parse("4th March 2012")
+      expect(task.created_on).to eq(Date.parse("4th March 2012"))
     end
 
     it 'should return nil if no creation date is present' do
       task = Todo::Task.new "No date!"
-      task.created_on.should be_nil
+      expect(task.created_on).to be_nil
     end
 
     it 'should not recognise malformed dates' do
       task = Todo::Task.new "03-04-2012 This has a malformed date!"
-      task.created_on.should be_nil
+      expect(task.created_on).to be_nil
     end
-  
+
     it 'should be able to tell if the task is overdue' do
       task = Todo::Task.new((Date.today - 1).to_s + " This task is overdue!")
-      task.overdue?.should be_false
+      expect(task.overdue?).to be false
     end
 
     it 'should return false on overdue? if there is no creation date' do
       task = Todo::Task.new "No date!"
-      task.overdue?.should be_false
+      expect(task.overdue?).to be false
     end
 
     it 'should return nil on ridiculous date data' do
       task = Todo::Task.new "2012-56-99 This has a malformed date!"
-      task.created_on.should be_nil
+      expect(task.created_on).to be_nil
     end
   end
-  
+
   describe "Completion dates:" do
     it 'should be able to recognise completion dates' do
       task = Todo::Task.new "x 2012-12-08 This is done!"
-      task.completed_on.should == Date.parse("8th December 2012")
+      expect(task.completed_on).to eq(Date.parse("8th December 2012"))
     end
 
     it 'should set the current completion dates when calling Task#do!' do
       task = Todo::Task.new "2012-12-08 Task"
       Timecop.freeze(2013, 12, 8) do
         task.do!
-        task.completed_on.should == Date.parse("8th December 2013")
+        expect(task.completed_on).to eq(Date.parse("8th December 2013"))
       end
     end
   end
 
   describe "Due dates:" do
-    its 'should have a due date' do
+    it 'should have a due date' do
       task = Todo::Task.new '(A) this task has due date due:2013-12-22'
-      task.due_on.should_not be_nil
+      expect(task.due_on).not_to be_nil
     end
 
     it 'should due on 2013-12-22' do
       task = Todo::Task.new '(A) this task has due date due:2013-12-22'
-      task.due_on.should == Date.parse('22th December 2013')
+      expect(task.due_on).to eq(Date.parse('22th December 2013'))
     end
 
     it 'should not be overdue on 2013-12-01' do
       task = Todo::Task.new '(A) this task has due date due:2013-12-22'
       Timecop.freeze(2013, 12, 01) do
-        task.overdue?.should be_false
+        expect(task.overdue?).to be false
       end
     end
 
     it 'should be overdue on 2013-12-23' do
       task = Todo::Task.new '(A) this task has due date due:2013-12-22'
       Timecop.freeze(2013, 12, 23) do
-        task.overdue?.should be_true
+        expect(task.overdue?).to be true
       end
     end
 
     it 'should convert to a string with due date' do
       task = Todo::Task.new "x 2012-09-11 (B) 2012-03-04 This is a sweet task. @context due:2012-01-01 +project"
-      task.to_s.should == "x 2012-09-11 (B) 2012-03-04 This is a sweet task. @context +project due:2012-01-01"
+      expect(task.to_s).to eq("x 2012-09-11 (B) 2012-03-04 This is a sweet task. @context +project due:2012-01-01")
     end
 
     it 'should have no due date with malformed date' do
       task = Todo::Task.new "x 2012-09-11 (B) 2012-03-04 This is a sweet task. @context due:01-01-2012 +project"
-      task.due_on.should be_nil
+      expect(task.due_on).to be_nil
     end
 
     it 'should have no due date with invalid date' do
       task = Todo::Task.new "x 2012-09-11 (B) 2012-03-04 This is a sweet task. @context due:2012-02-31 +project"
-      task.due_on.should be_nil
+      expect(task.due_on).to be_nil
     end
 
     it 'should recognize DUE:2013-12-22 (case insensitive)' do
       task = Todo::Task.new '(A) this task has due date DUE:2013-12-22'
-      task.due_on.should == Date.parse('22th December 2013')
+      expect(task.due_on).to eq(Date.parse('22th December 2013'))
     end
-    
+
     it 'should reset to the original due date when calling Task#undo!' do
       task = Todo::Task.new "2012-12-08 Task"
       Timecop.freeze(2013, 12, 8) do
         task.do!
         task.undo!
-        task.created_on.should == Date.parse("8th December 2012")
+        expect(task.created_on).to eq(Date.parse("8th December 2012"))
       end
     end
 
@@ -269,11 +277,11 @@ describe Todo::Task do
       task = Todo::Task.new "2012-12-08 This ain't done!"
       Timecop.freeze(2013, 12, 8) do
         task.toggle!
-        task.completed_on.should == Date.parse("8th December 2013")
-        task.created_on.should == Date.parse("8th December 2012")
+        expect(task.completed_on).to eq(Date.parse("8th December 2013"))
+        expect(task.created_on).to eq(Date.parse("8th December 2012"))
         task.toggle!
-        task.created_on.should == Date.parse("8th December 2012")
-        task.completed_on.should be_nil
+        expect(task.created_on).to eq(Date.parse("8th December 2012"))
+        expect(task.completed_on).to be_nil
       end
     end
   end
@@ -284,7 +292,7 @@ describe Todo::Task do
       task2 = Todo::Task.new "(B) Not quite so high."
 
       assertion = task1 > task2
-      assertion.should == true
+      expect(assertion).to eq(true)
     end
 
     it 'should be comparable to task without priority' do
@@ -292,7 +300,7 @@ describe Todo::Task do
       task2 = Todo::Task.new "(B) Not quite so high."
 
       assertion = task1 < task2
-      assertion.should == true
+      expect(assertion).to eq(true)
     end
 
     it 'should be able to compare two tasks without priority' do
@@ -300,14 +308,14 @@ describe Todo::Task do
       task2 = Todo::Task.new "Not quite so high."
 
       assertion = task1 == task2
-      assertion.should == true
+      expect(assertion).to eq(true)
     end
   end
-  
+
   describe "Logging:" do
     it 'should have a logger' do
       task = Todo::Task.new "x 2012-09-11 (B) 2012-03-04 This is a sweet task. @context due:2012-02-31 +project"
-      task.logger.should_not be nil
+      expect(task.logger).not_to be nil
     end
 
     it 'should call @logger.warn if #date called as deprecated method' do
@@ -317,7 +325,7 @@ describe Todo::Task do
       task = Todo::Task.new "x 2012-09-11 (B) 2012-03-04 This is a sweet task. @context due:2012-02-31 +project"
       error_message = 'Task#date is deprecated, use created_on instead.'
 
-      logger.should_receive(:warn).with(error_message)
+      expect(logger).to receive(:warn).with(error_message)
       task.date
     end
   end

data/todo-txt.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{todo-txt}
-  s.version = "0.5"
+  s.version = "0.6"
   s.authors = ["Sam Rose"]
   s.email = %q{samwho@lbak.co.uk}
   s.summary = %q{A client library for parsing todo.txt files.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: todo-txt
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Sam Rose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies: []
 description: Allows for simple parsing of todo.txt files, as per Gina Trapani's todo.txt
   project.
@@ -21,13 +21,13 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - lib/todo-txt.rb
 - lib/todo-txt/list.rb
 - lib/todo-txt/logger.rb
+- lib/todo-txt/syntax.rb
 - lib/todo-txt/task.rb
 - spec/data/todo.txt
 - spec/spec_helper.rb

data/Gemfile.lock

@@ -1,29 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.1.3)
-    multi_json (1.8.0)
-    rake (0.9.2.2)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    timecop (0.6.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  rake
-  rspec
-  simplecov
-  timecop