rubyshelltools 0.0.7 → 0.0.8

data/assets/docs/examples.md

@@ -115,6 +115,29 @@ List entries with IDs and delete by ID
     
     $ rst cal --delete-event e5e14e59
 
+Print a pretty calendar
+-----------------------
+
+        $ rst cal -n work --print-calendar
+        
+             April 2013        EVENTS:
+        Su Mo Tu We Th Fr Sa   Wed, Apr 24 2013: RailsConf2013 7h Abflug München + TÜV-Audit
+            1  2  3  4  5  6   Mon, Apr 29 2013: RailsConf2013
+         7  8  9 10 11 12 13   Tue, Apr 30 2013: RailsConf2013
+        14 15 16 17 18 19 20   Wed, May 01 2013: RailsConf2013
+        21 22 23 24 25 26 27   Thu, May 02 2013: RailsConf2013
+        28 29 30               Fri, May 03 2013: RailsConf2013
+                               Sat, May 04 2013: RailsConf2013 Ankunft München
+                               Mon, May 06 2013: Prüfung Romy
+              May 2013
+        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 31
+
+
 
 Save defaults
 =============

data/lib/modules/calendar/calendar.rb

@@ -175,11 +175,13 @@ module RST
       # Output a calendar for the given range.Including a small
       # monthly calendar on the upper, left and a list of all
       # events within given date-range
-      def to_text(from,to)
+      # @param [String|Date] from - Start on date
+      # @param [String|Date] to - End on date
+      # @return [String]
+      def to_text(from,to,empty=false,ids=false)
         unless (_content=list_days(from,to)).empty?
-          _date = ensure_date(from)
-          left_column=build_cal(_date,ensure_date(to))
-          right_column=["EVENTS:"] + list_days(from,to)
+          left_column=build_cal(ensure_date(from),ensure_date(to))
+          right_column=("EVENTS:\n"+list_days(from,to,empty,ids).join("\n")).split(/\n/)
           rows = [] 
           source = left_column.count > right_column.count ? left_column : right_column
           source.each_with_index do |_r,idx|
@@ -201,7 +203,7 @@ module RST
       def build_cal from, to
         (from..to).map{ |d| [d.month, d.year ] }.uniq.map { |m,y|
           `cal #{m} #{y}`
-        }.join("\n\n").split(/\n/)
+        }.join("\n").split(/\n/)
       end
       # Output date and Events on this date in one line
       # @param [Date] _date
@@ -210,7 +212,7 @@ module RST
       # @param [Boolean] show_ids - output ids for events
       def format_events_for(_date,show_empty=false,show_ids=false)
         if  (_line=event_headlines_for(_date,show_ids)) != '' || show_empty
-          (show_ids ? "%s:\n  %s" : "%s: %s") % [_date.strftime(DEFAULT_DATE_FORMAT), _line]
+          (show_ids ? "%s:\n%s" : "%s: %s") % [_date.strftime(DEFAULT_DATE_FORMAT), _line]
         end
       end
 
@@ -223,8 +225,8 @@ module RST
           events_on(_date).map(&:event_headline).join(' + ').strip
         else
           events_on(_date).map{|e|
-            "%s > %s" % [e.respond_to?(:id) ? e.id : 'n/a' ,e.event_headline]
-          }.join("\n  ").strip
+            "%16.16s: %s" % [e.respond_to?(:id) ? e.id : 'n/a' ,e.event_headline]
+          }.join("\n").gsub(/\s*$/,'')
         end
       end
 

data/lib/rst.rb

@@ -301,8 +301,11 @@ module RST
     def print_long_calendar
       store = Persistent::DiskStore.new(CALENDAR_FILE)
       store.all.map { |calendar|
-        calendar.to_text(@options[:from], @options[:to])
-      }.join("\n\n")
+        if @options[:name].blank? || @options[:name] == calendar.name
+          calendar.name + "\n" +
+          calendar.to_text(@options[:from], @options[:to], @options[:show_empty], @options[:with_ids]).to_s 
+        end
+      }.compact.join("\n\n")
     end
 
     # Dump the calendar(s), thus the output can be used as input for -e again

data/rst.rb

@@ -3,7 +3,7 @@ require 'logger'
 # # Ruby Shell Tools Top-level file
 module RST
   # Gem-version
-  VERSION   = '0.0.7'
+  VERSION   = '0.0.8'
 
   # Path to the docs used by the software
   DOCS      = File.expand_path('../assets/docs', __FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyshelltools
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors: