trebbiatrice 0.2.3 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d64df67fc7516538b2c8bb487259796ec1b9caa2
-  data.tar.gz: d90efeb9af9273c8df565e806189cbd87d0a89fd
+  metadata.gz: c8d9ec205fd99b391308137e51a7c121d5936a39
+  data.tar.gz: 953a6f7fe4a80c99d601f8a9aab204308f1c6bc9
 SHA512:
-  metadata.gz: c73fe821ed0a263b480be8ebb2ed78046aaa805932c2cb52bb50cd5e1d0a262307321b2a134bb84b36424c9a038b6c928825ba8848c31007b55ffe1b5da2bb01
-  data.tar.gz: 176f5472149147c85ebd5df0dca5713fe568e4a16944a57d8a2c140b1df280e45d2b9034ad189ab2886f393de279600bbce52aa5d1de60cdfb944827a69605ba
+  metadata.gz: 773ac236d2f72ee26635070c0d602338fe83fa022c39bc767f379737647fdda2d778a5c332ccac0cf3109c1f68b519214c0ba35454b910eb009b0e4621381098
+  data.tar.gz: 037494c92697ab0cda72032fd0d951a4ea515f60e6fb86f722798ed1b459d8805cb5c62919a34890bf184af545a26c562594af368979432133786d95f18d3c3b

data/lib/trebbiatrice/harvest.rb

@@ -18,8 +18,19 @@ module Trebbiatrice
       @harvest.time.trackable_projects
     end
 
-    def new_entry!(entry)
-      @harvest.time.create(entry)
+    def new_entry!(entry_data, find = true)
+      if find
+        entry = @harvest.time.all.select { |entry| entry[:project_id].to_s == entry_data[:project_id].to_s }.last
+
+        if entry
+          toggle!(entry[:id])
+          entry
+        else
+          new_entry!(entry_data, false)
+        end
+      else
+        @harvest.time.create(entry_data)
+      end
     end
 
     def toggle!(entry_id)

data/lib/trebbiatrice/trebbia.rb

@@ -33,12 +33,8 @@ module Trebbiatrice
     def track!(task = 'Development', notes = '')
       return if tracking?
 
-      if @entry
-        @harvest.toggle!(@entry[:id])
-      else
-        task_id = get_task(task)[:id]
-        @entry  = @harvest.new_entry! notes: notes, hours: 0, spent_at: today, project_id: @project[:id], task_id: task_id
-      end
+      task_id = get_task(task)[:id]
+      @entry  = @harvest.new_entry! notes: notes, hours: 0, spent_at: today, project_id: @project[:id], task_id: task_id
 
       @tracking = true
     end
@@ -47,6 +43,7 @@ module Trebbiatrice
       if @entry && tracking?
         @tracking = false
         @harvest.toggle!(@entry[:id])
+        @entry = nil
       end
     end
 

data/lib/trebbiatrice/trebbiatrice.rb

@@ -19,14 +19,13 @@ module Trebbiatrice
         end.last
 
         if response[:status] == 'failure' || !trebbia.working_on
-          if trebbia.tracking?
-            puts "stopping #{trebbia.project[:name]}" if trebbia.project
-            trebbia.stop_tracking!
-          end
+          stop_tracking!(trebbia)
 
           last_project = nil
         else
           if trebbia.working_on && (last_project != trebbia.working_on || !trebbia.project)
+            stop_tracking!(trebbia)
+
             trebbia.project = trebbia.active_projects.last
             trebbia.track! task
 
@@ -38,5 +37,14 @@ module Trebbiatrice
         sleep frequency
       end
     end
+
+  private
+
+    def stop_tracking!(trebbia)
+      if trebbia.tracking?
+        puts "stopping #{trebbia.project[:name]}" if trebbia.project
+        trebbia.stop_tracking!
+      end
+    end
   end
 end

data/lib/trebbiatrice/version.rb

@@ -9,5 +9,5 @@
 #++
 
 module Trebbiatrice
-  VERSION = '0.2.3'
+  VERSION = '0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trebbiatrice
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: '0.3'
 platform: ruby
 authors:
 - Giovanni Capuano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: harvested