chef-cli 3.0.22 → 3.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4ad30b471d00e7b8b9d9b2c94a9722d4fa2dbd5a2b8db6eaf6340ad5cbee006
-  data.tar.gz: e925152292893332d5f846db05bc52299823f6e4e7043cc23783ed1ffd7b3a17
+  metadata.gz: 85e388b9fab9f43a073f194f4c3c6c9378c8a9adbed5ff72110f2c9a595902b7
+  data.tar.gz: eb70e257bc469e1e5fe45f8d35cbc1b1ae70d3906753c566d9d022cfc8733bc2
 SHA512:
-  metadata.gz: 7f1860d196d449214a2e5511c4add38e0b50a39c660837a1f6052fe145e274706f80dc44c474f0480c2b16518c08f77b424c902b1664cfa9bb7ab63408d3dc07
-  data.tar.gz: b1ad7b8563c1389e9ae62e906c998be45ee23d3bb2f044c7cc62fe4fd061577d33d70ab46e00445cb3d84d3754d033432c8cdbd553b9a263b8a5bc5eddb1ce23
+  metadata.gz: e8df4c043504a3671210ea15bb0109f4a1f8dc9929e9e86665f227b82e8425d35196e0cd9143c1842549f9cea3efe2bd6248a8c6d14b98abc2fd0825983559e9
+  data.tar.gz: 235eeafdd090fe44cb78ad741e55797d19da15acdf853d9877f0b164fdc782f21e75e3f523cd4f5e1c6810e4b256185c087c5e22644843c8a0cb667fe8692c32

data/Gemfile

@@ -28,3 +28,9 @@ group :development do
   gem "pry-stack_explorer", "~> 0.4.0"
   gem "rb-readline"
 end
+
+group :profile do
+  gem "stackprof"
+  gem "stackprof-webnav"
+  gem "memory_profiler"
+end

data/bin/chef-cli

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright:: Copyright (c) 2014-2018 Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@
 # Set a trap for ctrl-C right away so we don't surface interrupt exceptions inside of rubygems or whatever.
 Kernel.trap(:INT) { print("\n"); exit 1 }
 
-$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
+$:.unshift(File.expand_path(File.join(__dir__, "..", "lib")))
 require "chef-cli/cli"
 
 ChefCLI::CLI.new(ARGV.clone).run(enforce_license: true)

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 "license-acceptance", "~> 1.0", ">= 1.0.11"
+  gem.add_dependency "pastel", "~> 0.7" # used for policyfile differ
+  gem.add_dependency "license-acceptance", ">= 1.0.11", "< 3"
 end

data/lib/chef-cli/cli.rb

@@ -33,6 +33,10 @@ module ChefCLI
     include Chef::Mixin::ShellOut
 
     banner(<<~BANNER)
+      #{ChefCLI::Dist::WORKSTATION_HEADER}
+      Docs: #{ChefCLI::Dist::WORKSTATION_DOCS}
+      Patents: #{ChefCLI::Dist::PATENTS}
+
       Usage:
           #{ChefCLI::Dist::EXEC} -h/--help
           #{ChefCLI::Dist::EXEC} -v/--version
@@ -119,13 +123,13 @@ module ChefCLI
 
     def show_help
       msg(banner)
-      msg("\nAvailable Commands:")
+      msg("Available Commands:")
 
       justify_length = subcommands.map(&:length).max + 2
       subcommand_specs.each do |name, spec|
         next if spec.hidden
 
-        msg("    #{"#{name}".ljust(justify_length)}#{spec.description}")
+        msg("    #{name.to_s.ljust(justify_length)}#{spec.description}")
       end
     end
 

data/lib/chef-cli/command/env.rb

@@ -37,7 +37,7 @@ module ChefCLI
 
       def run(params)
         info = {}
-        info["#{ChefCLI::Dist::PRODUCT}"] = workstation_info
+        info[ChefCLI::Dist::PRODUCT] = workstation_info
         info["Ruby"] = ruby_info
         info["Path"] = paths
         ui.msg info.to_yaml

data/lib/chef-cli/command/generator_commands/cookbook.rb

@@ -197,20 +197,7 @@ module ChefCLI
           # .delivery/cli.toml starting from pwd:
           # https://github.com/chef/delivery-cli/blob/22cbef3987ebd0aee98405b7e161a100edc87e49/src/delivery/config/mod.rs#L225-L247
 
-          Pathname.new(Dir.pwd).ascend do |path|
-            return true if contains_delivery_cli_toml?(path)
-          end
-
-          false # nothing was found
-        end
-
-        #
-        # @param [Pathname] path a directory
-        #
-        # @return [Boolean] delivery cli.toml exists
-        #
-        def contains_delivery_cli_toml?(path)
-          path.join(".delivery/cli.toml").exist?
+          Pathname.pwd.ascend.any? { |path| path.join(".delivery/cli.toml").exist? }
         end
 
         def read_and_validate_params

data/lib/chef-cli/cookbook_profiler/identifiers.rb

@@ -18,7 +18,7 @@
 # TODO: Chef should require its dependency correctly.
 require "singleton" unless defined?(Singleton)
 require "chef/cookbook/cookbook_version_loader"
-require "digest/sha1"
+require "digest/sha1" unless defined?(Digest::SHA1)
 
 require "chef/digester"
 

data/lib/chef-cli/dist.rb

@@ -27,7 +27,6 @@ module ChefCLI
 
     # The name of the server product
     SERVER_PRODUCT = "Chef Infra Server".freeze
-
     WORKFLOW = "Chef Workflow (Delivery)".freeze
 
     # The chef executable, as in `chef gem install` or `chef generate cookbook`
@@ -38,7 +37,13 @@ module ChefCLI
 
     HAB_PRODUCT = "Chef Habitat".freeze
     HAB_SOFTWARE_NAME = "habitat".freeze
-
     HAB_CLI = "hab".freeze
+
+    # product patents page
+    PATENTS = "https://www.chef.io/patents".freeze
+
+    # Workstation banner/help text
+    WORKSTATION_DOCS = "https://docs.chef.io/workstation/".freeze
+    WORKSTATION_HEADER = "The Chef command line tool for managing your infrastructure from your workstation.".freeze
   end
 end

data/lib/chef-cli/generator.rb

@@ -154,7 +154,7 @@ module ChefCLI
         end
         if comment
           # Ensure there's no trailing whitespace
-          result.gsub(/^(.+)$/, "#{comment} \\1").gsub(/^$/, "#{comment}").strip
+          result.gsub(/^(.+)$/, "#{comment} \\1").gsub(/^$/, comment).strip
         else
           result
         end

data/lib/chef-cli/helpers.rb

@@ -141,7 +141,7 @@ module ChefCLI
 
     def default_package_home
       if Chef::Platform.windows?
-        File.join(ENV["LOCALAPPDATA"], "#{ChefCLI::Dist::PRODUCT_PKG_HOME}")
+        File.join(ENV["LOCALAPPDATA"], ChefCLI::Dist::PRODUCT_PKG_HOME)
       else
         File.expand_path("~/.#{ChefCLI::Dist::PRODUCT_PKG_HOME}")
       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/policyfile/storage_config.rb

@@ -52,7 +52,7 @@ module ChefCLI
           return use_policyfile_lock(policyfile_filename)
         end
         unless policyfile_filename.end_with?(".rb")
-          raise InvalidPolicyfileFilename, "Policyfile filenames must end with `.rb' extension (you gave: `#{policyfile_filename}')"
+          raise InvalidPolicyfileFilename, "Policyfile filenames must end with an `.rb' or `.lock.json' extension (you gave: `#{policyfile_filename}')"
         end
 
         @policyfile_filename = policyfile_filename

data/lib/chef-cli/policyfile_services/export_repo.rb

@@ -18,7 +18,7 @@
 require "pathname" unless defined?(Pathname)
 require "fileutils" unless defined?(FileUtils)
 require "tmpdir" unless defined?(Dir.mktmpdir)
-require "zlib"
+require "zlib" unless defined?(Zlib)
 
 require "archive/tar/minitar"
 

data/lib/chef-cli/policyfile_services/install.rb

@@ -42,8 +42,8 @@ module ChefCLI
         @overwrite = overwrite
         @chef_config = config
 
-        policyfile_rel_path = policyfile || "Policyfile.rb"
-        policyfile_full_path = File.expand_path(policyfile_rel_path, root_dir)
+        @policyfile_rel_path = policyfile || "Policyfile.rb"
+        policyfile_full_path = File.expand_path(@policyfile_rel_path, root_dir)
         @storage_config = Policyfile::StorageConfig.new.use_policyfile(policyfile_full_path)
 
         @policyfile_content = nil
@@ -51,9 +51,11 @@ module ChefCLI
       end
 
       def run(cookbooks_to_update = [], exclude_deps = false)
-        unless File.exist?(policyfile_expanded_path)
-          # TODO: suggest next step. Add a generator/init command? Specify path to Policyfile.rb?
-          # See card CC-232
+        # TODO: suggest next step. Add a generator/init command? Specify path to Policyfile.rb?
+        # See card CC-232
+        if @policyfile_rel_path.end_with?(".lock.json") && !File.exist?(policyfile_lock_expanded_path)
+          raise PolicyfileNotFound, "Policyfile lock not found at path #{policyfile_lock_expanded_path}"
+        elsif @policyfile_rel_path.end_with?(".rb") && !File.exist?(policyfile_expanded_path)
           raise PolicyfileNotFound, "Policyfile not found at path #{policyfile_expanded_path}"
         end
 

data/lib/chef-cli/policyfile_services/push_archive.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "zlib"
+require "zlib" unless defined?(Zlib)
 require "archive/tar/minitar"
 
 require_relative "../service_exceptions"

data/lib/chef-cli/version.rb

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

data/spec/test_helpers.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2018 Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,7 +35,7 @@ module TestHelpers
   end
 
   def fixtures_path
-    File.expand_path(File.dirname(__FILE__) + "/unit/fixtures/")
+    File.expand_path(__dir__ + "/unit/fixtures/")
   end
 
   def project_root

data/spec/unit/cli_spec.rb

@@ -41,12 +41,15 @@ describe ChefCLI::CLI do
 
   let(:base_help_message) do
     <<~E
+      #{ChefCLI::Dist::WORKSTATION_HEADER}
+      Docs: #{ChefCLI::Dist::WORKSTATION_DOCS}
+      Patents: #{ChefCLI::Dist::PATENTS}
+
       Usage:
           chef -h/--help
           chef -v/--version
           chef command [arguments...] [options...]
 
-
       Available Commands:
           gem      Runs the `gem` command in context of the embedded ruby
           example  Example subcommand for testing

data/spec/unit/command/exec_spec.rb

@@ -127,7 +127,7 @@ describe ChefCLI::Command::Exec do
         end
 
         context "when running a exec with #{switch}" do
-          let(:command_options) { ["#{switch}"] }
+          let(:command_options) { [switch] }
 
           it "should call not call exec, but it should print the banner" do
             allow(command_instance).to receive(:msg)

data/spec/unit/fixtures/cookbooks_api/update_fixtures.rb

@@ -1,14 +1,11 @@
 require "openssl"
-require "net/https"
+require "net/http" unless defined?(Net::HTTP)
 require "json" unless defined?(JSON)
-require "pp"
 require "uri"
 
-THIS_DIR = File.expand_path(File.dirname(__FILE__))
-
-UNIVERSE_JSON_PATH = File.join(THIS_DIR, "universe.json")
-SMALL_UNIVERSE_JSON_PATH = File.join(THIS_DIR, "small_universe.json")
-PRUNED_UNIVERSE_PATH = File.join(THIS_DIR, "pruned_small_universe.json")
+UNIVERSE_JSON_PATH = File.join(__dir__, "universe.json")
+SMALL_UNIVERSE_JSON_PATH = File.join(__dir__, "small_universe.json")
+PRUNED_UNIVERSE_PATH = File.join(__dir__, "pruned_small_universe.json")
 
 COOKBOOKS_IN_SMALL_UNIVERSE = %w{apache2 application apt database mysql nginx postgresql yum}.freeze
 

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

data/spec/unit/policyfile/storage_config_spec.rb

@@ -106,10 +106,10 @@ describe ChefCLI::Policyfile::StorageConfig do
 
     end
 
-    context "when the policyfile file name doesn't have a .rb extension" do
+    context "when the policyfile file name doesn't have an .rb or .lock.json extension" do
 
       it "raises an error" do
-        err_string = %q{Policyfile filenames must end with `.rb' extension (you gave: `Policyfile')}
+        err_string = %q{Policyfile filenames must end with an `.rb' or `.lock.json' extension (you gave: `Policyfile')}
         expect { storage_config.use_policyfile("Policyfile") }.to raise_error(ChefCLI::InvalidPolicyfileFilename, err_string)
       end
 

data/spec/unit/policyfile_services/install_spec.rb

@@ -77,6 +77,26 @@ describe ChefCLI::PolicyfileServices::Install do
 
   end
 
+  context "When an explicit Policfyfile lock name is given and does not exist" do
+
+    let(:policyfile_rb_explicit_name) { "i_do_not_exist.lock.json" }
+
+    it "errors out" do
+      expect { install_service.run }.to raise_error(ChefCLI::PolicyfileNotFound, "Policyfile lock not found at path #{policyfile_rb_path}")
+    end
+
+  end
+
+  context "When an explicit Policfyfile name is given and does not exist" do
+
+    let(:policyfile_rb_explicit_name) { "i_do_not_exist.rb" }
+
+    it "errors out" do
+      expect { install_service.run }.to raise_error(ChefCLI::PolicyfileNotFound, "Policyfile not found at path #{policyfile_rb_path}")
+    end
+
+  end
+
   context "when a Policyfile exists" do
 
     before do

data/spec/unit/service_exception_inspectors/http_spec.rb

@@ -16,7 +16,7 @@
 #
 
 require "spec_helper"
-require "net/http"
+require "net/http" unless defined?(Net::HTTP)
 require "chef/monkey_patches/net_http"
 require "chef-cli/service_exception_inspectors/http"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 3.0.22
+  version: 3.0.31
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -173,45 +173,39 @@ 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
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.11
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.11
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: A streamlined development and deployment workflow for Chef platform.
 email:
 - info@chef.io