rubyshelltools 0.0.6 → 0.0.7

data/assets/docs/examples.md

@@ -106,6 +106,15 @@ The full set of parameters is
 * --empty ...... show empty lines
 * --no-empty ... show no empty lines (default)
 
+List entries with IDs and delete by ID
+--------------------------------------
+
+    $ rst cal -i
+    Sun, Mar 31 2013:
+      e5e14e59 > Your Event ...
+    
+    $ rst cal --delete-event e5e14e59
+
 
 Save defaults
 =============

data/lib/modules/calendar/calendar.rb

@@ -39,7 +39,7 @@ module RST
   #     # => Thu, May 22 1997: Tina's Birthday
   #
   module Calendar
-  
+
     # Some helper-methods useful when dealing with dates
     module CalendarHelper
 
@@ -92,7 +92,7 @@ module RST
       # @group public api
 
       attr_reader :name, :start_date, :end_date, :events
-   
+
       # @param [String] _name Name and persistent-id of this calendar.
       # @param [Date|Time|String] _start The date when the calendar starts
       # @param [Date|Time|String] _end   The date when the calendar ends
@@ -129,13 +129,13 @@ module RST
       def <<(add)
         events << add 
       end
-  
+
       # Calculate the span between start and end in seconds
       # @return [Float]
       def span
         ((end_date - start_date)*Numeric::DAYS).to_f
       end
-  
+
       # Array of strings for each day with events on it.
       #
       # @example
@@ -150,8 +150,8 @@ module RST
           format_events_for(_date,show_empty,show_ids)
         }.compact
       end
-      
-  
+
+
       # All events on the given date
       # @param [Date] date 
       # @return [Array] of [CalendarEvents]
@@ -162,17 +162,47 @@ module RST
 
       # Dump calendar events
       # @return [String]
-      def dump
+      def dump show_ids=false
         events.map { |event|
-          '"%s,%s"' % [ event.event_date.strftime('%Y-%m-%d'), event.event_headline ]
+          if show_ids
+            '%-8.8s %-15.15s "%s,%s"' % [ event.id, self.name, event.event_date.strftime('%Y-%m-%d'), event.event_headline ]
+          else
+            '"%s,%s"' % [ event.event_date.strftime('%Y-%m-%d'), event.event_headline ]
+          end
         }.join("\n")
       end
 
+      # 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)
+        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)
+          rows = [] 
+          source = left_column.count > right_column.count ? left_column : right_column
+          source.each_with_index do |_r,idx|
+            rows << "%-22.22s %s " % [ left_column[idx].to_s+"     ", right_column[idx].to_s ]
+          end
+          rows.join("\n").gsub(/\s*$/,'')
+        end
+      end
       # @endgroup
 
       private
       # @group private api
 
+
+      # Uses OS'cal-command to format a small calendar for a given month
+      # @param [Date|String] from - start on date
+      # @param [Date|String] to - end on date
+      # @return [Arra] of text-lines
+      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/)
+      end
       # Output date and Events on this date in one line
       # @param [Date] _date
       # @param [Boolean] show_empty - do output lines with no events
@@ -197,7 +227,7 @@ module RST
           }.join("\n  ").strip
         end
       end
-  
+
       # @endgroup 
 
       # Convert strings to a date

data/lib/rst.rb

@@ -140,6 +140,10 @@ module RST
           @options[:clear_defaults] = v
         end
 
+        opts.on('-p', '--print-calendar', 'Print calendar') do |p|
+          @options[:print_calendar] = p
+        end
+
         opts.separator ''
         opts.separator 'Commands:'
 
@@ -192,7 +196,12 @@ module RST
         @files << '*' if @files.empty?
         directory_listing( @files )
       when 'cal', 'calendar'
-        print_calendar
+        if @options[:print_calendar]
+          print_long_calendar
+        else
+          print_calendar
+        end
+
       else
         "unknown command '#{cmd.inspect}' - try --help"
       end
@@ -288,6 +297,14 @@ module RST
       }
     end
 
+    # Print a nice calendar with all events
+    def print_long_calendar
+      store = Persistent::DiskStore.new(CALENDAR_FILE)
+      store.all.map { |calendar|
+        calendar.to_text(@options[:from], @options[:to])
+      }.join("\n\n")
+    end
+
     # Dump the calendar(s), thus the output can be used as input for -e again
     # if no name-param is given all calendars are dumped.
     # if name-param is given only the named calendar gets dumped.
@@ -295,7 +312,7 @@ module RST
     def dump_calendar
       store = Persistent::DiskStore.new(CALENDAR_FILE)
       store.all.map { |calendar|
-        calendar.dump if calendar.name == @options[:name] || @options[:name].blank?
+        calendar.dump(@options[:with_ids]) if calendar.name == @options[:name] || @options[:name].blank?
       }.compact.join("\n")
     end
 

data/rst.rb

@@ -3,7 +3,7 @@ require 'logger'
 # # Ruby Shell Tools Top-level file
 module RST
   # Gem-version
-  VERSION   = '0.0.6'
+  VERSION   = '0.0.7'
 
   # 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.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors: