hitimes 1.2.2-java → 1.2.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d94ad885b546cfabd2429bb32edb587cb5bdffce
-  data.tar.gz: 83cc096240320c96147dc18f9305345a14e64e87
+  metadata.gz: e88c13d5ede9b4ff83db2278d377572cc527be34
+  data.tar.gz: 700bc9d2e3a08c80eeeec494a6143e7a5b9c40cc
 SHA512:
-  metadata.gz: bd6ffe724b229edd4ccd3d2a348a9696e1d50d4dc732c49e5d0414e61b17598bb361ccf65b5186f45add3832bc4524e136ab05ca8396090fc4671d0728c469d5
-  data.tar.gz: fb95561d1d465d57faa6325df9fa0eafba5779a4eae813c8ada010673071edf60a08c8b27d9a01d29da03138ac56414cb08868f770ad5b46bc4dad5b80c8f38d
+  metadata.gz: 0aab8572f5cb56e331b15881d12fc29b39102c145801f5cd435995a62a645e3d89f82ff0d7be5873f4dac6021ee5dc6dccc03c5149b7a43dc6605091a4dc7424
+  data.tar.gz: 27f55ad2f013631ee64dd73d2f33e7ecde22b3e3abdf8e116f126fb07ee735678bd8ab3f0f27d8f3feab374e66c60b9c774a0329bb0d3036235c26490fa91fd5

data/HISTORY.md

@@ -1,5 +1,11 @@
 # Hitimes Changelog
 
+## Version 1.2.3 2015-09-13
+
+* Release new fatbinary version for windows
+* Update README to indicate duration units
+* Provide a more friendly error message if the gem is not installed correctly
+
 ## Version 1.2.2 2014-07-09
 
 * fix compilation issue with clock_gettime in libc (reported by eradman and virtualfunction)

data/LICENSE

@@ -1,6 +1,6 @@
 ISC LICENSE - http://opensource.org/licenses/isc-license.txt
 
-Copyright (c) 2008-2012 Jeremy Hinegardner
+Copyright (c) 2008-2015 Jeremy Hinegardner
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

data/Manifest.txt

@@ -1,4 +1,3 @@
-.travis.yml
 CONTRIBUTING.md
 HISTORY.md
 LICENSE

data/README.md

@@ -13,7 +13,7 @@
 
 Hitimes is a fast, high resolution timer library for recording
 performance metrics.  It uses the appropriate low method calls for each
-system to get the highest granularity time increments possible.  
+system to get the highest granularity time increments possible.
 
 It currently supports any of the following systems:
 
@@ -30,14 +30,17 @@ using `Process.times`.
 
 ### Interval
 
-Use Hitimes::Interval to calculate only the duration of a block of code
+Use Hitimes::Interval to calculate only the duration of a block of code. Returns
+the time as seconds.
 
 ``` ruby
 duration = Hitimes::Interval.measure do
-             # some operation ...
+             1_000_000.times do |x|
+               2 + 2
+             end
            end
 
-puts duration
+puts duration  # => 0.047414297 (seconds)
 ```
 
 ### TimedMetric
@@ -126,21 +129,14 @@ Read the HISTORY.md file.
 
 ## BUILDING FOR WINDOWS
 
-[rake-compiler](https://github.com/luislavena/rake-compiler) is use for building
-the windows version. For me, on OSX to cross compile the process is:
+This is done using https://github.com/rake-compiler/rake-compiler-dock
 
-```
-% gem install rake-compiler # in each rvm instance, 1.8.7, 1.9.3
-% rvm use 2.0.0@hitimes
-% rake-compiler cross-ruby VERSION=2.0.0-p0 # or latest
-% rvm use 1.9.3@hitimes
-% rake-compiler cross-ruby VERSION=1.9.3-p374 # or latest
-% rvm use 1.8.7@hitimes
-% rake-compiler cross-ruby VERSION=1.8.7-p371
-
-# This only works via 1.8.7 at the current moment
-% rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.3:2.0.0
-```
+1. have VirtualBox installed
+2. Install boot2docker `brew install boot2docker`
+3. `gem install rake-compiler-dock`
+4. `rake-compiler-dock`
+5. `bundle`
+6 `rake cross native gem`
 
 ## CREDITS
 
@@ -148,7 +144,7 @@ the windows version. For me, on OSX to cross compile the process is:
 
 ## ISC License
 
-Copyright (c) 2008-2012 Jeremy Hinegardner
+Copyright (c) 2008-2015 Jeremy Hinegardner
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

data/Rakefile

@@ -7,11 +7,12 @@ This.email    = "jeremy@copiousfreetime.org"
 This.homepage = "http://github.com/copiousfreetime/#{ This.name }"
 
 This.ruby_gemspec do |spec|
-  spec.add_development_dependency( 'rake'         , '~> 10.0')
-  spec.add_development_dependency( 'minitest'     , '~> 5.3' )
-  spec.add_development_dependency( 'rdoc'         , '~> 4.1'  )
-  spec.add_development_dependency( 'json'         , '~> 1.7.7' )
+  spec.add_development_dependency( 'rake'         , '~> 10.4')
+  spec.add_development_dependency( 'minitest'     , '~> 5.5' )
+  spec.add_development_dependency( 'rdoc'         , '~> 4.2'  )
+  spec.add_development_dependency( 'json'         , '~> 1.8' )
   spec.add_development_dependency( 'rake-compiler', '~> 0.9' )
+  spec.add_development_dependency( 'simplecov'    , '~> 0.9' )
 
   spec.extensions.concat This.extension_conf_files
   spec.license = "ISC"

data/ext/hitimes/c/extconf.rb

@@ -4,7 +4,7 @@ require 'mkmf'
 if RbConfig::CONFIG['host_os'] =~ /darwin/ then
   $CFLAGS += " -DUSE_INSTANT_OSX=1 -Wall"
   $LDFLAGS += " -framework CoreServices"
-elsif RbConfig::CONFIG['host_os'] =~ /win32/ or RbConfig::CONFIG['host_os'] =~ /mingw/ then
+elsif RbConfig::CONFIG['host_os'] =~ /win(32|64)/ or RbConfig::CONFIG['host_os'] =~ /mingw/ then
   $CFLAGS += " -DUSE_INSTANT_WINDOWS=1"
 else
   if have_library("rt", "clock_gettime") then

data/lib/hitimes.rb

@@ -29,13 +29,21 @@ require 'hitimes/version'
 # 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'
+
+attempts = [
+  "hitimes/#{RUBY_VERSION.sub(/\.\d$/,'')}/hitimes",
+  "hitimes/hitimes"
+]
+loaded = false
+
+attempts.each do |path|
+  begin
+    require path
+    loaded = true
+  rescue LoadError
+  end
 end
+raise LoadError, "Unable to find binary extension, was hitimes installed correctly?" unless loaded
 
 require 'hitimes/stats'
 require 'hitimes/mutexed_stats'

data/lib/hitimes/version.rb

@@ -4,5 +4,5 @@
 #++
 
 module Hitimes
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/tasks/default.rake

@@ -10,21 +10,12 @@ namespace :develop do
 
   # Install all the development and runtime dependencies of this gem using the
   # gemspec.
-  task :default do
+  task :default => 'Gemfile' do
     require 'rubygems/dependency_installer'
     installer = ::Gem::DependencyInstaller.new
-
-    This.set_coverage_gem
-
-    puts "Installing gem depedencies needed for development"
-    This.platform_gemspec.dependencies.each do |dep|
-      if dep.matching_specs.empty? then
-        puts "Installing : #{dep}"
-        installer.install dep
-      else
-        puts "Skipping   : #{dep} -> already installed #{dep.matching_specs.first.full_name}"
-      end
-    end
+    puts "Installing bundler..."
+    installer.install 'bundler'
+    sh 'bundle install'
     puts "\n\nNow run 'rake test'"
   end
 
@@ -37,14 +28,6 @@ namespace :develop do
       f.puts 'gemspec'
     end
   end
-
-  desc "Create a bundler Gemfile"
-  task :using_bundler => 'Gemfile' do
-    puts "Now you can 'bundle'"
-  end
-
-  # Gemfiles are build artifacts
-  CLOBBER << FileList['Gemfile*']
 end
 desc "Boostrap development"
 task :develop => "develop:default"
@@ -90,31 +73,16 @@ end
 # Coverage - optional code coverage, rcov for 1.8 and simplecov for 1.9, so
 #            for the moment only rcov is listed.
 #------------------------------------------------------------------------------
-if RUBY_VERSION < "1.9.0"
-  begin
-   require 'rcov/rcovtask'
-   Rcov::RcovTask.new( 'coverage' ) do |t|
-     t.libs      << 'spec'
-     t.pattern   = 'spec/**/*_spec.rb'
-     t.verbose   = true
-     t.rcov_opts << "-x ^/"           # remove all the global files
-     t.rcov_opts << "--sort coverage" # so we see the worst files at the top
-   end
-  rescue LoadError
-   This.task_warning( 'rcov' )
-  end
-else
-  begin
-    require 'simplecov'
-    desc 'Run tests with code coverage'
-    task :coverage do
-      ENV['COVERAGE'] = 'true'
-      Rake::Task[:test].invoke
-    end
-    CLOBBER << FileList["coverage"] if File.directory?( "coverage" )
-  rescue LoadError
-    This.task_warning( 'simplecov' )
+begin
+  require 'simplecov'
+  desc 'Run tests with code coverage'
+  task :coverage do
+    ENV['COVERAGE'] = 'true'
+    Rake::Task[:test].execute
   end
+  CLOBBER << 'coverage' if File.directory?('coverage')
+rescue LoadError
+  This.task_warning( 'simplecov' )
 end
 
 #------------------------------------------------------------------------------
@@ -179,9 +147,10 @@ namespace :fixme do
   end
 
   def outdated_fixme_files
-    local_fixme_files.reject do |local|
+    local_fixme_files.select do |local|
       upstream     = fixme_project_path( local )
-      Digest::SHA256.file( local ) == Digest::SHA256.file( upstream )
+      upstream.exist? &&
+        ( Digest::SHA256.file( local ) != Digest::SHA256.file( upstream ) )
     end
   end
 
@@ -231,9 +200,6 @@ task :gemspec do
   end
 end
 
-# the gemspec is also a dev artifact and should not be kept around.
-CLOBBER << This.gemspec_file.to_s
-
 # .rbc files from ruby 2.0
 CLOBBER << FileList["**/*.rbc"]
 

data/tasks/extension.rake

@@ -24,7 +24,7 @@ begin
       ext.gem_spec  = This.ruby_gemspec
 
       ext.cross_compile  = true               # enable cross compilation (requires cross compile toolchain)
-      ext.cross_platform = 'i386-mswin32'     # forces the Windows platform instead of the default one
+      ext.cross_platform = 'i386-mingw32'     # forces the Windows platform instead of the default one
                                               # configure options only for cross compile
     end
   end
@@ -35,4 +35,4 @@ rescue LoadError
 end
 
 CLOBBER << FileList["lib/**/*.{jar,so,bundle}"]
-CLOBBER << FileList["lib/#{This.name}/{1.8,1.9,2.0}/"]
+CLOBBER << FileList["lib/#{This.name}/{1.8,1.9,2.0,2.1,2.2}/"]

data/tasks/this.rb

@@ -13,7 +13,7 @@ class ThisProject
   attr_accessor :email
 
   # The homepage of this project
-  attr_accessor :homepage 
+  attr_accessor :homepage
 
   # The regex of files to exclude from the manifest
   attr_accessor :exclude_from_manifest
@@ -25,7 +25,11 @@ class ThisProject
   #
   # Yields self
   def initialize(&block)
-    @exclude_from_manifest = %r/\.(git|DS_Store)|^(doc|coverage|pkg|tmp|Gemfile(\.lock)?)|^[^\/]+\.gemspec|\.(swp|jar|bundle|so|rvmrc)$|~$/
+    @exclude_from_manifest = Regexp.union(/\.(git|DS_Store)/,
+                                          /^(doc|coverage|pkg|tmp|Gemfile(\.lock)?)/,
+                                          /^[^\/]+\.gemspec/,
+                                          /\.(swp|jar|bundle|so|rvmrc|travis.yml)$/,
+                                          /~$/)
     @gemspecs              = Hash.new
     yield self if block_given?
   end
@@ -119,7 +123,7 @@ class ThisProject
 
   # Internal: Returns the gemspace associated with the current ruby platform
   def platform_gemspec
-    gemspecs[platform]
+    gemspecs.fetch(platform) { This.ruby_gemspec }
   end
 
   def core_gemspec
@@ -141,6 +145,8 @@ class ThisProject
       spec.extra_rdoc_files += spec.files.grep(/(txt|rdoc|md)$/)
       spec.rdoc_options = [ "--main"  , 'README.md',
                             "--markup", "tomdoc" ]
+
+      spec.required_ruby_version = '>= 1.9.3'
     end
   end
 
@@ -167,20 +173,6 @@ class ThisProject
     return spec
   end
 
-  # Internal: Set the recovery gem development dependency
-  #
-  # These are dynamically set since they cannot be hard coded as there is 
-  # no way to ship them correctly in the gemspec
-  #
-  # Returns nothing.
-  def set_coverage_gem
-    if RUBY_VERSION < "1.9.0"
-      platform_gemspec.add_development_dependency( 'rcov', '~> 1.0.0' )
-    else
-      platform_gemspec.add_development_dependency( 'simplecov', '~> 0.8.2' )
-    end
-  end
-
   # Internal: Return the platform of ThisProject at the current moment in time.
   def platform
     (RUBY_PLATFORM == "java") ? 'java' : Gem::Platform::RUBY
@@ -190,8 +182,8 @@ class ThisProject
   def description_section
     section_of( 'README.md', 'DESCRIPTION')
   end
- 
- # Internal: Return the summary text from the README 
+
+  # Internal: Return the summary text from the README
   def summary
     description_section.first
   end

metadata

@@ -1,88 +1,102 @@
 --- !ruby/object:Gem::Specification
 name: hitimes
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: java
 authors:
 - Jeremy Hinegardner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2015-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
   name: rake
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.4'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.5'
+  name: minitest
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: minitest
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.5'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '4.2'
+  name: rdoc
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rdoc
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '1.8'
+  name: json
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: '1.8'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: '0.9'
+  name: rake-compiler
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+  name: simplecov
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: 'Hitimes is a fast, high resolution timer library for recording performance
   metrics.  It uses the appropriate low method calls for each system to get the highest
-  granularity time increments possible.   It currently supports any of the following
+  granularity time increments possible. It currently supports any of the following
   systems: * any system with the POSIX call `clock_gettime()` * Mac OS X * Windows
   * JRuby 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`.'
@@ -95,7 +109,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.md
 files:
-- .travis.yml
 - CONTRIBUTING.md
 - HISTORY.md
 - LICENSE
@@ -118,6 +131,7 @@ files:
 - ext/hitimes/java/src/hitimes/HitimesService.java
 - ext/hitimes/java/src/hitimes/HitimesStats.java
 - lib/hitimes.rb
+- lib/hitimes/hitimes.jar
 - lib/hitimes/metric.rb
 - lib/hitimes/mutexed_stats.rb
 - lib/hitimes/paths.rb
@@ -140,32 +154,31 @@ files:
 - tasks/default.rake
 - tasks/extension.rake
 - tasks/this.rb
-- lib/hitimes/hitimes.jar
 homepage: http://github.com/copiousfreetime/hitimes
 licenses:
 - ISC
 metadata: {}
 post_install_message:
 rdoc_options:
-- --main
+- "--main"
 - README.md
-- --markup
+- "--markup"
 - tomdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Hitimes is a fast, high resolution timer library for recording performance metrics.  It uses the appropriate low method calls for each system to get the highest granularity time increments possible.

data/.travis.yml

@@ -1,11 +0,0 @@
-language: ruby
-rvm:
-  - "1.8.7"
-  - "1.9.2"
-  - "1.9.3"
-  - "2.0.0"
-  - "2.1.0"
-  - jruby-18mode # JRuby in 1.8 mode
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx
-install: rake develop