toggl 0.1.1 → 0.2.0

data/bin/toggl

@@ -6,5 +6,8 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'toggl'
 require 'toggl_cmd/runner'
 require 'toggl_cmd/runner_options'
+require 'hirb'
+require 'hirb/import_object'
 
+Hirb.enable
 TogglCmd::Runner.toggl(ARGV)

data/lib/toggl.rb

@@ -73,8 +73,8 @@ class Toggl
     get 'workspaces'
   end
   
-  def tasks
-    get 'tasks'
+  def tasks(params={})
+    get 'tasks', params
   end
   
   def projects
@@ -83,8 +83,8 @@ class Toggl
   
   private
   
-  def get(resource_name)
-    self.class.get("/api/v1/#{resource_name}.json", :basic_auth => basic_auth)
+  def get(resource_name, data={})
+    self.class.get("/api/v1/#{resource_name}.json", :basic_auth => basic_auth, :query => data)
   end
   
   def post(resource_name, data)

data/lib/toggl_cmd/runner.rb

@@ -1,19 +1,45 @@
 require "optparse"
+require "chronic_duration"
 
 module TogglCmd
   
+  NAME = "toggl-gem"
+  PROJECT_FIELDS = %w(client name)
+  TASK_FIELDS = %w(project description start duration billable)
+  
   class Runner
     
     def self.toggl(args)
+      token = IO.readlines(File.expand_path("~/.toggl")).join.strip
       options = RunnerOptions.new(args)
-      if options.any?
-        token = IO.readlines(File.expand_path("~/.toggl")).join
-        Toggl.new(token, "toggl-gem", options.delete(:debug)).create_task(options)
+      if options[:tasks]
+        prettify_tasks(Toggl.new(token, NAME).tasks)
+      elsif options[:projects]        
+        prettify_projects(Toggl.new(token, NAME).projects)
+      elsif options.any?        
+        prettify_tasks(Toggl.new(token, NAME, options.delete(:debug)).create_task(options))
       else
         puts options.opts
       end
     end
-        
+    
+    private
+    
+    def self.prettify_tasks(values)
+      values = [values] unless values.is_a?(Array)
+      values.each do |value| 
+        value["project"]    = value["project"]["name"]
+        value["workspace"]  = value["workspace"]["name"]
+        value["duration"] = ChronicDuration.output(value["duration"].to_i, :format => :short)
+        value["start"] = DateTime.parse(value["start"]).strftime("%d/%m/%Y")
+      end
+      values.view(:class => :table, :fields => TASK_FIELDS)
+    end
+
+    def self.prettify_projects(values)
+      values.view(:class => :table, :fields => PROJECT_FIELDS)
+    end
+            
   end
-  
+
 end

data/lib/toggl_cmd/runner_options.rb

@@ -25,6 +25,14 @@ module TogglCmd
           self[:start] = date
         end
         
+        o.on('--tasks', 'Show tasks') do |tasks|
+          self[:tasks] = tasks
+        end
+
+        o.on('--projects', 'Show projects') do |projects|
+          self[:projects] = projects
+        end
+        
         o.on('-v', '--verbose', 'What\'s happening?') do |debug|
           self[:debug] = debug
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: toggl
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Koen Van der Auwera
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 +01:00
+date: 2010-03-16 00:00:00 +01:00
 default_executable: toggl
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hirb
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.1
+    version: 
 description: Toggl provides a simple REST-style JSON API over standard HTTP - http://www.toggl.com
 email: koen@atog.be
 executables: