qer 0.2.3 → 0.2.6

data/History.txt

@@ -1,3 +1,15 @@
+== 0.2.5 2010-02-16
+* 1 bugfix:
+  * Don't error badly when calling remove with a bad index
+
+== 0.2.4 2010-02-15
+* 1 very minor enhancement:
+  * remove index from history print. 
+
+== 0.2.3 2010-02-09
+* 1 bugfix:
+  * fixed ruby 1.9 support
+
 == 0.2.2 2010-01-25
 * 2 bugfixes
   * Bumping too far back was leaving nil rows

data/README.rdoc

@@ -45,6 +45,8 @@ Commands:
     `qer bump 5 2` -> bumps index five up to 2
   clear - Clears the entire list
     `qer clear`
+  clear - Clears the given index without writing to the history file
+    `qer clear 2`
   history - displays list of completed tasks
     `qer history`
   help - Prints this message

data/Rakefile

@@ -1,25 +1,22 @@
-%w[rubygems rake rake/clean fileutils hoe newgem rubigen].each { |f| require f }
+%w[rubygems rake rake/clean fileutils hoe].each { |f| require f }
 require File.dirname(__FILE__) + '/lib/qer'
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.spec('qer') do |p|
-  p.developer('Josh Kleinpeter', 'josh@kleinpeter.org')
-  p.developer('Coby Randquist', 'randquistcp@gmail.com')
-  p.developer('Jacob Dunphy', 'jacob.dunphy@gmail.com')
-  p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.rubyforge_name       = p.name
-  p.description          = "Qer is an easy command-line todo list."
-  p.summary              = "Just type `qer --help` to get started."
-  p.extra_dev_deps = [
-    ['shoulda','= 2.10.1'],
-    ['newgem', ">= #{::Newgem::VERSION}"]
+$hoe = Hoe.spec('qer') do
+  developer('Josh Kleinpeter', 'josh@kleinpeter.org')
+  developer('Coby Randquist', 'randquistcp@gmail.com')
+  developer('Jacob Dunphy', 'jacob.dunphy@gmail.com')
+  self.changes              = paragraphs_of("History.txt", 0..1).join("\n\n")
+  self.rubyforge_name       = name
+  self.description          = "Qer is an easy command-line todo list."
+  self.summary              = "Just type `qer --help` to get started."
+  self.extra_dev_deps = [
+    ['shoulda','> 2.10.1'],
   ]
 
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
-  p.rsync_args = '-av --delete --ignore-errors'
+  self.clean_globs |= %w[**/.DS_Store tmp *.log]
+  self.rsync_args = '-av --delete --ignore-errors'
 end
 
 require 'newgem/tasks' # load /tasks/*.rake

data/lib/qer.rb

@@ -3,7 +3,7 @@ $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) ||
 require 'time'
 require 'qer/todo'
 module Qer
-  VERSION = '0.2.3'
+  VERSION = '0.2.6'
 end
 
 class Time
@@ -24,6 +24,6 @@ class Time
        when 86400..525599   then "~ #{(distance_in_minutes / 43200).round} months ago"
        when 525600..1051199 then "~ 1 year ago"
        else                      "> #{(distance_in_minutes / 525600).round} years ago"
-     end
-   end
+    end
+  end
 end

data/lib/qer/todo.rb

@@ -22,18 +22,28 @@ module Qer
     end
 
     def remove(index)
-      returning(item = self.queue.delete_at(index)) do
+      if item = self.queue.delete_at(index)
         self.history << [Time.now.to_s, item[0], item[1]]
         write_history
         write
-        print "Removed #{item.last}"
+        print "Removed: #{item.last}"
+        item
+      else
+        print "Provided index does not exist."
       end
     end
 
-    def clear
-      self.queue = []
-      write
-      print "ToDo list cleared"
+    def clear(index = nil)
+      unless index.nil?
+        item = self.queue.delete_at(index.to_i)
+        write
+        print "Removed #{item.last}"
+        item
+      else
+        self.queue = []
+        write
+        print "ToDo list cleared"
+      end
     end
 
     def pop
@@ -43,7 +53,7 @@ module Qer
     def push(item)
       self.queue.unshift([Time.now.to_s, item])
       write
-      print
+      print "Pushed to the top: #{item}"
     end
 
     def bump(index, new_index = 0)
@@ -61,7 +71,7 @@ module Qer
     def print_history(string = nil)
       dump self.history, string, history_title
     end
-    
+
     def write
       file("w+") {|f| Marshal.dump(self.queue, f) }
     end
@@ -86,11 +96,6 @@ module Qer
       self.queue.size
     end
 
-    def returning(thing)
-      yield
-      thing
-    end
-    
     def width
       80
     end
@@ -113,7 +118,7 @@ module Qer
 
     def process_line(index, item)
       return unless item
-      item.size == 2 ? process_queue_line(index,item) : process_history_line(index,item)
+      item.size == 2 ? process_queue_line(index,item) : process_history_line(item)
     end
 
     def process_queue_line(index, item)
@@ -123,11 +128,10 @@ module Qer
       right.insert(0, left)
     end
 
-    def process_history_line(index, item)
+    def process_history_line(item)
       end_time, time, task = item
-      left      = "(#{index}) #{task}"
-      right     = "#{tf(time)} | #{tf(end_time)}".rjust(width-left.length)
-      right.insert(0, left)
+      right     = "#{tf(time)} | #{tf(end_time)}".rjust(width-task.length)
+      right.insert(0, task)
     end
 
     def dump(queue, string, label = title)
@@ -148,15 +152,24 @@ module Qer
 
     def command(args)
       case(args.shift)
-      when /^a(dd)?/     : self.add(args.join(" "))     # qer add Some task 1
-      when /^r(emove)?/  : self.remove(args.shift.to_i) # qer remove 0
-      when /^pu(sh)?/    : self.push(args.join(" "))    # qer push Some task 2
-      when /^po(p)?/     : self.pop                     # qer pop
-      when /^b(ump)?/    : self.bump(*args.first(2))    # qer bump
-      when /^clear/      : self.clear                   # qer clear
-      when /.*help/      : self.help                    # qer help
-      when /^h(istory)?/  : self.print_history          # qer history
-      else self.print                                   # qer
+      when /^a(dd)?/
+        self.add(args.join(" "))     # qer add Some task 1
+      when /^r(emove)?/
+        self.remove(args.shift.to_i) # qer remove 0
+      when /^pu(sh)?/
+        self.push(args.join(" "))    # qer push Some task 2
+      when /^po(p)?/
+        self.pop                     # qer pop
+      when /^b(ump)?/
+        self.bump(*args.first(2))    # qer bump
+      when /^clear/
+        self.clear(args.shift)       # qer clear
+      when /.*help/
+        self.help                    # qer help
+      when /^h(istory)?/
+        self.print_history           # qer history
+      else
+        self.print                # qer
       end
     end
 
@@ -182,6 +195,8 @@ Commands:
     `qer bump 5 2` -> bumps index five up to 2
   clear - Clears the entire list
     `qer clear`
+  clear - Clears the given index without writing to history file
+    `qer clear 3`
   h(istory) - displays list of completed tasks
     `qer history`
   help - Prints this message

data/test/test_helper.rb

@@ -4,3 +4,16 @@ require 'shoulda'
 require File.dirname(__FILE__) + '/../lib/qer'
 
 Qer::ToDo.quiet = true
+
+class Test::Unit::TestCase
+
+  def assert_output matcher
+    assert_match matcher, read_stdout
+  end
+  
+  def read_stdout
+    @output.rewind
+    @output.read
+  end
+
+end

data/test/test_qer.rb

@@ -1,251 +1,292 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestQer < Test::Unit::TestCase
-
-  def setup
-    @file = File.join(File.dirname(__FILE__), 'testqueue.tmp')
-    File.delete(@file) if File.exists?(@file)
-    @todo = Qer::ToDo.new(@file)
-  end
-
-  context "push" do
-    setup do
-      @todo.push("Some Task")
-    end
-
-    should "have one item" do
-      assert_equal 1, @todo.size
-    end
-
-    should "have two items" do
-      @todo.push("Some Other Task")
-      assert_equal 2, @todo.size
-    end
-  end
-
-  context "pop" do
-    setup do
-      @todo.push("Some Task")
-      @todo.push("Some Other Task")
-      @item = @todo.pop
-    end
-
-    should "pop the right item" do
-      assert_equal "Some Other Task", @item[1]
-    end
-
-    should "have one item" do
-      assert_equal 1, @todo.size
-    end
-  end
-
-  context "add" do
-    setup do
-      @todo.add("Some Task")
-    end
-
-    should "have one item" do
-      assert_equal 1, @todo.size
-    end
-
-    should "have two items" do
-      @todo.add("Some Other Task")
-      assert_equal 2, @todo.size
-    end
-  end
-
-  context "remove" do
-    setup do
-      @todo.add("Some Task")
-      @todo.add("Some Other Task")
-      @item = @todo.remove(0)
-    end
-
-    should "remove the right item" do
-      assert_equal "Some Task", @item[1]
-    end
-
-    should "have one item" do
-      assert_equal 1, @todo.size
-    end
-  end
-
-  context "clear" do
-    setup do
-      @todo.add("Some Task")
-      @todo.add("Some Other Task")
-      @todo.clear
-    end
-
-    should "have one item" do
-      assert_equal 0, @todo.size
-    end
-  end
-
-
-  context "bump" do
-    setup do
-      @todo.add("first")
-      @todo.add("second")
-      @todo.add("third")
-    end
-
-    should "be able to bump to the top" do
-      @todo.bump(2)
-      assert_equal "third", @todo.queue.first.last
-    end
-
-    should "be able to bump to a specific location" do
-      @todo.bump(2,1)
-      assert_equal "third", @todo.queue[1].last
-    end
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestQer < Test::Unit::TestCase
+
+  def setup
+    @file = File.join(File.dirname(__FILE__), 'testqueue.tmp')
+    File.delete(@file) if File.exists?(@file)
+    @todo = Qer::ToDo.new(@file)
+  end
+
+  context "push" do
+    setup do
+      @todo.push("Some Task")
+    end
+
+    should "have one item" do
+      assert_equal 1, @todo.size
+    end
+
+    should "have two items" do
+      @todo.push("Some Other Task")
+      assert_equal 2, @todo.size
+    end
+  end
+
+  context "pop" do
+    setup do
+      @todo.push("Some Task")
+      @todo.push("Some Other Task")
+      @item = @todo.pop
+    end
+
+    should "pop the right item" do
+      assert_equal "Some Other Task", @item[1]
+    end
+
+    should "have one item" do
+      assert_equal 1, @todo.size
+    end
+  end
+
+  context "add" do
+    setup do
+      @todo.add("Some Task")
+    end
+
+    should "have one item" do
+      assert_equal 1, @todo.size
+    end
+
+    should "have two items" do
+      @todo.add("Some Other Task")
+      assert_equal 2, @todo.size
+    end
+  end
+
+  context "remove" do
+    setup do
+      @todo.add("Some Task")
+      @todo.add("Some Other Task")
+      @item = @todo.remove(0)
+    end
+
+    should "remove the right item" do
+      assert_equal "Some Task", @item[1]
+    end
+
+    should "have one item" do
+      assert_equal 1, @todo.size
+    end
+
+    should "not error out when an invalid index is removed" do
+      assert_nothing_raised {
+        @todo.remove(12)
+      }
+    end
+  end
+
+  context "clear all" do
+    setup do
+      @todo.add("Some Task")
+      @todo.add("Some Other Task")
+      @todo.clear
+    end
+
+    should "have no items" do
+      assert_equal 0, @todo.size
+    end
+  end
+
+  context "clear individual item" do
+    setup do
+      @todo.add("Some Task")
+      @todo.add("Some Other Task")
+      @item = @todo.clear(0)
+    end
+
+    should "have the right item left" do
+      assert_equal "Some Task", @item[1]
+    end
+
+    should "have one item" do
+      assert_equal 1, @todo.size
+    end
+  end
+
+  context "bump" do
+    setup do
+      @todo.add("first")
+      @todo.add("second")
+      @todo.add("third")
+    end
+
+    should "be able to bump to the top" do
+      @todo.bump(2)
+      assert_equal "third", @todo.queue.first.last
+    end
+
+    should "be able to bump to a specific location" do
+      @todo.bump(2,1)
+      assert_equal "third", @todo.queue[1].last
+    end
 
     should "not leave nil rows in if we bump too far back" do
       @todo.bump(0,100)
       assert !@todo.queue.include?(nil)
       assert_equal "first", @todo.queue.last[1] 
     end
-
-  end
-  
-
-  context "read" do
-    setup do
-      @file = File.join(File.dirname(__FILE__), 'test_queue')
-      @todo = Qer::ToDo.new(@file)
-    end
-
-    should "have 5 items" do
-      assert_equal 5, @todo.size
-    end
-  end
-
-  context "write" do
-    setup do
-      @todo.add("Some Task")
-      @todo.add("Some Other Task")
-      @other_todo = Qer::ToDo.new(@file)
-    end
-
-    should "have 2 items" do
-      assert_equal 2, @todo.size
-    end
-  end
-
-  context "command" do
-    setup do
-      @todo.add("Some Task")
-    end
-
-    should "add" do
-      @todo.command(%w(add some stuff))
-      assert_equal 2, @todo.size
-    end
-
-    should "remove" do
-      assert_equal "Some Task", @todo.command(%w(remove 0)).last
-      assert_equal 0, @todo.size
-    end
-
-    should "push" do
-      @todo.command(%w(push some stuff))
-      assert_equal 2, @todo.size
-    end
-
-    should "pop" do
-      assert_equal "Some Task", @todo.command(%w(pop)).last
-      assert_equal 0, @todo.size
-    end
-
-    should "clear" do
-      @todo.command(%w(clear))
-      assert_equal 0, @todo.size
-    end
-
-    should "help" do
-      @todo.command(%w(help))
-      assert_equal 1, @todo.size
-    end
-
-    should "print" do
-      @todo.command([])
-      assert_equal 1, @todo.size
-    end
-
-    should "bump" do
-      @todo.add("second")
-      @todo.command(%w(bump 1))
-      assert_equal "second", @todo.queue.first.last
-
-      @todo.add('third')
-      @todo.command(%w(bump 2 1))
-      assert_equal "third", @todo.queue[1].last
-    end
-  end  
-  
-
-  context "time" do
-    setup do
-      @time = Time.now
-    end
-
-    should "parse time" do
-      @time = @todo.tf("Fri Oct 02 15:04:59 -0700 2009")
-    end
-
-    should "have distance in seconds" do
-      assert_equal "> 1 sec ago", Time.time_ago(@time, @time - 1)
-    end
-
-    should "have distance in minutes" do
-      assert_equal "> 5 min ago", Time.time_ago(@time, @time - 5*60)
-    end
-
-    should "have distance in 1 hour" do
-      assert_equal "~ 1 hr ago", Time.time_ago(@time, @time - 3600)
-    end
-
-    should "have distance in hours" do
-      assert_equal "~ 2 hrs ago", Time.time_ago(@time, @time - 2*3600)
-    end
-
-    should "have distance in 1 day" do
-      assert_equal "~ 1 day ago", Time.time_ago(@time, @time - 86400)
-    end
-
-    should "have distance in days" do
-      assert_equal "~ 7 days ago", Time.time_ago(@time, @time - 7*86400)
-    end
-
-    should "have distance in 1 month" do
-      assert_equal "~ 1 month ago", Time.time_ago(@time, @time - 2592000)
-    end
-
-    should "have distance in months" do
-      assert_equal "~ 3 months ago", Time.time_ago(@time, @time - 3*2592000)
-    end
-
-    should "have distance in 1 year" do
-      assert_equal "~ 1 year ago", Time.time_ago(@time, @time - 31536000)
-    end
-
-    should "have distance in years" do
-      assert_equal "> 99 years ago", Time.time_ago(@time, @time - 99*31536000)
-    end
-  end
-
-  context "print" do
-    should "have width" do
+  end
+
+  context "read" do
+    setup do
+      @file = File.join(File.dirname(__FILE__), 'test_queue')
+      @todo = Qer::ToDo.new(@file)
+    end
+
+    should "have 5 items" do
+      assert_equal 5, @todo.size
+    end
+  end
+
+  context "write" do
+    setup do
+      @todo.add("Some Task")
+      @todo.add("Some Other Task")
+      @other_todo = Qer::ToDo.new(@file)
+    end
+
+    should "have 2 items" do
+      assert_equal 2, @todo.size
+    end
+  end
+
+  context "command" do
+    setup do
+      @todo.add("Some Task")
+      Qer::ToDo.quiet = false
+      @orig_stdout = $stdout.dup
+      @output = StringIO.new
+      $stdout = @output
+    end
+
+    teardown do
+      Qer::ToDo.quiet = true
+      $stdout = @orig_stdout
+    end
+
+    should "add" do
+      @todo.command(%w(add some stuff))
+      assert_equal 2, @todo.size
+      assert_output(/Adding: some stuff/)
+    end
+
+    should "remove" do
+      assert_equal "Some Task", @todo.command(%w(remove 0)).last
+      assert_equal 0, @todo.size
+      assert_output "Removed: Some Task"
+    end
+
+    should "not remove bad index" do
+      @todo.command(%w(remove 14))
+      assert_output "Provided index does not exist."
+    end
+
+    should "push" do
+      @todo.command(%w(push some stuff))
+      assert_equal 2, @todo.size
+      assert_output "Pushed to the top: some stuff"
+    end
+
+    should "pop" do
+      assert_equal "Some Task", @todo.command(%w(pop)).last
+      assert_equal 0, @todo.size
+      assert_output "Removed: Some Task"
+    end
+
+    should "clear" do
+      @todo.command(%w(clear))
+      assert_equal 0, @todo.size
+      assert_output(/list cleared/)
+    end
+
+    should "help" do
+      @todo.command(%w(help))
+      assert_equal 1, @todo.size
+      assert_output(/Help for Qer/)
+    end
+
+    should "print" do
+      @todo.command([])
+      assert_equal 1, @todo.size
+      assert_output "Stuff on the Hopper"
+    end
+
+    should "bump" do
+      @todo.add("second")
+      @todo.command(%w(bump 1))
+      assert_equal "second", @todo.queue.first.last
+
+      assert_output(/Bumped second to position 0/)
+
+      @todo.add('third')
+      @todo.command(%w(bump 2 1))
+      assert_equal "third", @todo.queue[1].last
+
+    end
+  end
+
+  context "time" do
+    setup do
+      @time = Time.now
+    end
+
+    should "parse time" do
+      @time = @todo.tf("Fri Oct 02 15:04:59 -0700 2009")
+    end
+
+    should "have distance in seconds" do
+      assert_equal "> 1 sec ago", Time.time_ago(@time, @time - 1)
+    end
+
+    should "have distance in minutes" do
+      assert_equal "> 5 min ago", Time.time_ago(@time, @time - 5*60)
+    end
+
+    should "have distance in 1 hour" do
+      assert_equal "~ 1 hr ago", Time.time_ago(@time, @time - 3600)
+    end
+
+    should "have distance in hours" do
+      assert_equal "~ 2 hrs ago", Time.time_ago(@time, @time - 2*3600)
+    end
+
+    should "have distance in 1 day" do
+      assert_equal "~ 1 day ago", Time.time_ago(@time, @time - 86400)
+    end
+
+    should "have distance in days" do
+      assert_equal "~ 7 days ago", Time.time_ago(@time, @time - 7*86400)
+    end
+
+    should "have distance in 1 month" do
+      assert_equal "~ 1 month ago", Time.time_ago(@time, @time - 2592000)
+    end
+
+    should "have distance in months" do
+      assert_equal "~ 3 months ago", Time.time_ago(@time, @time - 3*2592000)
+    end
+
+    should "have distance in 1 year" do
+      assert_equal "~ 1 year ago", Time.time_ago(@time, @time - 31536000)
+    end
+
+    should "have distance in years" do
+      assert_equal "> 99 years ago", Time.time_ago(@time, @time - 99*31536000)
+    end
+  end
+
+  context "print" do
+    should "have width" do
       assert_equal 80, @todo.width
-    end
-
-    should "have a title" do
-      assert_equal @todo.width, @todo.title.size
-    end
-
-    should "have a horizontal line printer" do
-      assert_equal @todo.width, @todo.hl.size
-    end
-  end
-
-end
+    end
+
+    should "have a title" do
+      assert_equal @todo.width, @todo.title.size
+    end
+
+    should "have a horizontal line printer" do
+      assert_equal @todo.width, @todo.hl.size
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: qer
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.6
 platform: ruby
 authors: 
 - Josh Kleinpeter
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 -08:00
+date: 2010-03-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,20 +20,10 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">"
       - !ruby/object:Gem::Version 
         version: 2.10.1
     version: 
-- !ruby/object:Gem::Dependency 
-  name: newgem
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.2
-    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -42,7 +32,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.0
+        version: 2.3.3
     version: 
 description: Qer is an easy command-line todo list.
 email: