et-orbi 1.2.10 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12da146d4d75a3fb39edea976685cd6117958484f265f6a7eff404a4f9726224
-  data.tar.gz: b772af0f0e49c040ef15e3b2d23a61b28b540cc7d69f3e338f6fca719057c94b
+  metadata.gz: 2bff6c08f6ece712b2058c0e91120b4bc4fff8925a377fdd8079ec4bbe151a44
+  data.tar.gz: 01ff0b2c74e2a62bb7b895fc83a2a993b2a5a2e1e6088fc4301848076b83a2f0
 SHA512:
-  metadata.gz: 56992ab662dc9ddcfbf6975332f7e44ee4a0c8eb5a90d519dbc8cd79da0847626f90451c21d5080eee440ba65c93cb16a939d20bb94b442eb5b05ce86cd6eea3
-  data.tar.gz: 6c04743276d444c5d7e38a852c385d643af9e8969f03de382c38661bf61ee6f692a1bebadb7c1700318aa99392c4292b592dbcbc27557cbc15d71e203a47e31a
+  metadata.gz: 1d6da83141821bb9f8afe331b8a24caeb88ef8723ea1b34e8c3ce34c8028e0f50a6b254e16fb4501d1cee092cec716e82cac970d1fdef130206fbcc38004d2a5
+  data.tar.gz: aa234212a99fb2c4991ee1cf081a34247f73bd01170d4cd3db2769c6c5d1d003543db0d08a887e4c544310e0da01f593d77d86f71c5b73e59cf029c5210fc075

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 # CHANGELOG.md
 
 
+## et-orbi 1.3.0  released 2025-08-08
+
+- Use probatio for testing
+- Drop unnecessary touch in EoTime#inc
+- Let EtOrbi #+ and #- accept instances with #to_i or #to_f (not strs), gh-40
+- Introduce EtOrbi.zone_abbreviation(zone_name, time)
+
+
+## et-orbi 1.2.11  released 2024-03-23
+
+- Cache @rweek and @rday, not @ref, gh-38
+
+
 ## et-orbi 1.2.10  released 2024-03-22
 
 - Refine #rweek computation, aim more at noon instead of midnight, gh-38

data/CREDITS.md

@@ -1,6 +1,7 @@
 
 # et-orbi credits
 
+* Keenan Brock https://github.com/kbrock version parsing and ostruct dep
 * Benjami Darcet https://github.com/bdarcet https://github.com/floraison/fugit/issues/67 gh-38
 * https://github.com/franckduche https://github.com/floraison/fugit/issues/67 gh-38
 * Igor Viktor https://github.com/gogainda gh-34
@@ -8,7 +9,7 @@
 * Peter Goldstein, https://github.com/petergoldstein GHA 3.3 j9.3, gh-32
 * harsha-flipp https://github.com/harsha-flipp https://github.com/floraison/fugit/issues/63
 * adank92 https://github.com/adank92 https://github.com/ondrejbartas/sidekiq-cron/issues/276 gh-28
-* Stan Hu https://github.com/stanhu Chronic toubles, gh-24, gh-26, etc
+* Stan Hu https://github.com/stanhu Chronic troubles, gh-24, gh-26, etc
 * d-m-u https://github.com/d-m-u EoTime#==(Time), gh-20, gh-7
 * Vais Salikhov (https://github.com/vais) missing US timezone aliases, gh-18 gh-19
 * Wenhui Wang https://github.com/w11th .parse vs Chronic+ActiveSupport, fugit 11

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2017-2024, John Mettraux, jmettraux+flor@gmail.com
+Copyright (c) 2017-2025, John Mettraux, jmettraux+flor@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Makefile

@@ -33,9 +33,9 @@ build: gemspec_validate
 push: build
 	gem push --otp "$(OTP)" pkg/$(NAME)-$(VERSION).gem
 
-spec:
-	bundle exec rspec
-test: spec
+test:
+	bundle exec proba
+spec: test
 
 
 ## specific to project ##
@@ -48,5 +48,5 @@ info:
 
 ## done ##
 
-.PHONY: count_lines scan gemspec_validate name cw build push spec info
+.PHONY: count_lines scan gemspec_validate name cw build push test info
 

data/README.md

@@ -43,7 +43,7 @@ eot = EtOrbi::EoTime.new(0, 'Europe/Moscow')
 eot.to_local_time.class  # => Time
 eot.to_local_time.to_s   # => "1970-01-01 09:00:00 +0900" (at least on my system)
 
-# For the rest, EtOrbi::EoTime mimicks ::Time
+# For the rest, EtOrbi::EoTime mimics ::Time
 ```
 
 Helper methods:
@@ -115,6 +115,14 @@ EtOrbi.parse('tomorrow')
   #   from /home/jmettraux/w/et-orbi/lib/et-orbi/make.rb:31:in `rescue in parse'
 ```
 
+### Testing
+
+To run tests, use `proba`:
+
+```
+bundle exec proba
+```
+
 ### Rails?
 
 If Rails is present, `Time.zone` is provided and EtOrbi will use it, unless `ENV['TZ']` is set to a valid timezone name. Setting `ENV['TZ']` to nil can give back precedence to `Time.zone`.

data/et-orbi.gemspec

@@ -1,12 +1,11 @@
 
-Gem::Specification.new do |s|
+require File.expand_path('../lib/et-orbi/version.rb', __FILE__)
 
-  s.name = 'et-orbi'
 
-  s.version = File.read(
-    File.expand_path('../lib/et-orbi.rb', __FILE__)
-  ).match(/ VERSION *= *['"]([^'"]+)/)[1]
+Gem::Specification.new do |s|
 
+  s.name = 'et-orbi'
+  s.version = EtOrbi::VERSION
   s.platform = Gem::Platform::RUBY
   s.authors = [ 'John Mettraux' ]
   s.email = [ 'jmettraux+flor@gmail.com' ]
@@ -26,6 +25,7 @@ Time zones for fugit and rufus-scheduler. Urbi et Orbi.
     'homepage_uri' =>  s.homepage,
     'source_code_uri' => s.homepage,
     #'wiki_uri' => s.homepage + '/wiki',
+    'rubygems_mfa_required' => 'true',
   }
 
   #s.files = `git ls-files`.split("\n")
@@ -48,8 +48,11 @@ Time zones for fugit and rufus-scheduler. Urbi et Orbi.
 
   #s.add_runtime_dependency 'raabro', '>= 1.1.3'
 
-  s.add_development_dependency 'rspec', '~> 3.8'
+  #s.add_development_dependency 'rspec', '~> 3.8'
+  s.add_development_dependency 'ostruct'
+  s.add_development_dependency 'probatio', '~> 1.3'
   s.add_development_dependency 'chronic', '~> 0.10'
+  #s.add_development_dependency 'activesupport', '~> 8.0'
 
   s.require_path = 'lib'
 end

data/lib/et-orbi/info.rb

@@ -17,6 +17,7 @@ module EtOrbi
         'win' => Gem.win_platform?,
         'rorv' => (Rails::VERSION::STRING rescue nil),
         'astz' => ([ Time.zone.class, Time.zone.tzinfo.name ] rescue nil),
+        'chronic' => (Chronic::VERSION rescue nil),
         'eov' => EtOrbi::VERSION,
         'eotnz' => '???',
         'eotnfz' => '???',

data/lib/et-orbi/time.rb

@@ -96,7 +96,8 @@ module EtOrbi
     def touch
 
       @time = nil
-      @ref = nil
+      @rday = nil
+      @rweek = nil
     end
 
     def seconds=(f)
@@ -315,24 +316,32 @@ module EtOrbi
 
     def inc(t, dir=1)
 
-      r =
-        case t
-        when Numeric
-          nt = self.dup
-          nt.seconds += dir * t.to_f
-          nt
-        when ::Time, ::EtOrbi::EoTime
-          fail ArgumentError.new(
-            "Cannot add #{t.class} to EoTime") if dir > 0
-          @seconds + dir * t.to_f
+      case t
+      when ::Time, ::EtOrbi::EoTime
+
+        fail(
+          ArgumentError.new("Cannot add #{t.class} to EoTime instance")
+            ) if dir > 0
+
+        @seconds + dir * t.to_f
+
+      when String
+
+        false
+
+      else
+
+        if t.respond_to?(:to_f)
+          nt = self.dup; nt.seconds += dir * t.to_f; nt
+        elsif t.respond_to?(:to_i)
+          nt = self.dup; nt.seconds += dir * t.to_i; nt
         else
-          fail ArgumentError.new(
-            "Cannot call add or subtract #{t.class} to EoTime instance")
+          false
         end
 
-      touch
-
-      r
+      end || fail(
+        ArgumentError.new(
+          "Cannot call add or subtract #{t.class} on EoTime instance"))
     end
 
     def localtime(zone=nil)
@@ -353,20 +362,24 @@ module EtOrbi
     #
     def rweek
 
-      @ref ||= EtOrbi.make_time('2019-01-01 12:00:00', @zone)
-      noon = EtOrbi.make_time(strftime('%F 12:00:00'), @zone)
-
-      ((noon - @ref) / WEEK_S).floor + 1
+      @rweek ||=
+        begin
+          ref = EtOrbi.make_time('2019-01-01 12:00:00', @zone)
+          noon = EtOrbi.make_time(strftime('%F 12:00:00'), @zone)
+          ((noon - ref) / WEEK_S).floor + 1
+        end
     end
 
     # "reference week", used in fugit for cron modulo notation
     #
     def rday
 
-      @ref ||= EtOrbi.make_time('2019-01-01 12:00:00', @zone)
-      noon = EtOrbi.make_time(strftime('%F 12:00:00'), @zone)
-
-      ((noon - @ref) / DAY_S).floor + 1
+      @rday ||=
+        begin
+          ref = EtOrbi.make_time('2019-01-01 12:00:00', @zone)
+          noon = EtOrbi.make_time(strftime('%F 12:00:00'), @zone)
+          ((noon - ref) / DAY_S).floor + 1
+        end
     end
 
     def reach(points)

data/lib/et-orbi/version.rb

@@ -0,0 +1,6 @@
+
+module EtOrbi
+
+  VERSION = '1.3.0'
+end
+

data/lib/et-orbi/zones.rb

@@ -77,7 +77,7 @@ module EtOrbi
       tz = (etz && tzs.find { |z| z.name == etz }) || tzs.first
       return tz if tz
 
-      # then, fall back to GMT offest :-(
+      # then, fall back to GMT offset :-(
 
       n = Time.now
 
@@ -161,6 +161,18 @@ module EtOrbi
       end
     end
 
+    def zone_abbreviation(zone_name, time)
+
+      tz = ::TZInfo::Timezone.get(zone_name)
+
+      ts = tz.period_for_local(time, true) rescue -1
+      tw = tz.period_for_local(time, false) rescue -2
+
+      return ts.abbreviation.to_s if ts == tw
+
+      tz.period_for_local(time + 2 * 3600).abbreviation.to_s
+    end
+
     def tweak_zone_name(name)
 
       return name unless (name.match(/./) rescue nil)

data/lib/et-orbi.rb

@@ -4,15 +4,10 @@ require 'time'
 
 require 'tzinfo'
 
+require 'et-orbi/version'
 require 'et-orbi/info'
 require 'et-orbi/make'
 require 'et-orbi/time'
 require 'et-orbi/zones'
 require 'et-orbi/zone'
 
-
-module EtOrbi
-
-  VERSION = '1.2.10'
-end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et-orbi
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.3.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-22 00:00:00.000000000 Z
+date: 2025-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -25,19 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: ostruct
+  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: probatio
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -69,6 +83,7 @@ files:
 - lib/et-orbi/info.rb
 - lib/et-orbi/make.rb
 - lib/et-orbi/time.rb
+- lib/et-orbi/version.rb
 - lib/et-orbi/zone.rb
 - lib/et-orbi/zones.rb
 - lib/et_orbi.rb
@@ -82,6 +97,7 @@ metadata:
   bug_tracker_uri: https://github.com/floraison/et-orbi/issues
   homepage_uri: https://github.com/floraison/et-orbi
   source_code_uri: https://github.com/floraison/et-orbi
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -97,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: time with zones