mcalendar 0.5.5 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac015db20949925d06ccf0e5f37e6cda175d161c73761e716aad6038c7280511
-  data.tar.gz: 28d599a9eb429270732f2e7d216eb0969212325a1f42efad84da7fc94a92ddfe
+  metadata.gz: 1b8b4ca4a9ab65f33b16609833ba52b47565da3dd42bba249112ebe0134fe0e7
+  data.tar.gz: 9b4be615e52a0285d55cc686ecef029ec51bd2f8d810a59df9485eeae0b18447
 SHA512:
-  metadata.gz: f5d978d7361405ac362dde8e36f1a435a9e4391673a92350b9bbe1b3659a569374e764a92dab89686aab3e20ee01d9650d04d973063210540278f8bc67f8d13f
-  data.tar.gz: 9750e02a0e79139e039dccc4fb6bfa46e0090b4193f7006378717bf81940b9aca214057ce1605dd51a68258ff8f450cf2757b0a0bf9c4773b001b13565c645fe
+  metadata.gz: bab1cee9cde84161543d3ad5dfe912a948929a5473b94e12a7db977dc64df9262cf80573fd57ba8db21ed953576a525ad166139189f3e7454e7323f535a05ba4
+  data.tar.gz: f8ad3f54399e6dd85facaac66e0c8eb73432fd203e2061cf5414f41e5c19f47fe9cbada09a5e2688401aac23279733e63af2d9c4120562c6b6511f9495703e67

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/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.5"
+  VERSION = "0.6.2"
 end

metadata

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