mcalendar 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 106df652910d9257dddfa3814af1ab493c2ead746ed454c94ce4aa9950014f16
-  data.tar.gz: 6889c7be1874699ac9c86bd96ee7e48f1d61a566c90a78dfb2f398163e86dcda
+  metadata.gz: 01d1ff265098d4230e22ea2fc37fa0abc0eb0beab77d4ed599b4d3b9d5010ba1
+  data.tar.gz: e4690991dcd510c5b6586d1ccb84a6504c6774962c1a0def325cb5464bdbb152
 SHA512:
-  metadata.gz: 953e8b02928a44b6129fc716858aceaf0d29288bd473b3f2e9e2e6dd2a3f7a8276fc1948e403840acb7640b83a68e4f733100c93d2fdc114843c33412823e629
-  data.tar.gz: 027ba073a3567099bf0f18378726925754097826ea8066c1c99b1776e87e90b816f9f6fc9af1cf03b41b1656ade0dc61c1bc2cfbe5e54fb4ffca8680d40d7801
+  metadata.gz: 49c1671c2e46bccae55d446fa2ef6a81cbb2b690d806bb7f909a9e0f6ef7a6b8ba8544cf7ec19cc503fa873692b4ab6f6485d4bd25293e4185f12ffcb789e0f9
+  data.tar.gz: 3db78a0da8022da712daa53a2c61a34b0e7aa986abf8a71ade7e2827c92cea320f263d03173cae21c26751640de3cfb204eaba4703fc5aa9a5f357e508eab0b3

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)

data/lib/mcalendar/version.rb

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

metadata

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