timer 0.1.3 → 0.1.4

data/Rakefile

@@ -14,6 +14,7 @@ begin
     gem.add_development_dependency "progressions-g", ">= 0"
     gem.add_development_dependency "rspec", ">= 0"
     gem.add_development_dependency "timecop", ">= 0"
+    gem.add_development_dependency "natural_time", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -22,8 +23,28 @@ rescue LoadError
 end
 
 require 'spec/rake/spectask'
-desc 'run all specs'
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ['-c']
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+  spec.spec_opts = ['-c']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :spec => :check_dependencies
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "translator #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/timer.rb

@@ -1,15 +1,16 @@
 require 'rubygems'
 require 'g'
+require 'natural_time'
 
 class Timer
   attr_accessor :title, :growl
   
+  DEFAULT_OPTIONS = { :growl => true }
+  
   def initialize(options={})
+    options = DEFAULT_OPTIONS.merge(options)
     @title = options[:title]
-    @growl = true
-    if options.has_key?(:growl)
-      @growl = options[:growl]
-    end
+    @growl = options[:growl]
   end
   
   def time(message="", options={})
@@ -19,10 +20,9 @@ class Timer
     begin
       yield
     rescue StandardError => e
-      put_elapsed_time(start_time, Time.now, message, current_title)
-      raise e
     end
     put_elapsed_time(start_time, Time.now, message, current_title)
+    raise e if e
   end
   
   def growl?
@@ -32,7 +32,7 @@ class Timer
   private
 
   def put_elapsed_time(start_time, end_time, message="", current_title=nil)
-    elapsed_time = format_time(start_time, end_time)
+    elapsed_time = format_time(end_time - start_time)
 
     e = ""
     if message.to_s.strip != ""
@@ -44,26 +44,8 @@ class Timer
     growl(e, current_title)
   end
   
-  def format_time(start_time, end_time=nil)
-    end_time ||= Time.now
-    seconds = end_time - start_time
-    if seconds > 59
-      minutes = seconds / 60.0
-      seconds = (minutes - minutes.to_i) * 60
-      m = minutes.to_i
-      s = seconds.to_i
-
-      minutes_msg = m != 1 ? "minutes" : "minute"
-      elapsed_time = "#{m} #{minutes_msg}"
-      if s > 0
-        seconds_msg = s != 1 ? "seconds" : "second"
-        elapsed_time += ", #{s} #{seconds_msg}"
-      end
-    else
-      s = seconds.to_i != 1 ? "seconds" : "second"
-      elapsed_time = "#{seconds.to_i} #{s}"
-    end
-    elapsed_time
+  def format_time(duration)
+    NaturalTime.new(duration).to_sentence
   end
   
   def growl(message, current_title)

data/spec/timer_spec.rb

@@ -158,7 +158,7 @@ describe "Timer" do
     end
     
     it "should report minutes and seconds" do
-      @g.should_receive(:notify).with(anything, anything, /Elapsed time: 1 minute, 14 seconds\"\n$/, anything, anything)
+      @g.should_receive(:notify).with(anything, anything, /Elapsed time: 1 minute and 14 seconds\"\n$/, anything, anything)
       @timer.time("hello") do
         Timecop.freeze(Time.now + 74)
       end

data/timer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{timer}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Coleman"]
-  s.date = %q{2010-01-12}
+  s.date = %q{2010-01-13}
   s.description = %q{Simple timer to perform a block and display the elapsed time. Growls message if growl is turned on.}
   s.email = %q{progressions@gmail.com}
   s.extra_rdoc_files = [
@@ -45,17 +45,20 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<progressions-g>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<timecop>, [">= 0"])
+      s.add_development_dependency(%q<natural_time>, [">= 0"])
     else
       s.add_dependency(%q<ruby-growl>, [">= 0"])
       s.add_dependency(%q<progressions-g>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<timecop>, [">= 0"])
+      s.add_dependency(%q<natural_time>, [">= 0"])
     end
   else
     s.add_dependency(%q<ruby-growl>, [">= 0"])
     s.add_dependency(%q<progressions-g>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<timecop>, [">= 0"])
+    s.add_dependency(%q<natural_time>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: timer
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jeff Coleman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-12 00:00:00 -06:00
+date: 2010-01-13 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: natural_time
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Simple timer to perform a block and display the elapsed time. Growls message if growl is turned on.
 email: progressions@gmail.com
 executables: []