timer 0.0.4 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.1.0

data/lib/timer.rb

@@ -1,17 +1,48 @@
 require 'rubygems'
 require 'g'
 
-module Timer
+class Timer
+  attr_accessor :timer_title, :growl
+  
+  def initialize(options={})
+    @timer_title = options[:title]
+    if options[:growl] == nil
+      options[:growl] = true
+    end
+    @growl = options[:growl]
+  end
+  
   def time(message="", options={})
-    title = options[:title] || ""
+    title = options[:title] || timer_title
     
     start_time = Time.now
     yield
     end_time = Time.now
     put_elapsed_time(start_time, end_time, message, title)
   end
+  
+  private
+  
+  def growl?
+    @growl
+  end
 
   def put_elapsed_time(start_time, end_time, message="", title=nil)
+    elapsed_time = format_time(start_time, end_time)
+
+    puts
+    e = ""
+    if message.to_s.strip != ""
+      message += ". "
+    end
+    e = message + e
+    e += "Elapsed time: #{elapsed_time}"
+    puts e
+    growl(e, 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
@@ -26,25 +57,21 @@ module Timer
     else
       s = seconds.to_i > 1 ? "seconds" : "minutes"
       elapsed_time = "#{seconds.to_i} #{s}"
-    end
-
-    puts
-    e = ""
-    if message.strip != ""
-      message += ". "
-    end
-    e = message + e
-    e += "Elapsed time: #{elapsed_time}"
-    puts e
-    if title
-      g(e, :title => title)
-    else
-      g(e)
+    end    
+  end
+  
+  def growl(message, title)
+    if growl?
+      if title
+        g(message, :title => title)
+      else
+        g(message)
+      end
     end
   rescue StandardError => e
     # growl isn't turned on, fail silently
     unless e.message =~ /Connection refused/
       raise e
-    end
+    end    
   end
 end

data/timer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{timer}
-  s.version = "0.0.4"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Coleman"]
-  s.date = %q{2010-01-10}
+  s.date = %q{2010-01-11}
   s.description = %q{Simple timer to perform a block and display the elapsed time}
   s.email = %q{progressions@gmail.com}
   s.extra_rdoc_files = [
@@ -24,8 +24,6 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/timer.rb",
-     "test/helper.rb",
-     "test/test_timer.rb",
      "timer.gemspec"
   ]
   s.homepage = %q{http://github.com/progressions/timer}
@@ -33,10 +31,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Simple timer to perform a block and display the elapsed time}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_timer.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: timer
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jeff Coleman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-10 00:00:00 -06:00
+date: 2010-01-11 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,8 +49,6 @@ files:
 - Rakefile
 - VERSION
 - lib/timer.rb
-- test/helper.rb
-- test/test_timer.rb
 - timer.gemspec
 has_rdoc: true
 homepage: http://github.com/progressions/timer
@@ -80,6 +78,5 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Simple timer to perform a block and display the elapsed time
-test_files: 
-- test/helper.rb
-- test/test_timer.rb
+test_files: []
+

data/test/helper.rb

@@ -1,10 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'timer'
-
-class Test::Unit::TestCase
-end

data/test/test_timer.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestTimer < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end