mhc 1.2.5 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0b65ae5e1dd5f504de2eeb59f280eff7ef0422133520006e9814ab52510e9ac
-  data.tar.gz: '0168de3d55867bf8356a02cf9be81d3ecd199b01f64d5c2cdc5f6835a0605fdd'
+  metadata.gz: 004715c2632703f8a918c99c43e56584131ca7f4a70fd9630a6a6b61d4808750
+  data.tar.gz: 64e5111a5ff3e0b6bb2e2aa5205484325bb93ca03b5ac0933900f8ba437b725c
 SHA512:
-  metadata.gz: d4533cef977bafd8491f1f3bbb709049dfa17b7ca70f0286381aaba60ffb51a096d34b28d6cb7239e1a5f932729237dce1d931332c1830983357ec99196f75e5
-  data.tar.gz: 40dbdfcdcacf2ac4f274db2897bfa91f25a58ebb0d80c4b705d9134efef3e2fafa7e1ec51a743817e075e7a0f015b53262a6c3c1f915400ce5e0dd5dad31727d
+  metadata.gz: d17c58fc4583093cc8fda63a622e3122ec236674fbdf5bfc61e69783a29e4d434fec4f277dd3e17470eed44a7a8ed706cdcba6e15ec6f91b869c19c592a6f10d
+  data.tar.gz: 7897b2a90736ece98f09d83aa26d800350390f00ea45f92fa8d10e31cade9f6e71d4e319e509cb9a1a103cd645708ffbd6e5c212e4f7ea2e11995354ae55b00f

data/Rakefile

@@ -20,7 +20,7 @@ task :build => :check_version
 task :check_version do
   for file in %w(mhc.el mhc-vars.el Cask)
     path = File.expand_path("../emacs/#{file}", __FILE__)
-    raise "File not found #{path}" unless File.exists?(path)
+    raise "File not found #{path}" unless File.exist?(path)
 
     content = File.open(path).read
     unless (/^;; Version: (\d+\.\d+\.\d+)$/ =~ content ||

data/bin/mhc

@@ -17,7 +17,7 @@ end
 
 gemfile = File.expand_path("../../Gemfile", __FILE__)
 
-if File.exists?(gemfile + ".lock")
+if File.exist?(gemfile + ".lock")
   ENV["BUNDLE_GEMFILE"] = gemfile
   require "bundler/setup"
 end

data/emacs/Cask

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

data/emacs/mhc-face.el

@@ -101,6 +101,8 @@ refer to mhc-calendar-hnf-face-alist-internal.")
     (mhc-summary-face-conflict  . (nil "white"       "purple"))
     (mhc-summary-face-recurrence . (nil "black"      "green"))
     (mhc-summary-face-secret    . (nil "gray"        nil))
+    (mhc-summary-face-todo      . (nil "red "        nil))
+    (mhc-summary-face-done      . (nil nil           nil))
     ;;
     (mhc-minibuf-face-candidate . (nil nil           "yellow"))
     ;;

data/emacs/mhc-summary.el

@@ -104,6 +104,18 @@
   :group 'mhc
   :type 'hook)
 
+(defcustom mhc-todo-string-done
+  (if (eq mhc-summary-language 'japanese) "■" "[X]")
+      "*String which indicates done TODO."
+      :group 'mhc
+      :type 'string)
+
+(defcustom mhc-todo-string-not-done
+  (if (eq mhc-summary-language 'japanese) "□" "[ ]")
+      "*String which indicates not-done TODO."
+      :group 'mhc
+      :type 'string)
+
 (defcustom mhc-summary-line-format
   (if (eq mhc-summary-language 'japanese)
       "%Y%年%M%月%D%日%(%曜%) %b%e %c%i%s %p%l"
@@ -124,6 +136,7 @@ which are replaced by the given information:
 %p The priority of the schedule.
 %l The location of the schedule.
 %r Indicator for recurrence-tag (See also `mhc-summary-string-recurrence').
+%t The indicator for TODO.
 
 %/ A slash character if first line of the day.
 %( A left parenthesis character if first line of the day.
@@ -221,6 +234,13 @@ which are replaced by the given information:
         (if mhc-tmp-private (mhc-face-category-to-face "Private")
           (mhc-face-category-to-face
            (car (mhc-schedule-categories mhc-tmp-schedule)))))
+    (?t (cond
+         ((mhc-schedule-in-category-p mhc-tmp-schedule "done") mhc-todo-string-done)
+         ((mhc-schedule-in-category-p mhc-tmp-schedule "todo") mhc-todo-string-not-done))
+        'face
+        (cond
+         ((mhc-schedule-in-category-p mhc-tmp-schedule "done") 'mhc-summary-face-done)
+         ((mhc-schedule-in-category-p mhc-tmp-schedule "todo") 'mhc-summary-face-todo)))
     (?l (mhc-summary/line-location-string)
         'face 'mhc-summary-face-location)
     (?\( (if mhc-tmp-first "(" " ")

data/emacs/mhc-vars.el

@@ -18,7 +18,7 @@
 
 
 ;;; Constants:
-(defconst mhc-version "mhc 1.2.5") ;; MHC_VERSION
+(defconst mhc-version "mhc 1.2.7") ;; 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.5
+;; Version: 1.2.7
 ;; Keywords: calendar
 ;; URL: http://www.quickhack.net/mhc
 ;; Package-Requires: ((calfw "20150703"))

data/lib/mhc/command/init.rb

@@ -62,7 +62,7 @@ module Mhc
         require "erb"
         template = ERB.new(File.open(template_path).read, nil, "-")
 
-        if File.exists?(dest_path)
+        if File.exist?(dest_path)
           say_status "exist", "Ignore #{dest_path}", :yellow
           return
         end
@@ -98,7 +98,7 @@ module Mhc
         require "digest/md5"
 
         # Debian
-        if File.exists?("/etc/timezone")
+        if File.exist?("/etc/timezone")
           return File.open("/etc/timezone").read.chomp
         end
 
@@ -109,13 +109,13 @@ module Mhc
         end
 
         # Red Had / CentOS
-        if File.exists?("/etc/sysconfig/clock") &&
+        if File.exist?("/etc/sysconfig/clock") &&
             /ZONE=["']?([^"']+)/ =~ File.open("/etc/sysconfig/clock").read.chomp
           return $1
         end
 
         # generic including FreeBSD
-        if File.exists?("/etc/localtime")
+        if File.exist?("/etc/localtime")
           localtime = Digest::MD5.file("/etc/localtime")
           candidates = Dir.chdir("/usr/share/zoneinfo") do
             Dir.glob("**/*").select do |fn|

data/lib/mhc/config.rb

@@ -211,7 +211,7 @@ module Mhc
     end # class Top
 
     def self.create_from_file(file_name)
-      unless File.exists?(File.expand_path(file_name))
+      unless File.exist?(File.expand_path(file_name))
         raise Mhc::ConfigurationError, "config file '#{file_name}' not found"
       end
       begin

data/lib/mhc/etag.rb

@@ -52,7 +52,7 @@ module Mhc
     end
 
     def unlink(key)
-      if File.exists?(path = make_path(key))
+      if File.exist?(path = make_path(key))
         File.unlink(path)
       end
     end

data/lib/mhc/formatter/text.rb

@@ -8,6 +8,13 @@ module Mhc
       def format_item(context, date, item)
         subject = item.subject.to_s
         subject = "(no subject)" if subject == ""
+        icon = { "Todo" => "[ ]", "Done" => "[X]" }
+        cat = item.categories.map{|s| s.to_s}.select{|s| s == "Todo" or s == "Done"}.map{|s| icon[s]}.join(",")
+        if cat != ""
+          subject = cat + " " + subject
+        else
+          subject = "    " + subject
+        end
         format("%s%-11s %s%s\n",
                format_item_header(context, date, item),
                item.time_range.to_mhc_string.toutf8,

data/lib/mhc/version.rb

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

data/mhc.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "ri_cal",      ">= 0.8.8"
   spec.add_runtime_dependency "tzinfo",      ">= 1.2.2"
   spec.add_runtime_dependency "tzinfo-data", ">= 1.2015.4"
+  spec.add_runtime_dependency "nkf"
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mhc
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.7
 platform: ruby
 authors:
 - Yoshinari Nomura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-28 00:00:00.000000000 Z
+date: 2024-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2015.4
+- !ruby/object:Gem::Dependency
+  name: nkf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement