toggl 0.2.0 → 0.2.1

data/lib/toggl.rb

@@ -6,55 +6,59 @@ class Toggl
   include HTTParty
   base_uri "https://toggl.com"
   format :json
-  
+
   attr_reader :name, :api_token
-  
+
   def initialize(token, name="toggl-gem", debug=false)
     self.class.default_params :output => 'json'
     @api_token = token
     @name = name
     self.class.debug_output if debug
   end
-    
+
+  def delete_task(task_id)
+    delete 'tasks', task_id
+  end
+
   def create_task(params={})
     workspace   = params[:workspace] || default_workspace_id
     project_id  = find_project_id(params[:project]) || create_project(params, workspace)
     params[:billable] = true
-    
-    params.merge!({ :created_with => name, 
-                    :workspace => {:id => workspace}, 
-                    :project => {:id => project_id}, 
-                    :tag_names => [name], 
-                    :start => start(params[:start]), 
+
+    params.merge!({ :created_with => name,
+                    :workspace => {:id => workspace},
+                    :project => {:id => project_id},
+                    :tag_names => [name],
+                    :start => start(params[:start]),
                     :duration => duration(params[:duration])})
-                    
+
     post 'tasks', {:task => params}
   end
-  
+
   def create_project(params={}, workspace=nil)
     workspace ||= default_workspace_id
-    if project = post("projects", 
-                      :project => {:name => params[:project], 
-                                   :workspace => {:id => workspace}, 
+    if project = post("projects",
+                      :project => {:name => params[:project],
+                                   :workspace => {:id => workspace},
                                    :billable => (params[:billable] || true)})
        project["id"]
      end
   end
-  
+
   def default_workspace_id
     self.workspaces.first["id"]
   end
-  
+
   def find_project_id(str)
     if project = self.projects.find{|project| project["client_project_name"].downcase =~ /#{str}/}
       project["id"]
     end
   end
-  
+
   def duration(str)
     str ? ChronicDuration.parse(str) : 1800
   end
-  
+
   def start(value)
     if value
       case value
@@ -68,31 +72,35 @@ class Toggl
       DateTime.now
     end
   end
-  
+
   def workspaces
     get 'workspaces'
   end
-  
+
   def tasks(params={})
     get 'tasks', params
   end
-  
+
   def projects
     get 'projects'
   end
-  
+
   private
-  
+
   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)
     self.class.post("/api/v1/#{resource_name}.json", :body => data, :basic_auth => basic_auth)
   end
-    
+
+  def delete(resource_name, id)
+    self.class.delete("/api/v1/#{resource_name}/#{id}.json", :basic_auth => basic_auth)
+  end
+
   def basic_auth
     {:username => self.api_token, :password => "api_token"}
   end
-  
+
 end

data/lib/toggl_cmd/runner.rb

@@ -2,36 +2,40 @@ require "optparse"
 require "chronic_duration"
 
 module TogglCmd
-  
+
   NAME = "toggl-gem"
   PROJECT_FIELDS = %w(client name)
-  TASK_FIELDS = %w(project description start duration billable)
-  
+  TASK_FIELDS = %w(id 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[:tasks]
         prettify_tasks(Toggl.new(token, NAME).tasks)
-      elsif options[:projects]        
+      elsif options[:projects]
         prettify_projects(Toggl.new(token, NAME).projects)
-      elsif options.any?        
+      elsif options[:delete]
+        toggl = Toggl.new(token, NAME)
+        toggl.delete_task(options[:delete])
+        prettify_tasks(toggl.tasks)
+      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| 
+      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")
+        value["start"] = value["start"].strftime("%d/%m/%Y")
       end
       values.view(:class => :table, :fields => TASK_FIELDS)
     end
@@ -39,7 +43,7 @@ module TogglCmd
     def self.prettify_projects(values)
       values.view(:class => :table, :fields => PROJECT_FIELDS)
     end
-            
+
   end
 
-end
+end

data/lib/toggl_cmd/runner_options.rb

@@ -1,5 +1,5 @@
 module TogglCmd
-  
+
   class RunnerOptions < Hash
     attr_reader :opts
 
@@ -24,7 +24,7 @@ module TogglCmd
         o.on('-d', '--date DATE', 'When exactly did it happen?') do |date|
           self[:start] = date
         end
-        
+
         o.on('--tasks', 'Show tasks') do |tasks|
           self[:tasks] = tasks
         end
@@ -32,15 +32,19 @@ module TogglCmd
         o.on('--projects', 'Show projects') do |projects|
           self[:projects] = projects
         end
-        
+
+        o.on('--delete TASK_ID', 'Delete tasks with id') do |task_id|
+          self[:delete] = task_id
+        end
+
         o.on('-v', '--verbose', 'What\'s happening?') do |debug|
           self[:debug] = debug
         end
-        
+
         o.on_tail('-h', '--help', 'Display this help and exit') do
           puts @opts
           exit
-        end        
+        end
 
       end
 
@@ -50,6 +54,6 @@ module TogglCmd
         self[:invalid_argument] = e.message
       end
     end
-    
+
   end
-end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: toggl
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Koen Van der Auwera
@@ -9,39 +14,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-16 00:00:00 +01:00
+date: 2010-06-23 00:00:00 +02:00
 default_executable: toggl
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: httparty
+  name: crack
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 7
+        version: 0.1.7
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: httparty
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.2
-    version: 
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: chronic_duration
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 0
         version: 0.9.0
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hirb
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 1
         version: 0.3.1
-    version: 
+  type: :runtime
+  version_requirements: *id004
 description: Toggl provides a simple REST-style JSON API over standard HTTP - http://www.toggl.com
 email: koen@atog.be
 executables: 
@@ -70,18 +101,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Toggl api ruby gem