cali 0.1.0 → 0.2.0

data/README.rdoc

@@ -0,0 +1,50 @@
+= cali
+
+Interactive cal(1) (but the name ical was taken)
+
+== Usage
+
+ gem install cali
+ cali
+ # interactive session
+
+ cat > ~/dates <<END
+ 2010-09-01 Write a better README for cali
+ 2010-09-02 ...
+ 2010-09-03 Profit
+ END
+
+ cali -d ~/dates
+ # interactive session with calendar entries
+
+ cat > ~/.calirc <<END
+ Cali.config.dates = '~/dates'
+ END
+
+ cali
+ # interactive session with calendar entries
+
+== Screenshots
+
+ RUBYLIB=lib ruby -rubygems bin/cali -d README
+
+    September 2010
+ Su Mo Tu We Th Fr Sa
+           1  2  3  4
+  5  6  7  8  9 10 11
+ 12 13 14 15 16 17 18
+ 19 20 21 22 23 24 25
+ 26 27 28 29 30
+
+ 2010-09-01 Write a better README for cali
+
+( The 1st is highlighted, and the 1st, 2nd, and 3rd are underlined. )
+
+== Key bindings
+
+[Up/down/left/right]  hjkl, Emacs bindings, arrow keys
+[Next/previous month] n/p, page down/page up
+[Next/previous year]  }/{
+[Next/previous event] w/b (this navigates between underlined days)
+[Quit]                q
+[Refresh]             ^L (Ctrl-L)

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/cali.rb

@@ -18,6 +18,21 @@ require 'date'
 require 'optparse'
 require 'ncurses'
 
+class OpenStruct
+  attr_reader :hsh
+  def method_missing(method, value = nil)
+    method = method.to_s
+    if method.match(/^(.*)=$/)
+      @hsh[$1] = value
+    else
+      @hsh[method]
+    end
+  end
+  def initialize
+    @hsh = {}
+  end
+end
+
 class Cali
   KEYBINDINGS = {
     ['q'[0]]=> :quit,
@@ -35,27 +50,32 @@ class Cali
   }
 
   def Cali::run
-    options = {}
+    dotcali = File.expand_path "~/.calirc"
+    load dotcali if File.exist? dotcali
+
+    dates = nil
     OptionParser.new { |opts|
       opts.banner = "Usage: cali [-d FILE]"
       opts.on("-d","--dates FILE","Use FILE for events") {|d|
-        options[:dates] = d
+        Cali.config.dates = d
       }
     }.parse!
-    dotcali = Dir["#{ENV['HOME']}/.calirc.rb"][0]
-    require dotcali if dotcali
-    cali=Cali.new(options[:dates])
+
+    cali=Cali.new
     cali.run
   end
 
-  def initialize(dates=nil)
-    preinit_hook
+  def Cali::config
+    @@config ||= OpenStruct.new
+    @@config
+  end
+
+  def initialize
     @today = Date.today
     @days = {}
-    dates ||= @default_dates
     @dates = {}
-    if dates
-      open(dates){|f|
+    if Cali.config.dates
+      open(File.expand_path(Cali.config.dates)){|f|
         until f.eof
           line = f.readline.strip
           d = line.match(/(\d{4})-(\d{2})-(\d{2})/)
@@ -73,8 +93,8 @@ class Cali
         @key[kk] = v
       }
     }
-    postinit_hook
   end
+
   def run
     begin
       Ncurses.initscr
@@ -86,6 +106,7 @@ class Cali
       Ncurses.endwin
     end
   end
+
   def mainloop
     displaycal
     displayevents
@@ -95,6 +116,7 @@ class Cali
       end
     end
   end
+
   def displaycal
     Ncurses.clear
     Ncurses.move(0,0)
@@ -103,6 +125,7 @@ class Cali
     displaydays
     Ncurses.refresh
   end
+
   def displaydays
     counter = (first - first.wday)
     before_month = true
@@ -136,6 +159,7 @@ class Cali
     end
     Ncurses.move(y,x+1)
   end
+
   def displayevents
     displaycal
     bounce {
@@ -147,11 +171,13 @@ class Cali
       } if @dates[@today]
     }
   end
+
   def bounce (&block)
     y,x = Ncurses.getcury(Ncurses.stdscr),Ncurses.getcurx(Ncurses.stdscr)
     yield
     Ncurses.move(y,x)
   end
+
   def movecursor(old)
     if old != @today
       a = @days[old.day]
@@ -168,6 +194,7 @@ class Cali
     Ncurses.attroff(Ncurses::A_UNDERLINE) if has_items?(@today)
     Ncurses.move(a[1],a[0]+1)
   end
+
   def update(&block)
     oldtoday = @today.dup
     yield
@@ -177,6 +204,7 @@ class Cali
       displaycal
     end
   end
+
   def move(to)
     case to
     when :quit
@@ -232,6 +260,7 @@ class Cali
     end
     displayevents
   end
+
   def weekdays
     wds = []
     counter = (@today - @today.wday)
@@ -244,9 +273,11 @@ class Cali
     end
     wds
   end
+
   def first
     Date.new(@today.year,@today.month,1)
   end
+
   def last
     newlast = @today.dup
     until newlast.month != @today.month
@@ -255,11 +286,8 @@ class Cali
     end
     last
   end
+
   def has_items?(date=@today)
     @dates.include?(date)
   end
-  def preinit_hook
-  end
-  def postinit_hook
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cali
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tom Adams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 +01:00
+date: 2010-09-01 00:00:00 +01:00
 default_executable: cali
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,11 +39,11 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.rdoc
 files: 
 - .gitignore
 - LICENCE
-- README
+- README.rdoc
 - Rakefile
 - VERSION
 - bin/cali

data/README

@@ -1,32 +0,0 @@
-
-cali
-====
-
-Interactive cal(1) (but the name ical was taken)
-
-.calirc.rb
-==========
-
-This file lives in your home directory and is a Ruby script which gets
-required if it exists. See examples/dotcalirc.rb for an example.
-
-dates
-=====
-
-The -d/--dates option takes a filename as an argument. That file should
-contain linebreak-separated items containing strings of the form
-/\d{4}-\d{2}-\d{2}/.
-
-I have something similar in my home directory containing items such as:
-
-2008-12-21 Start on RE essay, ML revision
-
-2009-01-04 The L Word season 6 (final season)
-
-2009-01-22 Shop meeting
-
-It's a very simple diary. Try running:
-ruby -rubygems bin/cali -d README
-
-The above dates should be underlined in the calendar, and pressing the
-appropriate key should display the item below the calendar.