rubyshelltools 0.0.9 → 0.0.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 641f55c4735fc80402667b74f37d8d6b2b91684f
+  data.tar.gz: cce31a850e6ca5f17a5a5b63da41fdcaf3c0a144
+SHA512:
+  metadata.gz: 12b4f4292524d658a3587aa3535b288b43b27dce16ffb5d68c585dfa90fa3d7b98713ae30add0e36a3517d1934cf3b774b47be099485768cd2c352e6b06c8717
+  data.tar.gz: 7a2f0e78844f86bc2da5ad9d3c41b58daefc5b633cc11503fe17e538cf7db133ba57072adaf44e507292375d2c0ecfb73c9db5fcde55dbc970386f4fe9547c3a

data/lib/modules/calendar/calendar.rb

@@ -1,6 +1,6 @@
 require 'date'
 require 'modules/persistent/persistent'
-
+require 'modules/calendar/calendar_helper'
 module RST
 
   # Calendar-module provides the Calendar-class which is supposed to hold
@@ -40,43 +40,7 @@ module RST
   #
   module Calendar
 
-    # Some helper-methods useful when dealing with dates
-    module CalendarHelper
-
-      # You can use 'today' or any format which Date.parse can handle.
-      # @param [nil|String|Time|Date] param
-      # @return [Date] always returns a Date regardless of the type of input
-      def ensure_date(param)
-        if param.is_a?(Date) || param.is_a?(::Time)
-          param
-        elsif param =~ /today/i || param.nil?
-          Date.today 
-        elsif param =~ /\d+[a-zA-Z]/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+)([a-z])/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
+    include CalendarHelper
 
     # Calendar has a name and will be stored in Persistent::DiskStore(CALENDAR_FILE)
     # with it's name as the id. Thus you can save different calendars in
@@ -183,7 +147,7 @@ module RST
       # @return [String]|nil
       def to_text(from,to,empty=false,ids=false)
         unless (_content=list_days(from,to)).empty?
-          left_column=build_cal(ensure_date(from),ensure_date(to))
+          left_column=build_cal(parse_date_param(from),parse_date_param(to))
           right_column=("EVENTS:\n"+list_days(from,to,empty,ids).join("\n")).split(/\n/)
           render_2col_lines(left_column, right_column)
         end
@@ -264,13 +228,6 @@ module RST
 
       # @endgroup 
 
-      # Convert strings to a date
-      # @param [Date|Time|String] param - default is 'today'
-      # @return [Date|Time]
-      def parse_date_param(param=Date.today)
-        ensure_date(param)
-      end
-
     end
 
   end

data/lib/modules/calendar/calendar_event.rb

@@ -30,7 +30,7 @@ module RST
       def initialize(_date,_label)
         @label = _label
         @id ||= SecureRandom::hex(4)
-        schedule! ensure_date(_date)
+        schedule! parse_date_param(_date)
       end
 
       # override abstract method for an Eventable

data/lib/modules/calendar/calendar_helper.rb

@@ -0,0 +1,56 @@
+module RST
+
+  # Some useful helpers for dates
+  module CalendarHelper
+
+    # You can use 'today' or any format which Date.parse can handle.
+    # @example
+    #   parse_date_param('1w')
+    #   parse_date_param('-41d')
+    #   parse_date_param('1week')
+    #   parse_date_param('4months')
+    #   parse_date_param('-12m')
+    #   parse_date_param('today')
+    # @param [nil|String|Time|Date] param
+    # @return [Date] always returns a Date regardless of the type of input
+    def parse_date_param(param)
+      if param.is_a?(Date) || param.is_a?(::Time)
+        param
+      elsif param =~ /today/i || param.nil?
+        Date.today 
+      elsif param =~ /\d+[a-zA-Z]/i
+        get_today_plus(param)
+      else 
+        Date.parse(param)
+      end
+    end
+
+    private
+
+    # Get Today + param
+    # @example
+    #   get_today_plus('1w')
+    #   get_today_plus('-41d')
+    #   get_today_plus('1week')
+    #   get_today_plus('4months')
+    #   get_today_plus('-12m')
+    # @param [String] param nDWM n=Number Day Weeks Months
+    def get_today_plus(param)
+      offset = 0
+      param.scan(/(\-?)(\d+)([a-z])/i) do |dir,count,unit|
+        _count = count.to_i * ( dir.to_s == '-' ?  -1 : 1 )
+        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
+end

data/lib/rst.rb

@@ -45,6 +45,7 @@ module RST
     #   app = RstCommand.new(ARGV)
     #   app.run()
     def initialize(args)
+      @options = {}
       load_defaults
       parse_options(args)
       _command = args.shift
@@ -126,7 +127,7 @@ module RST
 
         opts.separator '  Calendar-actions'
 
-        opts.on('-p', '--print-calendar', 'Print calendar') do |p|
+        opts.on('-p', '--[no-]print-calendar', 'Print calendar') do |p|
           @options[:print_calendar] = p
         end
 
@@ -158,7 +159,7 @@ module RST
           @options[:save_defaults] = v
         end
 
-        opts.on('--list-defaults', 'list saved defaults') do |v|
+        opts.on('--[no-]list-defaults', 'list saved defaults') do |v|
           @options[:list_defaults] = v
         end
 
@@ -253,9 +254,9 @@ module RST
     def run_option(option)
       case option.to_s
       when 'examples'
-        File.read(File.join(DOCS,'examples.md')).strip
+        File.read(File.join(DOCS,'examples.md')).strip if options[:examples]
       when 'verbose'
-        print_arguments
+        print_arguments if options[:verbose]
       when 'new_event'
         new_event = add_event
         "Added: %s: %s" % [new_event.event_date.strftime(DEFAULT_DATE_FORMAT), new_event.event_headline.strip]
@@ -270,7 +271,7 @@ module RST
       when 'save_defaults'
         save_defaults
       when 'list_defaults'
-        list_defaults
+        list_defaults if options[:list_defaults]
       when 'clear_defaults'
         clear_defaults
       else

data/rst.rb

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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyshelltools
 version: !ruby/object:Gem::Version
-  version: 0.0.9
-  prerelease: 
+  version: 0.0.10
 platform: ruby
 authors:
 - Andi Altendorfer
@@ -14,7 +13,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -76,6 +69,7 @@ files:
 - lib/load.rb
 - lib/modules/calendar/calendar.rb
 - lib/modules/calendar/calendar_event.rb
+- lib/modules/calendar/calendar_helper.rb
 - lib/modules/calendar/eventable.rb
 - lib/modules/persistent/disk_store.rb
 - lib/modules/persistent/memory_store.rb
@@ -87,27 +81,26 @@ files:
 - assets/docs/examples.md
 homepage: http://rubygems.org/gems/rubyshelltools
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby Shell Tools
 test_files: []
 has_rdoc: