evados-tracker 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a49492cf7b2645dfcec699549d24e6d76eb0b9e
-  data.tar.gz: 83584a19ebfd70071ca058a8d4e796fffef9c2ec
+  metadata.gz: 82536553d06ffde22ecc1c9f9b9f2617f0974eb0
+  data.tar.gz: b71458ef71e3e4b0d4e6fd0734e9549ab23c493e
 SHA512:
-  metadata.gz: c4c12bb8b5a06ce03c4172fd001447b0101385d060e6f99a9285136c2067a7aa7d586359799e72e047bab3c36a7aecb2e72afd916253cfa2f47c2665155f99da
-  data.tar.gz: 768c55b6d6328dded8adfc02949fff2f9294f59306cf13740ee58ec08cfe9f5238cbf3953f47d19c6de00dca8565f6f96a9cc30a59b5f8350dd9864d21786618
+  metadata.gz: 251aad0a2b4e31eb712344e179fdd3daa800394e16290cfec3f6e5191705c06cb2278e70d7eb70ef6b732f209481493661f441c7437a847fba3a3358a72658e2
+  data.tar.gz: 114069961fe55af332329f419cbab2ac2af06a1df39181c3ab77f1c82721942ab5aca7717429f570159d498cdb86beacccb13cdeaf622df9abac83fbe644d3f2

data/.gitignore

@@ -15,7 +15,7 @@ doc
 # jeweler generated
 pkg
 
-# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
 #
 # * Create a file at ~/.gitignore
 # * Include files you want ignored
@@ -47,3 +47,14 @@ pkg
 
 # For rubinius:
 #*.rbc
+
+*.gem
+Gemfile.lock
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/bin/et

@@ -5,36 +5,49 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'thor'
 require 'evados_tracker'
 
-PATH_TO_KEY  = Dir.home + "/.evados-tracker-key"
+PATH_TO_KEY  = Dir.home + "/.evados-tracker/.key"
 
 class CLI < Thor
-  option :a
   def initialize(a, b, c)
     super(a, b, c)
     get_key!
     @tracker = EvadosTracker::Core.new(@key)
-    @tracker.get_tasks
+    check_for_response_error @tracker.get_tasks
   end
 
   desc "ls", "list tasks"
   def ls
+    check_for_response_error @tracker.get_tasks
     @tracker.numerated_list.each {|t| puts "#{t[0]}. " + "#{t[1]['title']}"}
   end
 
-  desc "start", "start task"
+  desc "start", "start task, with key -a start autocontinue"
+  method_options :a => :boolean
   def start(task_num)
-    begin
-      @tracker.current_isssue_id = @tracker.numerated_list["#{task_num}"]['id']
-      pomodoro = @tracker.create_pomodoro
-      @tracker.pomodoro_id = pomodoro["id"]
-      one_pomodoro_iteration
-      puts "You started doing #{@tracker.numerated_list[task_num.to_s]['title']}"
-    end while options[:a]
+    check_rescue do
+      begin
+        @tracker.current_isssue_id = @tracker.numerated_list["#{task_num}"]['id']
+        pomodoro = @tracker.create_pomodoro
+        @tracker.pomodoro_id = pomodoro["id"]
+        puts "You started doing #{@tracker.numerated_list[task_num.to_s]['title']}"
+        one_pomodoro_iteration
+      end while options[:a]
+    end
   end
 
-
-
 private ##############
+  def check_for_response_error(response)
+    if response.is_a? Hash
+      case response["error"]
+      when "Invalid authentication token.", "You need to sign in or sign up before continuing."
+        puts "Invalid authentication token, try again."
+        File.delete(PATH_TO_KEY) if File.exists?(PATH_TO_KEY)
+        set_key!
+        @tracker.key = @key
+        check_for_response_error @tracker.get_tasks
+      end
+    end
+  end
 
   def one_pomodoro_iteration
     display_25_minutes_timer
@@ -53,23 +66,36 @@ private ##############
                     :progress_mark  => ' ',
                     :remainder_mark => '･',
                     :title => "Break")
-    100.times { progressbar.increment; sleep(3); progressbar.refresh }
+    100.times { sleep(3); progressbar.refresh; progressbar.increment; }
   end
 
   def display_25_minutes_timer
-    progressbar = ProgressBar.create
-    100.times { progressbar.increment; sleep(15); progressbar.refresh }
+    progressbar = ProgressBar.create( :format => '%a %b %p%% %t',
+                                      :title => "Work")
+    100.times { sleep(15); progressbar.refresh; progressbar.increment; }
   end
 
   def get_key!
-    if File.exists?(PATH_TO_KEY)
-      @key = File.foreach(PATH_TO_KEY).first.chomp
-    else
+    @key = File.foreach(PATH_TO_KEY).first.chomp if File.exists?(PATH_TO_KEY)
+  end
+
+  def set_key!
+    check_rescue do
       puts "Your api key: "
-      @key = gets.chomp
+      @key = $stdin.gets.chomp
+      Dir.mkdir(Dir.home + "/.evados-tracker/") unless File.exists?(Dir.home + "/.evados-tracker/")
       File.open(PATH_TO_KEY, "a+") { |f| f.puts @key }
     end
   end
+
+  def check_rescue
+    begin
+      yield
+    rescue SystemExit, Interrupt
+      @tracker.delete_pomodoro
+      puts "\nBye!"
+    end
+  end
 end
 
 CLI.start(ARGV)

data/lib/evados_tracker/version.rb

@@ -1,3 +1,3 @@
 module EvadosTracker
-  VERSION = "0.1.1"
+  VERSION = "0.2.1"
 end

data/lib/evados_tracker.rb

@@ -3,7 +3,7 @@ require 'ruby-progressbar'
 
 module EvadosTracker
   class Core
-    attr_accessor :numerated_list, :current_isssue_id, :pomodoro_id
+    attr_accessor :numerated_list, :current_isssue_id, :pomodoro_id, :key
 
     def initialize(key)
       @key = key
@@ -13,43 +13,45 @@ module EvadosTracker
     end
 
     def get_tasks
-      begin
-        response = HTTParty.get("http://pm.evados.com/api/v1/issues.json?auth_token=" + @key)
+      check_rescue do
+        response = HTTParty.get("http://pm.evados.com/api/v1/issues.json?auth_token=" + "#{@key}")
         numerate_task_list response
-      rescue StandardError
-        p "Have no internet connection"
+        response
       end
     end
 
     def create_pomodoro
-      begin
+      check_rescue do
         @pomodoro_id = HTTParty.post("http://pm.evados.com/api/v1/issues/" + "#{@current_isssue_id}" +
-                      "/pomodoros.json?auth_token=" + @key)
-      rescue StandardError
-        p "Have no internet connection"
+                      "/pomodoros.json?auth_token=" + "#{@key}")
       end
     end
 
     def commit_pomodoro
-      begin
-        HTTParty.put("http://pm.evados.com/api/v1/issues/" + "#{@current_isssue_id}" +
-                      "/pomodoros/" + "#{@pomodoro_id}" + ".json?auth_token=" + @key)
-      rescue StandardError
-        p "Have no internet connection"
+      check_rescue do
+        response = HTTParty.put("http://pm.evados.com/api/v1/issues/" + "#{@current_isssue_id}" +
+                      "/pomodoros/" + "#{@pomodoro_id}" + ".json?auth_token=" + "#{@key}")
       end
     end
 
     def delete_pomodoro
-      begin
-        HTTParty.delete("http://pm.evados.com/api/v1/issues/" + "#{@current_isssue_id}" +
-                      "/pomodoros/" + "#{@pomodoro_id}" + ".json?auth_token=" + @key)
-      rescue StandardError
-        p "Have no internet connection"
+      check_rescue do
+        response = HTTParty.delete("http://pm.evados.com/api/v1/issues/" + "#{@current_isssue_id}" +
+                      "/pomodoros/" + "#{@pomodoro_id}" + ".json?auth_token=" + "#{@key}")
       end
     end
 
     private
 
+    def check_rescue
+      begin
+        yield
+      rescue SocketError
+        p "Have no internet connection"
+        yield
+      end
+    end
+
     def numerate_task_list(task_list)
       @numerated_list = {};
       task_list.each_with_index{ |t, index| @numerated_list["#{index + 1}"] = t }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evados-tracker
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Seva Rybakov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -142,7 +142,6 @@ email:
 - codingfu@gmail.com
 - vmatiyko@gmail.com
 executables:
-- .et.swp
 - et
 extensions: []
 extra_rdoc_files: []
@@ -154,10 +153,8 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
-- bin/.et.swp
 - bin/et
 - evados_tracker.gemspec
-- lib/.evados_tracker.rb.swp
 - lib/evados_tracker.rb
 - lib/evados_tracker/core.rb
 - lib/evados_tracker/version.rb