From f521d9f2669abb4c507b476a93de36ea92201e0a Mon Sep 17 00:00:00 2001 From: d-m-u Date: Mon, 19 Aug 2019 06:46:40 -0400 Subject: [PATCH] EoTime gem has patch up for supporting EoTime == Time!! https://github.com/floraison/et-orbi/commit/283f5e207e9a6fe6a50dc2e39fc2e40eebd5b3b5 --- Gemfile | 5 ++--- config/initializers/convert_time_to_eo.rb | 12 ------------ 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 config/initializers/convert_time_to_eo.rb diff --git a/Gemfile b/Gemfile index fe3bc4bb6b7..4332c01bd1a 100644 --- a/Gemfile +++ b/Gemfile @@ -193,9 +193,8 @@ end group :scheduler, :manageiq_default do gem "rufus-scheduler" end -# rufus has et-orbi dependency -# this is temporary inclusion till we can get ConvertTimeToEoTime patch into upstream: -gem "et-orbi" +# rufus has et-orbi dependency, v1.2.2 has patch for ConvertTimeToEoTime that we need +gem "et-orbi", ">= 1.2.2" group :seed, :manageiq_default do manageiq_plugin "manageiq-content" diff --git a/config/initializers/convert_time_to_eo.rb b/config/initializers/convert_time_to_eo.rb deleted file mode 100644 index 7d0f9f10471..00000000000 --- a/config/initializers/convert_time_to_eo.rb +++ /dev/null @@ -1,12 +0,0 @@ -# temporary hack for when/if we can get patch accepted upscream -# et-orbi doesn't support comparisons of EoTime in the scheduler with user provided Time objects -# see https://github.com/ManageIQ/manageiq/pull/19153#issuecomment-521719495 -module ConvertTimeToEoTime - def ==(*args) - o = EtOrbi.make_time(args.first) if args.first.kind_of?(Time) || args.first.kind_of?(DateTime) - super(o) - end -end - -require 'et-orbi' -EtOrbi::EoTime.prepend(ConvertTimeToEoTime)