chef-dk 3.2.30 → 3.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3efb2de5668d591c97a8249d151858ac0b5c4a99f3416d3a77ccf34c947ccad7
-  data.tar.gz: cbcd78e999d46bbd4b6ceee5dd582fb4aacac6bebd8ee02232cc20a3877193e5
+  metadata.gz: fb1392f9bbcca8710d63f569e35dc53ae39ec1778c15e3f824ffa878a745b6da
+  data.tar.gz: 0b46cbb065f92afa28a607057b05912ae736869321a32810329446473dab5dd5
 SHA512:
-  metadata.gz: d17348847d440181aa411815919dc746e98e12e9a5bbaa5583aba34fd87ebee84eb6056d8e7682ccd5a0b25b9eb8be7319951c9350f83ca5ca737f50f51bd3c3
-  data.tar.gz: ddbed79aa03dd2916abd115cf8fb4ff8f2397eb9a0499685b262f84709c468e32192e1fb44b02ceeb7a0dbae369d5f2bd8aa2137c10f2bf68edf95dd4cd962b8
+  metadata.gz: 9cae75e6c52b37ea3ffbc944b1dfa7e74d972b694cfbb486322083f030a536016868133aefc5d7dde03402f764bd1c81dddcf6923d1d6f0906363a610897e47a
+  data.tar.gz: bf42d40ac0cbd586118b18d5058507a45e8dd610b9a2313951ccae385077a251ec1d6fdfd188c480c72e167c3fa4f0cab223f5525eba75284921c73705b3e322

data/Gemfile

@@ -47,14 +47,14 @@ group(:omnibus_package) do
   gem "chef-provisioning", ">= 2.7.1", group: :provisioning
   gem "chef-provisioning-aws", ">= 3.0.2", group: :provisioning
   gem "chef-provisioning-fog", ">= 0.26.1", group: :provisioning
-  gem "chef-vault", ">= 3.3.0"
+  gem "chef-vault", ">= 3.4.1"
   # Expeditor manages the version of chef released to Rubygems. We only release 'stable' chef
   # gems to Rubygems now, so letting this float on latest should always give us the latest
   # stable release. May have to re-pin around major version bumping time, or during patch
   # fixes.
-  gem "chef", ">= 14.0"
+  gem "chef", "= 14.5.33"
   gem "cheffish", ">= 14.0.1"
-  gem "chefspec", ">= 7.2.1"
+  gem "chefspec", ">= 7.3.0"
   gem "fauxhai", ">= 6.5.0"
   gem "inspec", ">= 2.2.55"
   gem "kitchen-azurerm", ">= 0.14"
@@ -105,9 +105,6 @@ group(:omnibus_package) do
   gem "winrm-elevated"
   gem "cucumber"
   gem "stove"
-
-  # TODO Remove this after https://github.com/fog/fog-openstack/issues/420 is fixed
-  gem "fog-openstack", "< 0.2.0"
 end
 
 # Everything except AIX

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    chef-dk (3.2.30)
+    chef-dk (3.3.23)
       addressable (>= 2.3.5, < 2.6)
       chef (~> 14.0)
       chef-provisioning (~> 2.0)
@@ -30,13 +30,13 @@ GEM
       mixlib-shellout (~> 2.0)
     artifactory (2.8.2)
     ast (2.4.0)
-    aws-sdk (2.11.120)
-      aws-sdk-resources (= 2.11.120)
-    aws-sdk-core (2.11.120)
+    aws-sdk (2.11.136)
+      aws-sdk-resources (= 2.11.136)
+    aws-sdk-core (2.11.136)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.11.120)
-      aws-sdk-core (= 2.11.120)
+    aws-sdk-resources (2.11.136)
+      aws-sdk-core (= 2.11.136)
     aws-sigv4 (1.0.3)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -44,9 +44,9 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     azure_graph_rbac (0.17.0)
       ms_rest_azure (~> 0.11.0)
-    azure_mgmt_network (0.17.1)
+    azure_mgmt_network (0.17.3)
       ms_rest_azure (~> 0.11.0)
-    azure_mgmt_resources (0.17.0)
+    azure_mgmt_resources (0.17.1)
       ms_rest_azure (~> 0.11.0)
     backports (3.11.4)
     berkshelf (7.0.6)
@@ -66,10 +66,10 @@ GEM
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
     byebug (10.0.2)
-    chef (14.4.56)
+    chef (14.5.33)
       addressable
       bundler (>= 1.10)
-      chef-config (= 14.4.56)
+      chef-config (= 14.5.33)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -97,10 +97,10 @@ GEM
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef (14.4.56-universal-mingw32)
+    chef (14.5.33-universal-mingw32)
       addressable
       bundler (>= 1.10)
-      chef-config (= 14.4.56)
+      chef-config (= 14.5.33)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -155,7 +155,7 @@ GEM
       toml-rb
       train
       tty-spinner
-    chef-config (14.4.56)
+    chef-config (14.5.33)
       addressable
       fuzzyurl
       mixlib-config (>= 2.2.12, < 3.0)
@@ -171,7 +171,7 @@ GEM
       winrm (~> 2.0)
       winrm-elevated (~> 1.0)
       winrm-fs (~> 1.0)
-    chef-provisioning-aws (3.0.4)
+    chef-provisioning-aws (3.0.6)
       aws-sdk (>= 2.2.18, < 3.0)
       chef-provisioning (>= 1.0, < 3.0)
       retryable (~> 2.0, >= 2.0.1)
@@ -194,7 +194,7 @@ GEM
       concurrent-ruby (~> 1.0)
       ffi-yajl (~> 2.2)
       http (~> 2.2)
-    chef-vault (3.3.0)
+    chef-vault (3.4.2)
     chef-zero (14.0.6)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
@@ -204,8 +204,8 @@ GEM
     cheffish (14.0.1)
       chef-zero (~> 14.0)
       net-ssh
-    chefspec (7.2.1)
-      chef (>= 12.14.89)
+    chefspec (7.3.2)
+      chef (>= 12.16.42)
       fauxhai (>= 4)
       rspec (~> 3.0)
     chefstyle (0.10.0)
@@ -229,10 +229,10 @@ GEM
       gherkin (~> 5.1.0)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    cucumber-core (3.2.0)
+    cucumber-core (3.2.1)
       backports (>= 3.8.0)
       cucumber-tag_expressions (~> 1.1.0)
-      gherkin (>= 5.0.0)
+      gherkin (~> 5.0)
     cucumber-expressions (6.0.1)
     cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
@@ -265,7 +265,7 @@ GEM
     equatable (0.5.0)
     erubis (2.7.0)
     excon (0.62.0)
-    faraday (0.15.2)
+    faraday (0.15.3)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
@@ -308,8 +308,8 @@ GEM
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
-    fog-openstack (0.1.27)
-      fog-core (~> 1.45.0)
+    fog-openstack (0.3.3)
+      fog-core (>= 1.45, <= 2.1.0)
       fog-json (>= 1.0)
       ipaddress (>= 0.8)
     fog-rackspace (0.1.6)
@@ -323,13 +323,14 @@ GEM
     fog-softlayer (1.1.4)
       fog-core
       fog-json
-    fog-xenserver (0.3.0)
+    fog-xenserver (1.0.0)
       fog-core
       fog-xml
+      xmlrpc
     fog-xml (0.1.3)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
-    foodcritic (14.0.0)
+    foodcritic (14.1.0)
       cucumber-core (>= 1.3)
       erubis
       ffi-yajl (~> 2.0)
@@ -388,7 +389,7 @@ GEM
     ice_nine (0.11.2)
     inifile (3.0.0)
     iniparse (1.4.4)
-    inspec (2.2.70)
+    inspec (2.2.112)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
       faraday_middleware (~> 0.12.2)
@@ -397,17 +398,18 @@ GEM
       json (>= 1.8, < 3.0)
       method_source (~> 0.8)
       mixlib-log
+      multipart-post
       parallel (~> 1.9)
       parslet (~> 1.5)
       pry (~> 0)
       rspec (~> 3)
       rspec-its (~> 1.2)
-      rubyzip (~> 1.1)
+      rubyzip (~> 1.2, >= 1.2.2)
       semverse
       sslshake (~> 1.2)
       thor (~> 0.20)
       tomlrb (~> 1.2)
-      train (~> 1.4, >= 1.4.15)
+      train (~> 1.4, >= 1.4.37)
     ipaddress (0.8.3)
     iso8601 (0.11.0)
     jmespath (1.4.0)
@@ -438,11 +440,11 @@ GEM
       test-kitchen
     kitchen-hyperv (0.5.1)
       test-kitchen (~> 1.4)
-    kitchen-inspec (0.23.1)
+    kitchen-inspec (0.24.0)
       hashie (~> 3.4)
       inspec (>= 0.34.0, < 3.0.0)
       test-kitchen (~> 1.6)
-    kitchen-vagrant (1.3.3)
+    kitchen-vagrant (1.3.4)
       test-kitchen (~> 1.4)
     knife-acl (1.0.3)
     knife-cloud (1.2.1)
@@ -534,7 +536,7 @@ GEM
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
-    net-telnet (0.2.0)
+    net-telnet (0.1.1)
     netaddr (1.5.1)
     nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
@@ -546,9 +548,9 @@ GEM
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.11.0)
+    octokit (4.12.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (14.4.2)
+    ohai (14.5.4)
       chef-config (>= 12.8, < 15)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -591,9 +593,9 @@ GEM
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
     public_suffix (3.0.3)
-    r18n-core (3.1.1)
-    r18n-desktop (3.1.1)
-      r18n-core (= 3.1.1)
+    r18n-core (3.1.2)
+    r18n-desktop (3.1.2)
+      r18n-core (= 3.1.2)
     rack (2.0.5)
     rainbow (3.0.0)
     rake (12.3.1)
@@ -647,7 +649,7 @@ GEM
     ruby-shadow (2.5.0)
     ruby_dep (1.5.0)
     rubyntlm (0.6.2)
-    rubyzip (1.2.1)
+    rubyzip (1.2.2)
     rufus-lru (1.1.0)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
@@ -660,7 +662,7 @@ GEM
       specinfra (~> 2.72)
     sfl (2.3)
     shellany (0.0.1)
-    signet (0.9.1)
+    signet (0.10.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
@@ -669,10 +671,10 @@ GEM
     solve (4.0.0)
       molinillo (~> 0.6)
       semverse (>= 1.1, < 3.0)
-    specinfra (2.76.1)
+    specinfra (2.76.2)
       net-scp
       net-ssh (>= 2.7)
-      net-telnet
+      net-telnet (= 0.1.1)
       sfl
     sshkey (1.9.0)
     sslshake (1.2.0)
@@ -698,7 +700,7 @@ GEM
     toml-rb (1.1.2)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.2.7)
-    train (1.4.35)
+    train (1.4.37)
       aws-sdk (~> 2)
       azure_graph_rbac (~> 0.16)
       azure_mgmt_resources (~> 0.15)
@@ -773,12 +775,13 @@ GEM
     winrm-elevated (1.1.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.2.1)
+    winrm-fs (1.3.0)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
       winrm (~> 2.0)
     wmi-lite (1.0.0)
+    xmlrpc (0.3.0)
     yard (0.9.16)
 
 PLATFORMS
@@ -791,16 +794,16 @@ DEPENDENCIES
   artifactory
   berkshelf (>= 7.0.5)
   bundler
-  chef (>= 14.0)
+  chef (= 14.5.33)
   chef-apply
   chef-dk!
   chef-provisioning (>= 2.7.1)
   chef-provisioning-aws (>= 3.0.2)
   chef-provisioning-fog (>= 0.26.1)
   chef-sugar
-  chef-vault (>= 3.3.0)
+  chef-vault (>= 3.4.1)
   cheffish (>= 14.0.1)
-  chefspec (>= 7.2.1)
+  chefspec (>= 7.3.0)
   chefstyle
   cookstyle (>= 2.0.0)
   cucumber
@@ -810,7 +813,6 @@ DEPENDENCIES
   fauxhai (>= 6.5.0)
   ffi-libarchive
   ffi-rzmq-core
-  fog-openstack (< 0.2.0)
   foodcritic (>= 12.1)
   guard
   inspec (>= 2.2.55)
@@ -868,4 +870,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.16.4
+   1.16.5

data/acceptance/Gemfile.lock

@@ -12,13 +12,13 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     artifactory (2.8.2)
-    aws-sdk (2.11.120)
-      aws-sdk-resources (= 2.11.120)
-    aws-sdk-core (2.11.120)
+    aws-sdk (2.11.126)
+      aws-sdk-resources (= 2.11.126)
+    aws-sdk-core (2.11.126)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.11.120)
-      aws-sdk-core (= 2.11.120)
+    aws-sdk-resources (2.11.126)
+      aws-sdk-core (= 2.11.126)
     aws-sigv4 (1.0.3)
     berkshelf (6.3.4)
       buff-config (~> 2.0)
@@ -182,7 +182,7 @@ GEM
     net-telnet (0.2.0)
     nio4r (2.3.1)
     nori (2.6.0)
-    octokit (4.10.0)
+    octokit (4.11.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     ohai (8.26.1)
       chef-config (>= 12.5.0.alpha.1, < 14)
@@ -245,7 +245,7 @@ GEM
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
     rubyntlm (0.6.2)
-    rubyzip (1.2.1)
+    rubyzip (1.2.2)
     safe_yaml (1.0.4)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
@@ -306,7 +306,7 @@ GEM
     winrm-elevated (1.1.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.2.1)
+    winrm-fs (1.3.0)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)

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

@@ -46,14 +46,14 @@ module ChefDK
         generators << GeneratorCommand.new(name, class_name, description)
       end
 
-      generator(:app, :App, "Generate an application repo")
+      generator(:app, :App, "Generate an application repo - DEPRECATED")
       generator(:cookbook, :Cookbook, "Generate a single cookbook")
       generator(:recipe, :Recipe, "Generate a new recipe")
       generator(:attribute, :Attribute, "Generate an attributes file")
       generator(:template, :Template, "Generate a file template")
       generator(:file, :CookbookFile, "Generate a cookbook file")
       generator(:helpers, :Helpers, "Generate a cookbook helper file in libraries")
-      generator(:lwrp, :Resource, "Generate a custom resource")
+      generator(:lwrp, :Resource, "Generate a lightweight resource provider (LWRP) - DEPRECATED")
       generator(:resource, :Resource, "Generate a custom resource")
       generator(:repo, :Repo, "Generate a Chef code repository")
       generator(:policyfile, :Policyfile, "Generate a Policyfile for use with the install/push commands")
@@ -86,6 +86,7 @@ E
 
       def run(params)
         if ( generator_spec = generator_for(params[0]) )
+          puts "WARNING: The command 'chef generator #{params[0]}' is deprecated and will be removed from the next major release of Chef DK / Workstation (April 2019)\n\n" if %w{lwrp app}.include?(params[0])
           params.shift
           generator = GeneratorCommands.build(generator_spec.class_name, params)
           generator.run

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

@@ -67,6 +67,12 @@ BANNER
         default:      false,
         boolean:      true
 
+      option :exclude_deps,
+        long:         "--exclude-deps",
+        description:  "Only update cookbooks explicitely mentioned on the command line",
+        boolean:      true,
+        default:      false
+
       attr_reader :policyfile_relative_path
 
       attr_accessor :ui
@@ -84,7 +90,7 @@ BANNER
       def run(params = [])
         return 1 unless apply_params!(params)
         attributes_updater.run
-        installer.run(@cookbooks_to_update) unless update_attributes_only?
+        installer.run(@cookbooks_to_update, config[:exclude_deps]) unless update_attributes_only?
         0
       rescue PolicyfileServiceError => e
         handle_error(e)

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

@@ -41,6 +41,7 @@ module ChefDK
         @ui = ui || UI.null
         @policy_document_native_api = policy_document_native_api
 
+        @policy_lock_for_transport = nil
         @cookbook_versions_for_policy = nil
       end
 
@@ -49,7 +50,7 @@ module ChefDK
       end
 
       def upload
-        ui.msg("Uploading policy to policy group #{policy_group}")
+        ui.msg("Uploading policy #{policy_name} (#{short_revision_id}) to policy group #{policy_group}")
 
         if !using_policy_document_native_api?
           ui.msg(<<-DRAGONS)
@@ -73,7 +74,7 @@ DRAGONS
       end
 
       def upload_policy_native
-        http_client.put("/policy_groups/#{policy_group}/policies/#{policy_name}", policyfile_lock.to_lock)
+        http_client.put("/policy_groups/#{policy_group}/policies/#{policy_name}", policy_lock_for_transport)
       end
 
       def data_bag_create
@@ -84,7 +85,7 @@ DRAGONS
 
       def data_bag_item_create
         policy_id = "#{policy_name}-#{policy_group}"
-        lock_data = policyfile_lock.to_lock.dup
+        lock_data = policy_lock_for_transport.dup
 
         lock_data["id"] = policy_id
 
@@ -180,6 +181,14 @@ DRAGONS
 
       private
 
+      def short_revision_id
+        policy_lock_for_transport["revision_id"][0, 10]
+      end
+
+      def policy_lock_for_transport
+        @policy_lock_for_transport ||= policyfile_lock.to_lock
+      end
+
       def list_cookbooks_url
         if using_policy_document_native_api?
           "cookbook_artifacts?num_versions=all"

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

@@ -22,6 +22,7 @@ require "chef-dk/service_exceptions"
 require "chef-dk/policyfile_compiler"
 require "chef-dk/policyfile/storage_config"
 require "chef-dk/policyfile_lock"
+require "chef-dk/policyfile/lock_applier"
 
 module ChefDK
   module PolicyfileServices
@@ -49,7 +50,7 @@ module ChefDK
         @policyfile_compiler = nil
       end
 
-      def run(cookbooks_to_update = [])
+      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
@@ -61,7 +62,7 @@ module ChefDK
         elsif cookbooks_to_update.empty? # means update everything
           generate_lock_and_install
         else
-          update_lock_and_install(cookbooks_to_update)
+          update_lock_and_install(cookbooks_to_update, exclude_deps)
         end
       end
 
@@ -113,9 +114,13 @@ module ChefDK
         raise PolicyfileInstallError.new("Failed to generate Policyfile.lock", error)
       end
 
-      def update_lock_and_install(cookbooks_to_update)
-        ui.msg "Updating #{cookbooks_to_update.join(',')} cookbooks"
-        to_update = policyfile_lock.solution_dependencies.transitive_deps(cookbooks_to_update)
+      def update_lock_and_install(cookbooks_to_update, exclude_deps)
+        ui.msg "Updating #{cookbooks_to_update.join(',')} cookbooks #{exclude_deps ? '(excluding dependencies)' : ''}"
+        to_update = if exclude_deps
+                      cookbooks_to_update
+                    else
+                      policyfile_lock.solution_dependencies.transitive_deps(cookbooks_to_update)
+                    end
         prepare_constraints_for_update(to_update)
         prepare_constraints_for_policies
         generate_lock_and_install

data/lib/chef-dk/skeletons/code_generator/metadata.rb

@@ -5,4 +5,4 @@ maintainer_email 'dev@chef.io'
 license          'Apache-2.0'
 description      'Generates Chef code for Chef DK'
 version          '0.1.0'
-chef_version     '>= 12.0'
+chef_version     '>= 13.0'

data/lib/chef-dk/skeletons/code_generator/templates/default/build_cookbook/metadata.rb.erb

@@ -3,7 +3,7 @@ maintainer '<%= copyright_holder %>'
 maintainer_email '<%= email %>'
 license '<%= license %>'
 version '0.1.0'
-chef_version '>= 12.14' if respond_to?(:chef_version)
+chef_version '>= 13.0'
 <% if build_cookbook_parent_is_cookbook -%>
 
 depends 'delivery-truck'

data/lib/chef-dk/skeletons/code_generator/templates/default/metadata.rb.erb

@@ -5,7 +5,7 @@ license '<%= @spdx_license %>'
 description 'Installs/Configures <%= cookbook_name %>'
 long_description 'Installs/Configures <%= cookbook_name %>'
 version '0.1.0'
-chef_version '>= 12.14' if respond_to?(:chef_version)
+chef_version '>= 13.0'
 
 # The `issues_url` points to the location where issues for this cookbook are
 # tracked.  A `View Issues` link will be displayed on this cookbook's page when

data/lib/chef-dk/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefDK
-  VERSION = "3.2.30"
+  VERSION = "3.3.23"
 end

data/spec/unit/command/generator_commands/build_cookbook_spec.rb

@@ -198,7 +198,7 @@ maintainer 'The Authors'
 maintainer_email 'you@example.com'
 license 'all_rights'
 version '0.1.0'
-chef_version '>= 12.14' if respond_to?(:chef_version)
+chef_version '>= 13.0'
 
 depends 'delivery-truck'
 METADATA

data/spec/unit/policyfile/uploader_spec.rb

@@ -28,6 +28,7 @@ describe ChefDK::Policyfile::Uploader do
     {
       "name" => "example",
       "run_list" => [ "recipe[omnibus::default]" ],
+      "revision_id" => "f4b29d87c36de67cbfd9aa3147df77cebf9f719e8c884036b3cf34ba94773ca5",
       "cookbook_locks" => {
         "omnibus" => {
           "version" => "2.2.0",

data/spec/unit/policyfile_services/update_spec.rb

@@ -104,12 +104,25 @@ EOH
     }.to_json
   end
 
+  shared_examples "regular update operation" do
+    it "allows update on cookbook to update" do
+      expect(install_service.policyfile_compiler.dsl.cookbook_location_specs["top-level"].version_constraint.to_s).to eq(">= 0.0.0")
+    end
+
+    it "does not update unrelated cookbooks" do
+      expect(install_service.policyfile_compiler.dsl.cookbook_location_specs["top-level-bis"].version_constraint.to_s).to eq("= 1.0.0")
+    end
+
+  end
+
   context "when given one cookbook to update" do
     before(:each) do
       # stub access to Policyfile.rb and Policyfile.lock.json
+      allow(File).to receive(:exist?).and_call_original
       expect(File).to receive(:exist?).at_least(:once).with(policyfile_rb_path).and_return(true)
       expect(File).to receive(:exist?).at_least(:once).with(policyfile_lock_path).and_return(true)
 
+      allow(IO).to receive(:read).and_call_original
       expect(IO).to receive(:read).with(policyfile_rb_path).and_return(policyfile_content)
       expect(IO).to receive(:read).with(policyfile_lock_path).and_return(policyfile_lock_content)
 
@@ -117,22 +130,31 @@ EOH
       # elsewhere. We only check constraints changes
       expect(install_service).to receive(:generate_lock_and_install)
 
-      expect { install_service.run(["top-level"]) }.not_to raise_error
-    end
-    it "allows update on cookbook to update" do
-      expect(install_service.policyfile_compiler.dsl.cookbook_location_specs["top-level"].version_constraint.to_s).to eq(">= 0.0.0")
+      expect { install_service.run(["top-level"], exclude_deps) }.not_to raise_error
     end
 
-    it "does not update unrelated cookbooks" do
-      expect(install_service.policyfile_compiler.dsl.cookbook_location_specs["top-level-bis"].version_constraint.to_s).to eq("= 1.0.0")
-    end
+    context "without exclude-deps flag" do
+      let(:exclude_deps) { false }
+
+      it_behaves_like "regular update operation"
+
+      it "allows update on dependencies" do
+        expect(install_service.policyfile_compiler.dsl.cookbook_location_specs["a"]).to be_nil
+      end
 
-    it "allows update on dependencies" do
-      expect(install_service.policyfile_compiler.dsl.cookbook_location_specs["a"]).to be_nil
+      it "preserves existing constraints from Policyfile" do
+        expect(install_service.policyfile_compiler.dsl.cookbook_location_specs["b"].version_constraint.to_s).to eq(">= 1.2.3")
+      end
     end
 
-    it "preserves existing constraints from Policyfile" do
-      expect(install_service.policyfile_compiler.dsl.cookbook_location_specs["b"].version_constraint.to_s).to eq(">= 1.2.3")
+    context "with exclude-deps flag" do
+      let(:exclude_deps) { true }
+
+      it_behaves_like "regular update operation"
+
+      it "does not allow update on dependencies" do
+        expect(install_service.policyfile_compiler.dsl.cookbook_location_specs["a"].version_constraint.to_s).to eq("= 2.1.0")
+      end
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-dk
 version: !ruby/object:Gem::Version
-  version: 3.2.30
+  version: 3.3.23
 platform: ruby
 authors:
 - Daniel DeLeo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli