taskbot 0.1.1 → 0.1.2

data/Gemfile

@@ -5,6 +5,7 @@ gem "mongo_mapper", "~> 0.8.6"
 gem "bson_ext", "~> 1.2.4"
 gem "daemons", "~> 1.1.0"
 gem "optiflag", "~> 0.7"
+gem "mongomapper_id2", "~> 0.0.3"
 
 group :development do
   gem "bundler", "~> 1.0.0"

data/Gemfile.lock

@@ -19,6 +19,11 @@ GEM
       activesupport (>= 2.3.4)
       jnunemaker-validatable (~> 1.8.4)
       plucky (~> 0.3.6)
+    mongomapper_id2 (0.0.3)
+      activesupport (>= 2.3.4)
+      jnunemaker-validatable (~> 1.8.4)
+      mongo_mapper
+      plucky (~> 0.3.6)
     optiflag (0.7)
     plucky (0.3.7)
       mongo (~> 1.1)
@@ -34,4 +39,5 @@ DEPENDENCIES
   daemons (~> 1.1.0)
   jeweler (~> 1.5.2)
   mongo_mapper (~> 0.8.6)
+  mongomapper_id2 (~> 0.0.3)
   optiflag (~> 0.7)

data/README.rdoc

@@ -58,9 +58,11 @@ It is distributed as a Ruby gem and based on Cinch and MongoDB.
 
 Use --daemonize if you want to run it in the background.
 
-== Usage
+== Changes
 
-Explore the options and features available with !task help
+0.1.2 - Fixes a bug preventing tasks from being removed correctly, and shortens visible task
+        identifiers to a simple integer. If you're updating an existing db you will need to 
+        add a unique integer 'id2' to each task manually.
 
 == Getting Help
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/cinch/plugins/taskbot/task.rb

@@ -1,12 +1,17 @@
 module Cinch
   module Plugins
     module TaskBot
-
+      
+      # content - String  - Description of the item
+      # status  - Symbol  - Typically :open or :completed
+      # id2     - Integer - Auto-incrementing numeric key (id uses ObjectId).
+      #                     Numeric IDs are easier for users to deal with over IRC.
       class Task
         include MongoMapper::Document
         key :content, String
         key :status, Symbol, :default => :open
         belongs_to :user
+        auto_increment!
       end
 
     end

data/lib/cinch/plugins/taskbot/tasks.rb

@@ -7,8 +7,8 @@ module Cinch
         match /add "(.+)"/, :method => :add_task
         match /add (.+) "(.+)"/, :method => :add_task_for
 
-        match /complete|finish #(.+)/, :method => :complete_task
-        match /rm|delete|remove #(.+)/, :method => :remove_task
+        match /(complete|finish) #(\d+)/, :method => :complete_task
+        match /(rm|delete|remove) #(\d+)/, :method => :remove_task
 
         match /list$/, :method => :get_list
         match /list (.+)/, :method => :get_list_for
@@ -49,18 +49,18 @@ module Cinch
         end
 
         # Mark a task completed
-        def complete_task(m, task_id)
-          set_task_status(m, task_id, :completed)
+        def complete_task(m, cmd_alias, task_id2)
+          set_task_status(m, task_id2.to_i, :completed)
         end
         
         # Remove a task
-        def remove_task(m, task_id)
-          task = Task.find(task_id)
+        def remove_task(m, cmd_alias, task_id2)
+          task = Task.find_by_id2(task_id2.to_i)
           if task
-            Task.destroy(task_id)
-            m.reply "Task ##{task_id} has been removed."
+            task.destroy
+            m.reply "Task ##{task_id2} has been removed."
           else
-            m.reply "Task ##{task_id} not found."
+            m.reply "Task ##{task_id2} not found."
           end
         end
 
@@ -81,7 +81,7 @@ module Cinch
           user_status = (user.nil?) ? "New user '#{nick}' created" : "Existing user '#{nick}' found"
           user ||= User.create( :nick => nick )
           task = user.tasks.create( :content => content )
-          m.reply "#{user_status}, task added as ##{task.id}"
+          m.reply "#{user_status}, task added as ##{task.id2}"
           return task
         end
 
@@ -90,24 +90,26 @@ module Cinch
           user = User.find_by_nick(nick)
           user_status = (user.nil?) ? "New user '#{nick}' created" : "Existing user '#{nick}' found"
           user ||= User.create( :nick => nick )
-          open_tasks = user.tasks.map { |t| t if t.status == :open }
+          open_tasks = user.tasks.select { |t| t if t.status == :open }
           if open_tasks.empty?
             m.reply "#{user_status}, no open tasks."
           else
             m.reply "#{user_status}, open tasks:"
-            open_tasks.each { |t| m.reply "##{t._id} #{t.content}" }
+            open_tasks.sort_by { |t| t.id2 }.each do |t| 
+              m.reply "##{t.id2} #{t.content}"
+            end
           end
         end
 
-        def set_task_status(m, task_id, new_status)
-          task = Task.find(task_id)
+        def set_task_status(m, task_id2, new_status)
+          task = Task.find_by_id2(task_id2.to_i)
           if task
             old_status = task.status
             task.status = new_status
             task.save
-            m.reply "Task ##{task.id} status changed from #{old_status} to #{task.status}"
+            m.reply "Task ##{task.id2} status changed from #{old_status} to #{task.status}"
           else
-            m.reply "Task ##{task_id} not found."
+            m.reply "Task ##{task.id2} not found."
           end
         end
 

data/lib/taskbot.rb

@@ -1,4 +1,4 @@
-%w{rubygems cinch mongo_mapper}.each { |d| require d }
+%w{rubygems cinch mongo_mapper mongomapper_id2}.each { |d| require d }
 
 require "#{File.dirname(__FILE__)}/cinch/plugins/taskbot"
 

data/taskbot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{taskbot}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Logan Koester"]
-  s.date = %q{2011-03-21}
+  s.date = %q{2011-03-30}
   s.default_executable = %q{taskbot}
   s.description = %q{Simple to-do lists implemented as an IRC robot}
   s.email = %q{logan@logankoester.com}
@@ -49,6 +49,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<bson_ext>, ["~> 1.2.4"])
       s.add_runtime_dependency(%q<daemons>, ["~> 1.1.0"])
       s.add_runtime_dependency(%q<optiflag>, ["~> 0.7"])
+      s.add_runtime_dependency(%q<mongomapper_id2>, ["~> 0.0.3"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
     else
@@ -57,6 +58,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bson_ext>, ["~> 1.2.4"])
       s.add_dependency(%q<daemons>, ["~> 1.1.0"])
       s.add_dependency(%q<optiflag>, ["~> 0.7"])
+      s.add_dependency(%q<mongomapper_id2>, ["~> 0.0.3"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     end
@@ -66,6 +68,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bson_ext>, ["~> 1.2.4"])
     s.add_dependency(%q<daemons>, ["~> 1.1.0"])
     s.add_dependency(%q<optiflag>, ["~> 0.7"])
+    s.add_dependency(%q<mongomapper_id2>, ["~> 0.0.3"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Logan Koester
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 -04:00
+date: 2011-03-30 00:00:00 -04:00
 default_executable: taskbot
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,8 +92,23 @@ dependencies:
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: mongomapper_id2
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 3
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -105,10 +120,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -120,7 +135,7 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 description: Simple to-do lists implemented as an IRC robot
 email: logan@logankoester.com
 executables: 
@@ -158,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1125883457316166182
+      hash: -3386362502869741852
       segments: 
       - 0
       version: "0"