shellout 0.2 → 0.3

data/CHANGES

@@ -0,0 +1,11 @@
+2011-10-31: version 0.3
+
+ - Added a class for printing calendars
+
+2011-10-21: version 0.2
+
+ - Fixed bug that caused wrong justification of numeric columns in tables.
+
+2011-10-21: version 0.1
+
+ - Initial release

data/README.md

@@ -22,9 +22,9 @@ Usage
     Shellout::Shadowbox.new("Hello world").print
     
     # ┌──────────────────────────────────────────┐ 
-	# │               Hello world                │▒
-	# └──────────────────────────────────────────┘▒
-	#   ▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒
+    # │               Hello world                │▒
+    # └──────────────────────────────────────────┘▒
+    #   ▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒
 
 
 ### Tables
@@ -35,8 +35,7 @@ Usage
 	                    rows: [['Man City', 22],
 	                           ['Man Utd', 20],
 	                           ['Chelsea', 19],
-	                           ['Newcastle', 16]]
-	).print
+	                           ['Newcastle', 16]]).print
 	
 	# ┌───────────┬────────┐
 	# │   Team    │ Points │
@@ -48,6 +47,49 @@ Usage
 	# └───────────┴────────┘
 
 
+### Calendars
+
+    require 'date'
+    require 'shellout/calendar'
+    
+    today = Date.today # => "2011-10-31"
+
+    Shellout::Calendar.new(today).print
+    
+    #     October 2011    
+    # Mo Tu We Th Fr Sa Su
+    #                 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
+    # 31
+    
+    Shellout::Calendar.new(today.prev_month,
+                           today,
+                           today.next_month).print
+
+    #    September 2011           October 2011           November 2011
+    # Mo Tu We Th Fr Sa Su    Mo Tu We Th Fr Sa Su    Mo Tu We Th Fr Sa Su
+    #           1  2  3  4                    1  2        1  2  3  4  5  6
+    #  5  6  7  8  9 10 11     3  4  5  6  7  8  9     7  8  9 10 11 12 13
+    # 12 13 14 15 16 17 18    10 11 12 13 14 15 16    14 15 16 17 18 19 20
+    # 19 20 21 22 23 24 25    17 18 19 20 21 22 23    21 22 23 24 25 26 27
+    # 26 27 28 29 30          24 25 26 27 28 29 30    28 29 30
+    #                         31
+
+Bugs
+----
+
+Report bugs to <http://github.com/kjellm/shellout/issues>
+
+
+Author
+------
+
+Kjell-Magne Øierud &lt;kjellm AT acm DOT org&gt;
+
+
 License
 -------
 

data/lib/shellout/calendar.rb

@@ -0,0 +1,94 @@
+module Shellout
+  class Calendar
+    
+    def initialize(*dates)
+      @dates = dates
+      @list_of_days = "Mo Tu We Th Fr Sa Su"
+      reset
+    end
+    
+    def print(out=$stdout)
+      @out=out
+      @dates.each do |d|
+        print_calendar(d)
+        unless d == @dates.last # FIXME
+          @col += 24
+          @out.print ansi_cursor_up(@lines) + ansi_cursor_right(@col)
+          @lines = 1
+        end
+      end
+      reset
+      #puts
+    end
+
+    private
+      
+    def reset
+      @lines = 1
+      @col   = 0
+    end
+    
+    def print_calendar(for_date)
+      print_heading(for_date)
+      print_dates(for_date)
+    end
+
+    def print_heading(for_date)
+      print_line("#{Date::MONTHNAMES[for_date.month]} #{for_date.year}".center(@list_of_days.length))
+      print_line(@list_of_days)
+    end
+    
+    def print_dates(for_date)
+      week = []
+      days(for_date).each_with_index do |d, i|
+        d = is_current_month?(for_date) && d == Date.today.day \
+          ? ansi_reverse_color(d) : d
+        week << "%2s" % d 
+        if end_of_week?(i)
+          print_week(week)
+          week = []
+        end
+      end
+      print_week(week) unless week.empty?
+      @out.puts
+    end
+
+    def print_week(week)
+      print_line week.join(' ')
+    end
+    
+    def end_of_week?(i)
+      (i+1) % 7 == 0
+    end
+    
+    def is_current_month?(date)
+      Date.today.month == date.month
+    end
+  
+    def print_line(s="")
+      @lines += 1
+      @out.print s
+      @out.print @col == 0 ? "\n" : ansi_cursor_down(1) + ansi_cursor_left(@list_of_days.length)
+    end
+
+    def days(for_date)
+      first_day_of_month = Date.new(for_date.year, for_date.month)
+      days = (1..last_day_of_month(first_day_of_month).day).to_a
+      wday = (first_day_of_month.wday - 1) % 7
+      days.unshift(*Array.new(wday, ""))
+      days
+    end
+    
+    def last_day_of_month(first_day_of_month)
+      first_day_of_month.next_month-1
+    end
+    
+    def ansi_reverse_color(s); "\e[7m#{s}\e[0m"; end
+    
+    def ansi_cursor_up(n);    "\e[#{n}A"; end
+    def ansi_cursor_down(n);  "\e[#{n}B"; end
+    def ansi_cursor_left(n);  "\e[#{n}D"; end
+    def ansi_cursor_right(n); "\e[#{n}C"; end
+    
+  end
+end

data/lib/shellout/version.rb

@@ -0,0 +1,3 @@
+module Shellout
+  VERSION = '0.3'
+end

data/lib/shellout.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 # Unicode box drawing characters and block elements
 #
@@ -18,7 +19,8 @@
 # U+259x ▐ ░ ▒ ▓ ▔ ▕ ▖ ▗ ▘ ▙ ▚ ▛ ▜ ▝ ▞ ▟
 
 module Shellout
-  
+
+  autoload :Calendar,  'shellout/calendar'
   autoload :Shadowbox, 'shellout/shadowbox'
   autoload :Table,     'shellout/table'
   

data/shellout.gemspec

@@ -1,8 +1,10 @@
 # encoding: utf-8
+$:.push File.expand_path("../lib", __FILE__)
+require 'shellout/version'
 
 Gem::Specification.new do |s|
   s.name        = "shellout"
-  s.version     = "0.2"
+  s.version     = Shellout::VERSION
   s.authors     = ["Kjell-Magne Øierud"]
   s.email       = ["kjellm@acm.org"]
   s.homepage    = "https://github.com/kjellm/shellout"

data/spec/shellout/calendar_spec.rb

@@ -0,0 +1,60 @@
+require 'date'
+require 'stringio'
+require 'shellout/calendar'
+
+class Date
+  def self.today
+    Date.new(2011, 10, 30)
+  end
+end
+
+describe Shellout::Calendar do
+
+  before(:each) do
+    @out = StringIO.new
+  end
+  
+  describe 'when one date given' do
+    it 'should print a calendar for the given month' do
+      Shellout::Calendar.new(Date.new(2011, 10)).print(@out)
+      @out.string.should == <<EOC
+    October 2011    
+Mo Tu We Th Fr Sa Su
+                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 \e[7m30\e[0m
+31
+
+EOC
+    end
+  end
+
+  describe 'when three dates are given' do
+    it 'should print all three calendars on one row' do
+      Shellout::Calendar.new(Date.new(2011, 7), Date.new(2011, 8), Date.new(2011, 9)).print(@out)
+      exp = <<EOC
+     July 2011      
+Mo Tu We Th Fr Sa Su
+             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 31
+
+\e[8A\e[24C    August 2011     \e[1B\e[20DMo Tu We Th Fr Sa Su\e[1B\e[20D 1  2  3  4  5  6  7\e[1B\e[20D 8  9 10 11 12 13 14\e[1B\e[20D15 16 17 18 19 20 21\e[1B\e[20D22 23 24 25 26 27 28\e[1B\e[20D29 30 31\e[1B\e[20D
+\e[8A\e[48C   September 2011   \e[1B\e[20DMo Tu We Th Fr Sa Su\e[1B\e[20D          1  2  3  4\e[1B\e[20D 5  6  7  8  9 10 11\e[1B\e[20D12 13 14 15 16 17 18\e[1B\e[20D19 20 21 22 23 24 25\e[1B\e[20D26 27 28 29 30\e[1B\e[20D
+EOC
+      #      July 2011              August 2011            September 2011   
+      # Mo Tu We Th Fr Sa Su    Mo Tu We Th Fr Sa Su    Mo Tu We Th Fr Sa Su
+      #              1  2  3     1  2  3  4  5  6  7              1  2  3  4
+      #  4  5  6  7  8  9 10     8  9 10 11 12 13 14     5  6  7  8  9 10 11
+      # 11 12 13 14 15 16 17    15 16 17 18 19 20 21    12 13 14 15 16 17 18
+      # 18 19 20 21 22 23 24    22 23 24 25 26 27 28    19 20 21 22 23 24 25
+      # 25 26 27 28 29 30 31    29 30 31                26 27 28 29 30
+      #
+      @out.string.inspect.should == exp.inspect # using inspect to help debugging
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shellout
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-21 00:00:00.000000000Z
+date: 2011-10-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70359984070900 !ruby/object:Gem::Requirement
+  requirement: &9770540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359984070900
+  version_requirements: *9770540
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70359984070420 !ruby/object:Gem::Requirement
+  requirement: &9770040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359984070420
+  version_requirements: *9770040
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70359984069960 !ruby/object:Gem::Requirement
+  requirement: &9769360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,29 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359984069960
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: &70359984069380 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70359984069380
-- !ruby/object:Gem::Dependency
-  name: growl_notify
-  requirement: &70359984068860 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70359984068860
+  version_requirements: *9769360
 description: Contains classes for printing tables and boxes
 email:
 - kjellm@acm.org
@@ -74,14 +52,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGES
 - Gemfile
 - Guardfile
 - README.md
 - Rakefile
 - lib/shellout.rb
+- lib/shellout/calendar.rb
 - lib/shellout/shadowbox.rb
 - lib/shellout/table.rb
+- lib/shellout/version.rb
 - shellout.gemspec
+- spec/shellout/calendar_spec.rb
 - spec/shellout/shadowbox_spec.rb
 - spec/shellout/table_spec.rb
 - spec/shellout_spec.rb
@@ -111,6 +93,8 @@ signing_key:
 specification_version: 3
 summary: Tools for writing terminal interfaces
 test_files:
+- spec/shellout/calendar_spec.rb
 - spec/shellout/shadowbox_spec.rb
 - spec/shellout/table_spec.rb
 - spec/shellout_spec.rb
+has_rdoc: