hitimes 1.0.5 → 1.1.0

data/HISTORY

@@ -1,4 +1,8 @@
 = Changelog
+== Version 1.1.0 2010-07-28
+
+* Add a pure java extension so hitimes may be used in jruby with the same API
+
 == Version 1.0.5 2010-07-20
 
 * Fix 'circular require considered harmful' warnings in 1.9.x (reported by Roger Pack)

data/gemspec.rb

@@ -57,4 +57,9 @@ Hitimes::GEM_SPEC_MINGW32= Hitimes::GEM_SPEC.clone
 Hitimes::GEM_SPEC_MINGW32.platform = ::Gem::Platform.new( "i386-mingw32" )
 Hitimes::GEM_SPEC_MINGW32.extensions = []
 
-Hitimes::SPECS = [ Hitimes::GEM_SPEC, Hitimes::GEM_SPEC_MSWIN32, Hitimes::GEM_SPEC_MINGW32 ] 
+Hitimes::GEM_SPEC_JAVA = Hitimes::GEM_SPEC.clone
+Hitimes::GEM_SPEC_JAVA.platform = ::Gem::Platform.new( 'java' )
+Hitimes::GEM_SPEC_JAVA.extensions = []
+
+Hitimes::SPECS = [ Hitimes::GEM_SPEC, Hitimes::GEM_SPEC_MSWIN32, Hitimes::GEM_SPEC_MINGW32, Hitimes::GEM_SPEC_JAVA ]
+

data/lib/hitimes.rb

@@ -19,9 +19,14 @@ end
 require 'hitimes/paths'
 require 'hitimes/version'
 
-# 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"
+if RUBY_PLATFORM == "java" then
+  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'
 require 'hitimes/mutexed_stats'
 

data/lib/hitimes/version.rb

@@ -13,10 +13,10 @@ module Hitimes
     MAJOR   = 1
 
     # Minor version number
-    MINOR   = 0
+    MINOR   = 1
 
     # Build number
-    BUILD   = 5
+    BUILD   = 0
 
     #
     # :call-seq:

data/spec/interval_spec.rb

@@ -37,7 +37,7 @@ describe Hitimes::Interval do
     d = Hitimes::Interval.measure do
       sleep 0.2
     end
-    d.should be_close(0.2, 0.01)
+    d.should be_close(0.2, 0.02)
   end
 
   it "raises an error if measure is called with no block" do

data/spec/timed_metric_spec.rb

@@ -84,10 +84,10 @@ describe Hitimes::TimedMetric do
   end
 
   it "keeps track of the minimum start time of all the intervals" do
-    f1 = Time.now.gmtime.to_f * 1000000
+    f1 = Time.now.gmtime.to_f * 1_000_000
     5.times { @tm.start ; sleep 0.05 ; @tm.stop }
-    f2 = Time.now.gmtime.to_f * 1000000
-    @tm.sampling_start_time.should > f1
+    f2 = Time.now.gmtime.to_f * 1_000_000
+    @tm.sampling_start_time.should >= f1
     @tm.sampling_start_time.should < f2
     # distance from now to start time should be greater than the distance from
     # the start to the min start_time
@@ -99,7 +99,7 @@ describe Hitimes::TimedMetric do
     5.times { @tm.start ; sleep 0.05 ; @tm.stop }
     f2 = Time.now.gmtime.to_f * 1_000_000
     @tm.sampling_stop_time.should > f1
-    @tm.sampling_stop_time.should < f2
+    @tm.sampling_stop_time.should <= f2
     # distance from now to max stop time time should be less than the distance
     # from the start to the max stop time
     (f2 - @tm.sampling_stop_time).should < ( @tm.sampling_stop_time - f1 )
@@ -140,7 +140,7 @@ describe Hitimes::TimedMetric do
     it "has the right sum" do
       10.times { |x| @tm.measure { sleep 0.01*x  } }
       h = @tm.to_hash
-      h['sum'].should be_close( 0.45, 0.002 )
+      h['sum'].should be_close( 0.45, 0.003 )
     end
 
     fields = ::Hitimes::Stats::STATS.dup + %w[ name additional_data sampling_start_time sampling_stop_time ]

data/spec/timed_value_metric_spec.rb

@@ -97,7 +97,7 @@ describe Hitimes::TimedValueMetric do
     f1 = Time.now.gmtime.to_f * 1000000
     5.times { @tm.start ; sleep 0.05 ; @tm.stop( 1 ) }
     f2 = Time.now.gmtime.to_f * 1000000
-    @tm.sampling_start_time.should > f1
+    @tm.sampling_start_time.should >= f1
     @tm.sampling_start_time.should < f2
     # distance from now to start time should be greater than the distance from
     # the start to the min start_time
@@ -109,7 +109,7 @@ describe Hitimes::TimedValueMetric do
     5.times { @tm.start ; sleep 0.05 ; @tm.stop( 1 ) }
     f2 = Time.now.gmtime.to_f * 1000000
     @tm.sampling_stop_time.should > f1
-    @tm.sampling_stop_time.should < f2
+    @tm.sampling_stop_time.should <= f2
     # distance from now to max stop time time should be less than the distance
     # from the start to the max stop time
     (f2 - @tm.sampling_stop_time).should < ( @tm.sampling_stop_time - f1 )

data/spec/value_metric_spec.rb

@@ -58,10 +58,10 @@ describe Hitimes::ValueMetric do
   it "keeps track of the first start time of all the measurements" do
     m = Hitimes::ValueMetric.new( "first-start-time" )
     f1 = Time.now.gmtime.to_f * 1_000_000
-    10.times{ |x| m.measure( x ) }
+    10.times{ |x| m.measure( x ); sleep 0.1 }
     f2 = Time.now.gmtime.to_f * 1_000_000
-    m.sampling_start_time.should > f1
-    m.sampling_stop_time.should < f2
+    m.sampling_start_time.should >= f1
+    m.sampling_start_time.should < f2
     # distance from now to start time should be greater than the distance from
     # the start to the min start_time
     (f2 - m.sampling_start_time).should > ( m.sampling_start_time - f1 )
@@ -70,10 +70,10 @@ describe Hitimes::ValueMetric do
   it "keeps track of the last stop time of all the intervals" do
     m = Hitimes::ValueMetric.new( "last-stop-time" )
     f1 = Time.now.gmtime.to_f * 1_000_000
-    10.times {|x| m.measure( x )  }
+    10.times {|x| m.measure( x ); sleep 0.1  }
     f2 = Time.now.gmtime.to_f * 1_000_000
     m.sampling_stop_time.should > f1
-    m.sampling_stop_time.should < f2
+    m.sampling_stop_time.should <= f2
     # distance from now to max stop time time should be less than the distance
     # from the start to the max stop time
     (f2 - m.sampling_stop_time).should < ( m.sampling_stop_time - f1 )

data/tasks/config.rb

@@ -2,6 +2,7 @@ require 'configuration'
 
 require 'rake'
 require 'tasks/utils'
+require 'yaml'
 
 #-----------------------------------------------------------------------
 # General project configuration
@@ -92,7 +93,7 @@ Configuration.for('rdoc') {
 #-----------------------------------------------------------------------
 Configuration.for('extension') {
   configs   Configuration.for('packaging').files.ext.find_all { |x| %w[ mkrf_conf.rb extconf.rb ].include?(File.basename(x)) }
-  cross_rbconfig YAML.load_file( File.expand_path("~/.rake-compiler/config.yml"))
+  cross_rbconfig ::YAML::load_file( File.expand_path("~/.rake-compiler/config.yml"))
 }
 
 #-----------------------------------------------------------------------

data/tasks/distribution.rake

@@ -36,11 +36,16 @@ if pkg_config = Configuration.for_if_exist?("packaging") then
       puts Hitimes::GEM_SPEC_WIN.to_ruby
     end
 
+    desc "dump gemspec for java"
+    task :gemspec_java do
+      puts Hitimes::GEM_SPEC_JAVA.to_ruby
+    end
+
     desc "reinstall gem"
     task :reinstall => [:uninstall, :repackage, :install]
 
     desc "package up a windows gem"
-    task :package_win => :clean do
+    task :package_win => :clean  do
       Configuration.for("extension").cross_rbconfig.keys.each do |rbconfig|
         v = rbconfig.split("-").last
         s = v.sub(/\.\d$/,'')
@@ -58,15 +63,25 @@ if pkg_config = Configuration.for_if_exist?("packaging") then
       end
     end
 
+    if RUBY_PLATFORM == "java" then
+      desc "package up a jruby gem"
+      task :package_java => "ext:build_java" do
+        Hitimes::GEM_SPEC_JAVA.files += FileList["lib/hitimes/java/*.jar"]
+        Gem::Builder.new( Hitimes::GEM_SPEC_JAVA ).build
+        mv Dir["*.gem"].first, "pkg"
+      end
+    end
+
     task :clobber do
       rm_rf "lib/hitimes/1.8"
       rm_rf "lib/hitimes/1.9"
+      rm_rf "lib/hitimes/*.jar"
     end
 
-    task :prep => [:clean, :package, :package_win]
+    task :prep => [:clean, :package, :package_win, :package_java ]
 
     desc "distribute copiously"
-    task :copious => [:clean, :package, :package_win ] do
+    task :copious => [:clean, :package, :package_win, :package_java ] do
       gems = Hitimes::SPECS.collect { |s| "#{s.full_name}.gem" }
       Rake::SshFilePublisher.new('jeremy@copiousfreetime.org',
                                '/var/www/vhosts/www.copiousfreetime.org/htdocs/gems/gems',

data/tasks/extension.rake

@@ -8,7 +8,7 @@ require 'pathname'
 if ext_config = Configuration.for_if_exist?('extension') then
   namespace :ext do  
     desc "Build the extension(s)"
-    task :build => :clean do
+    task :build => :clobber do
       ext_config.configs.each do |extension|
         path  = Pathname.new(extension)
         parts = path.split
@@ -26,6 +26,23 @@ if ext_config = Configuration.for_if_exist?('extension') then
       end
     end 
 
+    if RUBY_PLATFORM == "java" then
+      desc "Build the jruby extension"
+      task :build_java => [ :clobber, "lib/hitimes/hitimes.jar" ]
+
+      file "lib/hitimes/hitimes.jar" => FileList["ext/java/src/hitimes/*.java"] do |t|
+        jruby_home = Config::CONFIG['prefix']
+        jruby_jar  = File.join( jruby_home, 'lib', 'jruby.jar' )
+
+        mkdir_p 'pkg/classes'
+        sh "javac -classpath #{jruby_jar} -d pkg/classes #{t.prerequisites.join(' ')}"  
+
+        dest_dir = File.dirname(t.name)
+        sh "jar cf #{t.name} -C pkg/classes ."
+      end
+    end
+
+
     def build_win( version = "1.8.6" )
       ext_config = Configuration.for("extension")
       rbconfig = ext_config.cross_rbconfig["rbconfig-#{version}"]
@@ -34,7 +51,7 @@ if ext_config = Configuration.for_if_exist?('extension') then
         path = Pathname.new(extension)
         parts = path.split
         conf = parts.last
-        rvm = %x[ which rvm ].strip
+        rvm = File.expand_path( "~/.rvm/bin/rvm" )
         Dir.chdir(path.dirname) do |d| 
           if File.exist?( "Makefile" ) then
             sh "make clean distclean"

data/tasks/rspec.rake

@@ -25,7 +25,9 @@ if spec_config = Configuration.for_if_exist?("test") then
         end
       end
 
-      task :spec => "ext:build"
+      pre_req = "ext:build"
+      pre_req += "_java" if RUBY_PLATFORM == "java"
+      task :spec => pre_req
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hitimes
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 5
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-20 00:00:00 -06:00
+date: 2010-07-28 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -126,7 +126,6 @@ files:
 - ext/hitimes/hitimes_interval.h
 - ext/hitimes/hitimes_stats.h
 - ext/hitimes/extconf.rb
-- ext/hitimes/rbconfig.rb
 - lib/hitimes/metric.rb
 - lib/hitimes/mutexed_stats.rb
 - lib/hitimes/paths.rb

data/ext/hitimes/rbconfig.rb

@@ -1,179 +0,0 @@
-
-# This file was created by mkconfig.rb when ruby was built.  Any
-# changes made to this file will be lost the next time ruby is built.
-
-module Config
-  RUBY_VERSION == "1.8.6" or
-    raise "ruby lib version (1.8.6) doesn't match executable version (#{RUBY_VERSION})"
-
-  TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/1.8/i386-mingw32")
-  DESTDIR = '' unless defined? DESTDIR
-  CONFIG = {}
-  CONFIG["DESTDIR"] = DESTDIR
-  CONFIG["INSTALL"] = '/usr/bin/install -c'
-  CONFIG["prefix"] = (TOPDIR || DESTDIR + "/Users/jeremy/.rake-compiler/ruby/ruby-1.8.6-p287")
-  CONFIG["EXEEXT"] = ".exe"
-  CONFIG["ruby_install_name"] = "ruby"
-  CONFIG["RUBY_INSTALL_NAME"] = "ruby"
-  CONFIG["RUBY_SO_NAME"] = "msvcrt-ruby18"
-  CONFIG["SHELL"] = "/bin/sh"
-  CONFIG["PATH_SEPARATOR"] = ":"
-  CONFIG["PACKAGE_NAME"] = ""
-  CONFIG["PACKAGE_TARNAME"] = ""
-  CONFIG["PACKAGE_VERSION"] = ""
-  CONFIG["PACKAGE_STRING"] = ""
-  CONFIG["PACKAGE_BUGREPORT"] = ""
-  CONFIG["exec_prefix"] = "$(prefix)"
-  CONFIG["bindir"] = "$(exec_prefix)/bin"
-  CONFIG["sbindir"] = "$(exec_prefix)/sbin"
-  CONFIG["libexecdir"] = "$(exec_prefix)/libexec"
-  CONFIG["datarootdir"] = "$(prefix)/share"
-  CONFIG["datadir"] = "$(datarootdir)"
-  CONFIG["sysconfdir"] = "$(prefix)/etc"
-  CONFIG["sharedstatedir"] = "$(prefix)/com"
-  CONFIG["localstatedir"] = "$(prefix)/var"
-  CONFIG["includedir"] = "$(prefix)/include"
-  CONFIG["oldincludedir"] = "/usr/include"
-  CONFIG["docdir"] = "$(datarootdir)/doc/$(PACKAGE)"
-  CONFIG["infodir"] = "$(datarootdir)/info"
-  CONFIG["htmldir"] = "$(docdir)"
-  CONFIG["dvidir"] = "$(docdir)"
-  CONFIG["pdfdir"] = "$(docdir)"
-  CONFIG["psdir"] = "$(docdir)"
-  CONFIG["libdir"] = "$(exec_prefix)/lib"
-  CONFIG["localedir"] = "$(datarootdir)/locale"
-  CONFIG["mandir"] = "$(datarootdir)/man"
-  CONFIG["DEFS"] = ""
-  CONFIG["ECHO_C"] = ""
-  CONFIG["ECHO_N"] = "-n"
-  CONFIG["ECHO_T"] = ""
-  CONFIG["LIBS"] = "-lshell32 -lwsock32 "
-  CONFIG["build_alias"] = "i686-linux"
-  CONFIG["host_alias"] = "i386-mingw32"
-  CONFIG["target_alias"] = "i386-mingw32"
-  CONFIG["MAJOR"] = "1"
-  CONFIG["MINOR"] = "8"
-  CONFIG["TEENY"] = "6"
-  CONFIG["build"] = "i686-pc-linux"
-  CONFIG["build_cpu"] = "i686"
-  CONFIG["build_vendor"] = "pc"
-  CONFIG["build_os"] = "linux"
-  CONFIG["host"] = "i386-pc-mingw32"
-  CONFIG["host_cpu"] = "i386"
-  CONFIG["host_vendor"] = "pc"
-  CONFIG["host_os"] = "mingw32"
-  CONFIG["target"] = "i386-pc-mingw32"
-  CONFIG["target_cpu"] = "i386"
-  CONFIG["target_vendor"] = "pc"
-  CONFIG["target_os"] = "mingw32"
-  CONFIG["CC"] = "i386-mingw32-gcc"
-  CONFIG["CFLAGS"] = "-g -O2 "
-  CONFIG["LDFLAGS"] = "-L. "
-  CONFIG["CPPFLAGS"] = " $(DEFS)"
-  CONFIG["OBJEXT"] = "o"
-  CONFIG["CPP"] = "i386-mingw32-gcc -E"
-  CONFIG["GREP"] = "/usr/bin/grep"
-  CONFIG["EGREP"] = "/usr/bin/grep -E"
-  CONFIG["GNU_LD"] = "yes"
-  CONFIG["CPPOUTFILE"] = "-o conftest.i"
-  CONFIG["OUTFLAG"] = "-o "
-  CONFIG["YACC"] = "bison -y"
-  CONFIG["YFLAGS"] = ""
-  CONFIG["RANLIB"] = "i386-mingw32-ranlib"
-  CONFIG["AR"] = "i386-mingw32-ar"
-  CONFIG["AS"] = "i386-mingw32-as"
-  CONFIG["ASFLAGS"] = ""
-  CONFIG["NM"] = "i386-mingw32-nm"
-  CONFIG["WINDRES"] = "i386-mingw32-windres"
-  CONFIG["DLLWRAP"] = "i386-mingw32-dllwrap"
-  CONFIG["OBJDUMP"] = "i386-mingw32-objdump"
-  CONFIG["LN_S"] = "ln -s"
-  CONFIG["SET_MAKE"] = ""
-  CONFIG["INSTALL_PROGRAM"] = "$(INSTALL)"
-  CONFIG["INSTALL_SCRIPT"] = "$(INSTALL)"
-  CONFIG["INSTALL_DATA"] = "$(INSTALL) -m 644"
-  CONFIG["RM"] = "rm -f"
-  CONFIG["CP"] = "cp"
-  CONFIG["MAKEDIRS"] = "mkdir -p"
-  CONFIG["ALLOCA"] = ""
-  CONFIG["DLDFLAGS"] = " -Wl,--enable-auto-image-base,--enable-auto-import,--export-all"
-  CONFIG["ARCH_FLAG"] = ""
-  CONFIG["STATIC"] = ""
-  CONFIG["CCDLFLAGS"] = ""
-  CONFIG["LDSHARED"] = "i386-mingw32-gcc -shared -s"
-  CONFIG["DLEXT"] = "so"
-  CONFIG["DLEXT2"] = "dll"
-  CONFIG["LIBEXT"] = "a"
-  CONFIG["LINK_SO"] = ""
-  CONFIG["LIBPATHFLAG"] = " -L%s"
-  CONFIG["RPATHFLAG"] = ""
-  CONFIG["LIBPATHENV"] = ""
-  CONFIG["TRY_LINK"] = ""
-  CONFIG["STRIP"] = "strip"
-  CONFIG["EXTSTATIC"] = ""
-  CONFIG["setup"] = "Setup"
-  CONFIG["MINIRUBY"] = "ruby -I/Users/jeremy/.rake-compiler/builds/ruby-1.8.6-p287 -rfake"
-  CONFIG["PREP"] = "fake.rb"
-  CONFIG["RUNRUBY"] = "$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`"
-  CONFIG["EXTOUT"] = ".ext"
-  CONFIG["ARCHFILE"] = ""
-  CONFIG["RDOCTARGET"] = ""
-  CONFIG["XCFLAGS"] = " -DRUBY_EXPORT"
-  CONFIG["XLDFLAGS"] = " -Wl,--stack,0x02000000"
-  CONFIG["LIBRUBY_LDSHARED"] = "i386-mingw32-gcc -shared -s"
-  CONFIG["LIBRUBY_DLDFLAGS"] = " -Wl,--enable-auto-image-base,--enable-auto-import,--export-all -Wl,--out-implib=$(LIBRUBY)"
-  CONFIG["rubyw_install_name"] = "rubyw"
-  CONFIG["RUBYW_INSTALL_NAME"] = "rubyw"
-  CONFIG["LIBRUBY_A"] = "lib$(RUBY_SO_NAME)-static.a"
-  CONFIG["LIBRUBY_SO"] = "$(RUBY_SO_NAME).dll"
-  CONFIG["LIBRUBY_ALIASES"] = ""
-  CONFIG["LIBRUBY"] = "lib$(LIBRUBY_SO).a"
-  CONFIG["LIBRUBYARG"] = "$(LIBRUBYARG_SHARED)"
-  CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)-static"
-  CONFIG["LIBRUBYARG_SHARED"] = "-l$(RUBY_SO_NAME)"
-  CONFIG["SOLIBS"] = "$(LIBS)"
-  CONFIG["DLDLIBS"] = ""
-  CONFIG["ENABLE_SHARED"] = "yes"
-  CONFIG["MAINLIBS"] = ""
-  CONFIG["COMMON_LIBS"] = "m"
-  CONFIG["COMMON_MACROS"] = ""
-  CONFIG["COMMON_HEADERS"] = "windows.h winsock.h"
-  CONFIG["EXPORT_PREFIX"] = ""
-  CONFIG["MAKEFILES"] = "Makefile GNUmakefile"
-  CONFIG["arch"] = "i386-mingw32"
-  CONFIG["sitearch"] = "i386-msvcrt"
-  CONFIG["sitedir"] = "$(prefix)/lib/ruby/site_ruby"
-  CONFIG["configure_args"] = " '--target=i386-mingw32' '--host=i386-mingw32' '--build=i686-linux' '--enable-shared' '--disable-install-doc' '--without-tk' '--without-tcl' '--prefix=/Users/jeremy/.rake-compiler/ruby/ruby-1.8.6-p287' 'build_alias=i686-linux' 'host_alias=i386-mingw32' 'target_alias=i386-mingw32'"
-  CONFIG["NROFF"] = "/usr/bin/nroff"
-  CONFIG["MANTYPE"] = "doc"
-  CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
-  CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
-  CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
-  CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
-  CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
-  CONFIG["topdir"] = File.dirname(__FILE__)
-  MAKEFILE_CONFIG = {}
-  CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}
-  def Config::expand(val, config = CONFIG)
-    val.gsub!(/\$\$|\$\(([^()]+)\)|\$\{([^{}]+)\}/) do |var|
-      if !(v = $1 || $2)
-	'$'
-      elsif key = config[v = v[/\A[^:]+(?=(?::(.*?)=(.*))?\z)/]]
-	pat, sub = $1, $2
-	config[v] = false
-	Config::expand(key, config)
-	config[v] = key
-	key = key.gsub(/#{Regexp.quote(pat)}(?=\s|\z)/n) {sub} if pat
-	key
-      else
-	var
-      end
-    end
-    val
-  end
-  CONFIG.each_value do |val|
-    Config::expand(val)
-  end
-end
-RbConfig = Config # compatibility for ruby-1.9
-CROSS_COMPILING = nil unless defined? CROSS_COMPILING