toggl_cli 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f921feb5c6cf10b6b9e5916f9fec61a94c1ee2dd3126872e8fb8fbb4e8591566
-  data.tar.gz: 9a0361b9820ea32fd3db5d25f4a175f0ee71cf3ee1927a57b9eeaad18449ca78
+  metadata.gz: 3fc24cda91244babd028aad50e489902d8439d09ff28732c9b30542400cb8874
+  data.tar.gz: d954b78521ee467b2306ee3398352aaa897fb98d7d91625cae7802f5b7a94841
 SHA512:
-  metadata.gz: 654c6d0f915f714224df133fd12ab07f745d2f3e7acf9b50d94909dcd916b87064725ddb4e1cacfa6daf4cbc83a39055a1030c1fcabab3cd40af9cc88866ce10
-  data.tar.gz: 4e103afcfc01b80d75931ab4e5defc2620e037b0bc092536374c4efe7f04d7fe5fd07c1255f70a53cd0ea2ab76c801c126a1b81053c8ac455d7a26d332ed9b57
+  metadata.gz: f0bb0404cdfc0cc5124da5712bc51a693469ca8cb40b899de8b58cf55276e7f43171599cce565d33e141d3ba0ae1f27e4a00875505c3076cc05592984dbc88df
+  data.tar.gz: 1e608760d907149ea455ce3d5440bf095e1480e5336788f20136c136df5b88c4fc10057ff5a46a1a07a6e5cf6641d85e0b496b90417b31da9748674737a0e469

data/bin/toggl_cli

@@ -12,17 +12,28 @@ end
 
 case command
 when 'start'
-  project = ARGV[1]
-  description = ARGV[2]
-  @toggl_cli.start(project, description)
+  client = ARGV[1]
+  project = ARGV[2]
+  description = ARGV[3]
+  @toggl_cli.start(client, project, description)
   puts "Timer Started"
 when 'stop'
   result = @toggl_cli.stop
   duration = (result['duration'].to_i / 60.0).round(2)
   puts "Timer Stopped. Duration: #{duration} minutes."
 when 'today'
-  result = @toggl_cli.today
-  puts "You have logged #{result} minutes or #{(result/60.0).round(2)} hours today"
+  client = ARGV[1]
+  result = @toggl_cli.today(client)
+  puts result[:entries]
+  puts "You have logged #{result[:total]} minutes or #{(result[:total]/60.0).round(2)} hours today"
+when 'clients'
+  result = @toggl_cli.clients
+  puts result
+when 'projects'
+  result = @toggl_cli.projects
+  result.each do |r|
+    puts "#{r['id']} #{r['cid']} #{r['name']}"
+  end
 else
   puts "Uh-oh! I haven't learned that command yet"
 end

data/lib/toggl_cli.rb

@@ -12,11 +12,10 @@ class TogglCLI
     @workspace_id = @workspaces.first['id']
   end
 
-  def start(project, description)
-    pid = ""
-    if @config['projects'][project]
-      pid = @config['projects'][project]
-    end
+  def start(client, project, description)
+    cid = client(client)['id']
+    pid = project(cid, project)['id']
+
     time_entry  = @toggl_api.start_time_entry({
       'pid' => pid,
       'description' => "#{description}",
@@ -33,7 +32,18 @@ class TogglCLI
     end
   end
 
-  def today
+  def today(client = nil, project = nil)
+    pids = []
+    if client
+      cid = client(client)['id']
+      presult = projects
+      presult.each do |r|
+        if r['cid'] == cid
+          pids << r['id']
+        end
+      end
+    end
+    entries = []
     dates = {
       start_date: Time.parse(Date.today.to_s).to_s,
       end_date: Time.now.to_s
@@ -41,8 +51,53 @@ class TogglCLI
     total = 0
     result = @toggl_api.get_time_entries(dates)
     result.each do |r|
-      total = total + r['duration']
+      if (client && (pids.include? r['pid']))
+        entries << "#{r['duration']} - #{r['description']}"
+        total = total + r['duration']
+      end
+    end
+    {entries: entries, total: (total / 60.0).round(2)}
+  end
+
+  def clients
+    clients = []
+    result = @toggl_api.my_clients
+    result.each do |r|
+      clients << "#{r['id']} #{r['name']}"
+    end
+    clients
+  end
+ 
+  def client(name)
+    client = ""
+    result = @toggl_api.my_clients
+    result.each do |r|
+      if r['name'].downcase == name
+        client = r
+      end
+    end
+    client
+  end
+
+  def projects(client_id = nil)
+    projects = []
+    result = @toggl_api.my_projects
+    result.each do |r|
+      if r['cid']
+        projects << r
+      end
+    end
+    projects
+  end
+
+  def project(client_id, name)
+    project = ""
+    result = @toggl_api.my_projects
+    result.each do |r|
+      if r['cid'] == client_id && r['name'].downcase == name
+        project = r
+      end
     end
-    (total / 60.0).round(2)
+    project
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toggl_cli
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Blake Erickson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2019-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: togglv8
@@ -52,7 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A simple command line tool for toggl