chef-sugar-ng 5.0.3 → 5.1.12

data/lib/chef/sugar/shell.rb

@@ -14,34 +14,37 @@
 # limitations under the License.
 #
 
-require 'mixlib/shellout'
-require 'pathname'
+require 'mixlib/shellout' unless defined?(Mixlib::ShellOut)
+require 'pathname' unless defined?(Pathname)
 
 class Chef
   module Sugar
     module Shell
       extend self
 
-      #
-      # Finds a command in $PATH
-      #
-      # @param [String] cmd
-      #   the command to find
-      #
-      # @return [String, nil]
-      #
-      def which(cmd)
-        if Pathname.new(cmd).absolute?
-          File.executable?(cmd) ? cmd : nil
-        else
-          paths = ENV['PATH'].split(::File::PATH_SEPARATOR) + %w(/bin /usr/bin /sbin /usr/sbin)
-
-          paths.each do |path|
-            possible = File.join(path, cmd)
-            return possible if File.executable?(possible)
+      # this helper has been moved to core chef
+      if !defined?(Chef::VERSION) || Gem::Requirement.new("< 16.0.257").satisfied_by?(Gem::Version.new(Chef::VERSION))
+        #
+        # Finds a command in $PATH
+        #
+        # @param [String] cmd
+        #   the command to find
+        #
+        # @return [String, nil]
+        #
+        def which(cmd)
+          if Pathname.new(cmd).absolute?
+            File.executable?(cmd) ? cmd : nil
+          else
+            paths = ENV['PATH'].split(::File::PATH_SEPARATOR) + %w(/bin /usr/bin /sbin /usr/sbin)
+
+            paths.each do |path|
+              possible = File.join(path, cmd)
+              return possible if File.executable?(possible)
+            end
+
+            nil
           end
-
-          nil
         end
       end
 
@@ -51,7 +54,11 @@ class Chef
       # @return [String]
       #
       def dev_null(node)
-        Chef::Sugar::PlatformFamily.windows?(node) ? 'NUL' : '/dev/null'
+        if defined?(ChefUtils)
+          ChefUtils.windows?(node) ? 'NUL' : '/dev/null'
+        else
+          Chef::Sugar::PlatformFamily.windows?(node) ? 'NUL' : '/dev/null'
+        end
       end
 
       #
@@ -124,8 +131,11 @@ class Chef
     end
 
     module DSL
-      # @see Chef::Sugar::Shell#which
-      def which(cmd); Chef::Sugar::Shell.which(cmd); end
+      # this helper has been moved to core chef
+      if !defined?(Chef::VERSION) || Gem::Requirement.new("< 16.0.257").satisfied_by?(Gem::Version.new(Chef::VERSION))
+        # @see Chef::Sugar::Shell#which
+        def which(cmd); Chef::Sugar::Shell.which(cmd); end
+      end
 
       # @see Chef::Sugar::Shell#dev_null
       def dev_null; Chef::Sugar::Shell.dev_null(node); end

data/lib/chef/sugar/version.rb

@@ -16,6 +16,6 @@
 
 class Chef
   module Sugar
-    VERSION = '5.0.3'
+    VERSION = "5.1.12"
   end
 end

metadata

@@ -1,85 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: chef-sugar-ng
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.1.12
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: chefspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-kitchen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: kitchen-vagrant
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2020-11-11 00:00:00.000000000 Z
+dependencies: []
 description: A series of helpful sugar of the Chef core and other resources to make
   a cleaner, more lean recipe DSL, enforce DRY principles, and make writing Chef recipes
   an awesome experience!
@@ -100,6 +30,7 @@ files:
 - lib/chef/sugar/core_extensions/object.rb
 - lib/chef/sugar/core_extensions/string.rb
 - lib/chef/sugar/data_bag.rb
+- lib/chef/sugar/deprecation.rb
 - lib/chef/sugar/docker.rb
 - lib/chef/sugar/filters.rb
 - lib/chef/sugar/init.rb
@@ -115,9 +46,9 @@ files:
 - lib/chef/sugar/vagrant.rb
 - lib/chef/sugar/version.rb
 - lib/chef/sugar/virtualization.rb
-homepage: https://github.com/sethvargo/chef-sugar
+homepage: https://github.com/chef/chef-sugar
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -127,7 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="