rbtclk 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ed5dee0180aa425d0ae3a2bbfdff9ee3ef61e96
-  data.tar.gz: 99b3b7cf00641ed2e080a4269362d498129a72af
+  metadata.gz: c9ac4d391a7a069163edb5ad6d7cf7665fa7661f
+  data.tar.gz: 844aa7ff03d7a17910f27b2bdfd949e1cf3da53f
 SHA512:
-  metadata.gz: eee3a10c5a55d8e154738ef4cb3e62453188633910083a4a6be97ce9c960d705bf86ea30dc032f5dc2ffcd3621b473b33b7f3cbb50d2f8623ecb81f400030d53
-  data.tar.gz: 6f50e4c9d2d51a95c73990715b55782fea6a7568fce20c30c485bc0942f984af9d4a69f756779a582ed417b9211ecd32d1125efbe84b5a34d685d963a2cb0b6c
+  metadata.gz: d571c5777e34deff6a0d4a5f698d6c15c6558f0a40f1cc4f478b4a217a5b9fac2f3b140ea7e0aba5c9fc7cec73d322722791039f1a58b21fe8c3e48da7b6c1ef
+  data.tar.gz: 188060960d79102feeca8cac2093dc4b56e78a10e512cb060f3bc9ee23c81228838f2eff0378011d0c388420cdf7efe53e6e5c15b5300ed3b5fceb80db3a6352

data/.gitignore

@@ -13,3 +13,4 @@
 *.a
 mkmf.log
 .DS_Store
+/vendor/bundle

data/README.md

@@ -34,8 +34,7 @@ $ rbtclk
 
 ### Mode
 
-Now we support only clock mode and countup mode.  
-Countdown timer mode is our future works.
+This application supports some modes; clock, countup and countdown.
 
 #### Example
 
@@ -69,6 +68,21 @@ $ rbtclk -m countup
   ####     ####      ##      ####     ####      ##        ##     ####
 ```
 
+```shell
+$ rbtclk --mode countdown --time 90
+$ rbtclk -m countdown --time 90
+```
+
+```
+  ####     ####              ####       ##              ####     ####
+ ##  ##   ##  ##     ##     ##  ##     ###      ##     ##  ##   ##  ##
+ ##  ##   ##  ##     ##     ##  ##      ##      ##         ##   ##  ##
+ ##  ##   ##  ##            ##  ##      ##               ###    ##  ##
+ ##  ##   ##  ##            ##  ##      ##                 ##   ##  ##
+ ##  ##   ##  ##     ##     ##  ##      ##      ##     ##  ##   ##  ##
+  ####     ####      ##      ####       ##      ##      ####     ####
+```
+
 ### Change font
 
 This application depends on artii library (https://github.com/miketierney/artii).  
@@ -153,7 +167,10 @@ $ rbtclk --color magenta
 
 - [x] Clock
 - [x] Countup Timer
-- [ ] Countdown Timer
+- [x] Countdown Timer
+- [ ] Configuration by ~/.rbtclk
+- [ ] Sound
+- [ ] Refactoring
 
 ## Code Status
 

data/lib/rbtclk/countdown_timer.rb

@@ -0,0 +1,82 @@
+# Rbtclk
+# Copyright (c) 2014 Moza USANE
+# This software is released under the MIT License.
+# http://opensource.org/licenses/mit-license.php
+
+require "artii"
+require "curses"
+require "rbtclk/color_code"
+
+module Rbtclk
+  class CountdownTimer
+    include ColorCode
+
+    def initialize(font: "clb8x8", format: "%X", color: "black", time: 180)
+      @artii = Artii::Base.new(font: font)
+      @format = format
+      @color = color
+      @time = time.to_i
+      @elapsed = 0
+    end
+
+    def show
+      Curses.init_screen
+      Curses.start_color
+      Curses.use_default_colors
+      Curses.init_pair(1, translate(@color), -1)
+      Curses.init_pair(2, translate("magenta"), translate("black"))
+      Curses.curs_set(0)
+
+      @start_time = Time.now + 1
+
+      begin
+        view_thread = Thread.new do
+          while @elapsed < @time
+            refresh
+            @elapsed += 1
+            sleep 1
+          end
+
+          toggle_marker = true
+          loop do
+            blink(toggle_marker)
+            is_even = !is_even
+            sleep 1
+          end
+        end
+
+        input_thread = Thread.new do
+          loop do
+            case Curses.getch
+            when "q"
+              Thread.kill(view_thread)
+              Thread.kill(input_thread)
+            end
+          end
+        end
+
+        view_thread.join
+        input_thread.join
+      ensure
+        Curses.close_screen
+      end
+    end
+
+    private
+    def refresh
+      Curses.clear
+      Curses.setpos(0, 0)
+      Curses.attron(Curses.color_pair(1))
+      Curses.addstr(@artii.asciify((Time.parse("1/1") + ((@start_time + @time) - Time.now)).strftime(@format)))
+      Curses.refresh
+    end
+
+    def blink(toggle_marker)
+      Curses.clear
+      Curses.setpos(0, 0)
+      Curses.attron(Curses.color_pair(2))
+      Curses.addstr(@artii.asciify(Time.parse("1/1").strftime(@format))) if toggle_marker
+      Curses.refresh
+    end
+  end
+end

data/lib/rbtclk/version.rb

@@ -4,5 +4,5 @@
 # http://opensource.org/licenses/mit-license.php
 
 module Rbtclk
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/rbtclk.rb

@@ -7,6 +7,7 @@ require "optparse"
 require "rbtclk/version"
 require "rbtclk/clock"
 require "rbtclk/countup_timer"
+require "rbtclk/countdown_timer"
 
 module Rbtclk
   class << self
@@ -19,13 +20,13 @@ module Rbtclk
         opt.on("--font FONT") { |f| params[:font] = f }
         opt.on("--version") { |v| params[:version] = v }
         opt.on("--color COLOR") { |c| params[:color] = c }
+        opt.on("--time TIME") { |t| params[:time] = t }
 
         opt.parse!(args)
       end
 
       if params[:version]
         puts Rbtclk::VERSION
-        exit
       else
         display_clock(params)
       end
@@ -43,6 +44,10 @@ module Rbtclk
         remove_extra_params(params)
         timer = CountupTimer.new(params)
         timer.show
+      when "countdown"
+        remove_extra_params(params)
+        timer = CountdownTimer.new(params)
+        timer.show
       else
         warn "#{params[:mode]} mode is not supported."
         warn "You can use [clock]."
@@ -54,7 +59,8 @@ module Rbtclk
       {mode: params[:mode] || "clock",
        font: params[:font] || "clb8x8",
        format: params[:format] || "%X",
-       color: params[:color] || "black"}
+       color: params[:color] || "black",
+       time: params[:time] || "180"}
     end
 
     def remove_extra_params(params)

data/rbtclk.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "timecop"
-  spec.add_development_dependency "ariete"
+  spec.add_development_dependency "ariete", "~> 1.0.0"
   spec.add_dependency "artii"
   spec.add_dependency "curses"
 end

data/spec/rbtclk_spec.rb

@@ -2,19 +2,33 @@ require 'spec_helper'
 
 RSpec.describe Rbtclk do
   describe "#run" do
-    pending "this is pending bcause on the issue#3 (https://github.com/mozamimy/rbtclk/issues/3)"
+    context "clock/countdown/countup modes" do
+      pending "this is pending bcause on the issue#3 (https://github.com/mozamimy/rbtclk/issues/3)"
+    end
+
+    context "-v is given as an option" do
+      subject { -> { Rbtclk.run(["-v"]) } }
+      it { expect(subject).to be_output "#{Rbtclk::VERSION}\n" }
+    end
+
+    context "--version is given as an option" do
+      subject { -> { Rbtclk.run(["--version"]) } }
+      it { expect(subject).to be_output "#{Rbtclk::VERSION}\n" }
+    end
   end
 
   describe "#display_clock" do
     pending "this is pending bcause on the issue#3 (https://github.com/mozamimy/rbtclk/issues/3)"
   end
 
+
   describe "methods related with params" do
     let(:filled_params) do
       {mode: "clock",
        font: "clb8x8",
        format: "%X",
-       color: "black"}
+       color: "black",
+       time: "180"}
     end
 
     describe "#fill" do

data/spec/spec_helper.rb

@@ -1,2 +1,3 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'rbtclk'
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+require "rbtclk"
+require "ariete"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbtclk
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Moza USANE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,16 @@ dependencies:
   name: ariete
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: artii
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +127,7 @@ files:
 - lib/rbtclk.rb
 - lib/rbtclk/clock.rb
 - lib/rbtclk/color_code.rb
+- lib/rbtclk/countdown_timer.rb
 - lib/rbtclk/countup_timer.rb
 - lib/rbtclk/version.rb
 - rbtclk.gemspec
@@ -153,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A light-weight timer application that can run in terminal emulators.