xoggl 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7b3485f9eb4edb7339c734264e8d3009a13fb64
-  data.tar.gz: 9de67a70b3ffb000e93e4f15b47f1af786173269
+  metadata.gz: be8b9ab30bce7f035c70a3929495943ad549e0d5
+  data.tar.gz: 1f1ce7378b30bee853abb3c33dbe19563193fac7
 SHA512:
-  metadata.gz: ea869a02f8271bd857e9ef129160209bd77660752b7f45cebce7ebed8ad941a64998c2c72ed2c61fe9aac06255ed86916015c713dfc6e06cb7c0baf9b3ace9cf
-  data.tar.gz: d9e467955c1eb680c2aaef63de7f491cd566bc5973ba0d58eeb74a21676439d3e7682f38f95ce64b2fa620d8ee86c6757d73fb385c90695bb47341d863ca1fe9
+  metadata.gz: f10f9dee4f42c14be00edc573d73bfaeea94ec13b10afe189a0c46109a3ec12df689e2e701818fa07e191ea4b91f19beaff5cfc93086e1b663b3a41e8b576e6d
+  data.tar.gz: a5cd959a91021972083af124b1ef371ac7c7916bf37b5c3e550d25722efc62a525310143199b308d237408640615f75f8994bdd5765bc76e6b2bad33a72f70de

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xoggl (1.0.0)
+    xoggl (1.2.0)
       awesome_print
       gli
       holidays

data/bin/xoggl

@@ -7,19 +7,31 @@ require 'xoggl'
 include GLI::App
 
 program_desc 'A simple Toggl cli'
+version Xoggl::VERSION
 
 pre do
-  @xoggl = Xoggl::Client.new
+  token_file = File.join(Dir.home, '.toggl')
+  api_token = IO.read(token_file).strip if File.file?(token_file)
+  exit_now!('Please create a `~/.toggl` file containing your API token (found in your Toggl profile https://toggl.com/app/profile)') if api_token.nil? || api_token.empty?
+
+  @xoggl = Xoggl::Client.new(api_token)
 end
 
-desc 'track days entries for a project'
+desc 'Track days entries for a project'
+long_desc 'Example: xoggl work \'My Project\' 2017-02-03 2017-02-15'
+arg '<project_name>'
+arg '<start_date>'
+arg '<end_date>'
 command :work do |c|
   c.action do |_, _, args|
     @xoggl.log_work(args[1], args[2], args[0])
   end
 end
 
-desc 'track days entries for vacation'
+desc 'Track days entries for vacation'
+long_desc 'Example: xoggl vacation 2017-02-03 2017-02-15'
+arg '<start_date>'
+arg '<end_date>'
 command :vacation do |c|
   c.action do |_, _, args|
     @xoggl.log_vacation(args[0], args[1])

data/lib/xoggl/client.rb

@@ -3,8 +3,8 @@ require 'holidays'
 
 module Xoggl
   class Client
-    def initialize(toggl = TogglV8::API.new)
-      @toggl = toggl
+    def initialize(api_token)
+      @toggl = TogglV8::API.new(api_token)
       @zone_offset = Time.now.utc_offset / 3600
     end
 

data/lib/xoggl/version.rb

@@ -1,3 +1,3 @@
 module Xoggl
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/spec/lib/xoggl/client_spec.rb

@@ -1,7 +1,9 @@
+TEST_API_TOKEN = '9b07c50c5126baf8c2d263b3dbfde3ee'
+
 describe Xoggl::Client do
   before :all do
-    @toggl = TogglV8::API.new('9b07c50c5126baf8c2d263b3dbfde3ee')
-    @client = Xoggl::Client.new(@toggl)
+    @client = Xoggl::Client.new(TEST_API_TOKEN)
+    @toggl = TogglV8::API.new(TEST_API_TOKEN)
     @workspace_id = @toggl.workspaces.first['id']
 
     @toggl.create_project('name' => 'Assenza', 'wid' => @workspace_id)
@@ -9,15 +11,11 @@ describe Xoggl::Client do
   end
 
   after :all do
-    delete_all_projects(@toggl, @workspace_id)
-    projects = @toggl.my_projects
-    expect(projects).to be_empty
+    delete_projects
   end
 
   after :each do
-    entries.each do |entry|
-      @toggl.delete_time_entry(entry['id'])
-    end
+    delete_entries
   end
 
   context 'vacation' do
@@ -71,15 +69,23 @@ describe Xoggl::Client do
     end
   end
 
+  private
+
+  def delete_entries
+    entries.each do |entry|
+      @toggl.delete_time_entry(entry['id'])
+    end
+  end
+
   def entries
     @toggl.get_time_entries(start_date: '2016-01-01', end_date: '2016-01-09')
   end
 
-  def delete_all_projects(toggl, workspace_id)
-    projects = toggl.projects(workspace_id)
+  def delete_projects
+    projects = @toggl.projects(@workspace_id)
     project_ids = projects.map { |p| p['id'] }
     return if project_ids.empty?
 
-    toggl.delete_projects(project_ids)
+    @toggl.delete_projects(project_ids)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xoggl
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Filippo Liverani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler