xoggl 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: be8b9ab30bce7f035c70a3929495943ad549e0d5
-  data.tar.gz: 1f1ce7378b30bee853abb3c33dbe19563193fac7
+SHA256:
+  metadata.gz: 51dcb1a9e27c52da3b210c80ef818c0d57f41ed33b85d859a2dde57c2b03e0bf
+  data.tar.gz: a0b4eb51f895ceacbb6e75f42edbd0dc7f1800537c0e7ac1a0a8cc9cdbc211a4
 SHA512:
-  metadata.gz: f10f9dee4f42c14be00edc573d73bfaeea94ec13b10afe189a0c46109a3ec12df689e2e701818fa07e191ea4b91f19beaff5cfc93086e1b663b3a41e8b576e6d
-  data.tar.gz: a5cd959a91021972083af124b1ef371ac7c7916bf37b5c3e550d25722efc62a525310143199b308d237408640615f75f8994bdd5765bc76e6b2bad33a72f70de
+  metadata.gz: ff7ebd260227702e81508afc2df57c54c5b35dee565afda39a973ad96d879b235f25818106c82d6253becdc4d98619977ebe774f9d2ba5a87b2d03a42b38904b
+  data.tar.gz: 2c3f1e55057aa5ed247c96647c0098a19178ecf07c49ef0dfeb99a8d78d31d13705f90f515975a84ae14fa626a86072ce4364882c91f22c46762ba7acc0a0fc5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xoggl (1.2.0)
+    xoggl (1.4.0)
       awesome_print
       gli
       holidays
@@ -12,27 +12,27 @@ GEM
   specs:
     awesome_print (1.8.0)
     diff-lcs (1.3)
-    faraday (0.13.1)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    gli (2.16.1)
-    holidays (6.1.0)
-    logger (1.2.8)
-    multipart-post (2.0.0)
-    oj (3.3.5)
-    rake (12.0.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    gli (2.18.0)
+    holidays (7.1.0)
+    logger (1.3.0)
+    multipart-post (2.1.1)
+    oj (3.7.12)
+    rake (12.3.2)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     togglv8 (1.2.1)
       faraday
       logger
@@ -42,11 +42,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
   rake
   rspec
   rspec-mocks
   xoggl!
 
 BUNDLED WITH
-   1.15.4
+   2.0.1

data/bin/xoggl

@@ -38,4 +38,14 @@ command :vacation do |c|
   end
 end
 
+desc 'Track days entries for sick leave'
+long_desc 'Example: xoggl sick 2017-02-03 2017-02-15'
+arg '<start_date>'
+arg '<end_date>'
+command :sick do |c|
+  c.action do |_, _, args|
+    @xoggl.log_sick_leave(args[0], args[1])
+  end
+end
+
 exit run(ARGV)

data/lib/xoggl/client.rb

@@ -15,13 +15,21 @@ module Xoggl
     end
 
     def log_vacation(start_isodate, end_isodate)
-      do_between(start_isodate, end_isodate) do |date|
-        log_vacation_day(date) unless to_skip?(date)
-      end
+      log_leave(start_isodate, end_isodate, 'Ferie')
+    end
+
+    def log_sick_leave(start_isodate, end_isodate)
+      log_leave(start_isodate, end_isodate, 'Malattia')
     end
 
     private
 
+    def log_leave(start_isodate, end_isodate, type)
+      do_between(start_isodate, end_isodate) do |date|
+        log_leave_day(date, type) unless to_skip?(date)
+      end
+    end
+
     def do_between(start_isodate, end_isodate)
       date = DateTime.iso8601(start_isodate)
       end_date = DateTime.iso8601(end_isodate)
@@ -44,9 +52,9 @@ module Xoggl
       create_work_entry(date_time_from(date, 14), project_name)
     end
 
-    def log_vacation_day(date)
-      create_vacation_entry(date_time_from(date, 9))
-      create_vacation_entry(date_time_from(date, 14))
+    def log_leave_day(date, type)
+      create_leave_entry(date_time_from(date, 9), type)
+      create_leave_entry(date_time_from(date, 14), type)
     end
 
     def create_work_entry(start_time, project_name)
@@ -60,12 +68,12 @@ module Xoggl
       )
     end
 
-    def create_vacation_entry(start_time)
+    def create_leave_entry(start_time, type)
       @toggl.create_time_entry(
         'billable' => false,
-        'description' => 'Ferie',
-        'tags' => ['Ferie'],
-        'pid' => vacation_project_id,
+        'description' => type,
+        'tags' => [type],
+        'pid' => leave_project_id,
         'duration' => 14_400,
         'start' => @toggl.iso8601(start_time)
       )
@@ -79,7 +87,7 @@ module Xoggl
       @workspace_id ||= @toggl.my_workspaces.first['id']
     end
 
-    def vacation_project_id
+    def leave_project_id
       @vacation_project_id ||= @toggl.my_projects.select do |project|
         project['name'] == 'Assenza'
       end.first['id']

data/lib/xoggl/version.rb

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

data/spec/lib/xoggl/client_spec.rb

@@ -69,6 +69,18 @@ describe Xoggl::Client do
     end
   end
 
+  context 'sick leave' do
+    it 'creates an entry' do
+      start_date = '2016-01-04'
+      end_date = '2016-01-04'
+
+      @client.log_sick_leave(start_date, end_date)
+
+      expect(entries.count).to eq(2)
+      expect(entries.first).to include('description' => 'Malattia')
+    end
+  end
+
   private
 
   def delete_entries

data/xoggl.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
 
   spec.requirements << 'A Toggl account (https://toggl.com/)'
 
-  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec-mocks'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: xoggl
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Filippo Liverani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -162,8 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - A Toggl account (https://toggl.com/)
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Simple Toggl cli