mcalendar 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01d1ff265098d4230e22ea2fc37fa0abc0eb0beab77d4ed599b4d3b9d5010ba1
-  data.tar.gz: e4690991dcd510c5b6586d1ccb84a6504c6774962c1a0def325cb5464bdbb152
+  metadata.gz: e0ba0d5eb52a4d7229c2a6e44d19b5d88cb48f429ee26756e94f5ff57c6da889
+  data.tar.gz: ff7860a811535caf70ddd900546ea0cffc1fa36c58b0bc53a7577ce020b82aa7
 SHA512:
-  metadata.gz: 49c1671c2e46bccae55d446fa2ef6a81cbb2b690d806bb7f909a9e0f6ef7a6b8ba8544cf7ec19cc503fa873692b4ab6f6485d4bd25293e4185f12ffcb789e0f9
-  data.tar.gz: 3db78a0da8022da712daa53a2c61a34b0e7aa986abf8a71ade7e2827c92cea320f263d03173cae21c26751640de3cfb204eaba4703fc5aa9a5f357e508eab0b3
+  metadata.gz: 694f1a3e42c289590ea5140b8f2959e5924fcd219f5b43a4123c3293b6468f80c3c162ba9667cb00d1f25c1ace2602e2685d38e2b610dd6adabaa448541246f4
+  data.tar.gz: 5eee6f4f6e9afb2fca6a8a028ddd983bb057015677e58d3ffc92b34cb0766277072a36ed526cafe22e3f427d4f1d307a0c8c7fb86b260476959dfa51dbe091a3

data/lib/mcalendar/options.rb

@@ -61,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.2"
+  VERSION = "0.5.3"
 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
+  # 2022xxxx: RubyKaigi
+  # 2022xxxx: RubyKaigi
+  # 2022xxxx: RubyKaigi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mcalendar
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - icm7216
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn