to-do 1.2.5 → 1.2.6

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - rbx-18mode
+  - rbx-19mode
+# uncomment this line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec

data/Gemfile

@@ -1,17 +1,16 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
+# Add dependencies required to use your gem here.
 gem "shoulda", ">= 0"
-gem "sequel", ">=3.12"
+gem "sqlite3", ">= 0"
+gem "sequel", ">= 3.12"
 gem "bundler", ">= 1.0.0"
 gem "jeweler", "~> 1.8.4"
 gem "simplecov", ">= 0"
 gem "colorize", ">= 0"
 
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "yard", ">= 0"
-end
+end

data/README.md

@@ -1,9 +1,9 @@
-#to-do 1.2.5
+#to-do 1.2.6 [![Build Status](https://secure.travis-ci.org/kristenmills/to-do.png?branch=master)](http://travis-ci.org/kristenmills/to-do)
 
-A simple command line todo application written in Ruby.  
+A simple command line todo application written in Ruby.   
 
-##What's new 1.2.5
-* Cleaned up the code by using the gem Sequel for the sqlite things
+##What's new in 1.2.6
+* Rewrote tests
 * Bug Fixes
 
 ##What's new in 1.2

data/VERSION

@@ -1 +1 @@
-1.2.5
+1.2.6

data/lib/to-do/tasks.rb

@@ -66,7 +66,7 @@ module Todo
 			clear_each 1, list_name
 			if clear_all
 				clear_each 0, list_name
-				DATABASE[:Lists].filter(:Name => list_name).update(:Total => 0)
+				#DATABASE[:Lists].filter(:Name => list_name).update(:Total => 0)
 				DATABASE[:Lists].filter(:Name => list_name).delete
 				puts "Cleared all tasks in #{list_name}"
 			else
@@ -95,7 +95,7 @@ module Todo
 					puts "Task ##{task} is not in the list."
 				end
 			else
-				found_task = names[:Tasks__Name.downcase => task.downcase]
+				found_task = names.with_sql("SELECT * FROM :table WHERE Name = :task COLLATE NOCASE",:table=>names, :task=>task).first
 				if found_task
 					DATABASE[:Tasks].filter(:Id => found_task[:Id]).update(:Completed => final)
 				else

data/test/helper.rb

@@ -10,22 +10,27 @@ end
 require 'test/unit'
 require 'shoulda'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'to-do'
+#$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+#$LOAD_PATH.unshift(File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), '..', 'lib','to-do')
 
 class Test::Unit::TestCase
+	def tasks_in_list database
+		database[:Tasks].join(:Task_list, :Tasks__id => :Task_list__Task_id).join(
+		:Lists, :Lists__id => :Task_list__List_id).select(:Tasks__Task_number, :Tasks__Name, 
+		:Tasks__Completed).filter(:Lists__Name => Todo::Config[:working_list_name])
+	end
 	def add_tasks
-		@list.add "Cook dinner"
-		@list.add "Write Paper"
-		@list.add "Do Laundry"
-		@list.add "Clean things"
-		@list.add "Jump up and down"
+		Todo::Tasks.add "Cook dinner"
+		Todo::Tasks.add "Write Paper"
+		Todo::Tasks.add "Do Laundry"
+		Todo::Tasks.add "Clean things"
+		Todo::Tasks.add "Jump up and down"
 	end
 
 	def finish_tasks
-		@list.finish 2, true
-		@list.finish "Clean Things", false
-		@list.finish "jUmP up AND down", false
+		Todo::Tasks.finish 2, true
+		Todo::Tasks.finish "Clean things", false
+		Todo::Tasks.finish "jUmP up AND down", false
 	end
 end

data/test/test_to-do.rb

@@ -1,71 +1,75 @@
 require File.join(File.dirname(__FILE__), 'helper')
-require '../lib/to-do.rb'
+require File.join(File.dirname(__FILE__),"..", "lib", "to-do.rb")
+require 'fileutils'
 
 class TestToDo < Test::Unit::TestCase
 	context "Test list" do
 		setup do
 			@list_name = Todo::Config[:working_list_name]
-			@list = Todo::List.new "Test List"
+			Todo::Config[:working_list_name] = 'Test list'
+			@database = Sequel.sqlite Todo::Config[:task_database]
 		end
 
-		should "list is empty" do
-			assert_equal 0, @list.count
-			assert_equal 0, @list.completed_count
-			assert_equal 0, @list.tasks.count
-			assert_equal 0, @list.completed_tasks.count
-			assert_equal "test_list" , Todo::Config[:working_list_name]
+		should "be empty" do
+			tasks = tasks_in_list @database
+			assert_equal 0, tasks.count
 		end
 
 		should "add some tasks"  do
 			add_tasks
-			assert_equal 5, @list.count
-			assert_equal 0, @list.completed_count
-			assert_equal 5, @list.tasks.count
-			assert_equal 0, @list.completed_tasks.count
+			tasks = tasks_in_list @database
+			list = @database[:Lists][:Name=>Todo::Config[:working_list_name]]
+			assert_equal 5, list[:Total]
+			assert_equal 0, tasks.filter(:Completed=>1).count
 		end
 
 		should "finish some tasks" do
 			add_tasks
 			finish_tasks
-			@list.finish "This task doesn't exist", false
-			@list.finish 40, true
-			assert_equal 5, @list.count
-			assert_equal 3, @list.completed_count
-			assert_equal 2, @list.tasks.count
-			assert_equal 3, @list.completed_tasks.count
+			Todo::Tasks.finish "This task doesn't exist", false
+			Todo::Tasks.finish 40, true
+			tasks = tasks_in_list @database
+			puts tasks.filter(:Completed=>1)
+			puts tasks.filter(:Completed=>0)
+			list = @database[:Lists][:Name=>Todo::Config[:working_list_name]]
+			assert_equal 5, list[:Total]
+			assert_equal 3, tasks.filter(:Completed=>1).count
+			assert_equal 2, tasks.filter(:Completed=>0).count
 		end
 
 		should "undo some tasks" do
 			add_tasks
 			finish_tasks
-			@list.undo 2, true
-			@list.undo "Clean Things", false
-			@list.undo "This task doesn't exist", false
-			@list.undo 40, true
-			assert_equal 5, @list.count
-			assert_equal 1, @list.completed_count
-			assert_equal 4, @list.tasks.count
-			assert_equal 1, @list.completed_tasks.count
+			Todo::Tasks.undo 2, true
+			Todo::Tasks.undo "Clean Things", false
+			Todo::Tasks.undo "This task doesn't exist", false
+			Todo::Tasks.undo 40, true
+			tasks = tasks_in_list @database
+			list = @database[:Lists][:Name=>Todo::Config[:working_list_name]]
+			assert_equal 5, list[:Total]
+			assert_equal 1, tasks.filter(:Completed=>1).count
+			assert_equal 4, tasks.filter(:Completed=>0).count
 		end
 
 		should "clear list" do
 			add_tasks
 			finish_tasks
-			@list.clear false
-			assert_equal 5, @list.count
-			assert_equal 3, @list.completed_count
-			assert_equal 2, @list.tasks.count
-			assert_equal 0, @list.completed_tasks.count
-			@list.finish 3, true
-			@list.clear true
-			assert_equal 0, @list.count
-			assert_equal 0, @list.completed_count
-			assert_equal 0, @list.tasks.count
-			assert_equal 0, @list.completed_tasks.count
+			Todo::Tasks.clear false
+			tasks = tasks_in_list @database
+			list = @database[:Lists][:Name=>Todo::Config[:working_list_name]]
+			assert_equal 5, list[:Total]
+			assert_equal 0, tasks.filter(:Completed=>1).count
+			assert_equal 2, tasks.filter(:Completed=>0).count
+			Todo::Tasks.finish 3, true
+			Todo::Tasks.clear true
+			list = @database[:Lists][:Name=>Todo::Config[:working_list_name]]
+			assert_nil list
+			assert_equal 0, tasks.filter(:Completed=>1).count
+			assert_equal 0, tasks.filter(:Completed=>0).count
 		end
 
 		teardown do
-			Todo::List.remove "Test List"
+			Todo::Tasks.clear true
 			Todo::Config[:working_list_name] = @list_name
 		end
 	end

data/to-do.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "to-do"
-  s.version = "1.2.5"
+  s.version = "1.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristen Mills"]
-  s.date = "2012-07-23"
+  s.date = "2012-07-26"
   s.description = "A simple command line todo application"
   s.email = "kristen@kristen-mills.com"
   s.executables = ["todo"]
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".travis.yml",
     "Gemfile",
     "LICENSE.txt",
     "README.md",
@@ -46,6 +47,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<shoulda>, [">= 0"])
+      s.add_runtime_dependency(%q<sqlite3>, [">= 0"])
       s.add_runtime_dependency(%q<sequel>, [">= 3.12"])
       s.add_runtime_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<jeweler>, ["~> 1.8.4"])
@@ -54,6 +56,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<yard>, [">= 0"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<sequel>, [">= 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
@@ -63,6 +66,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<sequel>, [">= 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: to-do
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70189841281860 !ruby/object:Gem::Requirement
+  requirement: &70270233879100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70189841281860
+  version_requirements: *70270233879100
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70270233878580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70270233878580
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70189841280700 !ruby/object:Gem::Requirement
+  requirement: &70270233877760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :runtime
   prerelease: false
-  version_requirements: *70189841280700
+  version_requirements: *70270233877760
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70189841279760 !ruby/object:Gem::Requirement
+  requirement: &70270233877040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70189841279760
+  version_requirements: *70270233877040
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70189841181960 !ruby/object:Gem::Requirement
+  requirement: &70270233876160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *70189841181960
+  version_requirements: *70270233876160
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70189841179620 !ruby/object:Gem::Requirement
+  requirement: &70270233874360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70189841179620
+  version_requirements: *70270233874360
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70189841178880 !ruby/object:Gem::Requirement
+  requirement: &70270233872100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70189841178880
+  version_requirements: *70270233872100
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70189841177640 !ruby/object:Gem::Requirement
+  requirement: &70270233902060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189841177640
+  version_requirements: *70270233902060
 description: A simple command line todo application
 email: kristen@kristen-mills.com
 executables:
@@ -98,6 +109,7 @@ extra_rdoc_files:
 - README.md
 files:
 - .document
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -128,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 181670245826667648
+      hash: 209463214064435770
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: