lib/fugit/parse.rb in fugit-1.10.1 vs lib/fugit/parse.rb in fugit-1.11.0

@@ -27,11 +27,28 @@
       nil
     end
 
     def do_parse(s, opts={})
 
-      parse(s, opts) ||
-      fail(ArgumentError.new("found no time information in #{s.inspect}"))
+      opts[:at] = opts[:in] if opts.has_key?(:in)
+
+      result = nil
+      errors = []
+
+      %i[ cron duration nat at ]
+        .each { |k|
+          begin
+            result ||= (opts[k] != false && self.send("do_parse_#{k}", s))
+          rescue => err
+            errors << err
+          end }
+
+      return result if result
+
+      raise(
+        errors.find { |r| r.class != ArgumentError } ||
+        errors.first ||
+        ArgumentError.new("found no time information in #{s.inspect}"))
     end
 
     def parse_cronish(s, opts={})
 
       r = parse_cron(s) || parse_nat(s, opts)