dooby 0.2.0 → 0.3.0

data/Rakefile

@@ -1,51 +1,50 @@
 # -*- encoding: utf-8 -*-
 require 'rubygems'
-require 'rake'
+require 'bundler'
 
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "dooby"
-    gem.summary = %Q{A very simplistic command-line to-do list manager in Ruby}
-    gem.description = %Q{With Dooby you can handle your to-do list or your notes in a simple way and through the command-line.}
-    gem.email = "raf.magana@gmail.com"
-    gem.homepage = "http://github.com/rafmagana/dooby"
-    gem.authors = ["Rafael Magaña"]
-    gem.add_development_dependency "shoulda", ">= 2.11.3"
-    gem.add_development_dependency "mocha", ">= 0.9.8"
-    gem.add_runtime_dependency('main', ">= 4.2.0")
-    gem.add_runtime_dependency('colored', ">= 1.2")
-    gem.add_runtime_dependency('highline', ">= 1.6.1")
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
 end
+require 'rake'
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+require 'jeweler'
+
+Jeweler::Tasks.new do |gem|
+  gem.name = "dooby"
+  gem.summary = %Q{A very simplistic command-line to-do list manager in Ruby}
+  gem.description = %Q{Handle your to-do/notes list through the command line}
+  gem.email = "raf.magana@gmail.com"
+  gem.homepage = "http://github.com/rafmagana/dooby"
+  gem.authors = ["Rafael Magaña"]
+
+  gem.add_runtime_dependency('main', ">= 4.2.0")
+  gem.add_runtime_dependency('colored', ">= 1.2")
+  gem.add_runtime_dependency('highline', ">= 1.6.1")
+  gem.add_runtime_dependency('chronic', ">= 0.3.0")
+
+  gem.add_development_dependency "rspec", ">= 2.0.1"
+  gem.add_development_dependency "bundler", "~> 1.0.0"
+  gem.add_development_dependency "jeweler", "~> 1.5.0.pre5"
+  gem.add_development_dependency "rcov", ">= 0"
 end
+Jeweler::RubygemsDotOrgTasks.new
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :test => :check_dependencies
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
 
-task :default => :test
+task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/bin/dooby

@@ -14,7 +14,7 @@ Main {
 
    ########################## DEFAULT #############################
    def run
-     list = Dooby.current_list.list.tasks_by_tag(*Dooby::SPLITTABLE_TAGS)
+     list = Dooby.current_list.find.tasks_by_tag(*Dooby::SPLITTABLE_TAGS)
      if list
        say 'Showing all items...'.blue_on_white.bold
        puts list
@@ -34,15 +34,14 @@ Main {
     
   ########################## ADD #################################  
   mode 'add' do
-    description 'Creates a new task and adds it to the current todo list'
+    description 'Creates a new item and adds it to the current todo list'
     argument 'task_text'
     def run
       Dooby.current_list.add do |t|
         t.todo = params[:task_text].value
-        t.hold!
       end
       
-      puts 'Task added!'
+      puts 'Item added!'
     end
   end
   
@@ -50,18 +49,19 @@ Main {
   mode 'ilist' do
     description "Interactive Listing"
     def run
+      autocomp = Dooby.current_list.all_tags
       say "input #hashtag, @person, %project, :status or simple text"
       
-      Dooby.cli_helper.keep_asking "> " do |what_to_show| 
+      Dooby.cli_helper.keep_asking "> ", autocomp do |what_to_show| 
         puts
-        puts Dooby.current_list.list(what_to_show.split(' ')).tasks_by_tag(*Dooby::SPLITTABLE_TAGS)
+        puts Dooby.current_list.find(what_to_show.split(' ')).tasks_by_tag(*Dooby::SPLITTABLE_TAGS)
         puts
       end
     end
   end
   
   mode 'list' do
-    description 'Lists @people, #tags, %projects or tasks (default)'
+    description 'Lists @people, #tags, %projects or items (default)'
 
     argument('what_to_show'){
       arity -1 # zero or more arguments
@@ -69,7 +69,7 @@ Main {
     
     def run
       what_to_show = params[:what_to_show].values
-      list = Dooby.current_list.list(what_to_show).tasks_by_tag(*Dooby::SPLITTABLE_TAGS)
+      list = Dooby.current_list.find(what_to_show).tasks_by_tag(*Dooby::SPLITTABLE_TAGS)
       if list
         if what_to_show.empty?
           say 'Showing all items...'.blue_on_white.bold
@@ -102,7 +102,7 @@ Main {
   end  
   
   def handle_tag_lists(tag, error_message)
-    list = Dooby.current_list.list tag
+    list = Dooby.current_list.find tag
     if list
       puts list
     else
@@ -112,11 +112,11 @@ Main {
   
   ########################## DELETE ###############################  
   mode 'flush' do
-    description 'Deletes all the tasks'
+    description 'Deletes all the items'
     def run
       if Dooby.cli_helper.flush?
         Dooby.current_list.flush!
-        say "All the task were deleted!".red.bold
+        say "All the items were deleted!".red.bold
       else
         say "Keep doing things!".green.bold
       end
@@ -138,12 +138,12 @@ Main {
   mode 'delete' do
     def run
       unless Dooby.current_list.tasks?
-        puts 'No tasks to delete'.red
+        puts 'No items to delete'.red
         exit
       end
       
       autocomp = Dooby.current_list.tasks.keys
-      question = 'Tasky ID '.red.bold + '> '
+      question = 'Item ID '.red.bold + '> '
       
       Dooby.cli_helper.keep_asking question, autocomp  do |task_id|
          
@@ -151,7 +151,7 @@ Main {
           say task_id + ' deleted...'
           exit
         else
-          say "Don't try to fool #{'Dooby'.red}, she knows such task doesn't exists"
+          say "Don't try to fool #{'Dooby'.red}, she knows such item doesn't exists"
         end
         
       end
@@ -160,16 +160,16 @@ Main {
   end
   
   mode 'bulkdelete' do
-    description "Deletes all the tasks that contains the specified tags.\n $ dooby bulkdelete %mypage @jim \n It will only delete by tag, not by plain text"
+    description "Deletes all the items that contains the specified tags.\n $ dooby bulkdelete %mypage @jim \n It will only delete by tag, not by plain text"
     def run
       
       unless Dooby.current_list.tasks?
-        puts 'No tasks to delete'.red
+        puts 'No items to delete'.red
         exit
       end
       
       autocomp = Dooby.current_list.all_tags
-      question = "What do you want to bulk delete? (#{Dooby::SPECIAL_TAGS.join(', ')} allowed) \n> "
+      question = "What do you want to bulk delete?\n> "
           
       Dooby.cli_helper.keep_asking question, autocomp do |tags|
         unless tags.empty?
@@ -186,7 +186,7 @@ Main {
     def run
       
       autocomp = Dooby.current_list.tasks.keys
-      question = 'Tasky ID '.blue.bold + '> '
+      question = 'Item ID '.blue.bold + '> '
       
       current_task_id = ''
       
@@ -198,7 +198,7 @@ Main {
           autocomp = [todo_to_edit]
           break
         else
-          puts "Task doesn't exist".red.bold
+          puts "Item doesn't exist".red.bold
           exit
         end
 
@@ -219,5 +219,21 @@ Main {
       
     end
   end
-
+  
+  ########################## GIT #################################  
+  mode 'commit' do
+    current_item = Dooby.current_list.current_item
+    if current_item
+      result = %x[git commit -m "#{current_item}"]
+      if result.include? current_item
+        puts "The commit message was #{current_item.yellow}".blue
+      else
+        puts 'Nothing added to commit'.red if result.include? 'added to commit'
+      end
+      exit
+    else
+      puts "First you have to tag an item with #{Dooby::CURRENT_ITEM_TAG.magenta}".red
+      exit
+    end
+  end
 }

data/dooby.gemspec

@@ -5,49 +5,59 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dooby}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rafael Maga\303\261a"]
-  s.date = %q{2010-10-28}
+  s.date = %q{2010-11-06}
   s.default_executable = %q{dooby}
-  s.description = %q{With Dooby you can handle your to-do list or your notes in a simple way and through the command-line.}
+  s.description = %q{Handle your to-do/notes list through the command line}
   s.email = %q{raf.magana@gmail.com}
   s.executables = ["dooby"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "bin/dooby",
-     "dooby.gemspec",
-     "lib/dooby.rb",
-     "lib/dooby/base.rb",
-     "lib/dooby/cli_helper.rb",
-     "lib/dooby/core_ext.rb",
-     "lib/dooby/exceptions.rb",
-     "lib/dooby/formatter.rb",
-     "lib/dooby/list.rb",
-     "lib/dooby/task.rb",
-     "test/helper.rb",
-     "test/test_dooby.rb"
+    ".rspec",
+    "CHANGELOG.md",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "bin/dooby",
+    "dooby.gemspec",
+    "lib/dooby.rb",
+    "lib/dooby/base.rb",
+    "lib/dooby/cli_helper.rb",
+    "lib/dooby/config.rb",
+    "lib/dooby/core_ext.rb",
+    "lib/dooby/dates_helper.rb",
+    "lib/dooby/exceptions.rb",
+    "lib/dooby/list.rb",
+    "lib/dooby/status_generator.rb",
+    "lib/dooby/task.rb",
+    "spec/dooby_module_spec.rb",
+    "spec/list_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/task_spec.rb",
+    "test/helper.rb",
+    "test/test_dooby.rb"
   ]
   s.homepage = %q{http://github.com/rafmagana/dooby}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{A very simplistic command-line to-do list manager in Ruby}
   s.test_files = [
+    "spec/dooby_module_spec.rb",
+    "spec/list_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/task_spec.rb",
     "test/helper.rb",
-     "test/test_dooby.rb"
+    "test/test_dooby.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -55,24 +65,45 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 2.11.3"])
-      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_runtime_dependency(%q<main>, [">= 4.2.0"])
       s.add_runtime_dependency(%q<colored>, [">= 1.2"])
       s.add_runtime_dependency(%q<highline>, [">= 1.6.1"])
+      s.add_runtime_dependency(%q<chronic>, [">= 0.3.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.1"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<shoulda>, [">= 2.11.3"])
-      s.add_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_dependency(%q<rspec>, ["~> 2.0.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
+      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<main>, [">= 4.2.0"])
       s.add_dependency(%q<colored>, [">= 1.2"])
       s.add_dependency(%q<highline>, [">= 1.6.1"])
+      s.add_dependency(%q<chronic>, [">= 0.3.0"])
+      s.add_dependency(%q<rspec>, [">= 2.0.1"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
+      s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<shoulda>, [">= 2.11.3"])
-    s.add_dependency(%q<mocha>, [">= 0.9.8"])
+    s.add_dependency(%q<rspec>, ["~> 2.0.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
+    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<main>, [">= 4.2.0"])
     s.add_dependency(%q<colored>, [">= 1.2"])
     s.add_dependency(%q<highline>, [">= 1.6.1"])
+    s.add_dependency(%q<chronic>, [">= 0.3.0"])
+    s.add_dependency(%q<rspec>, [">= 2.0.1"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
+    s.add_dependency(%q<rcov>, [">= 0"])
   end
 end
 

data/lib/dooby.rb

@@ -1,26 +1,25 @@
 $:.unshift(File.dirname(__FILE__)) 
 
-%w[fileutils digest/sha1 colored readline highline/import].each { |f| require "#{f}" }
+#dependencies
+%w[fileutils 
+   digest/sha1
+   colored
+   readline
+   highline/import
+   chronic].each { |f| require "#{f}" }
 
-%w[exceptions
+#dooby
+%w[config
+   exceptions
    core_ext
    base
+   dates_helper
    list
-   formatter
+   status_generator
    task
    cli_helper].each { |f| require "dooby/#{f}" }
    
 module Dooby
-  
-  DOOBY_DIR = '.dooby'
-  CURRENT_TODO_LIST_FILE = "#{DOOBY_DIR}/list.yml"
-  
-  DEFAULT_STATUS = :hold
-  
-  AVAILABLE_STATUSES = [:hold, :doing, :done]
-  SPECIAL_TAGS = %w[@ # %]
-  SPLITTABLE_TAGS = %w[#today #urgent]
-  
   def self.init
     unless File.exist? CURRENT_TODO_LIST_FILE
       FileUtils.mkdir DOOBY_DIR

data/lib/dooby/cli_helper.rb

@@ -1,7 +1,7 @@
 module Dooby
   class CLIHelper
     
-    DEL_TASKS = "Sure you want to delete all the taks???".red_on_white.bold
+    DEL_TASKS = "Sure you want to delete all the items???".red_on_white.bold
     TRASH = "Sure you want to delete the .dooby directory???".red_on_white.bold
     
     def self.flush?
@@ -12,13 +12,16 @@ module Dooby
       agree TRASH, true
     end
     
-    def self.keep_asking(question, autocompletion = nil)
+    def self.keep_asking(question, autocompletion = [])
+      Readline.basic_word_break_characters = 
+          Readline.basic_word_break_characters.delete("@")
       Readline.completion_append_character = " "
       Readline.completion_proc = proc { |s| autocompletion.grep( /^#{Regexp.escape(s)}/ ) }
       
       stty_save = `stty -g`.chomp
       
       while value = Readline.readline(question, true)
+          exit if value == 'q'
           yield value.chomp.strip
       end