Support Time.now with :in keyword argument

Author: andrykonchin

spec/ruby/core/time/now_spec.rb

@@ -30,6 +30,10 @@
         time.zone.should == nil
       end
 
+      it "returns a Time with UTC offset specified as a single letter military timezone" do
+        Time.now(in: "W").utc_offset.should == 3600 * -10
+      end
+
       it "could be a timezone object" do
         zone = TimeSpecs::TimezoneWithName.new(name: "Asia/Colombo")
         time = Time.now(in: zone)

spec/ruby/core/time/utc_spec.rb

@@ -21,12 +21,22 @@
     Time.new(2022, 1, 1, 0, 0, 0, "UTC").utc?.should == true
     Time.now.localtime("UTC").utc?.should == true
     Time.at(Time.now, in: 'UTC').utc?.should == true
+
+    ruby_version_is "3.1" do
+      Time.new(2022, 1, 1, 0, 0, 0, in: "UTC").utc?.should == true
+      Time.now(in: "UTC").utc?.should == true
+    end
   end
 
   it "does treat time with Z offset as UTC" do
     Time.new(2022, 1, 1, 0, 0, 0, "Z").utc?.should == true
     Time.now.localtime("Z").utc?.should == true
     Time.at(Time.now, in: 'Z').utc?.should == true
+
+    ruby_version_is "3.1" do
+      Time.new(2022, 1, 1, 0, 0, 0, in: "Z").utc?.should == true
+      Time.now(in: "Z").utc?.should == true
+    end
   end
 
   ruby_version_is "3.1" do

spec/ruby/core/time/zone_spec.rb

@@ -74,6 +74,17 @@
       Time.now.localtime("-00:00").zone.should == "UTC"
       Time.at(Time.now, in: '-00:00').zone.should == "UTC"
     end
+
+    ruby_version_is "3.1" do
+      Time.new(2022, 1, 1, 0, 0, 0, in: "UTC").zone.should == "UTC"
+      Time.new(2022, 1, 1, 0, 0, 0, in: "Z").zone.should == "UTC"
+
+      Time.now(in: 'UTC').zone.should == "UTC"
+      Time.now(in: 'Z').zone.should == "UTC"
+
+      Time.at(Time.now, in: 'UTC').zone.should == "UTC"
+      Time.at(Time.now, in: 'Z').zone.should == "UTC"
+    end
   end
 
   platform_is_not :aix, :windows do

spec/tags/core/time/now_tags.txt

@@ -1,3 +1 @@
-fails:Time.now :in keyword argument could be UTC offset as a String in '+HH:MM or '-HH:MM' format
-fails:Time.now :in keyword argument could be UTC offset as a number of seconds
 fails:Time.now :in keyword argument could be a timezone object

src/main/java/org/truffleruby/core/time/TimeNodes.java

@@ -197,8 +197,8 @@ private ZonedDateTime inUTC(ZonedDateTime dateTime) {
 
     }
 
-    @CoreMethod(names = "now", constructor = true)
-    public abstract static class TimeNowNode extends CoreMethodArrayArgumentsNode {
+    @Primitive(name = "time_now")
+    public abstract static class TimeNowNode extends PrimitiveArrayArgumentsNode {
 
         @Child private GetTimeZoneNode getTimeZoneNode = GetTimeZoneNodeGen.create();
         @Child private TruffleString.FromJavaStringNode fromJavaStringNode = TruffleString.FromJavaStringNode.create();

src/main/ruby/truffleruby/core/time.rb

@@ -475,10 +475,6 @@ def new(year=undefined, month=nil, day=nil, hour=nil, minute=nil, second=nil, ut
         utc_offset ? self.now.getlocal(utc_offset) : self.now
       elsif Primitive.nil? utc_offset
         compose(:local, year, month, day, hour, minute, second)
-      elsif utc_offset.instance_of?(String) && !utc_offset.encoding.ascii_compatible?
-        raise ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: ' + utc_offset.inspect
-      elsif utc_offset.instance_of?(String) && !valid_utc_offset_string?(utc_offset)
-        raise ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: ' + utc_offset
       elsif utc_offset == :std
         compose(:local, second, minute, hour, day, month, year, nil, nil, false, nil)
       elsif utc_offset == :dst
@@ -493,19 +489,24 @@ def new(year=undefined, month=nil, day=nil, hour=nil, minute=nil, second=nil, ut
       end
     end
 
-    def valid_utc_offset_string?(utc_offset)
-      utc_offset == 'UTC' \
-        || (utc_offset.size == 1 && ('A'..'Z') === utc_offset && utc_offset != 'J') \
-        || (utc_offset =~ /\A[+-](\d{2})(?::(\d{2})(?::(\d{2}))?)?\z/ && $1.to_i < 24 && $2.to_i < 60 && $3.to_i < 60) \
-        || (utc_offset =~ /\A[+-](\d{2})(?:(\d{2})(?:(\d{2}))?)?\z/ && $1.to_i < 24 && $2.to_i < 60 && $3.to_i < 60) # without ":" separators
-    end
-    private :valid_utc_offset_string?
-
     def utc_offset_in_utc?(utc_offset)
       utc_offset == 'UTC' || utc_offset == 'Z' || utc_offset == '-00:00'
     end
     private :utc_offset_in_utc?
 
+    def now(**options)
+      time_now = Primitive.time_now(self)
+      in_timezone = options[:in]
+
+      if in_timezone
+        utc_offset = Truffle::Type.coerce_to_utc_offset(in_timezone)
+        is_utc = utc_offset_in_utc?(in_timezone)
+        is_utc ? Primitive.time_utctime(time_now) : Primitive.time_localtime(time_now, utc_offset)
+      else
+        time_now
+      end
+    end
+
     def local(*args)
       compose(:local, *args)
     end

src/main/ruby/truffleruby/core/type.rb

@@ -495,10 +495,10 @@ def self.coerce_string_to_utc_offset(offset)
         else
           offset = (offset.ord - 'N'.ord + 1) * -3600 # ("N"..Y) => -1, -2, ...
         end
-      elsif offset.match(/\A(\+|-)(\d\d)(?::(\d\d)(?::(\d\d))?)?\z/) # with ":" separators
+      elsif offset.match(/\A(\+|-)(\d\d)(?::(\d\d)(?::(\d\d))?)?\z/) && $1.to_i < 24 && $2.to_i < 60 && $3.to_i < 60 # with ":" separators
         offset = $2.to_i*60*60 + $3.to_i*60 + $4.to_i
         offset = -offset if $1.ord == 45
-      elsif offset.match(/\A(\+|-)(\d\d)(?:(\d\d)(?:(\d\d))?)?\z/) # without ":" separators
+      elsif offset.match(/\A(\+|-)(\d\d)(?:(\d\d)(?:(\d\d))?)?\z/) && $1.to_i < 24 && $2.to_i < 60 && $3.to_i < 60 # without ":" separators
         offset = $2.to_i*60*60 + $3.to_i*60 + $4.to_i
         offset = -offset if $1.ord == 45
       else