doro 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d02765588dd4c833d4f9bc66fae716c149dba520
-  data.tar.gz: 049a0aabbe96cf5f94c546c4b10364b6b4857102
+  metadata.gz: 3667c3eb9700f16c394fa7146658d84898eca76d
+  data.tar.gz: 3df19758ab2f9269019b72762dba1c49f3d322c3
 SHA512:
-  metadata.gz: 0f06fac5f5bd7d38d899591191e178b42974128611b0016ded2ee0b12c0d1a5e2cc6b77e863a504e2911444e34ef24ae2e9cc00cd5d93e7cc5031def0de99c29
-  data.tar.gz: dd850abc9e3efa1d99d6484fdf67babd3564ff4487a94dd151ef170015d9391c821cd720bda13dfa9e12c97030f327640753b7d02302b0c7a0a24688ecbf76ea
+  metadata.gz: 34ce48b740896a1dcab654472651540de65fc406e52c1382e29c0c3f9547e85119565440aeec0085d369e79901eb2d8b01b3fbb82076a71a33ae6752c75cfb5f
+  data.tar.gz: d96845e0a919626da1b9c7f74c1c611ac22e6251a8ec4fe2b30f72959d55d3ced45ec93967c7198a9e3d44f1ba72cdb1cede979b64699f7371eccabe8b7d5bd1

data/Gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: .
   specs:
-    doro (0.0.1)
+    doro (0.2.0)
       gli (= 2.13.4)
-      notifier
-      ruby-progressbar
-      terminal-notifier
+      notifier (~> 0.5)
+      terminal-notifier (~> 1.6)
 
 GEM
   remote: https://rubygems.org/
@@ -47,7 +46,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    ruby-progressbar (1.7.5)
     terminal-notifier (1.6.3)
     thor (0.19.1)
 
@@ -55,10 +53,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba
+  aruba (~> 0.13)
   doro!
-  rake
-  rdoc
+  rake (~> 10.5)
+  rdoc (~> 4.2)
 
 BUNDLED WITH
    1.11.2

data/README.md

@@ -29,10 +29,7 @@ For detailed information.
 ## Todo
 
 - [ ] number flag on list
-- [ ] time flag on break
-- [ ] long switch on break
 - [ ] remove dependencies
-- [ ] colorize
 
 ### Notifications
 

data/bin/doro

@@ -3,7 +3,6 @@ require 'gli'
 require 'fileutils'
 require 'csv'
 require 'date'
-require 'ruby-progressbar'
 require 'notifier'
 
 require 'doro'
@@ -50,14 +49,7 @@ command :start do |c|
     start_time = Time.now
     seconds = 0
 
-    puts ''
-    bar = ProgressBar.create(
-      :title => task_name,
-      :format => '%a [%B] %t',
-      :progress_mark  => '=',
-      :remainder_mark => ' ',
-      :total => 1500
-    )
+    ProgressBar.new(task_name, 1500).start
 
     Signal.trap("INT") { interrupt = true }
 
@@ -107,13 +99,7 @@ command :break do |c|
     minutes = options[:t]
     options[:long]? minutes = 15 : nil
 
-    bar = ProgressBar.create(
-      :title => 'Break',
-      :format => '%a %bᗧ%i %t',
-      :progress_mark  => ' ',
-      :remainder_mark => '･',
-      :total => minutes * 60
-    )
+    ProgressBar.new('Break', minutes * 60).start
 
     Signal.trap("INT") { interrupt = true }
 

data/doro.gemspec

@@ -5,7 +5,7 @@ spec = Gem::Specification.new do |s|
   s.version = Doro::VERSION
   s.author = 'Marcus Orochena'
   s.email = 'marcus@orochena.net'
-  s.homepage = 'http://www.orochena.net'
+  s.homepage = 'https://github.com/morochena/doro'
   s.platform = Gem::Platform::RUBY
   s.summary = 'A minimalist pomodoro cli application'
   s.files = `git ls-files`.split("
@@ -18,7 +18,6 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency('rdoc', '~> 4.2')
   s.add_development_dependency('aruba', '~> 0.13')
 
-  s.add_dependency('ruby-progressbar', '~> 1.7')
   s.add_dependency('notifier', '~> 0.5')
   s.add_dependency('terminal-notifier', '~> 1.6')
 

data/lib/doro.rb

@@ -1,5 +1,6 @@
 require 'doro/version.rb'
 require 'doro/entries.rb'
+require 'doro/progressbar.rb'
 
 # Add requires for other files you add to your project here, so
 # you just need to require this one file in your bin file

data/lib/doro/progressbar.rb

@@ -0,0 +1,75 @@
+require 'io/console'
+require 'time'
+
+class ProgressBar
+  def initialize(title, max_progress)
+    @progress = 0
+    @max_progress = max_progress
+    @title = title
+    @start_time = Time.now
+  end
+
+  def start
+    while (@progress <= @max_progress)
+      render_progress
+      sleep 1
+      @progress += 1
+    end
+  end
+
+  private
+
+  def render_progress
+    print @title
+    print " ["
+    print "=" * progress_bar_ticks
+    print " " * remaining_bar_ticks rescue 0
+    print "] "
+    print "\e[32m#{display_time}\e[0m"
+    print "\r"
+  end
+
+  # Methods for determing time
+
+  def display_time
+    Time.at((Time.now - @start_time)).utc.strftime("%M:%S")
+  end
+
+  # Methods for determing progress bar length
+  def progress_bar_ticks
+    (percent * (terminal_length - other_items_length)).to_i
+  end
+
+  def remaining_bar_ticks
+    terminal_length - progress_bar_ticks - other_items_length
+  end
+
+  def percent
+    (@progress.to_f / @max_progress)
+  end
+
+  def other_items_length
+    @title.size + 10
+  end
+
+
+  # Methods for determining terminal length
+  def terminal_length
+    return 80 unless unix?
+
+    result = dynamic_width
+    result < 20? 80 : result
+
+  rescue
+    80
+  end
+
+  def dynamic_width
+    _rows, columns = IO.console.winsize
+    columns
+  end
+
+  def unix?
+    RUBY_PLATFORM =~ /(aix|darwin|linux|(net|free|open)bsd|cygwin|solaris|irix|hpux)/i
+  end
+end

data/lib/doro/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doro
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Marcus Orochena
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
-- !ruby/object:Gem::Dependency
-  name: ruby-progressbar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: notifier
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +164,7 @@ 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
@@ -185,11 +172,12 @@ files:
 - features/support/env.rb
 - lib/doro.rb
 - lib/doro/entries.rb
+- lib/doro/progressbar.rb
 - lib/doro/version.rb
 - results.html
 - test/default_test.rb
 - test/test_helper.rb
-homepage: http://www.orochena.net
+homepage: https://github.com/morochena/doro
 licenses: []
 metadata: {}
 post_install_message: