nib 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4222483b3c2ebfb88a93d8d6798d250bfac16bdd01e685d2c8397dacbd3e72f0
-  data.tar.gz: abd1e97f561ac535af89409e11fdf20f0c5be96404e6fa90e43561e9ce6a97b4
+  metadata.gz: b69fb8eb3b9ba8f08e35a98aecb2334e6ed064202851793609a2611928ac047f
+  data.tar.gz: f60ce60ae0b32ebd7bfe6adfa68aded161d3d35f3a038bc036121f86a9c2ddd7
 SHA512:
-  metadata.gz: 5612ed97ecd998f1cf22fab6262bcde9fb1f4ac9e06588c1418c3c4fa7f6d68cbb9744ea2a89bdcccee9f2a5a80f926cafbce8e30349d8e6440707147393604e
-  data.tar.gz: b2a84a25909913a4941357727c0f6304a5f09a0f3358eaf892c04e9884a1a157b1254f74f4d66b36893eab65ca7b2978827cc3a0940126bb694abd960ff03f18
+  metadata.gz: 9f487437d32af8de8e5f4cd31664a11f70661bd4290f9c6314b146f1f73cf382e47af8e2101826586214b8bbb2ecbc1efb34c91ddaaf9cd9fb594cdf06c677d8
+  data.tar.gz: 8bf1f908a299ea019744b92e7c0dd72a9f276ff2f45b119ca01e1cd8e186cf946b5954597aacff42ed9b9f5eb49c2636052ca64104b976fd893f6dd82b530c74

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

data/lib/core_extensions/psych.rb

@@ -0,0 +1,29 @@
+require 'yaml'
+
+module CoreExtensions
+  # Handle the fact that we are loading potentially "unsafe" YAML while still
+  # supporting Ruby 2.7 and 3.0.
+  module Psych
+    def flexible_load(string)
+      load_with = if ::Psych.respond_to?(:unsafe_load)
+        :unsafe_load
+      else
+        :load
+      end
+
+      ::Psych.send(load_with, string)
+    end
+
+    def flexible_load_file(path)
+      load_with = if ::Psych.respond_to?(:unsafe_load_file)
+        :unsafe_load_file
+      else
+        :load_file
+      end
+
+      ::Psych.send(load_with, path)
+    end
+  end
+end
+
+Psych.extend CoreExtensions::Psych

data/lib/nib/debug.rb

@@ -1,5 +1,3 @@
-require 'yaml'
-
 class Nib::Debug
   include Nib::Command
 

data/lib/nib/history/compose.rb

@@ -28,7 +28,9 @@ class Nib::History::Compose
   end
 
   def original_config
-    @original_config ||= YAML.safe_load(docker_compose_config.gsub(/\$/, '$$'))
+    @original_config ||= Psych.flexible_load(
+      docker_compose_config.gsub(/\$/, '$$')
+    )
   end
 
   def file

data/lib/nib/options.rb

@@ -4,13 +4,7 @@ module Nib::Options
   def config
     return @config if @config
 
-    load_with = if YAML.respond_to?(:unsafe_load_file)
-      :unsafe_load_file
-    else
-      :load_file
-    end
-
-    @config = YAML.send(load_with, "#{Nib::GEM_ROOT}/config/options.yml")
+    @config = Psych.flexible_load_file("#{Nib::GEM_ROOT}/config/options.yml")
   end
 
   def options_for(type, name)

data/lib/nib.rb

@@ -2,6 +2,7 @@ require 'nib/version'
 
 require 'core_extensions/hash'
 require 'core_extensions/string'
+require 'core_extensions/psych'
 
 require 'nib/options'
 require 'nib/options/augmenter'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nib
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - John Allen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -166,6 +166,7 @@ files:
 - config/commands/shell/pryrc
 - config/options.yml
 - lib/core_extensions/hash.rb
+- lib/core_extensions/psych.rb
 - lib/core_extensions/string.rb
 - lib/nib.rb
 - lib/nib/check_for_update.rb
@@ -208,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: The tip of the pen (compose)