vgcal 0.1.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 701ecf0f97cfb2ea0b0fb0a5fd1ebcb9038f748556c2c9ee4231b3dbf2dedb2c
-  data.tar.gz: bb0c8dabfb844f55da48aba9739dcd4dd82a558fbac1e13efe11b703465e236c
+  metadata.gz: e8dd7c78c6a1c70737ac7aa5f7d9e8e0d32060fb63adf0447db01acdaf5376c0
+  data.tar.gz: 5fbb39780a006902a4ec96105a0f773cb56d2b073ebd268e415a0789fd4f3039
 SHA512:
-  metadata.gz: '009bc0bf59ec2dea2137c786aac66bf6f96ea001a6f935e77519e9100b5d92b2e060b6f39188565d2d11a5e19c0ea696805ae04550530e1781d00fb1e01d8b09'
-  data.tar.gz: a9e307ba086c79062d334a7c6f54c4ff406cf63b36887124da22d028d0199fc3b8cc9b5201ae80b7d4ecfb959f5c21e03c3b0639c00561eca7ea473190dd3564
+  metadata.gz: '0748ef604645d4c5bce2a495a1373455b9c88773a6b34b0abd27fd8ef40a2a17d168d61de096223524cc92a2f145b79553ebbc890bdff1fb5c90f55f8cbc69fd'
+  data.tar.gz: a7f7bd82e58d3f63706f7711bcce7215ea3c2803fa9df51e1e406a0c62204f3eaaecc45bb4a1bdb337d599c74197ce9dd17f28540c653280d0900d8aa333983f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vgcal (0.1.1)
+    vgcal (0.2.3)
       dotenv
       google-api-client
       thor (~> 1.1)

data/README.md

@@ -41,10 +41,11 @@ Usage:
   vgcal show
 
 Options:
-  -d, [--date=DATE]                  # Show relative date. ex.-1, +10
-  -c, [--current-week=CURRENT-WEEK]  # Show current week tasks
-  -s, [--start-date=N]               # Start date. ex.20210701
-  -e, [--end-date=N]                 # End date. ex.20210728
+  -d, [--date=DATE]                          # Show relative date. ex.-1, +10
+  -c, [--current-week], [--no-current-week]  # Show current week tasks
+  -n, [--next-week], [--no-next-week]        # Show next week tasks
+  -s, [--start-date=N]                       # Start date. ex.20210701
+  -e, [--end-date=N]                         # End date. ex.20210728
 
 Show google calendar
 $

data/lib/vgcal/handlers/describer.rb

@@ -21,7 +21,8 @@ module Vgcal
       end
 
       option :date, type: :string, aliases: '-d', desc: 'Show relative date. ex.-1, +10'
-      option :'current-week', type: :string, aliases: '-c', desc: 'Show current week tasks'
+      option :'current-week', type: :boolean, aliases: '-c', desc: 'Show current week tasks'
+      option :'next-week', type: :boolean, aliases: '-n', desc: 'Show next week tasks'
       option :'start-date', type: :numeric, aliases: '-s', desc: 'Start date. ex.20210701'
       option :'end-date', type: :numeric, aliases: '-e', desc: 'End date. ex.20210728'
 
@@ -62,7 +63,13 @@ module Vgcal
                    if Date.today.sunday?
                      Date.today.to_s
                    else
-                     (Date.today - Date.today.wday - 1).to_s
+                     (Date.today - Date.today.wday).to_s
+                   end
+                 elsif options[:'next-week']
+                   if Date.today.sunday?
+                     (Date.today + 7).to_s
+                   else
+                     (Date.today + Date.today.wday - 1).to_s
                    end
                  elsif options[:date]
                    case options[:date][0]
@@ -88,6 +95,12 @@ module Vgcal
                    else
                      (Date.today + (6 - Date.today.wday)).to_s
                    end
+                 elsif options[:'next-week']
+                   if Date.today.sunday?
+                     (Date.today + 7).to_s
+                   else
+                     (Date.today + 7 + (6 - Date.today.wday)).to_s
+                   end
                  elsif options[:date]
                    case options[:date][0]
                    when '+'
@@ -100,7 +113,11 @@ module Vgcal
                  elsif options['start-date'] && options['end-date']
                    Date.parse(options['end-date'].to_s)
                  else
-                   Date.today.to_s
+                   if Date.today.sunday?
+                     (Date.today + 6).to_s
+                   else
+                     (Date.today + (6 - Date.today.wday)).to_s
+                   end
                  end
         "#{e_date}T23:59:59+09:00"
       end

data/lib/vgcal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vgcal
-  VERSION = '0.1.1'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vgcal
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Shota Ito
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-25 00:00:00.000000000 Z
+date: 2021-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler