totaltime 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 308f7df39a3bc151d353bb5d9d086fb0934831f2a0f565d088d069ce86fd0255
-  data.tar.gz: 1e5f8993aa40f057e2535b4c2a7eeb502bf8fe1ed08fd5512d68824978724b1f
+  metadata.gz: dfb8c01349f144eb6c3174d88e17189b0ffa14c541f5348c0afee0d5ab727d42
+  data.tar.gz: 1903a9ba6ccc5c37c1d397ba18fd9fdf5cb84725de663ac0b68d357ad5d9e0fb
 SHA512:
-  metadata.gz: 01d1ab0ee6caf5f829939096f51a9023b787f06023842c378de84b55fb87e2fc4b4c669f6bf1657006fb88ee64eecaf5a50ce2642d05f634fdac689a52ce3f22
-  data.tar.gz: 1c0620fc501f4c45f32bcbe0dd21be073a6ff94d23ca9b4a9d4aca8dcb1a6c224f69f7de2065dfef0c024a8c3d520aa360d1565695245d2355d2bd78b79e573f
+  metadata.gz: 9099a30045368857fe64714178a256bd46a74d1ca97be7772090e3c75cd050b3d52ea1b4154024e3ee5e4bb4efcbf670ff7a614db5b5f8e6c4780152fd338ef3
+  data.tar.gz: 920c993d45f1b63b45027de0ed8720ad20700207a2653a7459796c5b38915f82972d194eba5f0cf22317bfac467db446f485e68e7c6f083f2c0de8ef94c4dc4e

data/bin/totaltime

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
-require "cli"
+require_relative "../lib/cli.rb"
 CLI.run

data/lib/cli.rb

@@ -3,10 +3,11 @@ require "tempfile"
 require "readline"
 require "colorize"
 
-require "duration.rb"
+require_relative "./duration.rb"
 
 class CLI
     def self.run
+
         OptionParser.new do |parser| 
             parser.banner = "Usage: totaltime [options]"
 

data/lib/duration.rb

@@ -1,3 +1,5 @@
+require "time"
+
 class Duration
     attr_accessor :hours, :minutes
 
@@ -20,6 +22,10 @@ class Duration
         Duration.new(newHours, newMinutes)
     end
 
+    def total_minutes()
+        return @hours * 60 + @minutes
+    end
+
     def self.try_convert(str)
         floatValue = Float(str, exception: false)
         if floatValue
@@ -31,21 +37,47 @@ class Duration
             return newDuration if newDuration.valid?
         end
 
-        parts=str.split(":")
-        
-        return unless parts.length == 2
-        
-        parsedHours = Integer(parts[0], exception: false)
-        parsedMinutes = Integer(parts[1], exception: false)
-
-        parsedHours = parsedHours + (parsedMinutes / 60) if parsedHours != nil && parsedMinutes != nil
-        parsedHours = (parsedMinutes / 60) if parsedHours == nil && parsedMinutes != nil
-        return unless parsedHours != nil && parsedMinutes != nil
-
-        parsedMinutes = parsedMinutes % 60
-        
-        newDuration = Duration.new(parsedHours, parsedMinutes)
-        if newDuration.valid? then newDuration else nil end
+        if str.include?("-")
+            times = str.split("-")
+            times.map! { |t|  t + (t.include?(":") ? "" : ":00") }
+
+            begin
+                startTime = Time.parse(times[0])
+                endTime = Time.parse(times[1])
+            rescue 
+                return
+            end
+
+            minutesBetween = Integer((endTime - startTime) / 60, exception: false)
+            return unless minutesBetween != nil
+
+            parsedHours = minutesBetween / 60
+            parsedMinutes = minutesBetween % 60
+
+            newDuration = Duration.new(parsedHours, parsedMinutes)
+            if newDuration.valid? then newDuration else nil end
+        else
+            parts=str.split(":")
+            return unless parts.length == 2
+    
+            parsedHours = Integer(parts[0], exception: false)
+            parsedMinutes = Integer(parts[1], exception: false)
+    
+            return if parsedMinutes == nil
+            parsedHours = 0 if parsedHours == nil
+            parsedHours = parsedHours + (parsedMinutes / 60)
+    
+            parsedMinutes = parsedMinutes % 60
+            
+            newDuration = Duration.new(parsedHours, parsedMinutes)
+            if newDuration.valid? then newDuration else nil end
+        end
+    end
+
+    def self.from_minutes(mins)
+        newMinutes = mins % 60
+        newHours = mins / 60
+        Duration.new(newHours, newMinutes)
     end
 
     def to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: totaltime
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - NikxDa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies: []
 description: A beautiful timesheet calculator for the command line
 email: ''
@@ -20,6 +20,7 @@ files:
 - bin/totaltime
 - lib/cli.rb
 - lib/duration.rb
+- lib/parser.rb
 homepage: https://rubygems.org/gems/totaltime
 licenses:
 - MIT