qer 0.2.6 → 0.3.0

data/README.rdoc

@@ -1,6 +1,6 @@
 = qer
 
-* http://github.com/j05h-qer
+* http://github.com/j05h/qer
 
 == DESCRIPTION:
 
@@ -24,6 +24,16 @@ Example Output:
   (4) Deploy Qer to github.                                      > 15 sec ago
   ----------------------------------------------------------------------------
 
+Config file:
+
+Qer supports a simple config file for a few options.  Qer will look for a YAML 
+config at $HOME/.qer. Here's a sample config file with the available flags.
+
+    --- 
+    queue_file: ~/Dropbox/.qer-queue  # default: ~/.qer-queue
+    page_width: 100                   # default: 80
+    history_length: 45                # default: 30
+
 == SYNOPSIS:
 
 Qer supports various operation for manipulating your Todo list.
@@ -85,4 +95,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/qer.rb

@@ -1,9 +1,12 @@
-$:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+$:.unshift(File.dirname(__FILE__)) unless
+  $:.include?(File.dirname(__FILE__)) ||
+  $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'time'
+require 'yaml'
 require 'qer/todo'
 module Qer
-  VERSION = '0.2.6'
+  VERSION = '0.3.0'
 end
 
 class Time
@@ -14,16 +17,19 @@ class Time
     distance_in_seconds = ((to_time - from_time).abs).round
 
     case distance_in_minutes
-       when 0..1            then "> #{distance_in_seconds} sec ago"
-       when 2..44           then "> #{distance_in_minutes} min ago"
-       when 45..89          then "~ 1 hr ago"
-       when 90..1439        then "~ #{(distance_in_minutes.to_f / 60.0).round} hrs ago"
-       when 1440..2879      then "~ 1 day ago"
-       when 2880..43199     then "~ #{(distance_in_minutes / 1440).round} days ago"
-       when 43200..86399    then "~ 1 month ago"
-       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"
+    when 0..1            then "> #{distance_in_seconds} sec ago"
+    when 2..44           then "> #{distance_in_minutes} min ago"
+    when 45..89          then "~ 1 hr ago"
+    when 90..1439        then
+      "~ #{(distance_in_minutes.to_f / 60.0).round} hrs ago"
+    when 1440..2879      then "~ 1 day ago"
+    when 2880..43199     then "~ #{(distance_in_minutes / 1440).round} days ago"
+    when 43200..86399    then "~ 1 month ago"
+    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

data/lib/qer/todo.rb

@@ -1,5 +1,8 @@
 module Qer
   class ToDo
+
+    CONFIG_PATH = File.expand_path("~/.qer")
+
     class << self
       attr_accessor :quiet
     end
@@ -7,9 +10,8 @@ module Qer
     attr_accessor :queue
     attr_accessor :history
 
-    def initialize(filename = File.expand_path("~/.qer-queue"))
-      @filename  = filename
-      @history_filename = "#{filename}-history"
+    def initialize(config_file = CONFIG_PATH)
+      load_config(config_file)
 
       file {|f| self.queue = Marshal.load(f) } rescue self.queue= []
       history_file {|f| self.history = Marshal.load(f) } rescue self.history= []
@@ -69,7 +71,7 @@ module Qer
     end
 
     def print_history(string = nil)
-      dump self.history, string, history_title
+      dump self.history.last(history_limit), string, history_title
     end
 
     def write
@@ -80,24 +82,37 @@ module Qer
       history_file("w+") {|f| Marshal.dump(self.history, f) }
     end
 
+    def history_limit
+      @config["history_limit"] || 30
+    end
+
     def file(mode = "r", &block)
-      File.open(@filename, mode) do |f|
-        yield f
-      end
+      File.open(filename, mode) { |f| yield f }
     end
 
     def history_file(mode = "r", &block)
-      File.open(@history_filename, mode) do |f|
-        yield f
-      end
+      File.open(history_filename, mode) { |f| yield f }
     end
 
-    def size
-      self.queue.size
+    def width
+      @config["page_width"] || 80
     end
 
-    def width
-      80
+    def load_config(path)
+      @config = {}
+      return unless File.exist?(path)
+      @config = YAML.load_file(path)
+    rescue StandardError => e
+      puts "Error during config file loading."
+      puts "Error: #{e.name} - #{e.message}"
+    end
+
+    def filename
+      @filename ||= File.expand_path(@config["queue_file"] || "~/.qer-queue")
+    end
+
+    def history_filename
+      @history_filename ||= "#{filename}-history"
     end
 
     def title
@@ -116,19 +131,19 @@ module Qer
       Time.time_ago(Time.parse(t))
     end
 
-    def process_line(index, item)
+    def print_line(index, item)
       return unless item
-      item.size == 2 ? process_queue_line(index,item) : process_history_line(item)
+      item.size == 2 ? print_queue_line(index,item) : print_history_line(item)
     end
 
-    def process_queue_line(index, item)
+    def print_queue_line(index, item)
       time, task = item
       left       = "(#{index}) #{task}"
       right      = tf(time).rjust(width - left.length)
       right.insert(0, left)
     end
 
-    def process_history_line(item)
+    def print_history_line(item)
       end_time, time, task = item
       right     = "#{tf(time)} | #{tf(end_time)}".rjust(width-task.length)
       right.insert(0, task)
@@ -141,7 +156,7 @@ module Qer
       out << hl
       unless queue.empty?
         queue.each_with_index do |item, index|
-          out << process_line(index, item)
+          out << print_line(index, item)
         end
       else
         out << "Nothing in this queue!"

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require 'stringio'
 require 'test/unit'
 require 'shoulda'
-require File.dirname(__FILE__) + '/../lib/qer'
+require 'qer'
 
 Qer::ToDo.quiet = true
 
@@ -10,10 +10,22 @@ class Test::Unit::TestCase
   def assert_output matcher
     assert_match matcher, read_stdout
   end
-  
+
   def read_stdout
     @output.rewind
     @output.read
   end
 
+  def with_config(config)
+    tmp_config = 'test/tmp-config'
+
+    File.open(tmp_config, 'w') do |f|
+      f << YAML.dump(config)
+    end
+
+    yield Qer::ToDo.new(tmp_config)
+
+  ensure
+    File.delete(tmp_config) if File.exist?(tmp_config)
+  end
 end

data/test/test_qer.rb

@@ -1,11 +1,13 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require '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)
+    queue = File.join(File.dirname(__FILE__), 'testqueue.tmp')
+    File.delete(queue) if File.exists?(queue)
+
+    @config = File.join(File.dirname(__FILE__), 'config')
+    @todo = Qer::ToDo.new(@config)
   end
 
   context "push" do
@@ -14,12 +16,12 @@ class TestQer < Test::Unit::TestCase
     end
 
     should "have one item" do
-      assert_equal 1, @todo.size
+      assert_equal 1, @todo.queue.size
     end
 
     should "have two items" do
       @todo.push("Some Other Task")
-      assert_equal 2, @todo.size
+      assert_equal 2, @todo.queue.size
     end
   end
 
@@ -35,7 +37,7 @@ class TestQer < Test::Unit::TestCase
     end
 
     should "have one item" do
-      assert_equal 1, @todo.size
+      assert_equal 1, @todo.queue.size
     end
   end
 
@@ -45,12 +47,12 @@ class TestQer < Test::Unit::TestCase
     end
 
     should "have one item" do
-      assert_equal 1, @todo.size
+      assert_equal 1, @todo.queue.size
     end
 
     should "have two items" do
       @todo.add("Some Other Task")
-      assert_equal 2, @todo.size
+      assert_equal 2, @todo.queue.size
     end
   end
 
@@ -66,7 +68,7 @@ class TestQer < Test::Unit::TestCase
     end
 
     should "have one item" do
-      assert_equal 1, @todo.size
+      assert_equal 1, @todo.queue.size
     end
 
     should "not error out when an invalid index is removed" do
@@ -84,7 +86,7 @@ class TestQer < Test::Unit::TestCase
     end
 
     should "have no items" do
-      assert_equal 0, @todo.size
+      assert_equal 0, @todo.queue.size
     end
   end
 
@@ -100,7 +102,7 @@ class TestQer < Test::Unit::TestCase
     end
 
     should "have one item" do
-      assert_equal 1, @todo.size
+      assert_equal 1, @todo.queue.size
     end
   end
 
@@ -130,12 +132,12 @@ class TestQer < Test::Unit::TestCase
 
   context "read" do
     setup do
-      @file = File.join(File.dirname(__FILE__), 'test_queue')
-      @todo = Qer::ToDo.new(@file)
+      config = File.join(File.dirname(__FILE__), 'static-config')
+      @todo = Qer::ToDo.new(config)
     end
 
     should "have 5 items" do
-      assert_equal 5, @todo.size
+      assert_equal 5, @todo.queue.size
     end
   end
 
@@ -143,11 +145,10 @@ class TestQer < Test::Unit::TestCase
     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
+      assert_equal 2, @todo.queue.size
     end
   end
 
@@ -167,13 +168,13 @@ class TestQer < Test::Unit::TestCase
 
     should "add" do
       @todo.command(%w(add some stuff))
-      assert_equal 2, @todo.size
+      assert_equal 2, @todo.queue.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_equal 0, @todo.queue.size
       assert_output "Removed: Some Task"
     end
 
@@ -184,31 +185,31 @@ class TestQer < Test::Unit::TestCase
 
     should "push" do
       @todo.command(%w(push some stuff))
-      assert_equal 2, @todo.size
+      assert_equal 2, @todo.queue.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_equal 0, @todo.queue.size
       assert_output "Removed: Some Task"
     end
 
     should "clear" do
       @todo.command(%w(clear))
-      assert_equal 0, @todo.size
+      assert_equal 0, @todo.queue.size
       assert_output(/list cleared/)
     end
 
     should "help" do
       @todo.command(%w(help))
-      assert_equal 1, @todo.size
+      assert_equal 1, @todo.queue.size
       assert_output(/Help for Qer/)
     end
 
     should "print" do
       @todo.command([])
-      assert_equal 1, @todo.size
+      assert_equal 1, @todo.queue.size
       assert_output "Stuff on the Hopper"
     end
 
@@ -289,4 +290,24 @@ class TestQer < Test::Unit::TestCase
       assert_equal @todo.width, @todo.hl.size
     end
   end
+
+  context "config" do
+    should "set #filename" do
+      with_config('queue_file' => 'foo') do |todo|
+        assert_equal File.expand_path('foo'), todo.filename
+      end
+    end
+
+    should "set #width" do
+      with_config('page_width' => 120) do |todo|
+        assert_equal 120, todo.width
+      end
+    end
+
+    should "set #history_limit" do
+      with_config('history_limit' => 40) do |todo|
+        assert_equal 40, todo.history_limit
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: qer
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors: 
 - Josh Kleinpeter
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 -07:00
+date: 2010-05-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.5.0
     version: 
 description: Qer is an easy command-line todo list.
 email: