hitimes 1.1.1-java → 1.2.0-java

data/ext/{java → hitimes/java}/src/hitimes/Hitimes.java

@@ -42,7 +42,7 @@ public class Hitimes {
     }
 
     static RaiseException newHitimesError( Ruby runtime, String message ) {
-        RubyClass errorClass = runtime.fastGetModule("Hitimes").fastGetClass( "Error" );
+        RubyClass errorClass = runtime.getModule("Hitimes").getClass( "Error" );
         return new RaiseException( RubyException.newException( runtime, errorClass, message ), true );
     }
 

data/ext/{java → hitimes/java}/src/hitimes/HitimesInterval.java

@@ -47,6 +47,13 @@ public class HitimesInterval extends RubyObject {
     @JRubyMethod( name = "duration", alias = { "length", "to_f", "to_seconds" } )
     public IRubyObject duration() {
 
+        /*
+         * if start has not yet been called, then raise an exception.
+         */
+        if ( INSTANT_NOT_SET == this.start_instant ) {
+            throw Hitimes.newHitimesError( getRuntime(), "Attempt to report a duration on an interval that has not started");
+        }
+
         /*
          * if stop has not yet been called, then return the amount of time so far
          */
@@ -128,7 +135,7 @@ public class HitimesInterval extends RubyObject {
     @JRubyMethod( name = "stop" )
     public IRubyObject stop() {
         if ( INSTANT_NOT_SET == this.start_instant ) {
-            throw Hitimes.newHitimesError( getRuntime(), "Attempt to stop an interval that has not started." + System.nanoTime() );
+            throw Hitimes.newHitimesError( getRuntime(), "Attempt to stop an interval that has not started" );
         }
 
         if ( INSTANT_NOT_SET == this.stop_instant ) {

data/lib/hitimes.rb

@@ -15,16 +15,26 @@ module Hitimes
   # Base class of all errors in Hitimes
   #
   class Error < ::StandardError; end
+
+  # Hitimes.measure { } -> Float
+  #
+  # Times the execution of the block, returning the number of seconds it took
+  def self.measure(&block)
+    Hitimes::Interval.measure(&block)
+  end
 end
 require 'hitimes/paths'
 require 'hitimes/version'
 
-if RUBY_PLATFORM == "java" then
+# Load the binary extension, try loading one for the specific version of ruby
+# and if that fails, then fall back to one in the top of the library.
+# this is the method recommended by rake-compiler
+begin
+  # this will be for windows
+  require "hitimes/#{RUBY_VERSION.sub(/\.\d$/,'')}/hitimes"
+rescue LoadError
+  # everyone else.
   require 'hitimes/hitimes'
-else
-  # use a version subdirectory for extensions, initially to support windows, but
-  # why make a special case.  It doesn't hurt anyone to have an extra subdir.
-  require "hitimes/#{RUBY_VERSION.sub(/\.\d$/,'')}/hitimes_ext"
 end
 
 require 'hitimes/stats'

data/lib/hitimes/version.rb

@@ -4,54 +4,5 @@
 #++
 
 module Hitimes
-  #
-  # module containing all the version information about Hitimes
-  #
-  module Version
-
-    # Major version number
-    MAJOR   = 1
-
-    # Minor version number
-    MINOR   = 1
-
-    # Build number
-    BUILD   = 1
-
-    #
-    # :call-seq:
-    #   Version.to_a -> [ MAJOR, MINOR, BUILD ]
-    #
-    # Return the version as an array of Integers
-    #
-    def self.to_a
-      [MAJOR, MINOR, BUILD]
-    end
-
-    #
-    # :call-seq:
-    #   Version.to_s -> "MAJOR.MINOR.BUILD"
-    #
-    # Return the version as a String with dotted notation
-    #
-    def self.to_s
-      to_a.join(".")
-    end
-
-    #
-    # :call-seq:
-    #   Version.to_hash -> { :major => ..., :minor => ..., :build => ... }
-    #
-    # Return the version as a Hash
-    #
-    def self.to_hash
-      { :major => MAJOR, :minor => MINOR, :build => BUILD }
-    end
-
-    # The Version in MAJOR.MINOR.BUILD dotted notation
-    STRING = Version.to_s
-  end
-
-  # The Version in MAJOR.MINOR.BUILD dotted notation
-  VERSION = Version.to_s
+  VERSION = "1.2.0"
 end

data/spec/hitimes_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Hitimes do
+  it "can time a block of code" do
+    d = Hitimes.measure do
+      sleep 0.2
+    end
+    d.should be_within(0.02).of(0.2)
+  end
+
+  it "raises an error if measure is called with no block" do
+    lambda{ Hitimes.measure }.should raise_error( Hitimes::Error, /\ANo block given to Interval.measure\Z/ )
+  end
+end

data/spec/interval_spec.rb

@@ -1,11 +1,14 @@
-require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
-
-require 'hitimes'
+require "spec_helper"
 
 describe Hitimes::Interval do
-  it "has a 0 duration when newly created" do
-    i = Hitimes::Interval.new   
-    i.duration == 0.0
+  it "raises an error if duration is called on a non-started interval" do
+    i = Hitimes::Interval.new
+    lambda{ i.duration }.should raise_error( Hitimes::Error, /\AAttempt to report a duration on an interval that has not started\Z/ )
+  end
+
+  it "raises an error if stop is called on a non-started interval" do
+    i = Hitimes::Interval.new
+    lambda { i.stop }.should raise_error( Hitimes::Error, /\AAttempt to stop an interval that has not started\Z/ )
   end
 
   it "knows if it has been started" do
@@ -37,11 +40,11 @@ describe Hitimes::Interval do
     d = Hitimes::Interval.measure do
       sleep 0.2
     end
-    d.should be_close(0.2, 0.02)
+    d.should be_within(0.02).of(0.2)
   end
 
   it "raises an error if measure is called with no block" do
-    lambda{ Hitimes::Interval.measure }.should raise_error( Hitimes::Error )
+    lambda{ Hitimes::Interval.measure }.should raise_error( Hitimes::Error, /\ANo block given to Interval.measure\Z/ )
   end
 
   it "creates an interval via #now" do
@@ -60,10 +63,10 @@ describe Hitimes::Interval do
 
   it "calling start multiple times on has no effect after the first call" do
     i = Hitimes::Interval.new
-    i.start.should == true
+    i.start.should be == true
     x = i.start_instant
-    i.start_instant.should > 0
-    i.start.should == false
+    i.start_instant.should be > 0
+    i.start.should be == false
     x.should == i.start_instant
   end
 
@@ -75,12 +78,12 @@ describe Hitimes::Interval do
 
   it "calling stop multiple times on has no effect after the first call" do
     i = Hitimes::Interval.new
-    i.start.should == true
+    i.start.should be == true
     i.stop
 
     x = i.stop_instant
-    i.stop_instant.should > 0
-    i.stop.should == false
+    i.stop_instant.should be > 0
+    i.stop.should be == false
     x.should == i.stop_instant
 
   end
@@ -90,14 +93,14 @@ describe Hitimes::Interval do
     i.start
     x = i.stop
     y = i.duration
-    i.stop.should == false
+    i.stop.should be == false
 
     z = i.duration
 
-    x.should == y
-    x.should == z
+    x.should be == y
+    x.should be == z
 
-    y.should == z
+    y.should be == z
   end
 
   it "can return how much time has elapsed from the start without stopping the interval" do
@@ -107,9 +110,9 @@ describe Hitimes::Interval do
     i.should be_running
     y = i.duration_so_far
     i.stop
-    x.should < y
-    x.should < i.duration
-    y.should < i.duration
+    x.should be < y
+    x.should be < i.duration
+    y.should be < i.duration
   end
 
   describe "#split" do

data/spec/metric_spec.rb

@@ -1,6 +1,4 @@
-require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
-
-require 'hitimes/metric'
+require "spec_helper"
 
 describe Hitimes::Metric do
   before( :each ) do
@@ -8,22 +6,22 @@ describe Hitimes::Metric do
   end
 
   it 'has a name' do
-    @metric.name.should == "testing"
+    @metric.name.should be == "testing"
   end
 
   it "has associated data from initialization" do
     m = Hitimes::Metric.new( "more-data", 'foo' => 'bar', 'this' => 'that' )
-    m.additional_data['foo'].should == 'bar'
-    m.additional_data['this'].should == 'that'
+    m.additional_data['foo'].should be == 'bar'
+    m.additional_data['this'].should be == 'that'
     
     m = Hitimes::Metric.new( "more-data", { 'foo' => 'bar', 'this' => 'that' } )
-    m.additional_data['foo'].should == 'bar'
-    m.additional_data['this'].should == 'that'
+    m.additional_data['foo'].should be == 'bar'
+    m.additional_data['this'].should be == 'that'
   end
 
   it "initially has no sampling times" do
-    @metric.sampling_start_time.should == nil
-    @metric.sampling_stop_time.should == nil
+    @metric.sampling_start_time.should be == nil
+    @metric.sampling_stop_time.should be == nil
   end
 end
 

data/spec/mutex_stats_spec.rb

@@ -1,7 +1,4 @@
-require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
-
-require 'hitimes'
-require 'hitimes/mutexed_stats'
+require 'spec_helper'
 
 describe Hitimes::MutexedStats do
   before( :each ) do
@@ -19,8 +16,13 @@ describe Hitimes::MutexedStats do
     return stats
   end
 
-  it "is unsafe normally" do
-    pending "not for MRI -- not interruptable in this C extension" do
+  if (not defined? RUBY_ENGINE) or (RUBY_ENGINE == "ruby") then
+    it "Hitimes::Stats is threadsafe" do
+      stats = run_with_scissors( ::Hitimes::Stats.new, @threads, @iters )
+      stats.count.should== @final_value
+    end
+  else
+    it "Hitimes::Stats is not threadsafe" do
       stats = run_with_scissors( ::Hitimes::Stats.new, @threads, @iters )
       stats.count.should_not == @final_value
     end

data/spec/paths_spec.rb

@@ -1,6 +1,4 @@
-require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
-
-require 'hitimes/paths'
+require 'spec_helper'
 
 describe Hitimes::Paths do
   it "can access the root dir of the project" do

data/spec/spec_helper.rb

@@ -1,5 +1,9 @@
-require 'rubygems'
-require 'spec'
+if RUBY_VERSION >= '1.9.2' then
+  require 'simplecov'
+  puts "Using coverage!"
+  SimpleCov.start if ENV['COVERAGE']
+end
 
-$: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
+require 'rspec/autorun'
+require 'hitimes'
 

data/spec/stats_spec.rb

@@ -1,6 +1,4 @@
-require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
-
-require 'hitimes/stats'
+require 'spec_helper'
 require 'json'
 
 describe Hitimes::Stats do
@@ -12,60 +10,60 @@ describe Hitimes::Stats do
   end
 
   it "is initialized with 0 values" do
-    @stats.count.should == 0
-    @stats.min.should == 0.0
-    @stats.max.should == 0.0
-    @stats.sum.should == 0.0
-    @stats.rate.should == 0.0
+    @stats.count.should be == 0
+    @stats.min.should be == 0.0
+    @stats.max.should be == 0.0
+    @stats.sum.should be == 0.0
+    @stats.rate.should be == 0.0
   end
 
   it "calculates the mean correctly" do
-    @full_stats.mean.should == 2.0
+    @full_stats.mean.should be == 2.0
   end
 
   it "calculates the rate correctly" do
-    @full_stats.rate.should == 0.5
+    @full_stats.rate.should be == 0.5
   end
 
   it "tracks the maximum value" do
-    @full_stats.max.should == 3.0
+    @full_stats.max.should be == 3.0
   end
 
   it "tracks the minimum value" do
-    @full_stats.min.should == 1.0
+    @full_stats.min.should be == 1.0
   end
 
   it "tracks the count" do
-    @full_stats.count.should == 3
+    @full_stats.count.should be == 3
   end
   
   it "tracks the sum" do
-    @full_stats.sum.should == 6.0
+    @full_stats.sum.should be == 6.0
   end
 
   it "calculates the standard deviation" do
-    @full_stats.stddev.should == 1.0
+    @full_stats.stddev.should be == 1.0
   end 
 
   it "calculates the sum of squares " do
-    @full_stats.sumsq.should == 14.0
+    @full_stats.sumsq.should be == 14.0
   end 
 
   describe "#to_hash " do
     it "converts to a Hash" do
       h = @full_stats.to_hash
-      h.size.should == ::Hitimes::Stats::STATS.size
-      h.keys.sort.should == ::Hitimes::Stats::STATS
+      h.size.should be == ::Hitimes::Stats::STATS.size
+      h.keys.sort.should be == ::Hitimes::Stats::STATS
     end
 
     it "converts to a limited Hash if given arguments" do
       h = @full_stats.to_hash( "min", "max", "mean" )
-      h.size.should == 3
-      h.keys.sort.should == %w[ max mean min  ]
+      h.size.should be == 3
+      h.keys.sort.should be == %w[ max mean min  ]
 
       h = @full_stats.to_hash( %w[ count rate ] )
-      h.size.should == 2
-      h.keys.sort.should == %w[ count rate ]
+      h.size.should be == 2
+      h.keys.sort.should be == %w[ count rate ]
     end
 
     it "raises NoMethodError if an invalid stat is used" do
@@ -77,20 +75,20 @@ describe Hitimes::Stats do
     it "converts to a json string" do
       j = @full_stats.to_json
       h = JSON.parse( j )
-      h.size.should == ::Hitimes::Stats::STATS.size
-      h.keys.sort.should == ::Hitimes::Stats::STATS
+      h.size.should be == ::Hitimes::Stats::STATS.size
+      h.keys.sort.should be == ::Hitimes::Stats::STATS
     end
 
     it "converts to a limited Hash if given arguments" do
       j = @full_stats.to_json( "min", "max", "mean" )
       h = JSON.parse( j )
-      h.size.should == 3
-      h.keys.sort.should == %w[ max mean min  ]
+      h.size.should be == 3
+      h.keys.sort.should be == %w[ max mean min  ]
 
       j = @full_stats.to_json( %w[ count rate ] )
       h = JSON.parse( j )
-      h.size.should == 2
-      h.keys.sort.should == %w[ count rate ]
+      h.size.should be == 2
+      h.keys.sort.should be == %w[ count rate ]
     end
 
     it "raises NoMethodError if an invalid stat is used" do