evados-tracker 0.2.2 → 0.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8768cfaf56bb541d670cd67ff0c58330a6128a59
-  data.tar.gz: 2cbc29a89f420153a95137b05232b0aa2e4f1153
+  metadata.gz: eaa2edc5e8d9cb1439057aa6a0a73d761702d954
+  data.tar.gz: 65eda314798f566fb71253e958aa556625e73d6c
 SHA512:
-  metadata.gz: cfda633fb6f0591ee9bcd4653efdc51d215ffbde467cb04b0a4f75918963b4f8de20991344d2bd8600486fd50dde99bfe838adf29e561eeacd8c636ced20e550
-  data.tar.gz: cc1e13ca59a4781f4453a7e31cb9025c5e6cb7db878e5ba5f10dfed93335819dd5449588f499dd64844f68d76bff7615fe9c119e8b19aaf693792b3bcf4d2ada
+  metadata.gz: a3d7c57035910b3e46b670e9e94876b08c25cf76c743f17028a765678aa5c0021ad14b9139b69d2407753858624556773f4c361c4e014ad5295ce7e648b49ac2
+  data.tar.gz: 513829650e3816e35bf70369f7cbe3cd0fd623c5e67fe1dd9e788b426371f7ec9511c50987630bc1d45a2e2310723324638baf6bf94a9a220b608e9424b8e0d4

data/bin/et

@@ -8,12 +8,14 @@ require 'json'
 
 PATH_TO_KEY  = Dir.home + "/.evados-tracker/.key"
 PATH_TO_PREV_ISSUE = Dir.home + "/.evados-tracker/prev_issue.json"
+PATH_TO_UNSAVED_POMODORO = Dir.home + "/.evados-tracker/unsaved_pomodoro.json"
 
 class CLI < Thor
   def initialize(a, b, c)
     super(a, b, c)
     get_key!
     @tracker = EvadosTracker::Core.new(@key)
+    check_unsaved_pomodoro
     check_for_response_error @tracker.get_tasks
   end
 
@@ -26,7 +28,7 @@ class CLI < Thor
   desc "start", "start task, with key -a start autocontinue"
   method_options :a => :boolean
   def start(task_num)
-    check_rescue do
+    check_interrupt_rescue do
       @tracker.current_issue_id = @tracker.numerated_list["#{task_num}"]['id']
       @prev_issue = { @tracker.current_issue_id => @tracker.numerated_list[task_num.to_s]['title'] }
       hash_to_json
@@ -39,7 +41,7 @@ class CLI < Thor
   desc "resume", "resume to previous task, with key -a start autocontinue"
   method_options :a => :boolean
   def resume
-    check_rescue do
+    check_interrupt_rescue do
       @prev_issue = json_to_hash
       @tracker.current_issue_id = @prev_issue.keys.first
       begin
@@ -70,15 +72,11 @@ private ##############
   end
 
   def one_pomodoro_iteration
-    display_25_minutes_timer
-    begin
-      saved = @tracker.commit_pomodoro['is_finished']
-      unless saved
-        puts "Pomodoro save failed. Will attempt in 1 minute."
-        sleep 300
-      end
-    end while !saved
-    display_5_minute_timer
+    check_socket_rescue do
+      display_25_minutes_timer
+      @tracker.commit_pomodoro
+      display_5_minute_timer
+    end
   end
 
   def display_5_minute_timer
@@ -104,7 +102,7 @@ private ##############
   end
 
   def set_key!
-    check_rescue do
+    check_interrupt_rescue do
       puts "Your api key: "
       @key = $stdin.gets.chomp
       Dir.mkdir(Dir.home + "/.evados-tracker/") unless File.exists?(Dir.home + "/.evados-tracker/")
@@ -112,7 +110,7 @@ private ##############
     end
   end
 
-  def check_rescue
+  def check_interrupt_rescue
     begin
       yield
     rescue SystemExit, Interrupt
@@ -121,6 +119,20 @@ private ##############
     end
   end
 
+  def check_socket_rescue
+    begin
+      yield
+    rescue SocketError
+      p "Have no internet connection"
+      if @tracker.current_issue_id && @tracker.pomodoro_id
+        pomodoro = { @tracker.current_issue_id => @tracker.pomodoro_id }
+        File.delete(PATH_TO_UNSAVED_POMODORO) if File.exists?(PATH_TO_UNSAVED_POMODORO)
+        File.open(PATH_TO_UNSAVED_POMODORO, "a+") { |f| f.write pomodoro.to_json }
+        abort
+      end
+    end
+  end
+
   def hash_to_json
     File.delete(PATH_TO_PREV_ISSUE) if File.exists?(PATH_TO_PREV_ISSUE)
     File.open(PATH_TO_PREV_ISSUE, "a+") { |f| f.write @prev_issue.to_json }
@@ -134,6 +146,17 @@ private ##############
       abort
     end
   end
+
+  def check_unsaved_pomodoro
+    check_socket_rescue do
+      if File.exists? PATH_TO_UNSAVED_POMODORO
+        pomodoro = JSON.parse(IO.read PATH_TO_UNSAVED_POMODORO)
+        @tracker.current_issue_id = pomodoro.keys.first.to_i
+        @tracker.pomodoro_id = pomodoro[pomodoro.keys.first].to_i
+        File.delete(PATH_TO_UNSAVED_POMODORO) if @tracker.commit_pomodoro["is_finished"]
+      end
+    end
+  end
 end
 
 CLI.start(ARGV)

data/lib/evados_tracker.rb

@@ -28,10 +28,8 @@ module EvadosTracker
     end
 
     def commit_pomodoro
-      check_rescue do
-        response = HTTParty.put("http://pm.evados.com/api/v1/issues/" + "#{@current_issue_id}" +
-                      "/pomodoros/" + "#{@pomodoro_id}" + ".json?auth_token=" + "#{@key}")
-      end
+      response = HTTParty.put("http://pm.evados.com/api/v1/issues/" + "#{@current_issue_id}" +
+                    "/pomodoros/" + "#{@pomodoro_id}" + ".json?auth_token=" + "#{@key}")
     end
 
     def delete_pomodoro
@@ -48,7 +46,7 @@ module EvadosTracker
         yield
       rescue SocketError
         p "Have no internet connection"
-        yield
+        abort
       end
     end
 

data/lib/evados_tracker/version.rb

@@ -1,3 +1,3 @@
 module EvadosTracker
-  VERSION = "0.2.2"
+  VERSION = "0.2.21"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evados-tracker
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.21
 platform: ruby
 authors:
 - Seva Rybakov