toggl 0.1.0 → 0.1.1

data/README.rdoc

@@ -3,17 +3,14 @@
 Toggl API wrapper in a Ruby gem
 
 https://www.toggl.com
+
 https://www.toggl.com/public/api
 
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
+== toggl command
+
+If you want to create new tasks from the command line, make sure you create ~/.toggl file containing nothing but your API key.
+
+run 'toggl' to see all options.
 
 == Copyright
 

data/lib/toggl.rb

@@ -6,18 +6,20 @@ class Toggl
   include HTTParty
   base_uri "https://toggl.com"
   format :json
-  # debug_output
   
-  attr_reader :name
+  attr_reader :name, :api_token
   
-  def initialize(token, name="toggl-gem")
-    self.class.default_params :output => 'json', :api_token => 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 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}, 
@@ -26,15 +28,15 @@ class Toggl
                     :start => start(params[:start]), 
                     :duration => duration(params[:duration])})
                     
-    self.class.post("/api/tasks.json", :body => {:task => params})
+    post 'tasks', {:task => params}
   end
   
   def create_project(params={}, workspace=nil)
     workspace ||= default_workspace_id
-    if project = self.class.post("/api/projects.json", :body => {
+    if project = post("projects", 
                       :project => {:name => params[:project], 
                                    :workspace => {:id => workspace}, 
-                                   :billable => (params[:billable] || true)}})
+                                   :billable => (params[:billable] || true)})
        project["id"]
      end
   end
@@ -68,14 +70,29 @@ class Toggl
   end
   
   def workspaces
-    self.class.get("/api/workspaces.json")
+    get 'workspaces'
   end
   
   def tasks
-    self.class.get("/api/tasks.json")
+    get 'tasks'
   end
   
   def projects
-    self.class.get("/api/projects.json")
+    get 'projects'
   end
-end
+  
+  private
+  
+  def get(resource_name)
+    self.class.get("/api/v1/#{resource_name}.json", :basic_auth => basic_auth)
+  end
+  
+  def post(resource_name, data)
+    self.class.post("/api/v1/#{resource_name}.json", :body => data, :basic_auth => basic_auth)
+  end
+    
+  def basic_auth
+    {:username => self.api_token, :password => "api_token"}
+  end
+  
+end

data/lib/toggl_cmd/runner.rb

@@ -8,7 +8,7 @@ module TogglCmd
       options = RunnerOptions.new(args)
       if options.any?
         token = IO.readlines(File.expand_path("~/.toggl")).join
-        Toggl.new(token).create_task(options)
+        Toggl.new(token, "toggl-gem", options.delete(:debug)).create_task(options)
       else
         puts options.opts
       end

data/lib/toggl_cmd/runner_options.rb

@@ -25,6 +25,10 @@ module TogglCmd
           self[:start] = date
         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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: toggl
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Koen Van der Auwera
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 +01:00
+date: 2010-02-25 00:00:00 +01:00
 default_executable: toggl
 dependencies: 
 - !ruby/object:Gem::Dependency