rubyshelltools 0.0.4 → 0.0.5

data/lib/modules/calendar/calendar.rb

@@ -51,10 +51,31 @@ module RST
           param
         elsif param =~ /today/i || param.nil?
           Date.today 
-        else
+        elsif param =~ /\d+[wmd]/i
+          get_today_plus(param)
+        else 
           Date.parse(param)
         end
       end
+
+      # Get Today + param
+      # @param [String] param nDWM n=Number Day Weeks Months
+      def get_today_plus(param)
+        offset = 0
+        param.scan(/(\d+)([dwm])/i) do |count,unit|
+          offset = case unit[0].downcase
+          when 'd'
+            count.to_i.days
+          when 'w'
+            count.to_i.weeks
+          when 'm'
+            count.to_i.months
+          else
+            raise "Unknown unit #{unit}. Valid units are d,w,m or days,weeks,months"
+          end
+        end
+        Date.parse( (Time.now + offset).to_s )
+      end
     end
 
     # Calendar has a name and will be stored in Persistent::DiskStore(CALENDAR_FILE)

data/lib/rst.rb

@@ -96,7 +96,11 @@ module RST
           @options[:name] = name
         end
 
-        opts.on('-e', '--new-event DATE,STRING', Array, 'Add an event') do |date,name|
+        opts.on('-e', '--new-event [DATE,]STRING', Array, 'Add an event') do |date,name|
+          if name.nil?
+            name = date
+            date = Date.today
+          end
           @options[:new_event] = {date: date, label: name}
         end
 
@@ -130,6 +134,14 @@ module RST
           nil .......... no command. Interpret options only (useful in combination with -v)
           ls ........... list directory and files
           cal[endar] ... print a calendar --from --to
+
+          DATE-FORMATS FOR --new-event
+          ommit ........ today
+          today ........ today
+          yyyy-mm-dd
+          dd.mm.yyyy
+          mm/dd/yyyy
+          nDWM ......... today + n days, weeks, months eg 1w, 2d[ays], 1M[ONTH]
         EOT
         .gsub(/^\s+/,'    ')
 

data/rst.rb

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