vgcal 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a632e5cfab5b38c6448d2ec560cbe8b7f81bfa60eaa7926a1cc007946f6d1ab0
-  data.tar.gz: b558eee546de6744e98dd62828d0708c98b6d1bba1b209d8e0885fdb1b05e571
+  metadata.gz: a094a0dff8c0b5b6718905988811abcc18a7f2218166992a187a60305714dbff
+  data.tar.gz: a784420508bec7292a539001cacb819b0a355e19bcf2e2f0f9e137401efa7921
 SHA512:
-  metadata.gz: a5a8d0dd3424094faafd0c3f70a009f2ec95cdfbdb54773ca4da29dae27fcdaa942e3d31de0d5ebc9aa23c3b424dbf5bc8beb3847db8ecf3b41867c5e1d0a107
-  data.tar.gz: 4151ee42551a148d35e6230c99e466ba000778ca60aa4871c1e932664519785fc5b8466febe7afa1709724ce96dcac9af41db4484b07822a1e3baff15ce836c6
+  metadata.gz: 1fb45ccd27ec15e7a4b2e3f4ec88cfc967b9187b54895740077c3d9716e434b79b98e0640432375230225cbe7c3b1d1c55af54d252ae4941ff7c2509db399df5
+  data.tar.gz: 43a5785852131ef658b79e4409d0cf58f4c4b09cea501d0f54d5917b2b43636d32838e5f546539210bdb3ec818d2f434673ee343d4560f3c174446cc2e4424fe

data/.ruby-version

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vgcal (0.3.1)
+    vgcal (0.4.0)
       dotenv
       google-api-client
       thor (~> 1.1)
@@ -9,43 +9,27 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     declarative (0.0.20)
     diff-lcs (1.4.4)
-    dotenv (2.7.6)
-    faraday (1.7.1)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+    dotenv (2.8.1)
+    faraday (2.4.0)
+      faraday-net_http (~> 2.0)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
+    faraday-net_http (2.1.0)
     gems (1.2.0)
     google-api-client (0.53.0)
       google-apis-core (~> 0.1)
       google-apis-generator (~> 0.1)
-    google-apis-core (0.4.1)
+    google-apis-core (0.7.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -54,39 +38,38 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-discovery_v1 (0.6.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-generator (0.4.0)
+    google-apis-discovery_v1 (0.11.0)
+      google-apis-core (>= 0.7, < 2.a)
+    google-apis-generator (0.9.0)
       activesupport (>= 5.0)
       gems (~> 1.2)
-      google-apis-core (>= 0.4, < 2.a)
+      google-apis-core (>= 0.7, < 2.a)
       google-apis-discovery_v1 (~> 0.5)
       thor (>= 0.20, < 2.a)
-    googleauth (0.17.1)
-      faraday (>= 0.17.3, < 2.0)
+    googleauth (1.2.0)
+      faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.15)
+      signet (>= 0.16, < 2.a)
     httpclient (2.8.3)
-    i18n (1.8.10)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    jwt (2.2.3)
+    jwt (2.4.1)
     memoist (0.16.2)
-    mini_mime (1.1.1)
-    minitest (5.14.4)
+    mini_mime (1.1.2)
+    minitest (5.16.2)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
-    os (1.1.1)
+    os (1.1.4)
     parallel (1.20.1)
     parser (3.0.2.0)
       ast (~> 2.4.1)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     rainbow (3.0.0)
     rake (13.0.3)
     regexp_parser (2.1.1)
-    representable (3.1.1)
+    representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
@@ -118,21 +101,21 @@ GEM
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
-    signet (0.16.0)
+    signet (0.17.0)
       addressable (~> 2.8)
-      faraday (>= 0.17.3, < 2.0)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    thor (1.1.0)
-    trailblazer-option (0.1.1)
-    tzinfo (2.0.4)
+    thor (1.2.1)
+    trailblazer-option (0.1.2)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unicode-display_width (2.0.0)
     webrick (1.7.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
+  arm64-darwin-21
   x86_64-darwin-19
 
 DEPENDENCIES
@@ -143,4 +126,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

@@ -15,9 +15,10 @@ module Vgcal
         vgcal_dir = "#{Dir.home}/.vgcal"
         cred_json = "#{vgcal_dir}/credentials.json"
         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
 

data/lib/vgcal/my_calendar.rb

@@ -29,7 +29,7 @@ module Vgcal
       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時間スケジュール

data/lib/vgcal/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vgcal
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Shota Ito
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-05 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.}"