time_overlap 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac731a50647898c03ac78d6a3b28f0035a8cd084
-  data.tar.gz: 51e0cfb23c2e9e37dfc7fd986e82e0f495d2baa9
+  metadata.gz: e669bba185d150189f3a3b3d39a5e2580fe504a8
+  data.tar.gz: 040f0a671e8033280f98dd97e9835fa48e65c21c
 SHA512:
-  metadata.gz: af67e6cc0e4fa6bc52e8356f56a3ac99dda323c8716ef36f23ffe356ed05c67748084428850303fd527341e37a74669aacd3b87eb3cb032932e04db3c9b834d1
-  data.tar.gz: 168fdc74d095e38b911009a55a74d6856098d5bad729b133f1e7955103a66f56d879cad97bcaeb1a7078d3b68fbe6b441631c1672cce86c4b856901f092370ed
+  metadata.gz: 2b60df8d43e896651ea4ad0eb24b2a1f087dc8688360d669e3d20999881fa5d8685c2a3de1129d5e1d967228daa6c0b84fb29e4dff4be08dd92a8c7a9f31d92b
+  data.tar.gz: 67daa85fa3d19669f63b89386f30cf06dc48d09ae7677ba3b0a48b8cbcaa15ec73778ab0e1e1fca1c90f8051c9976a7261352f3c218ac04b257597ce3e46cf86

data/Gemfile.lock

@@ -1,21 +1,23 @@
 PATH
   remote: .
   specs:
-    time_overlap (0.1.0)
+    time_overlap (0.1.1)
       activesupport
+      colorize
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.2)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    concurrent-ruby (1.1.4)
+    colorize (0.8.1)
+    concurrent-ruby (1.1.5)
     diff-lcs (1.3)
-    i18n (1.5.3)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     minitest (5.11.3)
     rake (10.5.0)
@@ -42,11 +44,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.0)
   rake (~> 10.0)
   rspec (~> 3.0)
   time_overlap!
   timecop
 
 BUNDLED WITH
-   1.16.5
+   2.0.1

data/README.md

@@ -1,8 +1,21 @@
 # TimeOverlap
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/time_overlap`. To experiment with that code, run `bin/console` for an interactive prompt.
+TODO: Add meeting time!!!!!!!!!!!!!!!!!!!
 
-TODO: Delete this and the text above, and describe your gem
+Simple command line tool that allows to find overlap hours between two time zones, with visualization.
+
+```
+$ time_overlap count 8 16 +00:00 Bangkok 4
+```
+
+![screenshot](http://i68.tinypic.com/mi1npd.png)
+
+Assuming that you are in Bangkok and the target time zone is UTC +0
+and you want to cover 4 hours - from 8:00 to 16:00.
+
+In most cases it suggests 2 options (cover first 4 hours: 8-12 or last: 12-16).
+
+More info: https://www.daxx.com/blog/offshore-team/time-difference-offshore-development
 
 ## Installation
 
@@ -22,7 +35,6 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
 
 ## Development
 

data/lib/time_overlap.rb

@@ -1,111 +1,11 @@
+require 'time'
+require 'active_support/core_ext/time'
+
 require "time_overlap/version"
 require "time_overlap/presenter"
 require "time_overlap/cli"
-require 'time'
-require 'active_support/core_ext/time'
+require "time_overlap/calculator"
 
 module TimeOverlap
-  class Calculator
-
-    # TODO: add meeting time to choose overlap 1 or overlap 2
-
-    def initialize(from:, to:, time_zone:, my_time_zone:, min_overlap:)
-      @current_year = Time.current.year
-      @current_month = Time.current.month
-      @current_day = Time.current.day
-      @from = from
-      @to = to
-      @time_zone = time_zone
-      @my_time_zone = my_time_zone
-      @min_overlap = min_overlap
-
-      @duration = (end_time - start_time).to_i / 60 / 60
-
-      @data = {}
-    end
-
-    def self.count(*args)
-      self.new(*args).execute
-    end
-
-    def execute
-      offset = duration - min_overlap
-
-      start_time_in_my_time_zone = start_time.in_time_zone(my_time_zone)
-      end_time_in_my_time_zone = end_time.in_time_zone(my_time_zone)
-
-      x_start_time = (start_time - offset * 60 * 60).in_time_zone(my_time_zone)
-      x_end_time = (end_time - offset * 60 * 60).in_time_zone(my_time_zone)
-
-      y_start_time = (end_time - min_overlap * 60 * 60).in_time_zone(my_time_zone)
-      y_end_time = (y_start_time + duration * 60 * 60).in_time_zone(my_time_zone)
-
-      @data = {
-        original: {
-          start: start_time,
-          end: end_time
-        },
-        full_overlap: {
-          start: start_time_in_my_time_zone,
-          end: end_time_in_my_time_zone
-        },
-        overlap_1: {
-          start: x_start_time,
-          end: x_end_time
-        },
-        overlap_2: {
-          start: y_start_time,
-          end: y_end_time
-        }
-      }
-
-      check
-      Presenter.new(@data).generate_output
-      @data
-    end
-
-    private
-
-    attr_reader(
-      :current_year,
-      :current_month,
-      :current_day,
-      :from,
-      :to,
-      :time_zone,
-      :my_time_zone,
-      :min_overlap,
-      :data,
-      :duration
-    )
-
-    def start_time
-      @start_time ||= Time.new(
-        current_year,
-        current_month,
-        current_day,
-        from,
-        0,
-        0,
-        Time.zone_offset(time_zone)
-      )
-    end
-
-    def end_time
-      @end_time ||= Time.new(
-        current_year,
-        current_month,
-        current_day,
-        to,
-        0,
-        0,
-        Time.zone_offset(time_zone)
-      )
-    end
 
-    def check
-      raise "Wrong Overlap 1" unless (data[:overlap_1][:end] - data[:overlap_1][:start]).to_i / 60 / 60 == duration
-      raise "Wrong Overlap 2" unless (data[:overlap_2][:end] - data[:overlap_2][:start]).to_i / 60 / 60 == duration
-    end
-  end
 end

data/lib/time_overlap/calculator.rb

@@ -0,0 +1,112 @@
+module TimeOverlap
+  class Calculator
+
+    def initialize(from:, to:, time_zone:, my_time_zone:, min_overlap:)
+      @current_year = Time.current.year
+      @current_month = Time.current.month
+      @current_day = Time.current.day
+      @from = from
+      @to = to
+      @time_zone = time_zone
+      @my_time_zone = my_time_zone
+      @min_overlap = min_overlap
+      @start_time = set_time(from)
+      @end_time = set_time(to)
+      @duration = (end_time - start_time).to_i / 60 / 60
+
+      @data = {}
+    end
+
+    def self.count(*args)
+      self.new(*args).execute
+    end
+
+    def execute
+      offset = duration - min_overlap
+
+      start_time_in_my_time_zone = start_time.in_time_zone(my_time_zone)
+      end_time_in_my_time_zone = end_time.in_time_zone(my_time_zone)
+
+      x_start_time = (start_time - offset * 60 * 60).in_time_zone(my_time_zone)
+      x_end_time = (end_time - offset * 60 * 60).in_time_zone(my_time_zone)
+
+      y_start_time = (end_time - min_overlap * 60 * 60).in_time_zone(my_time_zone)
+      y_end_time = (y_start_time + duration * 60 * 60).in_time_zone(my_time_zone)
+
+      @data = {
+        original: {
+          start: start_time,
+          end: end_time
+        },
+        full_overlap: {
+          start: start_time_in_my_time_zone,
+          end: end_time_in_my_time_zone
+        },
+        overlap_1: {
+          start: x_start_time,
+          end: x_end_time
+        },
+        overlap_2: {
+          start: y_start_time,
+          end: y_end_time
+        }
+      }
+
+      puts @data.inspect
+
+      if x_start_time == y_start_time && x_end_time == y_end_time
+        @data.delete(:overlap_2)
+      end
+
+      throw_errors!
+      Presenter.new(@data).generate_output
+    end
+
+    private
+
+    attr_reader(
+      :start_time,
+      :end_time,
+      :from,
+      :to,
+      :time_zone,
+      :my_time_zone,
+      :min_overlap,
+      :data,
+      :duration
+    )
+
+    def set_time(hour)
+      offset = Time.zone_offset(time_zone)
+
+      if offset.nil?
+        zone = ActiveSupport::TimeZone[time_zone]
+        offset = zone.utc_offset
+      end
+
+      raise 'Wrong time_zone' if offset.nil?
+
+      Time.new(
+        @current_year,
+        @current_month,
+        @current_day,
+        hour,
+        0,
+        0,
+        offset
+      )
+    end
+
+    def throw_errors!
+      if @min_overlap > @duration
+        raise "Min overlap must be lower that duration"
+      end
+
+      raise "Wrong Overlap 1" unless (data[:overlap_1][:end] - data[:overlap_1][:start]).to_i / 60 / 60 == duration
+
+      if data[:overlap_2] && (data[:overlap_2][:end] - data[:overlap_2][:start]).to_i / 60 / 60 != duration
+        raise "Wrong Overlap 2"
+      end
+    end
+  end
+end

data/lib/time_overlap/presenter.rb

@@ -1,6 +1,17 @@
+require 'colorize'
+
 module TimeOverlap
   class Presenter
 
+    AM = "AM ".freeze
+    PM = " PM".freeze
+    NOON = " 12:00 "
+    SIX_AM = " 6:00 "
+    SIX_PM = " 6:00 "
+
+    AVAILABLE_SLOT = "|█| "
+    EMPTY_SLOT = "[ ] "
+
     def initialize(data, format = '%T%:z')
       @data   = data
       @format = format
@@ -10,85 +21,114 @@ module TimeOverlap
       new(*args).generate_output
     end
 
-    def show_it(s, e)
-      print"|AM| "
-      # puts (s.hour..e.hour).inspect
+    def generate_output
+      puts "Original:"
+      puts "#{formated_time(@data[:original][:start], false)} - #{formated_time(@data[:original][:end])}".green
+      timeline(@data[:original][:start], @data[:original][:end])
+      puts "Full overlap:"
+      puts "#{formated_time(@data[:full_overlap][:start], false)} - #{formated_time(@data[:full_overlap][:end])}".green
+      timeline(@data[:full_overlap][:start], @data[:full_overlap][:end])
+      puts "Overlap 1:"
+      puts "#{formated_time(@data[:overlap_1][:start], false)} - #{formated_time(@data[:overlap_1][:end])}".green
+      timeline(@data[:overlap_1][:start], @data[:overlap_1][:end])
+
+      if @data[:overlap_2]
+        puts "Overlap 2:"
+        puts "#{formated_time(@data[:overlap_2][:start], false)} - #{formated_time(@data[:overlap_2][:end])}".green
+        timeline(@data[:overlap_2][:start], @data[:overlap_2][:end])
+      end
+
+      @data
+    end
+
+    private
+
+    def separator
+      puts (" " * 102)
+    end
+
+    def formated_time(time, zone=true)
+      format = "%T"
+      format.concat(" (%:z)") if zone
+      time.strftime(format)
+    end
+
+    def get_color(hour)
+      case hour
+        when 0..5
+          then :blue
+        when 6..7
+          then :light_blue
+        when 8..17
+          then :light_yellow
+        when 18..21
+          then :light_blue
+        when 22..23
+          then :blue
+      end
+
+    end
+
+    def with_color(string, hour)
+      string.colorize(get_color(hour))
+    end
 
+    def timeline(start_time, end_time)
+      print "    "
       (0..23).each do |hour|
-        print ' |NOON| ' if hour == 12
+        printf("%-4s", hour)
+      end
+
+      puts ""
 
-        if s.hour < e.hour
-          if (s.hour..e.hour).cover?(hour)
-            if e.hour != hour
-              print "[✓]"
+      print AM
+
+      (0..23).each do |hour|
+        # print NOON if hour == 12
+        # print SIX_AM if hour == 6
+        # print SIX_PM if hour == 18
+
+        if start_time.hour < end_time.hour
+          if (start_time.hour..end_time.hour).cover?(hour)
+            if end_time.hour != hour
+              print with_color(AVAILABLE_SLOT, hour)
             else
-              print "[ ]"
+              print with_color(EMPTY_SLOT, hour)
             end
           else
-            print "[ ]"
+            print with_color(EMPTY_SLOT, hour)
           end
         else
-          if s.hour <= 12
-            if (e.hour..s.hour).cover?(hour)
-              if e.hour != hour
-                print "[✓]"
+          if start_time.hour <= 12
+            if (end_time.hour..start_time.hour).cover?(hour)
+              if end_time.hour != hour
+                print with_color(AVAILABLE_SLOT, hour)
               else
-                print "[ ]"
+                print with_color(EMPTY_SLOT, hour)
               end
             else
-              print "[ ]"
+              print with_color(EMPTY_SLOT, hour)
             end
           else
-            if (e.hour..s.hour).cover?(hour)
-              print "[ ]"
+            if (end_time.hour..start_time.hour).cover?(hour)
+              if (start_time.hour == hour)
+                print with_color(AVAILABLE_SLOT, hour)
+              else
+                print with_color(EMPTY_SLOT, hour)
+              end
             else
-              if e.hour != hour
-                print "[✓]"
+              if end_time.hour != hour
+                print with_color(AVAILABLE_SLOT, hour)
               else
-                print "[ ]"
+                print with_color(EMPTY_SLOT, hour)
               end
             end
           end
         end
-
       end
-      print " |PM|"
+      print PM
       puts ""
       separator
     end
-
-    def generate_output
-      puts "Original:"
-      puts "#{formated_time(@data[:original][:start])} - #{formated_time(@data[:original][:end])}"
-
-      separator
-
-      puts "Full overlap:"
-      puts "#{formated_time(@data[:full_overlap][:start])} - #{formated_time(@data[:full_overlap][:end])}"
-
-      show_it(@data[:full_overlap][:start], @data[:full_overlap][:end])
-
-      puts "Overlap 1:"
-      puts "#{formated_time(@data[:overlap_1][:start])} - #{formated_time(@data[:overlap_1][:end])}"
-
-      show_it(@data[:overlap_1][:start], @data[:overlap_1][:end])
-
-      puts "Overlap 2:"
-      puts "#{formated_time(@data[:overlap_2][:start])} - #{formated_time(@data[:overlap_2][:end])}"
-
-      show_it(@data[:overlap_2][:start], @data[:overlap_2][:end])
-
-      @data
-    end
-
-    private
-
-    def separator
-      puts "_" * 40
-    end
-
-    def formated_time(time)
-      time.strftime("%T %:z")
-    end
   end
 end

data/lib/time_overlap/version.rb

@@ -1,3 +1,3 @@
 module TimeOverlap
- VERSION = "0.1.1"
+ VERSION = "0.1.2"
 end

data/time_overlap.gemspec

@@ -32,8 +32,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport'
   spec.add_dependency 'thor'
+  spec.add_dependency 'colorize'
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "timecop"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_overlap
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Rafał Trojanowski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-27 00:00:00.000000000 Z
+date: 2019-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,20 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +130,7 @@ files:
 - bin/setup
 - exe/time_overlap
 - lib/time_overlap.rb
+- lib/time_overlap/calculator.rb
 - lib/time_overlap/cli.rb
 - lib/time_overlap/presenter.rb
 - lib/time_overlap/version.rb