mhc 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 650db4a5196f97fe4edc81028a8eaa77be9914fbe3d3ea1c5d27b3b0fe790cbe
-  data.tar.gz: a164d3c77a6aa6dbce5aa702158a70c9a558b6c11023dd282a14a535234ee7d7
+  metadata.gz: 4522630272ecdc9d44c9b994b2b31f8e36278abb0004708ec0e39d63e5d16792
+  data.tar.gz: cbcd079db569d336eec4eb87f21e5598cd3735b04f0fef6ffbbc8b7fdb583067
 SHA512:
-  metadata.gz: 61edc1a0f6c05b05af51a84c9dcb40425eab9ff217f37017f8c1d9e2000c12e0c086f63fbc5a5da87e7367ceb28b5fa40657311a1d08dc0e09298f743f9629d7
-  data.tar.gz: 7221e67e855a6658922a81482875cd92ddb6250aa89f07a671e04175a0d158a2918a68b820c04a76326aa8760fc08808515590658d4439f21c95859bc668bafe
+  metadata.gz: 1f052c78047e59e8638248ef56928f2ee3e85ae544b959d294c6900afb06868cb305a4a23b1ae85a35d963b870dbb0ec950c4c1d5cd9ea25d9ffe07334be5cd8
+  data.tar.gz: 874b007618cfd8be8a49ba0fab497ba38f6a36edfedbedf0ec72bb983c6c5ceff67a52c2b6138a62ced23fb0586e5f644eca018e2d9b963a8d79666100b94b9a

data/.gitignore

@@ -5,7 +5,7 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
+Gemfile.lock*
 InstalledFiles
 _yardoc
 attic/

data/bin/mhc

@@ -120,6 +120,7 @@ class MhcCLI < Thor
   method_option :show_all, :desc => "Include all finished tasks."
 
   def todo
+    todos = []
     calendar.tasks.each do |task|
       if task.recurring?
         # Yearly: today - 90days .. today + 365d - 90days ?
@@ -130,9 +131,24 @@ class MhcCLI < Thor
         search_range = nil
       end
       next if task.in_category?("done") && !options[:show_all]
-      occurrence = task.occurrences(range: search_range).first
-      deadline = occurrence.dtstart
-      puts format("%s %s", deadline.strftime("%Y/%m/%d %a"), task.subject)
+      todos << task.occurrences(range: search_range).first
+    end
+    todos.each.sort{|a, b| a.dtstart <=> b.dtstart}.each do |t|
+      deadline = t.dtstart
+      deadline_string = ""
+      remaining = (deadline - Mhc::PropertyValue::Date.today).to_i
+      if remaining == 0
+        deadline_string = " (due this date)"
+      elsif remaining > 0
+        deadline_string = format(" (%d days to go)", remaining)
+      else
+        deadline_string = format(" (%d days overdue)", -remaining)
+      end
+      location_string = " [#{t.location}]" if !t.location.empty?
+      puts format("%s %-11s %s%s%s",
+                  deadline.strftime("%Y/%m/%d %a"),
+                  t.time_range.to_mhc_string,
+                  t.subject, location_string, deadline_string)
     end
   end # todo
 

data/emacs/Cask

@@ -5,7 +5,7 @@
 (source org)
 (source melpa)
 
-(package "mhc" "1.2.3" "Message Harmonized Calendaring system") ;; MHC_VERSION
+(package "mhc" "1.2.4" "Message Harmonized Calendaring system") ;; MHC_VERSION
 
 (files "mhc.el" "mhc-*.el")
 

data/emacs/mhc-date.el

@@ -411,17 +411,10 @@
   `(/ (1- (mhc-date-dd ,date)) 7))
 
 (defsubst mhc-date-cw (date)
-  (mhc-date-let date
-    (let* ((yday (mhc-date/day-number yy mm dd))
-           (days (mhc-date/iso-week-days yday ww))
-           (d))
-      (if (< days 0)
-          (setq days (mhc-date/iso-week-days
-                      (+ yday 365 (if (mhc-date/leap-year-p (1- yy)) 1 0)) ww))
-        (setq d (mhc-date/iso-week-days
-                 (- yday 365 (if (mhc-date/leap-year-p yy) 1 0)) ww))
-        (if (<= 0 d) (setq days d)))
-      (1+ (/ days 7)))))
+  (string-to-number
+   (format-time-string
+    (if (= mhc-start-day-of-week 1) "%V" "%U")
+    (mhc-date-to-second date))))
 
 ;;
 ;; compare.

data/emacs/mhc-record.el

@@ -54,7 +54,7 @@
 
 (defun mhc-record-create-id ()
   "Return unique ID string."
-  (org-id-new))
+  (upcase (org-id-new)))
 
 (defun mhc-record-new (name &optional id schedules sexp)
   "Constructer of MHC-RECORD structure."

data/emacs/mhc-summary.el

@@ -356,7 +356,8 @@ message and cdr keeps a visible message."
                 (or (null (setq dayinfo
                                 (get-text-property (point) 'mhc-dayinfo)))
                     (not (eq (mhc-day-date dayinfo) date))))
-      (goto-char (next-single-property-change (point) 'mhc-dayinfo)))))
+      (goto-char (or (next-single-property-change (point) 'mhc-dayinfo)
+                     (point-min))))))
 
 (defun mhc-summary-record (&optional mailer)
   "Return record on current line."

data/emacs/mhc-vars.el

@@ -18,7 +18,7 @@
 
 
 ;;; Constants:
-(defconst mhc-version "mhc 1.2.3") ;; MHC_VERSION
+(defconst mhc-version "mhc 1.2.4") ;; MHC_VERSION
 
 
 ;;; Configration Variables:

data/emacs/mhc.el

@@ -3,7 +3,7 @@
 ;; Description: Message Harmonized Calendaring system.
 ;; Author:  Yoshinari Nomura <nom@quickhack.net>
 ;; Created: 1994-07-04
-;; Version: 1.2.3
+;; Version: 1.2.4
 ;; Keywords: calendar
 ;; URL: http://www.quickhack.net/mhc
 ;; Package-Requires: ((calfw "20150703"))
@@ -25,7 +25,7 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))
 
 ;; For Mule 2.3
 (eval-and-compile

data/lib/mhc/caldav.rb

@@ -26,7 +26,7 @@ module Mhc
              D:propstat/D:prop/caldav:calendar-data
           ).map{|e| xmldoc.elements[e].text rescue nil}
 
-        info.href = URI.unescape(href)
+        info.href = URI.decode_www_form_component(href)
         info.uid = File.basename(info.href, ".ics")
         info.status = status
         info.content_type = content_type

data/lib/mhc/command/completions.rb

@@ -95,7 +95,7 @@ module Mhc
         when "COMMAND"
           possible_commands
         when "RANGE"
-          "(today tomorrow thismonth nextmonth)"
+          "(all today tomorrow thismonth nextmonth)"
         when /^NUM/
           "_guard '[0-9]#' 'Number'"
         else

data/lib/mhc/version.rb

@@ -1,4 +1,4 @@
 module Mhc
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
   PRODID = "-//Quickhack.net//MHC #{Mhc::VERSION}//EN"
 end

data/samples/japanese-holidays.mhcc

@@ -72,14 +72,14 @@ X-SC-Record-Id: 5E03776A-4280-4337-85C0-F1322A3AAE6E
 
 X-SC-Subject: 海の日
 X-SC-Category: Holiday Japanese
-X-SC-Day: !20200720 20200723
+X-SC-Day: !20200720 20200723 !20210719 20210722
 X-SC-Cond: 3rd Mon Jul
 X-SC-Duration: 20030701-
 X-SC-Record-Id: BD4156C2-5546-4146-8297-09CF4210A346
 
 X-SC-Subject: 山の日
 X-SC-Category: Holiday Japanese
-X-SC-Day: 20200810 !20200811
+X-SC-Day: 20200810 !20200811 20210808 !20210811
 X-SC-Cond: 11 Aug
 X-SC-Duration: 20160811-
 X-SC-Record-Id: FC7C481B-7BF5-4639-B700-3B60CB99E05D
@@ -110,7 +110,7 @@ X-SC-Record-Id: C17D9CA5-28AF-4826-AD33-8B75473E5B52
 
 X-SC-Subject: スポーツの日
 X-SC-Category: Holiday Japanese
-X-SC-Day: 20200724 !20201012
+X-SC-Day: 20200724 !20201012 20210723 !20211011
 X-SC-Cond: 2nd Mon Oct
 X-SC-Duration: 20200101-
 X-SC-Record-Id: F10B2B18-B0FB-477E-A7D3-A067B31F4736
@@ -184,6 +184,7 @@ X-SC-Day: 19730430 19730924 19740506 19740916 19741104 19751124
   20081124 20090506 20100322 20120102 20120430 20121224 20130506
   20131104 20140506 20141124 20150506 20160321 20170102 20180212
   20180430 20180924 20181224 20190506 20190812 20191104 20200224 20200506
+  20210809
   20230102 20240212 20240506 20240812 20240923 20241104 20250224 20250506
   20251124 20260506 20270322 20290212 20290430 20290924 20291224
   20300506 20300812 20301104 20310224 20310506 20311124 20330321 20340102

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mhc
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Yoshinari Nomura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2020-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -255,8 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Message Harmonized Calendaring