hitimes 1.0.4 → 1.0.5

data/HISTORY

@@ -1,5 +1,10 @@
 = Changelog
-== Version 1.0.4 2009-08-1
+== Version 1.0.5 2010-07-20
+
+* Fix 'circular require considered harmful' warnings in 1.9.x (reported by Roger Pack)
+* Fix 'method redefined' warnings in 1.9.x (reported by Roger Pack)
+
+== Version 1.0.4 2009-08-01
 
 * Add in support for x86-mingw32 gem
 * Add version subdirectory for extension on all platforms

data/ext/hitimes/rbconfig.rb

@@ -0,0 +1,179 @@
+
+# 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

data/lib/hitimes.rb

@@ -24,6 +24,7 @@ require 'hitimes/version'
 require "hitimes/#{RUBY_VERSION.sub(/\.\d$/,'')}/hitimes_ext"
 require 'hitimes/stats'
 require 'hitimes/mutexed_stats'
+
 require 'hitimes/metric'
 require 'hitimes/value_metric'
 require 'hitimes/timed_metric'

data/lib/hitimes/metric.rb

@@ -1,3 +1,9 @@
+
+#--
+# Copyright (c) 2008, 2009 Jeremy Hinegardner
+# All rights reserved.  See LICENSE and/or COPYING for details.
+#++
+
 module Hitimes
   #
   # Metric hold the common meta information for all derived metric classes

data/lib/hitimes/mutexed_stats.rb

@@ -1,4 +1,8 @@
-require 'hitimes'
+#--
+# Copyright (c) 2008, 2009 Jeremy Hinegardner
+# All rights reserved.  See LICENSE and/or COPYING for details.
+#++
+
 require 'thread'
 
 module Hitimes

data/lib/hitimes/stats.rb

@@ -1,4 +1,8 @@
-require 'hitimes'
+#--
+# Copyright (c) 2008, 2009 Jeremy Hinegardner
+# All rights reserved.  See LICENSE and/or COPYING for details.
+#++
+
 require 'stringio'
 module Hitimes
   class Stats

data/lib/hitimes/timed_metric.rb

@@ -3,7 +3,6 @@
 # All rights reserved.  See LICENSE and/or COPYING for details.
 #++
 
-require 'hitimes'
 require 'forwardable'
 module Hitimes
   #
@@ -171,7 +170,7 @@ module Hitimes
 
     # forward appropriate calls directly to the stats object
     extend Forwardable
-    def_delegators :@stats, :count, :sum, :max, :mean, :min, :rate, :stddev, :sum, :sumsq
+    def_delegators :@stats, :count, :max, :mean, :min, :rate, :stddev, :sum, :sumsq
     alias :duration :sum
   end
 end

data/lib/hitimes/timed_value_metric.rb

@@ -3,8 +3,6 @@
 # All rights reserved.  See LICENSE and/or COPYING for details.
 #++
 
-require 'hitimes'
-
 module Hitimes
   #
   # A TimedValueMetric holds the metrics on how long it takes to do a batch of something.

data/lib/hitimes/value_metric.rb

@@ -4,7 +4,6 @@
 #++
 
 require 'forwardable'
-require 'hitimes'
 module Hitimes
   #
   # A ValueMetric holds the data from measuring a single value over a period of
@@ -67,6 +66,6 @@ module Hitimes
 
     # forward appropriate calls directly to the stats object
     extend Forwardable
-    def_delegators :@stats, :count, :sum, :max, :mean, :min, :stddev, :sum, :sumsq
- end
+    def_delegators :@stats, :count, :max, :mean, :min, :stddev, :sum, :sumsq
+  end
 end

data/lib/hitimes/version.rb

@@ -16,7 +16,7 @@ module Hitimes
     MINOR   = 0
 
     # Build number
-    BUILD   = 4
+    BUILD   = 5
 
     #
     # :call-seq:

data/tasks/extension.rake

@@ -30,21 +30,20 @@ if ext_config = Configuration.for_if_exist?('extension') then
       ext_config = Configuration.for("extension")
       rbconfig = ext_config.cross_rbconfig["rbconfig-#{version}"]
       raise ArgumentError, "No cross compiler for version #{version}, we have #{ext_config.cross_rbconfig.keys.join(",")}" unless rbconfig
-      ruby_exe = if version =~ /1\.8/ then
-                   "ruby"
-                 else
-                   "ruby1.9"
-                 end
       Hitimes::GEM_SPEC.extensions.each do |extension|
         path = Pathname.new(extension)
         parts = path.split
         conf = parts.last
+        rvm = %x[ which rvm ].strip
         Dir.chdir(path.dirname) do |d| 
           if File.exist?( "Makefile" ) then
             sh "make clean distclean"
           end
           cp "#{rbconfig}", "rbconfig.rb"
-          sh "#{ruby_exe} -I. extconf.rb"
+          rubylib = ENV['RUBYLIB']
+          ENV['RUBYLIB'] = "."
+          sh %[#{rvm} #{version} -S extconf.rb]
+          ENV['RUBYLIB'] = rubylib
           sh "make"
         end
       end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hitimes
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  hash: 29
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -9,50 +15,87 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-01 00:00:00 -06:00
+date: 2010-07-20 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 0
+        - 8
+        - 1
         version: 0.8.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: configuration
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 0
+        - 5
         version: 0.0.5
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 1
+        - 3
         version: 1.1.3
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
         version: 0.5.0
-    version: 
-description: "Hitimes is a fast, high resolution timer library for recording performance metrics.  It uses the appropriate C method calls for each system to get the highest granularity time increments possible.    It currently supports any of the following systems:  * any system with the POSIX call <tt>clock_gettime()</tt>, * Mac OS X * Windows  Using Hitimes can be faster than using a series of +Time.new+ calls, and it will have a much higher granularity.   It is definitely faster than using +Process.times+."
+  type: :development
+  version_requirements: *id004
+description: |-
+  Hitimes is a fast, high resolution timer library for recording
+  performance metrics.  It uses the appropriate C method calls for each
+  system to get the highest granularity time increments possible.  
+  
+  It currently supports any of the following systems:
+  
+  * any system with the POSIX call <tt>clock_gettime()</tt>,
+  * Mac OS X
+  * Windows
+  
+  Using Hitimes can be faster than using a series of +Time.new+ calls, and
+  it will have a much higher granularity.   It is definitely faster than
+  using +Process.times+.
 email: jeremy@copiousfreetime.org
 executables: []
 
@@ -83,6 +126,7 @@ 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
@@ -117,6 +161,8 @@ files:
 - gemspec.rb
 has_rdoc: true
 homepage: http://copiousfreetime.rubyforge.org/hitimes/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -126,23 +172,29 @@ require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: copiousfreetime
-rubygems_version: 1.3.1
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Hitimes is a fast, high resolution timer library for recording performance metrics
 test_files: []