mcalendar 0.5.1 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 106df652910d9257dddfa3814af1ab493c2ead746ed454c94ce4aa9950014f16
-  data.tar.gz: 6889c7be1874699ac9c86bd96ee7e48f1d61a566c90a78dfb2f398163e86dcda
+  metadata.gz: c413c998aafb8d17962a9610bad85958075a2779d7fc1cbf0859037ffe5c8e95
+  data.tar.gz: 931462951e2ee6ae342405aad95e7a09d93d6e1a315d4c593b9f2e2c368894cf
 SHA512:
-  metadata.gz: 953e8b02928a44b6129fc716858aceaf0d29288bd473b3f2e9e2e6dd2a3f7a8276fc1948e403840acb7640b83a68e4f733100c93d2fdc114843c33412823e629
-  data.tar.gz: 027ba073a3567099bf0f18378726925754097826ea8066c1c99b1776e87e90b816f9f6fc9af1cf03b41b1656ade0dc61c1bc2cfbe5e54fb4ffca8680d40d7801
+  metadata.gz: 833c63b6fa24b4f5b18b505ede13cd069b9fccff1cdbf83ba2c1b1bd482c8b23a8c6eb1967090d5b68af0e288ecc3330b1f4225c19b272512b2c5e1d4c57da64
+  data.tar.gz: 0d83b7e80cd2b54a005919a95da5e5f34cda5604a1512f6f53e3c283b147843195edbc920c7fe86d80a8720dbd2b6d427b5fda6a2d0224098d7d7734d4b0441a

data/README.md

@@ -74,7 +74,7 @@ mcalendar 2021/02 -n my_calendar.pdf
 
 ### Configure mcalendar schedule
 
-mcalendar reads mcalendar.yml in the current working directory as mcalendar's schedule file. It can contain the following settings:
+mcalendar reads `~/.mcalendar.yml` or `mcalendar.yml` in the current working directory as mcalendar's schedule file. It can contain the following settings:
 * holiday
 * anniversary
 

data/lib/mcalendar/config.rb

@@ -23,5 +23,6 @@ module Mcalendar
   DEFAULT_PDF_NAME = "calendar.pdf".freeze
 
   DEFAULT_CONFIG_FILE = "mcalendar.yml".freeze
-
+  GLOBAL_CONFIG_FILE = File.expand_path("~/.mcalendar.yml").freeze
+  BUILT_IN_CONFIG_FILE = File.expand_path("../../mcalendar.yml", __dir__).freeze
 end

data/lib/mcalendar/options.rb

@@ -7,14 +7,17 @@ module Mcalendar
         :anniversary => {}
       }
 
-      # If mcalendar.yml is not found, load the built-in mcalendar.yml.
+      # If mcalendar.yml or ~/.mcalendar.yml is not found, load the built-in mcalendar.yml.
       if File.exist?(Mcalendar::DEFAULT_CONFIG_FILE)
-        load_config(Mcalendar::DEFAULT_CONFIG_FILE)
+        config_yaml = Mcalendar::DEFAULT_CONFIG_FILE
+      elsif File.exist?(Mcalendar::GLOBAL_CONFIG_FILE)
+        config_yaml = Mcalendar::GLOBAL_CONFIG_FILE
       else
-        config_file = File.expand_path("../../mcalendar.yml",__dir__)
-        load_config(config_file)
+        config_yaml = Mcalendar::BUILT_IN_CONFIG_FILE
       end
 
+      load_config(config_yaml)
+
     end
 
     def hash_key_to_sym(h)
@@ -58,13 +61,14 @@ module Mcalendar
 
       begin
         remained = parser.parse!(argv)
-      rescue OptionParser::InvalidArgument => e
-        abort e.message
       rescue OptionParser::MissingArgument => e
         case e.args
         when ["-n"], ["--name"]
           @options[:name] = Mcalendar::DEFAULT_PDF_NAME
         end
+      rescue OptionParser::ParseError => e
+        puts parser
+        abort e.message
       end
 
       begin

data/lib/mcalendar/schedule.rb

@@ -18,16 +18,24 @@ module Mcalendar
       @days_config = Hash.new(nil)
       @holidays = @config_schedule[:holiday]
       @anniversaries = @config_schedule[:anniversary]
+      @date = @config_schedule[:date]
       
       setup_schedule
     end
 
+    def holidays_in_the_year(holidays)
+      holidays.map do |k,v|
+        year_of_key = Date.parse(k.to_s).year
+        "#{k}: #{v}" if year_of_key == Date.parse(@date.to_s).year
+      end.compact
+    end
+
     def show_holidays
-      @holidays.map{|k,v| "#{k}: #{v}"}
+      holidays_in_the_year(@holidays)
     end
 
     def show_anniversaries
-      @anniversaries.map{|k,v| "#{k}: #{v}"}
+      holidays_in_the_year(@anniversaries)
     end
 
     def setup_schedule

data/lib/mcalendar/version.rb

@@ -1,3 +1,3 @@
 module Mcalendar
-  VERSION = "0.5.1"
+  VERSION = "0.5.4"
 end

data/mcalendar.yml

@@ -1,4 +1,9 @@
+# Japanese holidays in English
+# https://www8.cao.go.jp/chosei/shukujitsu/gaiyou.html
+# 2021 -> 2022
+
 holiday:
+# 2021
   20210101: New Year's Day
   20210111: Coming-of-age Day
   20210211: National Foundation Day
@@ -16,10 +21,32 @@ holiday:
   20210923: Autumnal Equinox Day
   20211103: Culture Day
   20211123: Labour Thanksgiving Day
+# 2022
+  20220101: New Year's Day
+  20220110: Coming-of-age Day
+  20220211: National Foundation Day
+  20220223: Emperor's Birthday
+  20220321: Vernal Equinox Day
+  20220429: Showa Day
+  20220503: Constitution Memorial Day
+  20220504: Greenery Day
+  20220505: Children's Day
+  20220718: Marine Day
+  20220811: Mountain Day
+  20220919: Respect for the Aged Day
+  20220923: Autumnal Equinox Day
+  20221010: Sports Day
+  20221103: Culture Day
+  20221123: Labour Thanksgiving Day
 
 anniversary:
+# 2021
   20210224: Ruby's Birthday
   20210909: RubyKaigi Takeout 2021
   20210910: RubyKaigi Takeout 2021
   20210911: RubyKaigi Takeout 2021
-
+# 2022
+  20220224: Ruby's Birthday
+  20220908: RubyKaigi 2022 
+  20220909: RubyKaigi 2022
+  20220910: RubyKaigi 2022

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mcalendar
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.4
 platform: ruby
 authors:
 - icm7216
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-18 00:00:00.000000000 Z
+date: 2022-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn