chef-dk 3.13.1 → 4.0.60

data/lib/chef-dk/command/push.rb

@@ -30,7 +30,7 @@ module ChefDK
       banner(<<~E)
         Usage: chef push POLICY_GROUP [ POLICY_FILE ] [options]
 
-        `chef push` Uploads an existing Policyfile.lock.json to a Chef Server, along
+        `chef push` Uploads an existing Policyfile.lock.json to a Chef Infra Server, along
         with all the cookbooks contained in the policy lock. The policy lock is applied
         to a specific POLICY_GROUP, which is a set of nodes that share the same
         run_list and cookbooks.
@@ -71,7 +71,6 @@ module ChefDK
 
       def run(params = [])
         return 1 unless apply_params!(params)
-
         push.run
         0
       rescue PolicyfileServiceError => e

data/lib/chef-dk/command/push_archive.rb

@@ -30,7 +30,7 @@ module ChefDK
       banner(<<~E)
         Usage: chef push-archive POLICY_GROUP ARCHIVE_FILE [options]
 
-        `chef push-archive` publishes a policy archive to a Chef Server. Policy
+        `chef push-archive` publishes a policy archive to a Chef Infra Server. Policy
         archives can be created with `chef export -a`. The policy will be applied to
         the given POLICY_GROUP, which is a set of nodes that share the same
         run_list and cookbooks.
@@ -97,7 +97,7 @@ module ChefDK
             policy_group: policy_group,
             ui: ui,
             config: chef_config
-          )
+        )
       end
 
       def archive_file

data/lib/chef-dk/command/shell_init.rb

@@ -46,8 +46,8 @@ module ChefDK
       banner(<<~HELP)
         Usage: chef shell-init
 
-        `chef shell-init` modifies your shell environment to make ChefDK your default
-        ruby.
+        `chef shell-init` modifies your shell environment to make ChefDK or Workstation your
+        default Ruby.
 
           To enable for just the current shell session:
 
@@ -95,7 +95,7 @@ module ChefDK
           return 1
         elsif !SUPPORTED_SHELLS.include?(shell_name)
           err("Shell `#{shell_name}' is not currently supported")
-          err("Supported shells are: #{SUPPORTED_SHELLS.join(" ")}")
+          err("Supported shells are: #{SUPPORTED_SHELLS.join(' ')}")
           return 1
         end
 
@@ -116,7 +116,6 @@ module ChefDK
 
       def completion_for(shell)
         return "" unless (completion_template_basename = completion_template_for(shell))
-
         completion_template_path = expand_completion_template_path(completion_template_basename)
         erb = ERB.new(File.read(completion_template_path), nil, "-")
         context_binding = shell_completion_template_context.get_binding
@@ -166,7 +165,7 @@ module ChefDK
         # /dev/null to avoid Fish's helpful warnings about nonexistent
         # PATH elements.
         if var == "PATH"
-          emit_shell_cmd(%Q{set -gx #{var} "#{val.split(":").join('" "')}" 2>/dev/null;})
+          emit_shell_cmd(%Q{set -gx #{var} "#{val.split(':').join('" "')}" 2>/dev/null;})
         else
           emit_shell_cmd(%Q{set -gx #{var} "#{val}";})
         end
@@ -175,6 +174,11 @@ module ChefDK
       def powershell_export(var, val)
         emit_shell_cmd(%Q{$env:#{var}="#{val}"})
       end
+
+      def check_license_acceptance
+        # It gives a very weird error if users try to eval the shell-init command and it requests the
+        # license from them. Instead, let users shell-init without accepting the license.
+      end
     end
   end
 end

data/lib/chef-dk/command/show_policy.rb

@@ -86,7 +86,6 @@ module ChefDK
 
       def run(params)
         return 1 unless apply_params!(params)
-
         show_policy_service.run
         0
       rescue PolicyfileServiceError => e

data/lib/chef-dk/command/undelete.rb

@@ -88,7 +88,6 @@ module ChefDK
 
       def run(params)
         return 1 unless apply_params!(params)
-
         if list_undo_records?
           undelete_service.list
         else

data/lib/chef-dk/command/update.rb

@@ -89,7 +89,6 @@ module ChefDK
 
       def run(params = [])
         return 1 unless apply_params!(params)
-
         attributes_updater.run
         installer.run(@cookbooks_to_update, config[:exclude_deps]) unless update_attributes_only?
         0

data/lib/chef-dk/command/verify.rb

@@ -70,7 +70,7 @@ module ChefDK
       bundle_install_mutex = Mutex.new
 
       #
-      # Components included in ChefDK:
+      # Components included in Chef Development kit:
       # :base_dir => Relative path of the component w.r.t. omnibus_apps_dir
       # :gem_base_dir => Takes a gem name instead and uses first gem found
       # :test_cmd => Test command to be launched for the component
@@ -168,7 +168,7 @@ module ChefDK
         c.smoke_test do
           tmpdir do |cwd|
             FileUtils.touch(File.join(cwd, "apply.rb"))
-            sh("#{bin("chef-apply")} apply.rb", cwd: cwd)
+            sh("#{bin("chef-apply")} apply.rb --chef-license 'accept-no-persist'", cwd: cwd)
           end
         end
       end
@@ -193,103 +193,6 @@ module ChefDK
         c.smoke_test { sh("#{bin("chef-run")} -v") }
       end
 
-      # entirely possible this needs to be driven by a utility method in chef-provisioning.
-      add_component "chef-provisioning" do |c|
-        c.gem_base_dir = "chef-dk"
-
-        c.smoke_test do
-          # ------------
-          # we want to avoid hard-coding driver names, but calling Gem::Specification produces a warning;
-          # changing $VERBOSE seems to be the best way to silence it.
-          verbose = $VERBOSE
-          $VERBOSE = nil
-
-          # construct a hash of { driver_name => [version1, version2, ...]}
-          driver_versions = {}
-          Gem::Specification.all.map { |gs| [gs.name, gs.version] }
-                                  .select { |n| n[0] =~ /^chef-provisioning-/ }
-                                  .each { |gem, version| (driver_versions[gem] ||= []) << version }
-
-          drivers = Gem::Specification.all.map { |gs| gs.name }
-                                           .select { |n| n =~ /^chef-provisioning-/ }
-                                           .uniq
-
-          versions = Gem::Specification.find_all_by_name("chef-provisioning").map { |s| s.version }
-          $VERBOSE = verbose
-          # ------------
-          failures = []
-
-          # ------------
-          # fail the verify if we have more than one version of chef-provisioning or any of its drivers.
-          def format_gem_failure(name, versions)
-            <<~EOS
-              #{name} has multiple versions installed:
-              #{versions.sort.map { |gv| "    #{gv}" }.join("\n")}
-            EOS
-          end
-
-          failures << format_gem_failure("chef-provisioning", versions) if versions.size > 1
-
-          driver_versions.keys.sort.each do |driver_name|
-            v = driver_versions[driver_name]
-            failures << format_gem_failure(driver_name, v) if v.size > 1
-          end
-
-          if failures.size > 0
-            failures << <<~EOS
-
-              Some applications may need or prefer different versions of the chef-provisioning gem or its drivers, so
-              this multiple-version check can fail if a user has installed new versions of those libraries.
-            EOS
-          end
-
-          # ------------
-          # load the core gem and all of the drivers (ignoring versions).
-          require "chef/provisioning"
-          drivers.map { |d| "#{d.tr('-', '/')}_driver" }.each do |driver_gem|
-            begin
-              begin
-                require driver_gem
-              rescue LoadError
-                # anomalously, chef-provisioning-fog does not have a fog_driver.rb. (9/2015)
-                require "#{driver_gem}/driver.rb"
-              end
-            rescue LoadError => ex
-              puts ex
-            end
-          end
-
-          # ------------
-          # look for version dependency conflicts.
-          tmpdir do |cwd|
-            versions.each do |provisioning_version|
-              gemfile = "chef-provisioning-#{provisioning_version}-chefdk-test.gemfile"
-
-              # write out the gemfile for this chef-provisioning version, and see if Bundler can make it go.
-              with_file(File.join(cwd, gemfile)) do |f|
-                f.puts %Q{gem "chef-provisioning", "= #{provisioning_version}"}
-                drivers.each { |d| f.puts %Q{gem "#{d}"} }
-              end
-
-              result = bundle_install_mutex.synchronize do
-                sh("#{embedded_bin("bundle")} install --local --quiet", cwd: cwd, env: { "BUNDLE_GEMFILE" => gemfile })
-              end
-
-              if result.exitstatus != 0
-                failures << result.stdout
-              end
-            end # end provisioning versions.
-
-            failures.each { |fail| puts fail }
-
-            # dubious on Windows.
-            # this is weird, but we seem to require a Mixlib::ShellOut as the return value. suggestions
-            # welcome.
-            sh(failures.size > 0 ? "false" : "true")
-          end
-        end
-      end
-
       add_component "chefspec" do |c|
         c.gem_base_dir = "chefspec"
         c.unit_test do
@@ -321,26 +224,21 @@ module ChefDK
         end
       end
 
-      add_component "generated-cookbooks-pass-chefspec-and-foodcritic" do |c|
+      add_component "generated-cookbooks-pass-chefspec" do |c|
+
         c.gem_base_dir = "chef-dk"
         c.smoke_test do
           tmpdir do |cwd|
             sh("#{bin("chef")} generate cookbook example", cwd: cwd)
             cb_cwd = File.join(cwd, "example")
             sh(embedded_bin("rspec"), cwd: cb_cwd)
-            sh(embedded_bin("foodcritic --tags ~supermarket ."), cwd: cb_cwd)
           end
         end
       end
 
-      add_component "chef-vault" do |c|
-        c.gem_base_dir = "chef-vault"
-        c.smoke_test { sh("#{embedded_bin("chef-vault -h")}") }
-      end
-
       add_component "fauxhai" do |c|
         c.gem_base_dir = "fauxhai"
-        c.smoke_test { sh(embedded_bin("fauxhai")) }
+        c.smoke_test { sh("#{embedded_bin("gem")} list fauxhai") }
       end
 
       add_component "knife-spork" do |c|
@@ -348,6 +246,12 @@ module ChefDK
         c.smoke_test { sh("#{bin("knife")} spork info") }
       end
 
+      add_component "kitchen-vagrant" do |c|
+        c.gem_base_dir = "kitchen-vagrant"
+        # The build is not passing in travis, so no tests
+        c.smoke_test { sh("#{embedded_bin("gem")} list kitchen-vagrant") }
+      end
+
       add_component "package installation" do |c|
 
         c.gem_base_dir = "chef-dk"
@@ -379,7 +283,6 @@ module ChefDK
             sh!("#{usr_bin_path("ohai")} -v")
             sh!("#{usr_bin_path("foodcritic")} -V")
             sh!("#{usr_bin_path("inspec")} version")
-            sh!("#{usr_bin_path("dco")} -h")
           end
 
           # Test blocks are expected to return a Mixlib::ShellOut compatible
@@ -462,7 +365,7 @@ module ChefDK
           c.smoke_test do
             tmpdir do |cwd|
               sh!("#{embedded_bin("git")} config -l")
-              sh!("#{embedded_bin("git")} clone https://github.com/chef/chef-provisioning", cwd: cwd)
+              sh!("#{embedded_bin("git")} clone https://github.com/chef/license-acceptance", cwd: cwd)
             end
           end
         end
@@ -472,7 +375,7 @@ module ChefDK
           c.smoke_test do
             tmpdir do |cwd|
               sh!("#{File.join(omnibus_root, "gitbin", "git")} config -l")
-              sh!("#{File.join(omnibus_root, "gitbin", "git")} clone https://github.com/chef/chef-provisioning", cwd: cwd)
+              sh!("#{File.join(omnibus_root, "gitbin", "git")} clone https://github.com/chef/license-acceptance", cwd: cwd)
 
               # If /usr/bin/git is a symlink, fail the test.
               # Note that this test cannot go last because it does not return a

data/lib/chef-dk/component_test.rb

@@ -144,7 +144,9 @@ module ChefDK
     end
 
     def nix_platform_native_bin_dir
-      if /darwin/ =~ RUBY_PLATFORM
+      if /sunos|solaris/ =~ RUBY_PLATFORM
+        "/opt/local/bin"
+      elsif /darwin/ =~ RUBY_PLATFORM
         "/usr/local/bin"
       else
         "/usr/bin"
@@ -179,6 +181,7 @@ module ChefDK
           # Add the embedded/bin to the PATH so that bundle executable can
           # be found while running the tests.
           path_variable_key => omnibus_path,
+          "CHEF_LICENSE" => "accept-no-persist",
         },
         timeout: 3600,
       }
@@ -196,7 +199,6 @@ module ChefDK
 
     def gem_base_dir
       return nil if @gem_name_for_base_dir.nil?
-
       # There is no way to say "give me the latest prerelease OR normal version of this gem.
       # So we first ask if there is a normal version, and if there is not, we ask if there
       # is a prerelease version.  ">= 0.a" is how we ask for a prerelease version, because a

data/lib/chef-dk/configurable.rb

@@ -49,7 +49,6 @@ module ChefDK
 
     def chef_config
       return @chef_config if @chef_config
-
       config_loader.load
       @chef_config = Chef::Config
       CookbookOmnifetch.integration.default_chef_server_http_client = default_chef_server_http_client

data/lib/chef-dk/exceptions.rb

@@ -66,7 +66,7 @@ module ChefDK
     def initialize(url, reason = nil)
       @url    = url
       @reason = reason
-      msg     = "'#{@url}' is not a valid Policyfile Source URI"
+      msg     = "'#{@url}' is not a valid Policy File Source URI"
       msg << " #{@reason}." unless @reason.nil?
       super(msg)
     end

data/lib/chef-dk/generator.rb

@@ -24,7 +24,7 @@ module ChefDK
       def self.add_attr(name)
         @attributes ||= [ ]
 
-        unless @attributes.include?(name)
+        if !@attributes.include?(name)
           @attributes << name
           attr_accessor(name)
         end

data/lib/chef-dk/helpers.rb

@@ -136,8 +136,7 @@ module ChefDK
 
     def omnibus_expand_path(*paths)
       dir = File.expand_path(File.join(paths))
-      raise OmnibusInstallNotFound.new unless dir && File.directory?(dir)
-
+      raise OmnibusInstallNotFound.new() unless dir && File.directory?(dir)
       dir
     end
 

data/lib/chef-dk/policyfile/chef_server_lock_fetcher.rb

@@ -28,7 +28,7 @@ module ChefDK
       attr_accessor :source_options
       attr_accessor :chef_config
 
-      # Initialize a ChefServerLockFetcher
+      # Initialize a LocalLockFetcher
       #
       # @param name [String] The name of the policyfile
       # @param source_options [Hash] A hash with a :server key pointing at the chef server,
@@ -67,7 +67,7 @@ module ChefDK
         errors.empty?
       end
 
-      # Check the options provided when creating this class for errors
+      # Check the options provided when craeting this class for errors
       #
       # @return [Array<String>] A list of errors found
       def errors

data/lib/chef-dk/policyfile/cookbook_locks.rb

@@ -54,7 +54,7 @@ module ChefDK
       attr_accessor :identifier
 
       # A string in "X.Y.Z" version number format that uniquely identifies the
-      # cookbook version. This is for compatibility with Chef Server 11.x,
+      # cookbook version. This is for compatibility with Chef Infra Server 11.x,
       # where cookbooks are stored by x.y.z version numbers.
       attr_accessor :dotted_decimal_identifier
 

data/lib/chef-dk/policyfile/dsl.rb

@@ -27,7 +27,7 @@ module ChefDK
   module Policyfile
     class DSL
 
-      RUN_LIST_ITEM_COMPONENT = %r{^[.[:alnum:]_-]+$}
+      RUN_LIST_ITEM_COMPONENT = %r{^[.[:alnum:]_-]+$}.freeze
 
       include StorageConfigDelegation