cal4near 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 872a62fa1f557fdf85235824334bdff98fa6d2b64205f846a3d803024d0f11fc
-  data.tar.gz: e8ebfc5bc675c8116288f23d89c7517946aca6be1c87d9f4441e4888ea1d52fe
+  metadata.gz: 962a769e590ce2126052259f29cb6388e0437a3bb7710d6af2352ba9390b9ba7
+  data.tar.gz: e6f4a4aef668039638293302e4fa8be1d2e8774fe9640dfcb4c158fae7175999
 SHA512:
-  metadata.gz: 9fbcc0c20819f60918457dc4592e547e794edb49b398127a20ac8de1409c80d74be82d77dc4e4b9b241dd9575b1394ebc76bb63459c1ec864a4dd77b25f62e55
-  data.tar.gz: 410751d59e27aee97f4634d8043e4d152d2743b826b5c5bafe97c46df7c9ef250aeeb104226277cd16365a672c5091d3f7060e2fe56ac1c104a4b195c986bf10
+  metadata.gz: 7c410224e01c9ada37128b56e5f6535d26fafe12099edccd8c76266e706020aa82b3f4c923950e05de7abef4e02104c67294e74dd516b5bc1ee8f60abd9e9e40
+  data.tar.gz: a33c7228f8b45b1d9d85427a7598ad1325c1c6ce07c8c666562c1c912e38544e11033b9e7b4c6ad7e1a09f346c74152dd5637e42be7a8283823de9a276f99e1a

data/README.md

@@ -1,53 +1,73 @@
 # Cal4near
 
-Googleカレンダーの情報をコンソールから取得するツール
+Googleカレンダーの情報をコンソールへ出力するツールです。
 
-(作成中)
+### 主な機能
+- 空いている時間を出力する
+- [WIP]予定がある時間を出力する
 
-予定が入っていない時間を出力する
+### 出力例
 
 ```
-$bin/cal4
-2021/10/28(木) 16:00-17:00, 18:00-19:00
-2021/10/29(金) 11:00-16:00, 17:00-19:00
-2021/10/30(土) 9:00-19:00
-2021/10/31(日) 9:00-19:00
-2021/11/01(月) 12:00-14:00, 17:00-19:00
-2021/11/02(火) 11:00-16:00
-2021/11/03(水) 12:00-19:00
-2021/11/04(木) 11:00-19:00
+--------------
+free times
+--------------
+2022/02/21(月) 
+2022/02/22(火) 12:00-17:00
+2022/02/23(水) 11:00-13:00, 14:00-18:00
+2022/02/24(木) 
+2022/02/25(金) 
+2022/02/26(土) 9:00-18:00
+2022/02/27(日) 9:00-18:00
+2022/02/28(月) 11:00-14:00, 16:00-18:00
+2022/03/01(火) 12:00-17:00
+2022/03/02(水) 11:00-18:00
+2022/03/03(木) 12:00-14:00, 15:00-17:00
 
 ```
 
-## Installation
+## インストール
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'cal4near'
-```
+    $ gem install cal4near
 
-And then execute:
+## 事前準備
 
-    $ bundle install
+GoogleClandarAPIを使えるように設定が必要です。
+以下を参考にしてください。
 
-Or install it yourself as:
+https://qiita.com/nakamaksk/items/d1f522ecbb12aa969afc
 
-    $ gem install cal4near
+## 使い方
 
-## Usage
+### 空いている時間を取得
 
-TODO: Write usage instructions here
+```
+cal4 free
+```
 
-## Development
+出力例
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+```
+--------------
+free times
+--------------
+2022/02/21(月) 
+2022/02/22(火) 12:00-17:00
+2022/02/23(水) 11:00-13:00, 14:00-18:00
+2022/02/24(木) 
+2022/02/25(金) 
+2022/02/26(土) 9:00-18:00
+2022/02/27(日) 9:00-18:00
+2022/02/28(月) 11:00-14:00, 16:00-18:00
+2022/03/01(火) 12:00-17:00
+2022/03/02(水) 11:00-18:00
+2022/03/03(木) 12:00-14:00, 15:00-17:00
+```
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/cal4near.
+Bug reports and pull requests are welcome on GitHub at https://github.com/nakamaksk/cal4near.
 
 ## License
 

data/cal4near.gemspec

@@ -29,9 +29,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency 'google-api-client'
+
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency 'google-api-client'
   spec.add_development_dependency 'dotenv'
   spec.add_development_dependency "pry"
   spec.add_development_dependency 'pry-byebug'

data/exe/cal4

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+require "bundler/setup"
+require "cal4near"
+
+HELP_MSG =<<-MSG
+usage: cal4 [ free, f | busy, b ] [ -h ]
+
+free, f : Stdout free times from Google Calendar api
+busy, b : Stdout busy times from Google Calendar api
+
+-h : Show help
+MSG
+
+WRONG_ARG_ERR_MSG =<<-MSG
+[ERR]argument is wrong.
+MSG
+
+if ARGV.length > 0
+  case ARGV[0]
+  when '-h'
+    puts HELP_MSG
+    return
+  when 'free', 'f'
+    msg = "free times"
+    times_info = Cal4near.free_busy_times
+    is_free = true
+  when 'busy', 'b'
+    msg = "busy times"
+    times_info = Cal4near.free_busy_times
+    is_free = false
+  else
+    puts WRONG_ARG_ERR_MSG
+    puts HELP_MSG
+    return
+  end
+else
+  puts WRONG_ARG_ERR_MSG
+  puts HELP_MSG
+  return
+end
+
+puts <<-MSG
+----------------------------
+#{msg} (9:00 - 19:00) 
+----------------------------
+MSG
+
+puts Cal4near.format(times_info, is_free)

data/lib/cal4near/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cal4near
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/cal4near.rb

@@ -6,8 +6,6 @@ require "googleauth"
 require "googleauth/stores/file_token_store"
 require "date"
 require "fileutils"
-require 'pry'
-require 'pry-byebug'
 
 module Cal4near
   class Error < StandardError; end
@@ -22,7 +20,7 @@ module Cal4near
   SCOPE = Google::Apis::CalendarV3::AUTH_CALENDAR_READONLY
 
   # 空き時間を検索する日時の範囲
-  START_DATE = DateTime.now
+  START_DATE = DateTime.now.next_day(1)
   END_DATE = DateTime.now.next_day(30)
 
   # 空き時間を検索する時間の範囲
@@ -53,11 +51,12 @@ module Cal4near
   # @return [Hash]
   # @example 返り値のサンプルは以下
   #  "2022-03-21"=> {"2022-03-21 09:00"=>{:free=>true}
-  def self.free_times(
+  def self.free_busy_times(
     start_date = START_DATE,
     end_date = END_DATE,
     start_hour = START_HOUR,
-    end_hour = END_HOUR
+    end_hour = END_HOUR,
+    max_date_count = 100
   )
     busy_list = []
     events(start_date, end_date).each do |event|
@@ -78,7 +77,9 @@ module Cal4near
     # puts "Free time:"
 
     result = {}
-    (start_date.to_date..end_date.to_date).each do |date|
+    (start_date.to_date..end_date.to_date).each.with_index(1) do |date, i|
+      break if i > max_date_count
+
       result[date.strftime(DATE_FORMAT)] ||= {} # YYYY-MM-DD
 
       start_work_time = Time.new(date.year, date.month, date.day, start_hour, 0, 0)
@@ -107,19 +108,19 @@ module Cal4near
     result
   end
 
-  # @param [Hash] free_times
-  def self.stdout(times_info)
+  # @param [Hash] free_busy_times
+  def self.format(times_info, is_free = true)
     result = times_info
     wdays = %w(日 月 火 水 木 金 土)
     # 出力
-    result.each do |date, times|
+    date_time_info = result.map do |date, times|
       min_time = max_time = nil
       spans = []
       times.each do |time, info|
         time = DateTime.parse(time)
         min_time ||= time
         max_time = time
-        if info[:free]
+        if (is_free && info[:free]) || (!is_free && !info[:free])
           next
         else
           if min_time && max_time && min_time < max_time
@@ -134,8 +135,11 @@ module Cal4near
       end
 
       tmp_date = Date.parse(date)
-      puts "#{tmp_date.strftime("%Y/%m/%d")}(#{wdays[tmp_date.wday]}) #{spans.join(", ")}"
+      spans_text = spans.empty? ? "" : " #{spans.join(", ")}"
+      "#{tmp_date.strftime("%Y/%m/%d")}(#{wdays[tmp_date.wday]})#{spans_text}"
     end
+
+    date_time_info.join("\n")
   end
 
   ##

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: cal4near
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - nakamaksk
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-21 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: google-api-client
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -97,7 +97,8 @@ dependencies:
 description: Fetch calendar information.
 email:
 - adebayanen@gmail.com
-executables: []
+executables:
+- cal4
 extensions: []
 extra_rdoc_files: []
 files:
@@ -108,10 +109,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/cal4
 - bin/console
 - bin/setup
 - cal4near.gemspec
+- exe/cal4
 - lib/cal4near.rb
 - lib/cal4near/version.rb
 homepage: https://github.com/nakamaksk/cal4near

data/bin/cal4

@@ -1,44 +0,0 @@
-#!/usr/bin/env ruby
-require "bundler/setup"
-require "cal4near"
-
-HELP_MSG =<<-MSG
-usage: cal4 [--free] [--busy]
-
---free : Stdout free times from calendar api
---busy : Stdout busy times from calendar api [WIP]
-MSG
-
-WRONG_ARG_ERR_MSG =<<-MSG
-[ERR]argument is wrong.
-MSG
-
-if ARGV.length > 0
-  case ARGV[0]
-  when '-h'
-    puts HELP_MSG
-    return
-  when '--free', '-f'
-    msg = "free times"
-    times_info = Cal4near.free_times
-  # when '--busy', 'b'
-    # TODO:busy_timesの実装
-    # msg = "busy times"
-    # times_info = Cal4near.busy_times
-  else
-    puts WRONG_ARG_ERR_MSG
-    puts HELP_MSG
-    return
-  end
-else
-  msg = "free times"
-  times_info = Cal4near.free_times
-end
-
-puts <<-MSG
---------------
-#{msg}
---------------
-MSG
-
-Cal4near.stdout(times_info)