doro 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3667c3eb9700f16c394fa7146658d84898eca76d
-  data.tar.gz: 3df19758ab2f9269019b72762dba1c49f3d322c3
+  metadata.gz: 792149da11730576f2d234760321ec94918e6357
+  data.tar.gz: 4ce5187a36584f13c307832808452ae2f6766ee5
 SHA512:
-  metadata.gz: 34ce48b740896a1dcab654472651540de65fc406e52c1382e29c0c3f9547e85119565440aeec0085d369e79901eb2d8b01b3fbb82076a71a33ae6752c75cfb5f
-  data.tar.gz: d96845e0a919626da1b9c7f74c1c611ac22e6251a8ec4fe2b30f72959d55d3ced45ec93967c7198a9e3d44f1ba72cdb1cede979b64699f7371eccabe8b7d5bd1
+  metadata.gz: 1631c6a0222f08c602953d6d15d06761b553ce3ae44edea8d3f25b4d29761cbd97e0fb76aaadef6dfbd85f3ab92c2e42783c278be0b441da98e5ef6d5f03e829
+  data.tar.gz: 3e920b045ff6d83e2a1f77c0ad375dba5193825eed7b27c1190303773097ff666c33acc84d284c4cc170e2bcfcc0804f0aadf6f16ba5dc3f9b962b391d1a7729

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doro (0.2.0)
+    doro (0.2.2)
       gli (= 2.13.4)
       notifier (~> 0.5)
       terminal-notifier (~> 1.6)

data/README.md

@@ -29,7 +29,7 @@ For detailed information.
 ## Todo
 
 - [ ] number flag on list
-- [ ] remove dependencies
+- [ ] .dororc
 
 ### Notifications
 

data/bin/doro

@@ -3,7 +3,6 @@ require 'gli'
 require 'fileutils'
 require 'csv'
 require 'date'
-require 'notifier'
 
 require 'doro'
 
@@ -32,8 +31,6 @@ command :list do |c|
   end
 end
 
-
-
 desc 'Begins a pomodoro timer'
 arg_name '*description of task* (eg. cool task)'
 command :start do |c|
@@ -44,30 +41,12 @@ command :start do |c|
 
   c.action do |global_options,options,args|
     raise "You didn't specify a task" if args.empty?
-    interrupt = false
     task_name = args.join(' ')
     start_time = Time.now
     seconds = 0
 
-    ProgressBar.new(task_name, 1500).start
-
-    Signal.trap("INT") { interrupt = true }
-
-    1500.times do
-      break if interrupt == true
-      bar.increment
-      seconds += 1
-      sleep 1
-    end
-
-    print("\r")
-
-    if interrupt == false
-      Notifier.notify(
-        :image   => "logo.png",
-        :title   => task_name,
-        :message => "Your timer is up! Take a break!"
-        )
+    ProgressBar.new(task_name, 1500).start do
+      seconds +=1
     end
 
     Doro::Entries::add_entry(
@@ -77,11 +56,10 @@ command :start do |c|
       start_time: start_time,
       tag: options[:t]
     )
+
   end
 end
 
-
-
 desc 'Begins a break timer'
 arg_name '*none*'
 command :break do |c|
@@ -94,33 +72,15 @@ command :break do |c|
   c.flag :t, type: Integer
 
   c.action do |global_options,options,args|
-    interrupt = false
 
     minutes = options[:t]
     options[:long]? minutes = 15 : nil
 
     ProgressBar.new('Break', minutes * 60).start
 
-    Signal.trap("INT") { interrupt = true }
-
-    (minutes * 60).times do
-      break if interrupt == true
-      bar.increment
-      sleep 1
-    end
-
-    if interrupt == false
-      Notifier.notify(
-        :image   => "logo.png",
-        :title   => 'Break',
-        :message => "Break time's over! Back to work!"
-      )
-    end
   end
 end
 
-
-
 pre do |global,command,options,args|
   FileUtils::touch doro_file unless File.file? doro_file
   true

data/lib/doro/progressbar.rb

@@ -1,5 +1,6 @@
 require 'io/console'
 require 'time'
+require 'notifier'
 
 class ProgressBar
   def initialize(title, max_progress)
@@ -7,14 +8,22 @@ class ProgressBar
     @max_progress = max_progress
     @title = title
     @start_time = Time.now
+    @interrupt = false
   end
 
   def start
-    while (@progress <= @max_progress)
+    Signal.trap("INT") { @interrupt = true }
+
+    while (@progress <= @max_progress && @interrupt == false )
       render_progress
-      sleep 1
       @progress += 1
+      yield
+      sleep 1
     end
+
+    print("\r")
+
+    display_notification
   end
 
   private
@@ -30,7 +39,6 @@ class ProgressBar
   end
 
   # Methods for determing time
-
   def display_time
     Time.at((Time.now - @start_time)).utc.strftime("%M:%S")
   end
@@ -52,7 +60,6 @@ class ProgressBar
     @title.size + 10
   end
 
-
   # Methods for determining terminal length
   def terminal_length
     return 80 unless unix?
@@ -72,4 +79,12 @@ class ProgressBar
   def unix?
     RUBY_PLATFORM =~ /(aix|darwin|linux|(net|free|open)bsd|cygwin|solaris|irix|hpux)/i
   end
+
+  # Methods for notifications
+  def display_notification
+    unless @interrupt
+      Notifier.notify(image: "logo.png", title: @title, message: "")
+    end
+  end
+
 end

data/lib/doro/version.rb

@@ -1,3 +1,3 @@
 module Doro
-  VERSION = '0.2.0'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doro
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Marcus Orochena
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -101,6 +101,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -164,7 +165,6 @@ files:
 - doc/js/search_index.js
 - doc/js/searcher.js
 - doc/table_of_contents.html
-- doro-0.1.0.gem
 - doro.gemspec
 - doro.rdoc
 - features/doro.feature