mcalendar 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21ef82a6c59eecbb2f6352fcdd3c07319ba97b7c0171c3e0f62acd2af9cf2b69
-  data.tar.gz: a0964b22fc234f1c30e4ff849891cc9e87ce4df0d0fd1b319fb7b7ab33371f38
+  metadata.gz: 27619fc0c5bfa245496da8f7c40af714931a96274b6f3eacbd383cf97a749aef
+  data.tar.gz: 45cbfb1b5e59b75c57b50889d82948401b9c80d8037ba5d7da59964020baf78e
 SHA512:
-  metadata.gz: 937ead03075cbc8f91df5051cb1b4ba8c20f64bcad713f213c328e3a7dc285aa3404fc44a2bb5803fe49811456844020b12366c60a8c7a228ac43ce07fa3b0c2
-  data.tar.gz: 3d2082a57b49dce4647546899083832d7b9a8e7b754f0aa0a113c5a5142c8cc93f796510f96ba758bd76d6ffbc058a7814b5d58ddca665761e504707fc3f6246
+  metadata.gz: 668ed5dda0d31695fe02b2b8946e858cf10b516a9bbc6317eacfd6f8e0d1d972a262ceb787d02a5b2fc8c4ce8c25b34309786f7980fcee02e8efbee87dc8c752
+  data.tar.gz: 9871a3699694fde7f6d8f1bcab59328620403f86744bd15c00fd4dd25f1adb8bfc13602f6b2e5e3ac4efaa8c15cf33b92abf5f3881687cfed981f7f72a9dc990

data/.gitignore

@@ -9,3 +9,4 @@
 /Gemfile.lock
 pdf/*.pdf
 *.pdf
+/.vscode/

data/lib/mcalendar/command.rb

@@ -2,7 +2,6 @@
 
 module Mcalendar
   class Command
-
     def self.run(argv)
       new(argv).execute
     end
@@ -12,12 +11,12 @@ module Mcalendar
     end
 
     def execute
-
       options = Mcalendar::Options.parse(@argv)
       date = options[:date]
       console = options[:opt][:console]
       pdf = options[:opt][:pdf]
       pdf_name = options[:opt][:name]
+      version = options[:opt][:version]
       calendar = Mcalendar::Calendar.new(date.year, date.month, pdf_name)
 
       # output calendar
@@ -25,11 +24,10 @@ module Mcalendar
       calendar.pdf if pdf
 
       # both outputs if no options
-      if console.nil? && pdf.nil?
+      if console.nil? && pdf.nil? && version.nil?
         calendar.display
         calendar.pdf
       end
-      
     end
   end
 end

data/lib/mcalendar/config.rb

@@ -1,33 +1,33 @@
 module Mcalendar
   COLOR = {
-    white:    "FFFFFF",
-    silver:   "C0C0C0",
-    gray:     "808080",
-    black:    "000000",
-    red:      "FF0000",
-    maroon:   "800000",
-    yellow:   "FFFF00",
-    olive:    "808000",
-    lime:     "00FF00",
-    green:    "008000",
-    aqua:     "00FFFF",
-    teal:     "008080",
-    blue:     "0000FF",
-    navy:     "000080",
-    fuchsia:  "FF00FF",
-    purple:   "800080",
-    orange:   "FFA500",  
-  }
+    white: "FFFFFF",
+    silver: "C0C0C0",
+    gray: "808080",
+    black: "000000",
+    red: "FF0000",
+    maroon: "800000",
+    yellow: "FFFF00",
+    olive: "808000",
+    lime: "00FF00",
+    green: "008000",
+    aqua: "00FFFF",
+    teal: "008080",
+    blue: "0000FF",
+    navy: "000080",
+    fuchsia: "FF00FF",
+    purple: "800080",
+    orange: "FFA500",
+  }.freeze
 
-  DAY_OF_WEEK = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
-  DEFAULT_PDF_NAME = "calendar.pdf"
+  DAY_OF_WEEK = %w[Sun Mon Tue Wed Thu Fri Sat].freeze
+  DEFAULT_PDF_NAME = "calendar.pdf".freeze
 
   Config_day = Struct.new(
-    "ConfigDay", 
-    :day, 
-    :day_color, 
-    :holiday_text, 
-    :anniversary_text 
+    "ConfigDay",
+    :day,
+    :day_color,
+    :holiday_text,
+    :anniversary_text
   )
 
   module Config
@@ -36,6 +36,7 @@ module Mcalendar
       # @end_of_month = obj_calendar.end_of_month
 
       @days_config = Hash.new(nil)
+      holiday_description_language
       days_basic
       holiday
       anniversary
@@ -48,11 +49,16 @@ module Mcalendar
       end
     end
 
+    def holiday_description_language
+      Mcalendar.const_set(:HOLIDAY, Mcalendar::EN::HOLIDAY)
+      Mcalendar.const_set(:ANNIVERSARY, Mcalendar::EN::ANNIVERSARY)
+    end
+
     def holiday
-      y = "%4d" % @first_of_month.year
-      m = "%02d" % @first_of_month.month
+      y = format("%4d", @first_of_month.year)
+      m = format("%02d", @first_of_month.month)
       regex = /#{y}#{m}\d\d/
-  
+
       Mcalendar::HOLIDAY.keys.grep(regex).each do |d|
         @days_config[d].day = Date.parse(d.to_s).day
         @days_config[d].day_color = :red
@@ -61,10 +67,10 @@ module Mcalendar
     end
 
     def anniversary
-      y = "%4d" % @first_of_month.year
-      m = "%02d" % @first_of_month.month
+      y = format("%4d", @first_of_month.year)
+      m = format("%02d", @first_of_month.month)
       regex = /#{y}#{m}\d\d/
-  
+
       Mcalendar::ANNIVERSARY.keys.grep(regex).each do |d|
         @days_config[d].day = Date.parse(d.to_s).day
         @days_config[d].anniversary_text = Mcalendar::ANNIVERSARY[d]
@@ -72,10 +78,9 @@ module Mcalendar
     end
 
     def days
-      pdf_days = @days_config.each_value.map {|val| val}
-      @first_of_month.wday.times {pdf_days.unshift("  ")}
+      pdf_days = @days_config.each_value.map { |val| val }
+      @first_of_month.wday.times { pdf_days.unshift("  ") }
       pdf_days
     end
-      
   end
-end
+end

data/lib/mcalendar/holiday.rb

@@ -1,31 +1,63 @@
 module Mcalendar
+  module JA
+    # Japanese holidays in Japanese
+    HOLIDAY = {
+      "20200101": "元日",
+      "20200113": "成人の日",
+      "20200211": "建国記念の日",
+      "20200223": "天皇誕生日",
+      "20200224": "振替休日",
+      "20200320": "春分の日",
+      "20200429": "昭和の日",
+      "20200503": "憲法記念日",
+      "20200504": "みどりの日",
+      "20200505": "子供の日",
+      "20200506": "振替休日",
+      "20200723": "海の日",
+      "20200724": "スポーツの日",
+      "20200810": "山の日",
+      "20200921": "敬老の日",
+      "20200922": "秋分の日",
+      "20201103": "文化の日",
+      "20201123": "勤労感謝の日",
+    }.freeze
 
-  # Japanese holidays
-  HOLIDAY = {
-    "20200101": "New Year's Day", 
-    "20200113": "Coming-of-age Day", 
-    "20200211": "National Foundation Day", 
-    "20200223": "Emperor's Birthday", 
-    "20200224": "Substitute Holiday", 
-    "20200320": "Vernal Equinox Day", 
-    "20200429": "Showa Day", 
-    "20200503": "Constitution Memorial Day", 
-    "20200504": "Greenery Day", 
-    "20200505": "Children's Day", 
-    "20200506": "Substitute Holiday", 
-    "20200723": "Marine Day", 
-    "20200724": "Sports Day", 
-    "20200810": "Mountain Day", 
-    "20200921": "Respect for the Aged Day", 
-    "20200922": "Autumnal Equinox Day", 
-    "20201103": "Culture Day", 
-    "20201123": "Labour Thanksgiving Day"
-  }
+    ANNIVERSARY = {
+      "20200224": "Rubyの誕生日",
+      "20200409": "RubyKaigi 2020 Nagano",
+      "20200410": "RubyKaigi 2020 Nagano",
+      "20200411": "RubyKaigi 2020 Nagano",
+    }.freeze
+  end
 
-  ANNIVERSARY = {
-    "20200224": "Ruby's Birthday",
-    "20200409": "RubyKaigi 2020 Nagano",
-    "20200410": "RubyKaigi 2020 Nagano",
-    "20200411": "RubyKaigi 2020 Nagano"
-  }
+  module EN
+    # Japanese holidays in English
+    HOLIDAY = {
+      "20200101": "New Year's Day",
+      "20200113": "Coming-of-age Day",
+      "20200211": "National Foundation Day",
+      "20200223": "Emperor's Birthday",
+      "20200224": "Substitute Holiday",
+      "20200320": "Vernal Equinox Day",
+      "20200429": "Showa Day",
+      "20200503": "Constitution Memorial Day",
+      "20200504": "Greenery Day",
+      "20200505": "Children's Day",
+      "20200506": "Substitute Holiday",
+      "20200723": "Marine Day",
+      "20200724": "Sports Day",
+      "20200810": "Mountain Day",
+      "20200921": "Respect for the Aged Day",
+      "20200922": "Autumnal Equinox Day",
+      "20201103": "Culture Day",
+      "20201123": "Labour Thanksgiving Day",
+    }.freeze
+
+    ANNIVERSARY = {
+      "20200224": "Ruby's Birthday",
+      "20200409": "RubyKaigi 2020 Nagano",
+      "20200410": "RubyKaigi 2020 Nagano",
+      "20200411": "RubyKaigi 2020 Nagano",
+    }.freeze
+  end
 end

data/lib/mcalendar/options.rb

@@ -1,17 +1,17 @@
 module Mcalendar
   module Options
-
     def self.parse(argv)
       options = {}
 
       parser = OptionParser.new do |o|
-        o.on_head('-v', '--version', 'Show version') do
+        o.on_head("-v", "--version", "Show version") do |v|
+          options[:version] = v
           o.version = Mcalendar::VERSION
           puts o.version
         end
-        o.on('-p', '--pdf', 'output pdf') {|v| options[:pdf] = v}
-        o.on('-n NAME', '--name=NAME', String, 'output pdf name') {|v| options[:name] = v}
-        o.on('-c', '--console', 'output console') {|v| options[:console] = v}
+        o.on("-p", "--pdf", "output pdf") { |v| options[:pdf] = v }
+        o.on("-n NAME", "--name=NAME", String, "output pdf name") { |v| options[:name] = v }
+        o.on("-c", "--console", "output console") { |v| options[:console] = v }
       end
 
       begin
@@ -24,14 +24,14 @@ module Mcalendar
           options[:name] = Mcalendar::DEFAULT_PDF_NAME
         end
       end
-      
+
       begin
         d = Date.parse(remained.first)
       rescue
         d = Date.today
       end
 
-      {date: d, opt: options}
+      { date: d, opt: options }
     end
   end
 end

data/lib/mcalendar/version.rb

@@ -1,3 +1,3 @@
 module Mcalendar
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mcalendar
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - icm7216
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit