hitimes 1.2.6-x86-mingw32 → 1.3.0-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f77a8cb0d147fccc6f8e430db6a84c57a7bdf6cc
-  data.tar.gz: 11798cc8c6b374331a5c10e4f1cf2a75efbe5f43
+SHA256:
+  metadata.gz: dc88d5e0f6472a324291e27dc5fb0dd6686d157e9d0a13bd28b61b9774ab84ec
+  data.tar.gz: 2428d66f48c04b6c7c7ddf50a492d2a3c972560fad1c717f3f53984c82ac9681
 SHA512:
-  metadata.gz: de2a0cc22908a378c82ba4c64c52f10e1c66b4135e89e4f1fcba78b13f020e0695923be17f92111ec0aa5ea871ac6cd5dbb8b14f6758e80d9978725a82260e34
-  data.tar.gz: 2aca46f8442873aea2dc1c1edca18fd369c3ac9d5d7b74f0c1f90aede7b2223c711ffbab429711faa03462edc457fd7073dafa3f1ca0a36a9a993f83007eb343
+  metadata.gz: dc2a3845c1deb1203441cebf93792a7f1b9f3640cfd36cd4387edb6669435ef380551ea0f3644ccc65853a0c3f4e4b35374a3f5792824995c8291bb1866d4122
+  data.tar.gz: 2ab963e8525d018be3e4706d2d94fb655e8ab64206b49bb03c205bee7f2bed7bde1340331ea73ba6f684b8183b948676743cd0c75d65823a7bb2926022183438

data/HISTORY.md

@@ -1,4 +1,10 @@
 # Hitimes Changelog
+## Version 1.3.0 2018-06-15
+
+* Add api method `Hitimes.raw_instant` to expose raw OS instant value
+* Add api constant `Hitimes::INSTANT_CONVERSION_FACTOR` to expose raw OS instant conversion factor
+* other development cleanup tasks
+
 ## Version 1.2.6 2017-08-04
 
 * Resolve version number issue (#61) (thanks @anthraxx)

data/README.md

@@ -1,5 +1,7 @@
 # Hitimes
 
+[![Build Status](https://travis-ci.org/copiousfreetime/hitimes.svg?branch=master)](https://travis-ci.org/copiousfreetime/hitimes)
+
 A fast, high resolution timer library for recording peformance metrics.
 
 * [Homepage](http://github.com/copiousfreetime/hitimes)
@@ -15,6 +17,7 @@ A fast, high resolution timer library for recording peformance metrics.
 * [Support](#support)
 * [License](#license)
 
+
 ## Requirements
 
 Hitimes requires the following to run:
@@ -156,14 +159,14 @@ Hitimes also follows [semantic versioning](http://semver.org/).
 
 The current officially supported versions of Ruby are:
 
-* MRI Ruby (all platforms) 2.2 - 2.4
-* JRuby 1.7.25, 9.0.5.0
+* MRI Ruby (all platforms) 2.3 - 2.5
+* JRuby 9.1.17.0, 9.2.0.0
 
 Unofficially supported versions, these have been supported in the past when they
 were the primary rubies around. In all likelihood they still work, but are not
 supported.
 
-* MRI Ruby (linux/mac/bsd/unix/etc) - everything from 1.8.7 to 2.1
+* MRI Ruby (linux/mac/bsd/unix/etc) - everything from 1.8.7 to 2.2
 * MRI Ruby (windows) - 2.0 and up
   * Ruby 1.8 and 1.9 for windows are supported in hitimes version 1.2.4 or earlier
 * JRuby - I think everything back to 1.4

data/ext/hitimes/c/hitimes.c

@@ -5,6 +5,20 @@
 VALUE mH;           /* module Hitimes            */
 VALUE eH_Error;     /* class  Hitimes::Error     */
 
+
+/**
+ * call-seq:
+ *    Hitimes.raw_instant -> Integer
+ *
+ * Return the raw instant value from the operating system
+ */
+VALUE hitimes_instant_raw( )
+{
+    unsigned long long i = (unsigned long long)hitimes_get_current_instant( );
+
+    return ULL2NUM(i);
+}
+
 /*
  * Document-class: Hitimes::Error
  *
@@ -13,8 +27,10 @@ VALUE eH_Error;     /* class  Hitimes::Error     */
 void Init_hitimes( )
 {
     mH = rb_define_module("Hitimes");
-     
+
     eH_Error = rb_define_class_under(mH, "Error", rb_eStandardError);
+    rb_define_const( mH, "INSTANT_CONVERSION_FACTOR", DBL2NUM( HITIMES_INSTANT_CONVERSION_FACTOR ));
+    rb_define_module_function( mH, "raw_instant", hitimes_instant_raw, 0 );
 
     Init_hitimes_interval();
     Init_hitimes_stats( );

data/ext/hitimes/java/src/hitimes/Hitimes.java

@@ -4,7 +4,10 @@ import java.lang.Math;
 import java.lang.System;
 
 import org.jruby.anno.JRubyClass;
+import org.jruby.anno.JRubyMethod;
 import org.jruby.anno.JRubyModule;
+import org.jruby.anno.JRubyConstant;
+import org.jruby.runtime.Visibility;
 
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
@@ -14,6 +17,8 @@ import org.jruby.RubyObject;
 
 import org.jruby.exceptions.RaiseException;
 
+import org.jruby.runtime.builtin.IRubyObject;
+
 
 /**
  * @author <a href="mailto:jeremy@hinegardner.org">Jeremy Hinegardner</a>
@@ -21,12 +26,18 @@ import org.jruby.exceptions.RaiseException;
 @JRubyModule( name = "Hitimes" )
 public class Hitimes {
 
+    public static final double INSTANT_CONVERSION_FACTOR = 1000000000d;
+
+    private static final Ruby __ruby__ = Ruby.getGlobalRuntime();
+
     public static RubyClass hitimesIntervalClass;
     /**
      * Create the Hitimes module and add it to the Ruby runtime.
      */
-    public static RubyModule createHitimes( Ruby runtime ) {
+    public static RubyModule createHitimesModule( Ruby runtime ) {
         RubyModule mHitimes = runtime.defineModule("Hitimes");
+        mHitimes.defineConstant("INSTANT_CONVERSION_FACTOR", __ruby__.newFloat(INSTANT_CONVERSION_FACTOR));
+        mHitimes.defineAnnotatedMethods( Hitimes.class );
 
         RubyClass  cStandardError = runtime.getStandardError();
         RubyClass  cHitimesError  = mHitimes.defineClassUnder("Error", cStandardError, cStandardError.getAllocator());
@@ -47,8 +58,9 @@ public class Hitimes {
     }
 
 
-
-    @JRubyClass( name = "Hitimes::Error", parent = "StandardError" )
-    public static class Error {};
+    @JRubyMethod( name = "raw_instant", module = true )
+    public static IRubyObject rawInstant(IRubyObject self) {
+      return __ruby__.newFixnum( System.nanoTime() );
+    }
 
 }

data/ext/hitimes/java/src/hitimes/HitimesInterval.java

@@ -16,11 +16,6 @@ import org.jruby.anno.JRubyMethod;
 @JRubyClass( name = "Hitimes::Interval" )
 public class HitimesInterval extends RubyObject {
 
-    /* this is a double to force all division by the conversion factor
-     * to cast to doubles
-     */
-    private static final double INSTANT_CONVERSION_FACTOR = 1000000000d;
-
     private static final long   INSTANT_NOT_SET  = Long.MIN_VALUE;
     private static final double DURATION_NOT_SET = Double.NaN;
 
@@ -58,7 +53,7 @@ public class HitimesInterval extends RubyObject {
          * if stop has not yet been called, then return the amount of time so far
          */
         if ( INSTANT_NOT_SET == this.stop_instant ) {
-            double d = ( System.nanoTime() - this.start_instant ) / INSTANT_CONVERSION_FACTOR;
+            double d = ( System.nanoTime() - this.start_instant ) / Hitimes.INSTANT_CONVERSION_FACTOR;
             return getRuntime().newFloat( d );
         }
 
@@ -66,7 +61,7 @@ public class HitimesInterval extends RubyObject {
          * if stop has been called, then calculate the duration and return
          */
         if ( DURATION_NOT_SET == this.duration ) {
-            this.duration = (this.stop_instant - this.start_instant) / INSTANT_CONVERSION_FACTOR;
+            this.duration = (this.stop_instant - this.start_instant) / Hitimes.INSTANT_CONVERSION_FACTOR;
         }
 
         return getRuntime().newFloat( this.duration );
@@ -82,7 +77,7 @@ public class HitimesInterval extends RubyObject {
         }
 
         if ( INSTANT_NOT_SET == this.stop_instant ) {
-            double d = ( System.nanoTime() - this.start_instant ) / INSTANT_CONVERSION_FACTOR;
+            double d = ( System.nanoTime() - this.start_instant ) / Hitimes.INSTANT_CONVERSION_FACTOR;
             return getRuntime().newFloat( d );
         }
 
@@ -140,7 +135,7 @@ public class HitimesInterval extends RubyObject {
 
         if ( INSTANT_NOT_SET == this.stop_instant ) {
             this.stop_instant = System.nanoTime();
-            this.duration = (this.stop_instant - this.start_instant) / INSTANT_CONVERSION_FACTOR;
+            this.duration = (this.stop_instant - this.start_instant) / Hitimes.INSTANT_CONVERSION_FACTOR;
             return getRuntime().newFloat( this.duration );
         }
 

data/ext/hitimes/java/src/hitimes/HitimesService.java

@@ -8,7 +8,7 @@ import org.jruby.runtime.load.BasicLibraryService;
 
 public class HitimesService implements BasicLibraryService {
     public boolean basicLoad( final Ruby runtime ) throws IOException {
-        Hitimes.createHitimes( runtime );
+        Hitimes.createHitimesModule( runtime );
         return true;
     }
 }

data/lib/hitimes/version.rb

@@ -4,5 +4,5 @@
 #++
 
 module Hitimes
-  VERSION = "1.2.6"
+  VERSION = "1.3.0"
 end

data/spec/hitimes_spec.rb

@@ -11,4 +11,14 @@ describe Hitimes do
   it "raises an error if measure is called with no block" do
     lambda{ Hitimes.measure }.must_raise( Hitimes::Error )
   end
+
+  it "has the raw instant value" do
+    v = Hitimes.raw_instant
+    v.must_be :>, 0
+  end
+
+  it "has access to the instant conversion factor" do
+    f = Hitimes::INSTANT_CONVERSION_FACTOR
+    f.must_be :>, 0
+  end
 end

data/tasks/default.rake

@@ -24,7 +24,7 @@ namespace :develop do
     File.open( "Gemfile", "w+" ) do |f|
       f.puts "# DO NOT EDIT - This file is automatically generated"
       f.puts "# Make changes to Manifest.txt and/or Rakefile and regenerate"
-      f.puts 'source "https://rubygems.org/"'
+      f.puts 'source "https://rubygems.org"'
       f.puts 'gemspec'
     end
   end
@@ -38,7 +38,7 @@ task :develop => "develop:default"
 begin
   require 'rake/testtask'
   Rake::TestTask.new( :test ) do |t|
-    t.ruby_opts    = %w[ -w -rubygems ]
+    t.ruby_opts    = %w[ -w ]
     t.libs         = %w[ lib spec test ]
     t.pattern      = "{test,spec}/**/{test_*,*_spec}.rb"
   end
@@ -80,7 +80,7 @@ begin
     ENV['COVERAGE'] = 'true'
     Rake::Task[:test].execute
   end
-  CLOBBER << 'coverage' if File.directory?('coverage')
+  CLOBBER << 'coverage' if File.directory?( 'coverage' )
 rescue LoadError
   This.task_warning( 'simplecov' )
 end

data/tasks/extension.rake

@@ -23,9 +23,9 @@ begin
       ext.lib_dir   = File.join( 'lib', This.name )
       ext.gem_spec  = This.ruby_gemspec
 
-      ext.cross_compile  = true               # enable cross compilation (requires cross compile toolchain)
-      ext.cross_platform = 'i386-mingw32'     # forces the Windows platform instead of the default one
-                                              # configure options only for cross compile
+      ext.cross_compile  = true                         # enable cross compilation (requires cross compile toolchain)
+      ext.cross_platform = %w[x86-mingw32 x64-mingw32]  # forces the Windows platform instead of the default one
+                                                        # configure options only for cross compile
     end
   end
 

data/tasks/this.rb

@@ -194,7 +194,9 @@ class ThisProject
   end
 
   def license
-    "ISC"
+    license_file = project_path("LICENSE")
+    line = license_file.readlines.first
+    line.split(/\s+/).first
   end
 
   # Internal: The path to the gemspec file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hitimes
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.0
 platform: x86-mingw32
 authors:
 - Jeremy Hinegardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2018-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,9 +108,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
-description: A fast, high resolution timer library for recording peformance metrics.
-  * (http://github.com/copiousfreetime/hitimes) * (http://github.com.org/copiousfreetime/hitimes)
-  * email jeremy at copiousfreetime dot org * `git clone url git://github.com/copiousfreetime/hitimes.git`
+description: "(https://travis-ci.org/copiousfreetime/hitimes.svg?branch=master)](https://travis-ci.org/copiousfreetime/hitimes)
+  A fast, high resolution timer library for recording peformance metrics. * (http://github.com/copiousfreetime/hitimes)
+  * (http://github.com.org/copiousfreetime/hitimes) * email jeremy at copiousfreetime
+  dot org * `git clone url git://github.com/copiousfreetime/hitimes.git`"
 email: jeremy@copiousfreetime.org
 executables: []
 extensions: []
@@ -147,6 +148,7 @@ files:
 - lib/hitimes/2.2/hitimes.so
 - lib/hitimes/2.3/hitimes.so
 - lib/hitimes/2.4/hitimes.so
+- lib/hitimes/2.5/hitimes.so
 - lib/hitimes/metric.rb
 - lib/hitimes/mutexed_stats.rb
 - lib/hitimes/paths.rb
@@ -188,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -196,10 +198,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
-summary: A fast, high resolution timer library for recording peformance metrics.
+summary: "[![Build Status](https://travis-ci.org/copiousfreetime/hitimes.svg?branch=master)](https://travis-ci.org/copiousfreetime/hitimes)"
 test_files:
 - spec/hitimes_spec.rb
 - spec/interval_spec.rb