morpheus-cli 5.2.1 → 5.3.0

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.2.1"
+    VERSION = "5.3.0"
   end
 end

data/lib/morpheus/formatters.rb

@@ -15,11 +15,7 @@ def parse_time(dt, format=nil)
   elsif dt.is_a?(String)
     result = nil
     err = nil
-    begin
-      result = Time.parse(dt)
-    rescue => e
-      err = e
-    end
+    
     if !result
       format ||= DEFAULT_TIME_FORMAT
       if format
@@ -29,12 +25,26 @@ def parse_time(dt, format=nil)
           err = e
         end
       end
-      if !result
-        begin
-          result = Time.strptime(dt, ALTERNATE_TIME_FORMAT)
-        rescue => e
-          err = e
-        end
+    end
+    if !result
+      begin
+        result = Time.strptime(dt, ALTERNATE_TIME_FORMAT)
+      rescue => e
+        # err = e
+      end
+    end
+    if !result
+      begin
+        result = Time.strptime(dt, DEFAULT_DATE_FORMAT)
+      rescue => e
+        # err = e
+      end
+    end
+    if !result
+      begin
+        result = Time.parse(dt)
+      rescue => e
+        err = e
       end
     end
     if result

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.3.0
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler