eac_ruby_utils 0.57.1 → 0.57.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6469a891b6aa484b994c98c3617fc63508607703f7eeb85106d543bdfb5a17e2
-  data.tar.gz: 8724c432235e501b3e3a645caee3ac3eb42ba2d0430d870db8b06dcd5c5b2afc
+  metadata.gz: e9a5ba0cb4987def93f005feb8c7d109afe4f5e202939d9a5db9e64eb8d08194
+  data.tar.gz: 9c7632467e434195994afdf69ada8ea8820e5df639709e79cae7cb8543169129
 SHA512:
-  metadata.gz: 7138140617aba1656eeaf68cce2a3a1895d9cc7f6bf9702c2d5630d71d4ca20022cb63c97bdefaae31815aaf7bfbb35d40ee2c139093c097c43f1f5819703bf8
-  data.tar.gz: f509f49102ff7360aa6d368a2558876d808d5cd78f419886304acfcadb219a54ec9a4ecaad988fad7c38f992e77d087d6b8580cb80df9a8b59ad9fc55ca30314
+  metadata.gz: 92cfc25fcb83ec39aff6136acd20fc30a5a9eacb493765ba034f6fa9291e022c931b55d80350fefe605a126a7f9c61b75e6e2b78e6d24b0b627912fde7a4c0fc
+  data.tar.gz: bedc1cd2d75146ca942894d9105e4c6ce02283996c7b1192cd26f93024895feb3a3b02c5dcab0e2f50d0ef5c273c3cdd494d576f55078aa1d5c27712a1679a0a

data/lib/eac_ruby_utils/local_time_zone.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/object/blank'
+require 'active_support/values/time_zone'
+
+module EacRubyUtils
+  module LocalTimeZone
+    DEBIAN_CONFIG_PATH = '/etc/timezone'
+
+    class << self
+      TIMEDATECTL_TIMEZONE_LINE_PATTERN = %r{\s*Time zone:\s*(\S+/\S+)\s}.freeze
+
+      def auto
+        %w[tz_env debian_config offset].lazy.map { |s| send("by_#{s}") }.find(&:present?)
+      end
+
+      def by_debian_config
+        path = ::Pathname.new(DEBIAN_CONFIG_PATH)
+        path.exist? ? path.read.strip.presence : nil
+      end
+
+      def by_offset
+        ::ActiveSupport::TimeZone[::Time.now.getlocal.gmt_offset].name
+      end
+
+      def by_timedatectl
+        executable = ::EacRubyUtils::Envs.local.executable('timedatectl', '--version')
+        return nil unless executable.exist?
+
+        TIMEDATECTL_TIMEZONE_LINE_PATTERN.if_match(executable.command.execute!) { |m| m[1] }
+      end
+
+      def by_tz_env
+        ENV['TZ'].presence
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/patches/time/default_time_zone_set.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/patches/time/local_time_zone'
+require 'active_support/core_ext/time/zones'
+require 'eac_ruby_utils/local_time_zone'
 
-::Time.zone = ::Time.local_time_zone
+::Time.zone = ::EacRubyUtils::LocalTimeZone.auto

data/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.57.1'
+  VERSION = '0.57.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.57.1
+  version: 0.57.2
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2021-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -186,6 +186,7 @@ files:
 - lib/eac_ruby_utils/listable/string_list.rb
 - lib/eac_ruby_utils/listable/symbol_list.rb
 - lib/eac_ruby_utils/listable/value.rb
+- lib/eac_ruby_utils/local_time_zone.rb
 - lib/eac_ruby_utils/on_clean_ruby_environment.rb
 - lib/eac_ruby_utils/options_consumer.rb
 - lib/eac_ruby_utils/patch.rb
@@ -225,7 +226,6 @@ files:
 - lib/eac_ruby_utils/patches/string/inflector.rb
 - lib/eac_ruby_utils/patches/time.rb
 - lib/eac_ruby_utils/patches/time/default_time_zone_set.rb
-- lib/eac_ruby_utils/patches/time/local_time_zone.rb
 - lib/eac_ruby_utils/paths_hash.rb
 - lib/eac_ruby_utils/paths_hash/entry_key_error.rb
 - lib/eac_ruby_utils/paths_hash/node.rb

data/lib/eac_ruby_utils/patches/time/local_time_zone.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/core_ext/time/zones'
-require 'eac_ruby_utils/envs'
-
-class Time
-  class << self
-    TIMEDATECTL_TIMEZONE_LINE_PATTERN = %r{\s*Time zone:\s*(\S+/\S+)\s}.freeze
-
-    def local_time_zone
-      local_time_zone_by_timedatectl || local_time_zone_by_offset
-    end
-
-    def local_time_zone_by_timedatectl
-      executable = ::EacRubyUtils::Envs.local.executable('timedatectl', '--version')
-      return nil unless executable.exist?
-
-      TIMEDATECTL_TIMEZONE_LINE_PATTERN.if_match(executable.command.execute!) { |m| m[1] }
-    end
-
-    def local_time_zone_by_offset
-      ::ActiveSupport::TimeZone[::Time.now.getlocal.gmt_offset].name
-    end
-  end
-end