chef-cli 3.0.22 → 3.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4ad30b471d00e7b8b9d9b2c94a9722d4fa2dbd5a2b8db6eaf6340ad5cbee006
-  data.tar.gz: e925152292893332d5f846db05bc52299823f6e4e7043cc23783ed1ffd7b3a17
+  metadata.gz: c339cf60e573bfcc494ea18c6b641186a8c755c935be0283a8406387540c0134
+  data.tar.gz: b774a1dd9c5d085d2d0b307febb9f9882ab5da6ca1517f8b0e6c1dea207b6404
 SHA512:
-  metadata.gz: 7f1860d196d449214a2e5511c4add38e0b50a39c660837a1f6052fe145e274706f80dc44c474f0480c2b16518c08f77b424c902b1664cfa9bb7ab63408d3dc07
-  data.tar.gz: b1ad7b8563c1389e9ae62e906c998be45ee23d3bb2f044c7cc62fe4fd061577d33d70ab46e00445cb3d84d3754d033432c8cdbd553b9a263b8a5bc5eddb1ce23
+  metadata.gz: 4737f6de6472e79359cd79694edcf5b0a87973b1ddb3757aed33a59aac968687aa99b5fa94056142cb82c1fa76ba220d2d2e38116004d1328b25ef628dfdaf4f
+  data.tar.gz: e616b2608aeb4891dc879c689b2b187885b79d62aa3ed6c9a7a8afb7b02610a4dd100b8eef243945baead2f4d460ce0b205d7d93314b44313e7661302e6ce79b

data/chef-cli.gemspec

@@ -48,6 +48,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "addressable", ">= 2.3.5", "< 2.8"
   gem.add_dependency "cookbook-omnifetch", "~> 0.5"
   gem.add_dependency "diff-lcs", ">= 1.0", "< 1.4" # 1.4 changes the output
-  gem.add_dependency "paint", ">= 1", "< 3"
+  gem.add_dependency "pastel", "~> 0.7" # used for policyfile differ
   gem.add_dependency "license-acceptance", "~> 1.0", ">= 1.0.11"
 end

data/lib/chef-cli/policyfile/differ.rb

@@ -17,7 +17,7 @@
 
 require "diff/lcs"
 require "diff/lcs/hunk"
-require "paint"
+require "pastel"
 require "ffi_yajl" unless defined?(FFI_Yajl)
 
 module ChefCLI
@@ -215,9 +215,15 @@ module ChefCLI
         ui.print("\n")
       end
 
+      def pastel
+        @pastel ||= Pastel.new
+      end
+
       def print_color_diff(hunk)
         hunk.to_s.each_line do |line|
-          ui.print(Paint[line, color_for_line(line)])
+          line_color = color_for_line(line)
+          line = pastel.decorate(line, line_color) unless line_color.nil?
+          ui.print(line)
         end
       end
 

data/lib/chef-cli/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefCLI
-  VERSION = "3.0.22".freeze
+  VERSION = "3.0.23".freeze
 end

data/spec/unit/policyfile/differ_spec.rb

@@ -243,7 +243,7 @@ describe ChefCLI::Policyfile::Differ do
 
   def output
     # ANSI codes make the tests harder to read
-    Paint.unpaint(ui.output)
+    Pastel.new.strip(ui.output)
   end
 
   subject(:differ) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 3.0.22
+  version: 3.0.23
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2020-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -173,25 +173,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: paint
+  name: pastel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: license-acceptance
   requirement: !ruby/object:Gem::Requirement