vgcal 0.2.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8dd7c78c6a1c70737ac7aa5f7d9e8e0d32060fb63adf0447db01acdaf5376c0
-  data.tar.gz: 5fbb39780a006902a4ec96105a0f773cb56d2b073ebd268e415a0789fd4f3039
+  metadata.gz: 9a8a4820ac5ec51ae8603b18a047717b7c0b12a143c70b04bd4dcff5fe21a349
+  data.tar.gz: 0e97596aecf4228d7c132a2960dcca84f8087402af8eeee99a1ad715432c6b8f
 SHA512:
-  metadata.gz: '0748ef604645d4c5bce2a495a1373455b9c88773a6b34b0abd27fd8ef40a2a17d168d61de096223524cc92a2f145b79553ebbc890bdff1fb5c90f55f8cbc69fd'
-  data.tar.gz: a7f7bd82e58d3f63706f7711bcce7215ea3c2803fa9df51e1e406a0c62204f3eaaecc45bb4a1bdb337d599c74197ce9dd17f28540c653280d0900d8aa333983f
+  metadata.gz: b4da59f8dc452af1ddcc90303a498cdf19af129fa8aa31f69cab379c34d674fc0d1709bfb23b04f958ff319b63cc665bbe4dd17b90a459fa88443a4af1ac7787
+  data.tar.gz: f5c2104b3e9b3928e5d16ab7a6332f32d3dc51c84964d89604a1d285550897cca16f8451017cd337c7234f8b043f41c39578119345d582d242f84ad9635fc043

data/.ruby-version

@@ -1 +1 @@
-3.0.1
+3.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vgcal (0.2.3)
+    vgcal (0.3.3)
       dotenv
       google-api-client
       thor (~> 1.1)
@@ -9,7 +9,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -22,7 +22,7 @@ GEM
     declarative (0.0.20)
     diff-lcs (1.4.4)
     dotenv (2.7.6)
-    faraday (1.5.1)
+    faraday (1.7.1)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -30,6 +30,7 @@ GEM
       faraday-net_http (~> 1.0)
       faraday-net_http_persistent (~> 1.1)
       faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
@@ -39,6 +40,7 @@ GEM
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
     gems (1.2.0)
     google-api-client (0.53.0)
       google-apis-core (~> 0.1)
@@ -60,19 +62,19 @@ GEM
       google-apis-core (>= 0.4, < 2.a)
       google-apis-discovery_v1 (~> 0.5)
       thor (>= 0.20, < 2.a)
-    googleauth (0.16.2)
+    googleauth (0.17.1)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.14)
+      signet (~> 0.15)
     httpclient (2.8.3)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jwt (2.2.3)
     memoist (0.16.2)
-    mini_mime (1.1.0)
+    mini_mime (1.1.1)
     minitest (5.14.4)
     multi_json (1.15.0)
     multipart-post (2.1.1)
@@ -116,8 +118,8 @@ GEM
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
-    signet (0.15.0)
-      addressable (~> 2.3)
+    signet (0.16.0)
+      addressable (~> 2.8)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
@@ -131,6 +133,7 @@ GEM
     zeitwerk (2.4.2)
 
 PLATFORMS
+  arm64-darwin-21
   x86_64-darwin-19
 
 DEPENDENCIES
@@ -141,4 +144,4 @@ DEPENDENCIES
   vgcal!
 
 BUNDLED WITH
-   2.2.15
+   2.2.33

data/README.md

@@ -46,6 +46,7 @@ Options:
   -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
+  -o, [--output=OUTPUT]                      # Output format. [text|json]
 
 Show google calendar
 $
@@ -61,8 +62,8 @@ $ vgcal show
 Period: 2021-07-24T00:00:00+09:00 - 2021-07-24T23:59:59+09:00
 
 My tasks: 5.25h(0.66day)
-  ・all day task 1: all day
-  ・all day task2: all day
+  ・all day task 1: 0h
+  ・all day task2: 0h
   ・meeting1: 2.0h
   ・meeting2: 0.25h
   ・meeting3: 3.0h
@@ -80,6 +81,30 @@ $ vgcal show -d +1
 
 # Schedule for 2021/07/01 - 2021/07/28
 $ vgcal show -s 20210701 -e 20210728
+
+# Formatted json
+$ vgcal show -o json | jq .
+{
+  "start_date": "2021-09-05T00:00:00+09:00",
+  "end_date": "2021-09-05T23:59:59+09:00",
+  "tasks": [
+    {
+      "title": "all day task 1",
+      "time": 0,
+      "task_type": "my_task"
+    },
+    {
+      "title": "task a",
+      "time": 1,
+      "task_type": "my_task"
+    },
+    {
+      "title": "task b",
+      "time": 1,
+      "task_type": "my_task"
+    }
+  ]
+}
 ```
 
 ## Development

data/lib/vgcal/handlers/describer.rb

@@ -3,6 +3,7 @@
 require 'thor'
 require 'vgcal/my_calendar'
 require 'fileutils'
+require 'json'
 
 module Vgcal
   module Handlers
@@ -13,10 +14,11 @@ module Vgcal
       def init
         vgcal_dir = "#{Dir.home}/.vgcal"
         cred_json = "#{vgcal_dir}/credentials.json"
-        dot_env = "#{vgcal_dir}/.env"
+        dot_env   = "#{vgcal_dir}/.env"
+        gem_root  = File.expand_path '../../../', __dir__
         Dir.mkdir(vgcal_dir, 0o755) unless Dir.exist?(vgcal_dir)
-        FileUtils.cp('template-credentials.json', cred_json) unless File.exist?(cred_json)
-        FileUtils.cp('template.env', dot_env) unless File.exist?(dot_env)
+        FileUtils.cp(File.join(gem_root,'template-credentials.json'), cred_json) unless File.exist?(cred_json)
+        FileUtils.cp(File.join(gem_root,'template.env'), dot_env) unless File.exist?(dot_env)
         puts "Fix the __FIX_ME__ in #{cred_json} and #{dot_env}"
       end
 
@@ -25,28 +27,22 @@ module Vgcal
       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'
+      option :'output', type: :string, aliases: '-o', desc: 'Output format. [text|json]'
 
       desc 'show', 'Show google calendar'
 
       def show
         Dotenv.load("#{Dir.home}/.vgcal/.env")
-        puts "Period: #{start_date} - #{end_date}"
-        puts
-        mcal = MyCalendar.new(start_date, end_date)
+        mcal   = MyCalendar.new(start_date, end_date)
         events = mcal.events
-        tasks = mcal.tasks(events)
-        puts "My tasks: #{tasks[0]}h(#{(tasks[0] / 8).round(2)}day)"
-        tasks[1].each do |task|
-          if task[1].is_a?(String)
-            puts "  ・#{task[0]}: #{task[1]}"
-          else
-            puts "  ・#{task[0]}: #{task[1]}h"
-          end
-        end
-        meetings = mcal.invited_meetings(events)
-        puts "Invited meetings: #{meetings[0]}h(#{(meetings[0] / 8).round(2)}day)"
-        meetings[1].each do |meeting|
-          puts "  ・#{meeting[0]}: #{meeting[1]}h"
+
+        case options[:output]
+        when 'json'
+          stdout_json(mcal.tasks(events), mcal.invited_meetings(events))
+        when 'text'
+          stdout_default(mcal.tasks(events), mcal.invited_meetings(events))
+        else
+          stdout_default(mcal.tasks(events), mcal.invited_meetings(events))
         end
       end
 
@@ -58,6 +54,55 @@ module Vgcal
 
       private
 
+      def stdout_json(my_tasks, invited_meetings)
+        hash = {
+          'start_date': "#{start_date}",
+          'end_date':   "#{end_date}",
+          'tasks':      []
+        }
+        my_tasks.each do |task|
+          hash[:tasks].push ({
+            "title":     task[0],
+            "time":      task[1],
+            "task_type": 'my_task'
+          })
+        end
+        invited_meetings.each do |meeting|
+          hash[:tasks].push ({
+            'title':     meeting[0],
+            'time':      meeting[1],
+            'task_type': 'invited_meeting'
+          })
+        end
+        puts hash.to_json
+      end
+
+      def stdout_default(my_tasks, invited_meetings)
+        puts "Period: #{start_date} - #{end_date}"
+        puts
+        my_task_time = 0
+        my_tasks.select do |n|
+          my_task_time += n[1]
+        end
+        puts "My tasks: #{my_task_time}h(#{(my_task_time / 8).round(2)}day)"
+        my_tasks.each do |task|
+          if my_tasks.is_a?(String)
+            puts "  ・#{task[0]}: #{task[1]}"
+          else
+            puts "  ・#{task[0]}: #{task[1]}h"
+          end
+        end
+
+        meeting_time = 0
+        invited_meetings.select do |m|
+          meeting_time += m[1]
+        end
+        puts "Invited meetings: #{meeting_time}h(#{(meeting_time / 8).round(2)}day)"
+        invited_meetings.each do |meeting|
+          puts "  ・#{meeting[0]}: #{meeting[1]}h"
+        end
+      end
+
       def start_date
         s_date = if options[:'current-week']
                    if Date.today.sunday?
@@ -97,7 +142,7 @@ module Vgcal
                    end
                  elsif options[:'next-week']
                    if Date.today.sunday?
-                     (Date.today + 7).to_s
+                     (Date.today + 13).to_s
                    else
                      (Date.today + 7 + (6 - Date.today.wday)).to_s
                    end
@@ -113,11 +158,7 @@ module Vgcal
                  elsif options['start-date'] && options['end-date']
                    Date.parse(options['end-date'].to_s)
                  else
-                   if Date.today.sunday?
-                     (Date.today + 6).to_s
-                   else
-                     (Date.today + (6 - Date.today.wday)).to_s
-                   end
+                   Date.today.to_s
                  end
         "#{e_date}T23:59:59+09:00"
       end

data/lib/vgcal/my_calendar.rb

@@ -8,29 +8,28 @@ module Vgcal
   class MyCalendar
     def initialize(start_date, end_date)
       @start_date = start_date
-      @end_date = end_date
+      @end_date   = end_date
     end
 
     def events
-      service = Google::Apis::CalendarV3::CalendarService.new
+      service               = Google::Apis::CalendarV3::CalendarService.new
       service.authorization = Vgcal::Authorizer.new.credentials
-      calendar_id = 'primary'
+      calendar_id           = 'primary'
       service.list_events(calendar_id,
-                          max_results: 100,
+                          max_results:   100,
                           single_events: true,
-                          order_by: 'startTime',
-                          time_min: @start_date,
-                          time_max: @end_date)
+                          order_by:      'startTime',
+                          time_min:      @start_date,
+                          time_max:      @end_date)
     end
 
-    # return: [4.25, [["daily scrum", 0.25], ["SRE定例", 1.0], ["test", 2.0], ["task2", 1.0]]]
+    # return: [["daily scrum", 0.25], ["SRE定例", 1.0], ["test", 2.0], ["task2", 1.0]]
     def tasks(events)
-      total_meeting_times = 0
       tasks_hash = {}
       events.items.each do |e|
         if e.organizer.email.include?(my_email_address) && !e.summary.start_with?(*hide_words)
           if all_day_event?(e.start.date)
-            tasks_hash[e.summary] = 'all day'
+            tasks_hash[e.summary] = 0
           else
             task_time = (e.end.date_time - e.start.date_time).to_f * 24
             # 1日の中で同じタスク名が複数あったら時間を集計する。例.午前と午後それぞれでAプロジェクトに1時間スケジュール
@@ -39,19 +38,14 @@ module Vgcal
             else
               tasks_hash[e.summary] = task_time
             end
-            total_meeting_times = 0
-            tasks_hash.each do |h|
-              total_meeting_times += h.to_ary[1] unless h.to_ary[1].is_a?(String)
-            end
           end
         end
       end
-      [total_meeting_times, tasks_hash.sort.to_a]
+      tasks_hash.sort.to_a
     end
 
-    # return: [2.25, [["朝会", 0.5], ["daily scrum", 0.25], ["SRE朝会", 0.5], ["定例", 1.0]]]
+    # return: [["朝会", 0.5], ["daily scrum", 0.25], ["SRE朝会", 0.5], ["定例", 1.0]]
     def invited_meetings(events)
-      total_meeting_times = 0
       tasks_hash = {}
       events.items.each do |e|
         next if e.organizer.email.include?(my_email_address) || e.summary.start_with?(*hide_words)
@@ -67,13 +61,9 @@ module Vgcal
           else
             tasks_hash[e.summary] = task_time
           end
-          total_meeting_times = 0
-          tasks_hash.each do |h|
-            total_meeting_times += h.to_ary[1]
-          end
         end
       end
-      [total_meeting_times, tasks_hash.sort.to_a]
+      tasks_hash.sort.to_a
     end
 
     private

data/lib/vgcal/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vgcal
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Shota Ito
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-04 00:00:00.000000000 Z
+date: 2022-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: "%q{The vgcal command simplifies the display of Google Calendar events.}"