pomodoro_timer 0.0.2 → 0.0.3

data/README.md

@@ -6,7 +6,7 @@ A simple project to count your pomodoros time.
 ### How use it ###
 First of all, install it...
 
-    gem install pomodoro-timer
+    gem install pomodoro_timer
 
 After that you can open irb, require and include:
 
@@ -23,8 +23,8 @@ Now you have the methods:
 
 
 ### How it works ###
-*First:* Calling the start method, your 25 minutes of work will start counting.
-*Second:* When this time end a ding sound will be played and your 5 minutes of break will starts counting automaticaly.
+*First:* Calling the start method, your 25 minutes of work will start counting.  
+*Second:* When this time end a ding sound will be played and your 5 minutes of break will starts counting automaticaly.  
 *Third:* When break time ends you have to start another pomodoro manualy, using the start method.
 
 

data/lib/pomodoro_timer/cycle.rb

@@ -0,0 +1,76 @@
+module PomodoroTimer
+  class Cycle
+    attr_reader :name
+    attr_accessor :progress
+
+    BEEP_SOUND = "resources/ding.wav"
+    STOPPED = Cycle.new
+
+    WORK_NAME = :work
+    BREAK_NAME = :break
+
+    WARNINGS = {
+      WORK_NAME => "It's work time!",
+      BREAK_NAME => "It's break time!"
+    }
+
+    LIMITS = {
+      WORK_NAME => 25,#25.minutes,
+      BREAK_NAME => 5#5.minutes
+    }
+
+    class << self
+      def break
+        Cycle.new(BREAK_NAME)
+      end
+
+      def work
+        Cycle.new(WORK_NAME)
+      end
+    end
+
+    def initialize(name)
+      @name = name
+      @progress = 0.0
+    end
+
+    def start
+      started = Time.now
+
+      puts "#{WARNINGS[@name]} (#{format(started)})"
+
+      while @progress < LIMITS[@name]
+        @progress = Time.now - started
+        sleep 1
+      end
+
+      beep
+    end
+
+    def missing_progress
+      return LIMITS[@name] - @progress
+    end
+
+    def break?
+      return @name == :break
+    end
+
+    def work?
+      return @name == :work
+    end
+
+    def stopped?
+      return self == STOPPED
+    end
+
+  private
+
+    def format(time)
+      return time.strftime(PomodoroTimer::TIME_FORMAT)
+    end
+
+    def beep
+      system "aplay #{File.join(File.dirname(__FILE__),"../../#{BEEP_SOUND}")} --quiet"
+    end
+  end
+end

data/lib/pomodoro_timer/pomodoro.rb

@@ -1,68 +1,35 @@
 module PomodoroTimer
   class Pomodoro
-    BEEP_SOUND = "resources/ding.wav"
-    WORK_TIME = 25.minutes
-    BREAK_TIME = 5.minutes
+    attr_reader :running
 
-    def initialize(what)
-      @start = Time.now
-      @thread = Thread.new do
-        @work_progress = Time.now
-        if what.to_s != "break"
-          puts "It's work time! (#{format(@work_progress)})"
-          while @work_progress - @start < WORK_TIME
-            @work_progress = Time.now
-            sleep 1
-          end
-          beep
-        end
-
-        puts "It's break time!(#{format(@work_progress)})"
-        @break_progress = Time.now
-        while @break_progress - @work_progress < BREAK_TIME
-          @break_progress = Time.now
-          sleep 1
-        end
-
-        puts "Pomodoro finished!(#{format(@break_progress)})"
-
-        beep
-        @finished = true
-      end
+    def initialize(will_work=false)
+      @running = RunningThread.new(will_work)
       return nil
     end
 
     def show_status
-      if @finished
-        puts "It's done"
-      elsif @break_progress
-        puts "It's break time! (#{format_seconds(BREAK_TIME - (@break_progress-@work_progress))})"
+      cycle = @running.cycle
+      if cycle.stopped?
+        puts "No pomodoro running."
+      elsif cycle.break?
+        puts "It's break time! (#{format_seconds(cycle.missing_progress)})"
       else
-        puts "It's work time! (#{format_seconds(WORK_TIME - (@work_progress-@start))})"
+        puts "It's work time! (#{format_seconds(cycle.missing_progress)})"
       end
     end
 
     def cancel
-      @thread.kill
-      @finished = true
+      @running.kill
     end
 
     def finished?
-      return @finished
+      return @running.cycle.stopped?
     end
 
   private
 
-    def format(time)
-      return time.strftime("%H:%M")
-    end
-
     def format_seconds(seconds)
       return sprintf("%.2d:%.2d",seconds/60, seconds%60)
     end
-
-    def beep
-      system "aplay #{File.join(File.dirname(__FILE__),"../../#{BEEP_SOUND}")} --quiet"
-    end
   end
 end

data/lib/pomodoro_timer/running_thread.rb

@@ -0,0 +1,38 @@
+module PomodoroTimer
+  class RunningThread
+    attr_reader :cycle
+
+    def initialize(will_work=false)
+      @will_work = will_work
+      @cycle = Cycle::STOPPED
+
+      @thread = Thread.new do
+        run
+      end
+    end
+
+    def run
+      if @will_work
+        @cycle = Cycle.work
+        @cycle.start
+      end
+
+      @cycle = Cycle.break
+      @cycle.start
+
+      puts "Pomodoro finished!(#{format(Time.now)})"
+      @cycle = Cycle::STOPPED
+    end
+
+    def kill
+      @cycle = Cycle::STOPPED
+      @thread.kill
+    end
+
+private
+
+    def format(time)
+      return time.strftime(PomodoroTimer::TIME_FORMAT)
+    end
+  end
+end

data/lib/pomodoro_timer/version.rb

@@ -1,3 +1,3 @@
 module PomodoroTimer
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/pomodoro_timer.rb

@@ -1,14 +1,18 @@
 require 'fixnum'
 require 'pomodoro_timer/pomodoro'
+require 'pomodoro_timer/running_thread'
+require 'pomodoro_timer/cycle'
 require 'pomodoro_timer/version'
 
 module PomodoroTimer
   extend self
 
+  TIME_FORMAT = "%H:%M"
+
   def start(what=nil)
     @@pomodoro ||= nil
     if @@pomodoro.nil? || @@pomodoro.finished?
-      @@pomodoro = Pomodoro.new(what)
+      @@pomodoro = Pomodoro.new(what!=Cycle::BREAK_NAME)
     else
       puts "Exist another pomodoro running!"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pomodoro_timer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-30 00:00:00.000000000 Z
+date: 2012-07-01 00:00:00.000000000 Z
 dependencies: []
 description: Helps handle your pomodoro time.
 email:
@@ -23,10 +23,10 @@ files:
 - README.md
 - Rakefile
 - lib/fixnum.rb
-- lib/lib/pomodoro_timer.rb
-- lib/lib/pomodoro_timer/version.rb
 - lib/pomodoro_timer.rb
+- lib/pomodoro_timer/cycle.rb
 - lib/pomodoro_timer/pomodoro.rb
+- lib/pomodoro_timer/running_thread.rb
 - lib/pomodoro_timer/version.rb
 - pomodoro_timer.gemspec
 - resources/ding.wav
@@ -53,5 +53,5 @@ rubyforge_project:
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: pomodoro_timer (0.0.2)
+summary: pomodoro_timer (0.0.3)
 test_files: []

data/lib/lib/pomodoro_timer/version.rb

@@ -1,3 +0,0 @@
-module PomodoroTimer
-  VERSION = "0.0.1"
-end

data/lib/lib/pomodoro_timer.rb

@@ -1,5 +0,0 @@
-require "pomodoro_timer/version"
-
-module PomodoroTimer
-  # Your code goes here...
-end