schedule-cli 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42782ff951ba926c55abecb022b485b9714a73a10b88d8edaf76fbc756cde429
-  data.tar.gz: b8e2f32fca289565b1852c6575da834936e24ce0be208610f5a504f19cb607ba
+  metadata.gz: 27845260a0b3a6e6dd6b06a498c510b452ae0a69b0b14ef524e0c94c9abea2d6
+  data.tar.gz: a87f684a45f6621007e489fa6d51653bc5a1a28f22fc2dc437c0261b63832746
 SHA512:
-  metadata.gz: da46ba9b924e8315b27a49d896dc744f3237e4c7389cecbbbfdb97116a84235f61e2c944f99c9df5cb4d5459a215829f2ed4b0f1933cd3169cefe9d0b2b95cbb
-  data.tar.gz: ef0a550eb9c6805ddc53cbfd874b7993d80f29c25fa1cba91cc6b7c71f2d465f29c108543efa04e40d53a895c0ae3f186f6e8dff8760ab43351050766ffb4589
+  metadata.gz: '08667553ba38fde90bce29ea3609ebf2aece59680e18f3c4b1fd7b2af7b305c0baac5e89042b139b5740dc328e4eeb4d9d3070e15416231d2a40071ab54fd86c'
+  data.tar.gz: ecf30cfa524aee407cd0898e5b84f4339e2d10a356ac6eacffaa92e8b5af88159f8c45ca574fed0290413dc070f71b229af641b7472f6b9d5c1aec62451426cd

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    schedule-cli (0.1.0)
+    schedule-cli (0.1.1)
       activesupport (~> 5.2)
       chronic
       google-api-client (~> 0.11)
       launchy
       nokogiri
+      parallel
       thor
 
 GEM
@@ -57,6 +58,7 @@ GEM
     nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     os (1.0.0)
+    parallel (1.12.1)
     public_suffix (3.0.2)
     rake (10.5.0)
     representable (3.0.4)

data/lib/schedule/availability_range.rb

@@ -4,12 +4,14 @@ require 'active_support/core_ext/numeric/time'
 
 module Schedule
   class AvailabilityRange
-    def initialize(start, end_, day_start:, day_end:, granularity: 5.minutes)
+    def initialize(start, end_, day_start:, day_end:, min_delay:, granularity: 5.minutes)
       @start = start
       @granularity = granularity
       @slots = Array.new(n_slots(start, end_)) do |i|
         dt = slot_to_datetime(i)
-        (dt.hour > day_start || (dt.hour == day_start && !dt.minute.zero?)) && (dt.hour < day_end || (dt.hour == day_end && dt.minute.zero?))
+        ((dt - DateTime.now).days >= min_delay.hours) &&
+          (dt.hour > day_start || (dt.hour == day_start && !dt.minute.zero?)) &&
+          (dt.hour < day_end || (dt.hour == day_end && dt.minute.zero?))
       end
     end
 

data/lib/schedule/calendar.rb

@@ -4,6 +4,7 @@ require 'active_support/core_ext/date'
 require 'active_support/core_ext/numeric/time'
 
 require 'launchy'
+require 'parallel'
 
 require 'google/apis/calendar_v3'
 require 'googleauth'
@@ -33,6 +34,7 @@ module Schedule
       range = AvailabilityRange.new(
         start.beginning_of_day,
         end_.end_of_day,
+        min_delay: @options[:min_delay],
         day_start: @options[:day][:start],
         day_end: @options[:day][:end],
       )
@@ -69,7 +71,6 @@ module Schedule
             end: Google::Apis::CalendarV3::EventDateTime.new(date: back_current.to_s),
           )
         else
-          events.concat get_events_for_date(back_current)
           buffer_back += 1
         end
       end
@@ -84,23 +85,24 @@ module Schedule
             end: Google::Apis::CalendarV3::EventDateTime.new(date: forward_current.to_s),
           )
         else
-          events.concat get_events_for_date(forward_current)
           buffer_forward += 1
         end
       end
 
+      events.concat get_events_for_dates(back_current, forward_current)
+
       [[back_current, forward_current], events.uniq]
     end
 
-    def get_events_for_date(date)
-      @options[:calendars].flat_map do |calendar|
+    def get_events_for_dates(from, to)
+      Parallel.map(@options[:calendars], in_threads: @options[:calendars].length) do |calendar|
         @service.list_events(
           calendar,
           single_events: true,
-          time_min: date.beginning_of_day.iso8601,
-          time_max: date.end_of_day.iso8601,
+          time_min: from.beginning_of_day.iso8601,
+          time_max: to.end_of_day.iso8601,
         ).items
-      end
+      end.flatten
     end
 
     def authorize!

data/lib/schedule/cli.rb

@@ -21,7 +21,7 @@ module Schedule
     method_option :debug, type: :boolean, default: false
     def availability(type = nil, *offset_string)
       config = Config.values.slice(:calendars, :day).merge(Config.value(:defaults))
-      if /\A\d+\z/.match(type)
+      if /\A\d+\z/.match?(type)
         config[:duration] = type.to_i
       else
         config.merge!(Config.value(:events, type&.to_sym) || {})
@@ -31,9 +31,9 @@ module Schedule
       elsif config[:day_offset].is_a?(String)
         config[:day_offset] = parse_offset config[:day_offset]
       end
-      puts "#{config}" if options.debug?
+      puts config.to_s if options.debug?
       slots = Schedule::Calendar.new(config).free_slots
-      print_with_options format_free_slots(slots)
+      print_with_options "#{format_free_slots(slots)}<br/>#{Config.value(:footer)}"
     end
 
     desc 'config', 'open config file in default editor'
@@ -59,6 +59,7 @@ module Schedule
     end
 
     def format_free_slots(slots)
+      return "<b style='color: red;'>No free slots!</b>" unless slots.present?
       dates = Hash.new { |h, k| h[k] = [] }
       slots.each do |(s, e)|
         dates[s.to_date] << "#{s.strftime('%-l:%M %p')} to #{e.strftime('%-l:%M %p')}"

data/lib/schedule/config.rb

@@ -13,15 +13,17 @@ module Schedule
         end: 18,
       },
       defaults: {
+        align_to: 15,
         day_offset: 'next weekday',
         day_buffer: 1,
         duration: 30,
-        align_to: 15,
+        min_delay: 4,
       },
       events: {
         call: { duration: 30 },
         coffee: { duration: 60 },
       },
+      footer: nil,
     }.freeze
 
     def self.file(*args)

data/lib/schedule/version.rb

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

data/schedule-cli.gemspec

@@ -27,9 +27,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
 
   spec.add_dependency 'activesupport', '~> 5.2'
+  spec.add_dependency 'chronic'
   spec.add_dependency 'google-api-client', '~> 0.11'
   spec.add_dependency 'launchy'
   spec.add_dependency 'nokogiri'
+  spec.add_dependency 'parallel'
   spec.add_dependency 'thor'
-  spec.add_dependency 'chronic'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schedule-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yasyf Mohamedali
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2018-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: chronic
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="