tago 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edc7f306a06b74be8335840e6389c78fb14e717e3e14600def550c2a1635835e
-  data.tar.gz: 955a080225f4377310a2f9aca051e9d8af109653be32c13ed0e03d89ed61ff5e
+  metadata.gz: 0127fd10025c451f556575af7705a2956defe95bca254d3c6e15fd340b23c0b1
+  data.tar.gz: 00e85043722bb7b4a1303954ecd6df39f8b3bd001090cfe61d14235b3b0bfdd3
 SHA512:
-  metadata.gz: 2a57f8321378010be1e3a04613b95a98b5e1988ccbe164cd0d261ca409d5d9837059289fb4c7adde269b33ff10ec819d4fead20a49cd9e3827ff280e66e068a7
-  data.tar.gz: 2fa126ecd1d8f59fecfdddff57e5003ecb74dd2e2c8c91cc314f3e72a750a15e48a9c2770d258f23f70d902a2c8d6a42401be50d790a19bed0b1f2b9069f9577
+  metadata.gz: ec9090a17889ec2cb4ebbf66323ccf678bcd668c82320731bf1c00f23a1fb5d348f76c50f16d03ff0967ae8ffae99340b1ed6f9ce08e7488914a0b6ef5647552
+  data.tar.gz: c84b2694de35f985e1150d5464c186ac61c3b6155ff2ba0a7e97a72cbab5945dffdb2d8363ca992d423c96308756fba7964454516afa7125e052d1b81e4b709e

data/Gemfile

@@ -26,7 +26,7 @@ gemspec
 gem 'minitest', '5.23.1', require: false
 gem 'rake', '13.2.1', require: false
 gem 'rubocop', '1.64.1', require: false
-gem 'rubocop-rspec', '2.31.0', require: false
+gem 'rubocop-rspec', '3.0.1', require: false
 gem 'simplecov', '0.22.0', require: false
 gem 'simplecov-cobertura', '2.1.0', require: false
 gem 'yard', '0.9.36', require: false

data/Gemfile.lock

@@ -34,17 +34,8 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
-    rubocop-capybara (2.21.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.26.0)
-      rubocop (~> 1.41)
-    rubocop-rspec (2.31.0)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.29.0)
-      rubocop (~> 1.40)
+    rubocop-rspec (3.0.1)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -69,7 +60,7 @@ DEPENDENCIES
   minitest (= 5.23.1)
   rake (= 13.2.1)
   rubocop (= 1.64.1)
-  rubocop-rspec (= 2.31.0)
+  rubocop-rspec (= 3.0.1)
   simplecov (= 0.22.0)
   simplecov-cobertura (= 2.1.0)
   tago!

data/lib/tago.rb

@@ -35,16 +35,23 @@ class Time
       format('%dμs', s * 1000 * 1000)
     elsif s < 1
       format('%dms', s * 1000)
-    elsif s < 60
-      format('%.1fs', s)
+    elsif s < 10
+      ms = format('%03d', s * 1000 % 1000)
+      if ms == '000'
+        format('%ds', s)
+      else
+        format('%<sec>ds%<msec>sms', sec: s, msec: ms)
+      end
+    elsif s < 100
+      format('%ds', s)
     elsif s < 60 * 60
-      format('%.1fm', s / 60)
+      format('%<mins>dm%<secs>ds', mins: s / 60, secs: s % 60)
     elsif s < 24 * 60 * 60
-      format('%.1fh', s / (60 * 60))
+      format('%<hours>dh%<mins>dm', hours: s / (60 * 60), mins: (s % (60 * 60)) / 60)
     elsif s < 7 * 24 * 60 * 60
-      format('%.1fd', s / (24 * 60 * 60))
+      format('%<days>dd%<hours>dh', days: s / (24 * 60 * 60), hours: (s % (24 * 60 * 60)) / (60 * 60))
     else
-      format('%.1fw', s / (7 * 24 * 60 * 60))
+      format('%<weeks>dw%<days>dd', weeks: s / (7 * 24 * 60 * 60), days: s % (7 * 24 * 60 * 60) / (24 * 60 * 60))
     end
   end
 end

data/tago.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.required_ruby_version = '>=3.0'
   s.name = 'tago'
-  s.version = '0.0.1'
+  s.version = '0.0.2'
   s.license = 'MIT'
   s.summary = 'A new .ago() method for the Time class'
   s.description =

data/test/test_tago.rb

@@ -31,20 +31,23 @@ class TestTago < Minitest::Test
   def test_simple_printing
     t = Time.now
     assert_equal('14ms', (t - 0.014).ago(t))
-    assert_equal('1.0s', (t - 1).ago(t))
-    assert_equal('1.1m', (t - 67).ago(t))
-    assert_equal('13.0h', (t - (13 * 60 * 60)).ago(t))
-    assert_equal('5.0d', (t - (5 * 24 * 60 * 60)).ago(t))
-    assert_equal('22.1w', (t - (155 * 24 * 60 * 60)).ago(t))
+    assert_equal('1s', (t - 1).ago(t))
+    assert_equal('1s350ms', (t - 1.35).ago(t))
+    assert_equal('67s', (t - 67).ago(t))
+    assert_equal('4m5s', (t - 245).ago(t))
+    assert_equal('13h18m', (t - (13.3 * 60 * 60)).ago(t))
+    assert_equal('5d0h', (t - (5 * 24 * 60 * 60)).ago(t))
+    assert_equal('5d7h', (t - (5.3 * 24 * 60 * 60)).ago(t))
+    assert_equal('22w1d', (t - (155 * 24 * 60 * 60)).ago(t))
   end
 
   def test_inverse
     t = Time.now
     assert_equal('14ms', (t + 0.014).ago(t))
-    assert_equal('1.0s', (t + 1).ago(t))
-    assert_equal('1.1m', (t + 67).ago(t))
-    assert_equal('13.0h', (t + (13 * 60 * 60)).ago(t))
-    assert_equal('5.0d', (t + (5 * 24 * 60 * 60)).ago(t))
-    assert_equal('22.1w', (t + (155 * 24 * 60 * 60)).ago(t))
+    assert_equal('1s', (t + 1).ago(t))
+    assert_equal('67s', (t + 67).ago(t))
+    assert_equal('13h0m', (t + (13 * 60 * 60)).ago(t))
+    assert_equal('5d0h', (t + (5 * 24 * 60 * 60)).ago(t))
+    assert_equal('22w1d', (t + (155 * 24 * 60 * 60)).ago(t))
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tago
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-11 00:00:00.000000000 Z
+date: 2024-06-13 00:00:00.000000000 Z
 dependencies: []
 description: This simple gem adds a new supplementary method .ago() to the existing
   class Time, thus making logging more convenient