mk_time 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f4596224b3a5a1dda7f4da26df071e4b5991b3c
-  data.tar.gz: 4341f0b3070b4b0e090ff7ff792eea7c84200fd4
+  metadata.gz: e53dc8d60c6fbf93a1a9f620efe200cae2166235
+  data.tar.gz: d45dd8be20c82a1ba37d18bc8747a425ce6cb3ab
 SHA512:
-  metadata.gz: 5aa116e8eae04f745c4fd54a339abf562248428366d2ce261460bc53b3b0951bbe472dfd6ffd64a0984344700d5e883fd63a77a6ec82580352c15777ff509b06
-  data.tar.gz: 6ec317c51aad7b091c45d86daed143717e141fd93351bed53f35a672c355b2491674c949180f5d2eadf5ff15379a3397d763abc6a17785eb5877abc479696201
+  metadata.gz: e2c5cc3dfd3b9c87ae6b4ef10ed48cd2a48ec631e4ecf1fd3ba06ce959b7acad9baabf54e0b3e2040c8e77bb752705f80d9b8d706d3380913a7f5ee2bf3525b1
+  data.tar.gz: 33ed2330807a2d4151cc2206a722c1a5823bd62be1322cf0aed7f9625e99f99c167b623822d737ac4c60030c8e8f616573f96c7d50444253e64a9b36565823ec

data/README.md

@@ -26,15 +26,16 @@ Or install it yourself as:
 
     t = MkTime.new("20160726")
     t = MkTime.new("20160726123456")
-    e = MkTime.new
+    t = MkTime.new("20160726123456123")
+    t = MkTime.new
 
-* You can set TDB formatted "YYYYMMDD" or "YYYYMMDDHHMMSS" as an argument.
+* You can set TDB formatted "YYYYMMDD" or "YYYYMMDDHHMMSS" or "YYYYMMDDHHMMSSU..." as an argument. (`U`: milliseconds)
 * If you don't set an argument, this class considers the system time to have been set as an argument.
 
 ### Conversion
 
-    puts "     UTC: #{t.utc}"
-    puts "     JST: #{t.jst}"
+    puts "     UTC: #{t.utc.instance_eval { '%s.%03d' % [strftime('%Y-%m-%d %H:%M:%S'), (usec / 1000.0).round] }}"
+    puts "     JST: #{t.jst.instance_eval { '%s.%03d' % [strftime('%Y-%m-%d %H:%M:%S'), (usec / 1000.0).round] }}"
     puts "      JD: #{t.jd} day"
     puts "       T: #{t.t} century"
     puts " UTC-TAI: #{t.utc_tai} sec"

data/exe/mk_time

@@ -3,12 +3,12 @@
 require "mk_time"
 
 t = MkTime.new(ARGV[0])
-puts "     UTC: #{t.utc}"
-puts "     JST: #{t.jst}"
+puts "     UTC: #{t.utc.instance_eval { '%s.%03d' % [strftime('%Y-%m-%d %H:%M:%S'), (usec / 1000.0).round] }}"
+puts "     JST: #{t.jst.instance_eval { '%s.%03d' % [strftime('%Y-%m-%d %H:%M:%S'), (usec / 1000.0).round] }}"
 puts "      JD: #{t.jd} day"
 puts "       T: #{t.t} century"
 puts " UTC-TAI: #{t.utc_tai} sec"
-puts "LEAP_SEC: #{t.leap_sec} sec"  # = tuc_tai
+puts "LEAP_SEC: #{t.leap_sec} sec"  # = utc_tai
 puts "    DUT1: #{t.dut1} sec"
 puts "  deltaT: #{t.dt} sec"
 puts "     TAI: #{t.tai.instance_eval { '%s.%03d' % [strftime('%Y-%m-%d %H:%M:%S'), (usec / 1000.0).round] }}"

data/lib/mk_time/argument.rb

@@ -13,12 +13,16 @@ module MkTime
     # @return: utc (Time Object)
     #=========================================================================
     def get_utc
-      (puts Const::MSG_ERR_1; return) unless @arg =~ /^\d{8}$|^\d{14}$/
+      (puts Const::MSG_ERR_1; return) unless @arg =~ /^\d{8}$|^\d{14,}$/
       year, month, day = @arg[ 0, 4].to_i, @arg[ 4, 2].to_i, @arg[ 6, 2].to_i
       hour, min,   sec = @arg[ 8, 2].to_i, @arg[10, 2].to_i, @arg[12, 2].to_i
+      usec = @arg.split(//).size > 14 ? @arg[14..-1].to_i : 0
       (puts Const::MSG_ERR_2; return) unless Date.valid_date?(year, month, day)
-      (puts Const::MSG_ERR_2; return) if hour > 23 || min > 59 || sec > 59
-      return Time.new(year, month, day, hour, min, sec, "+00:00")
+      (puts Const::MSG_ERR_2; return) if hour > 23 || min > 59 || sec >= 60.0
+      d = usec.to_s.split(//).size
+      return Time.new(
+        year, month, day, hour, min, sec + Rational(usec, 10 ** d), "+00:00"
+      )
     end
   end
 end

data/lib/mk_time/compute.rb

@@ -12,9 +12,10 @@ module MkTime
     #=========================================================================
     def utc2jst(utc)
       jst = utc + Const::JST_OFFSET * 60 * 60
+      d = jst.usec.to_s.split(//).size
       return Time.new(
         jst.year, jst.month, jst.day,
-        jst.hour, jst.min, jst.sec,
+        jst.hour, jst.min, jst.sec + Rational(jst.usec, 10 ** d),
         sprintf("+%02d:00", Const::JST_OFFSET)
       )
     rescue => e

data/lib/mk_time/consts.rb

@@ -1,6 +1,6 @@
 module MkTime
   module Const
-    MSG_ERR_1  = "[ERROR] Format: YYYYMMDD or YYYYMMDDHHMMSS"
+    MSG_ERR_1  = "[ERROR] Format: YYYYMMDD or YYYYMMDDHHMMSS or YYYYMMDDHHMMSSU..."
     MSG_ERR_2  = "[ERROR] Invalid date-time!"
     JST_OFFSET = 9                # JST offset from UTC
     J2000      = 2451545          # Julian Day of 2000-01-01 12:00:00

data/lib/mk_time/version.rb

@@ -1,3 +1,3 @@
 module MkTime
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mk_time
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - komasaru
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler