timestamp 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be00e7331269985823bb37353fe428e804e80e24
-  data.tar.gz: 3fad3ee98da39349fc54a60068cba9a3d998e2a3
+  metadata.gz: cf5d7af58ef3dde79bd60d34bfc99a8fdeb77254
+  data.tar.gz: 7b166d887f7596277906c7a38e70948126349981
 SHA512:
-  metadata.gz: 42f8515ba4d5b230ed8cfd300e048776112785824cb6aee18446768cadaf45ef9b69b4844400eca311807ef304572f95733a94bea2cb9c920d0416e1e04144b3
-  data.tar.gz: 7d08613bc3ecf4eba43bdf36cd26daea2aba382977ee4bea6f2be14195677e796b0b23c1fb973e99f13df0f3dc7cea161eff2b594a50190e2f59b0207e756f74
+  metadata.gz: ddb40b424daaa99e69bd3f009edefb07b6f741fbcb83a2a626b879ace085bcaef8ff68938d1240ba9f4bda64149ad31647089e09009c4e147bcdf03740607814
+  data.tar.gz: ff35f9ea6f552c118ac9f8a8eba5d13e82f4a231c5192c83f1a3a07e8d4c1b8cbabcebfcd4d487111874cc70d7af5251166248494afd9184b2928306eb78a6f5

data/ext/timestamp/Timestamp.c

@@ -1,26 +1,17 @@
 /*
- * Copyright (c) 2013, Matthew Kerwin
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met: 
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer. 
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution. 
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) 2013, Matthew Kerwin <matthew@kerwin.net.au>
+ * 
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include "ruby.h"
@@ -64,11 +55,13 @@ time_s_timestamp(VALUE klass)
 /*
  *  call-seq:
  *     Time.unix_timestamp  -> int
+ *     Time.unix_time       -> int
  *
  *  Returns the current time as an integer number of seconds
  *  since the Epoch.
  *
  *     Time.unix_timestamp  #=> 1363352771
+ *     Time.unix_time       #=> 1363352771
  */
 
 static VALUE
@@ -111,6 +104,7 @@ time_s_unix_microtime(VALUE klass)
 
 void Init_timestamp() {
     rb_define_singleton_method(rb_cTime, "timestamp", time_s_timestamp, 0);
+    rb_define_singleton_method(rb_cTime, "unix_time", time_s_unix_timestamp, 0);
     rb_define_singleton_method(rb_cTime, "unix_timestamp", time_s_unix_timestamp, 0);
     rb_define_singleton_method(rb_cTime, "unix_microtime", time_s_unix_microtime, 0);
 }

data/ext/timestamp/Timestamp.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2013, Matthew Kerwin <matthew@kerwin.net.au>
+ * 
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+//package au.net.kerwin.jruby;
+
+import java.io.IOException;
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.RubyInteger;
+import org.jruby.RubyFloat;
+import org.jruby.RubyModule;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.load.BasicLibraryService;
+
+public class Timestamp implements BasicLibraryService {
+    private Ruby runtime;
+
+    public boolean basicLoad(final Ruby runtime) throws IOException {
+	this.runtime = runtime;
+	RubyClass rb_cTime = runtime.getClass("Time");
+	rb_cTime.defineAnnotatedMethods(Timestamp.class);
+	return true;
+    }
+
+    /*
+     *  call-seq:
+     *     Time.timestamp  -> int
+     * 
+     * Returns a nanosecond timestamp on the system's monotonic clock.
+     *
+     *     Time.timestamp  #=> 17817203921822
+     */
+
+    @JRubyMethod( name = "timestamp", meta = true )
+    public RubyInteger timestamp() {
+	return runtime.newFixnum(System.nanoTime());
+    }
+
+    /*
+     *  call-seq:
+     *     Time.unix_timestamp -> int
+     *     Time.unix_time      -> int
+     *
+     *  Returns the current time as an integer number of seconds
+     *  since the Epoch.
+     *
+     *     Time.unix_timestamp  #=> 1363352771
+     *     Time.unix_time       #=> 1363352771
+     */
+
+    @JRubyMethod( name = {"unix_timestamp", "unix_time"}, meta = true )
+    public RubyInteger unix_timestamp() {
+	return runtime.newFixnum(System.currentTimeMillis() / 1000);
+    }
+
+    /*
+     *  call-seq:
+     *     Time.unix_microtime  -> float
+     *
+     *  Returns the current time as a floating-point number of seconds
+     *  since the Epoch.
+     *
+     *     Time.unix_microtime  #=> 1363352771.315240
+     */
+
+    @JRubyMethod( name = "unix_microtime", meta = true )
+    public RubyFloat unix_microtime() {
+	return RubyFloat.newFloat(runtime, System.currentTimeMillis() / 1000.0);
+    }
+
+}
+

data/ext/timestamp/extconf.rb

@@ -1,5 +1,6 @@
 require 'mkmf'
-extension_name = 'timestamp'
-dir_config(extension_name)
-create_makefile(extension_name)
+ext_name = 'timestamp'
+
+dir_config(ext_name)
+create_makefile(ext_name)
 

data/lib/timestamp.rb

@@ -0,0 +1,33 @@
+
+if defined?(JRUBY_VERSION)
+	require 'jruby'
+	require File.expand_path('../timestamp.jar', __FILE__)
+	require 'timestamp'
+
+	class Time
+		@@timestamp = Java::Default::Timestamp.new.tap{|ts| ts.java_send :basicLoad, [org.jruby.Ruby], org.jruby.Ruby.getGlobalRuntime }
+		class << self
+			def timestamp
+				@@timestamp.java_send :timestamp, []
+			end
+			def unix_timestamp
+				@@timestamp.java_send :unix_timestamp, []
+			end
+			alias :unix_time :unix_timestamp
+			def unix_microtime
+				@@timestamp.java_send :unix_microtime, []
+			end
+		end
+	end
+else
+	begin
+		require 'timestamp/timestamp'
+	rescue LoadError
+		begin
+			require "timestamp/timestamp.#{RbConfig::CONFIG['DLEXT']}"
+		rescue LoadError
+			require "timestamp.#{RbConfig::CONFIG['DLEXT']}"
+		end
+	end
+end
+

metadata

@@ -1,16 +1,89 @@
 --- !ruby/object:Gem::Specification
 name: timestamp
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Matthew Kerwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-13 00:00:00.000000000 Z
-dependencies: []
-description: Defines Time.timestamp and .unix_timestamp , from https://bugs.ruby-lang.org/issues/8096
+date: 2013-07-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |
+  == Time.timestamp
+
+  Defines <tt>Time::timestamp</tt> and <tt>Time::unix_timestamp</tt>.
+
+  See the original discussion at {Ruby-Lang}[https://bugs.ruby-lang.org/issues/8096]
+
+  :call-seq:
+    Time::timestamp  -> Integer
+
+  Returns a nanosecond-precision timestamp from the system's monotonic
+  clock. Note that the resolution of the measured time is system-
+  dependent (i.e. while the value displayed is always an integer number
+  of nanoseconds, the values may not necessarily change in increments of
+  exactly one).
+
+  This time value does not correlate to any absolute, real-world time
+  system; it is only useful for measuring relative (or elapsed) times at
+  a high granularity.  For example, benchmark measurements.
+
+  :call-seq:
+    Time::unix_timestamp  -> Integer
+    Time::unix_time       -> Integer
+
+  Returns the current real-world time as a whole number of seconds since
+  the Epoch (1-Jan-1970).
+
+  :call-seq:
+    Time::unix_microtime  -> Float
+
+  Returns the current real-world time as a floating-point number of
+  seconds since the Epoch (1-Jan-1970).
 email:
 - matthew@kerwin.net.au
 executables: []
@@ -19,10 +92,12 @@ extensions:
 extra_rdoc_files: []
 files:
 - ext/timestamp/Timestamp.c
+- ext/timestamp/Timestamp.java
 - ext/timestamp/extconf.rb
-homepage: http://rubygems.org/gems/timestamp
+- lib/timestamp.rb
+homepage: http://phluid61.github.com/timestamp-gem/
 licenses:
-- Simplified BSD License
+- ISC License
 metadata: {}
 post_install_message: 
 rdoc_options: []