mcalendar 0.5.4 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c413c998aafb8d17962a9610bad85958075a2779d7fc1cbf0859037ffe5c8e95
-  data.tar.gz: 931462951e2ee6ae342405aad95e7a09d93d6e1a315d4c593b9f2e2c368894cf
+  metadata.gz: c9557f17e35790f52927ea11905d943692e0a5973a68373204705e2991e380c6
+  data.tar.gz: b42a73edc44c7dc061e59d4e85cc38b34b67981bd7ac81e1f979cd8501f43eba
 SHA512:
-  metadata.gz: 833c63b6fa24b4f5b18b505ede13cd069b9fccff1cdbf83ba2c1b1bd482c8b23a8c6eb1967090d5b68af0e288ecc3330b1f4225c19b272512b2c5e1d4c57da64
-  data.tar.gz: 0d83b7e80cd2b54a005919a95da5e5f34cda5604a1512f6f53e3c283b147843195edbc920c7fe86d80a8720dbd2b6d427b5fda6a2d0224098d7d7734d4b0441a
+  metadata.gz: 2385cb49e422f191b2391ee78754370362a4090afaaa9c924f36b902f2ba69394e31d46cbf524d7aee286b25ffbed4af5d20b01841c9e83fc0bfb3350942f9ef
+  data.tar.gz: 36a5585b38178fec46f7face229ac766a666f3962b4ef6e4dcadb6be96a014906860ae24fcc71dde065b374513033ebe0ed835eb8dd0809a2d96560200128890

data/README.md

@@ -142,8 +142,24 @@ You can also use the command option `-f` or `--config=` to load your own `your_s
 >mcalendar -f your_schedule.yml
 ```
 
+How many Sundays are there this month? 
+Use the command option `-w`, You can easily know this answer.
+```
+>mcalendar -w
+
+Number of days for each day of the week in August 2022
+-----------------------------------------------------------------------
+Sun. 4 days. =>  7,14,21,28
+Mon. 5 days. =>  1, 8,15,22,29
+Tue. 5 days. =>  2, 9,16,23,30
+Wed. 5 days. =>  3,10,17,24,31
+Thu. 4 days. =>  4,11,18,25
+Fri. 4 days. =>  5,12,19,26
+Sat. 4 days. =>  6,13,20,27
+```
+
 
-show help
+Show help
 ```
 >mcalendar --help
 Usage: mcalendar [options]
@@ -153,6 +169,7 @@ Usage: mcalendar [options]
     -c, --console                    output console
     -f, --config=FILE                Use YAML format file.
     -y, --holidays                   Display holidays and anniversaries in YAML file
+    -w, --wday                       Number of days for each day of the week in this month
 ```
 
 ## License

data/lib/mcalendar/calendar.rb

@@ -26,11 +26,31 @@ module Mcalendar
       first_of_month.strftime("%B %Y")
     end
 
+    def this_month_calendar?
+      (Date.today.year == @year) && (Date.today.month == @month) 
+    end
+
+    def reverse_color(day_str)
+      "\e[7m" + day_str.to_s + "\e[0m"
+    end
+
+    def reverse_todays_date
+      today_str = format("%2s", Date.today.day.to_s)
+    
+      if this_month_calendar?
+        month_days = days.map {|x| x.sub(today_str, reverse_color(today_str))}
+      else
+        month_days = days
+      end
+
+      month_days
+    end
+
     def to_s
       week_header = Mcalendar::DAY_OF_WEEK.join(" ")
       month_header = month_title.center(week_header.size).rstrip
       calendar = [[week_header]]
-      days.each_slice(7) {|x| calendar << [x.join("  ")]}
+      reverse_todays_date.each_slice(7) {|x| calendar << [x.join("  ")]}
       [month_header, calendar]
     end
 

data/lib/mcalendar/command.rb

@@ -7,15 +7,53 @@ module Mcalendar
     end
 
     def initialize(argv)
-      @argv = argv
+      # @argv = argv
+      options = Mcalendar::Options.new.parse(argv)
+      @date = options[:date]
+ 
+      @console = options[:console]
+      @pdf = options[:pdf]
+      @pdf_name = options[:name]
+      @version = options[:version]
+      @holidays = options[:holidays]
+      @calendar = Mcalendar::Calendar.new(@date.year, @date.month)
+      @schedule = Mcalendar::Schedule.new(@calendar, options)
+      @wday = options[:wday]
     end
     
     def output_console
       puts @calendar.to_s
     end
 
+    # Number of days for each day of the week in this month.
+    def how_many_days
+      wdays = Mcalendar::DAY_OF_WEEK.map {|w| w.capitalize + "."}
+      wvalues = day_of_weeks.values
+
+      puts "\nNumber of days for each day of the week in #{@date.strftime("%B %Y")}"
+      puts "------------------------------------------------------------"
+      wdays.each_with_index do |wday, idx|
+        puts "#{wday} #{wvalues[idx].size} days. => #{wvalues[idx].join(",")}"
+      end
+      
+    end
+
+    def day_of_weeks
+      wks = @calendar.days.each_slice(7).map(&:to_a)     
+      keys = Mcalendar::DAY_OF_WEEK.map(&:downcase).map(&:to_sym)
+
+      vals = (0..6).map do |wd|
+        w = wks.map {|wk| wk[wd]}
+        w.delete("  ")
+        w.compact
+      end
+           
+      Hash[keys.zip(vals)]
+    end
+
     def output_pdf
-      @outputpdf.render_file(pdf_filename)
+      outputpdf = Mcalendar::OutputPdf.new(@calendar, @schedule)
+      outputpdf.render_file(pdf_filename)
     end
 
     def output_holidays
@@ -34,28 +72,19 @@ module Mcalendar
     end
 
     def execute
-      options = Mcalendar::Options.new.parse(@argv)
-      date = options[:date]
-      console = options[:console]
-      pdf = options[:pdf]
-      @pdf_name = options[:name]
-      version = options[:version]
-      holidays = options[:holidays]
-
-      @calendar = Mcalendar::Calendar.new(date.year, date.month)
-      @schedule = Mcalendar::Schedule.new(@calendar, options)
-      @outputpdf = Mcalendar::OutputPdf.new(@calendar, @schedule)
-
       # output calendar
-      output_console if console
-      output_pdf if pdf
-      output_holidays if holidays
+      output_console if @console
+      output_pdf if @pdf
+      output_holidays if @holidays
 
       # both outputs if no options
-      if console.nil? && pdf.nil? && version.nil? && holidays.nil?
+      if @console.nil? && @pdf.nil? && @version.nil? && @holidays.nil? && @wday.nil?
         output_console
         output_pdf
       end
+
+      # Number of days for each day of the week in this month.
+      how_many_days if @wday
       
     end
   end

data/lib/mcalendar/options.rb

@@ -57,6 +57,8 @@ module Mcalendar
         end
 
         o.on("-y", "--holidays", "Display holidays and anniversaries in YAML file") { |v| @options[:holidays] = v }
+
+        o.on("-w", "--wday", "Number of days for each day of the week in this month") { |v| @options[:wday] = v }
       end
 
       begin

data/lib/mcalendar/version.rb

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

metadata

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