chef-dk 1.6.11 → 2.0.26

data/lib/chef-dk/skeletons/code_generator/recipes/repo.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 context = ChefDK::Generator.context
 repo_dir = File.join(context.repo_root, context.repo_name)
 

data/lib/chef-dk/skeletons/code_generator/recipes/{lwrp.rb → resource.rb}

@@ -1,23 +1,13 @@
-
+# frozen_string_literal: true
 context = ChefDK::Generator.context
 cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
 
 resource_dir = File.join(cookbook_dir, 'resources')
 resource_path = File.join(resource_dir, "#{context.new_file_basename}.rb")
 
-provider_dir = File.join(cookbook_dir, 'providers')
-provider_path = File.join(provider_dir, "#{context.new_file_basename}.rb")
-
 directory resource_dir
 
 template resource_path do
   source 'resource.rb.erb'
   helpers(ChefDK::Generator::TemplateHelper)
 end
-
-directory provider_dir
-
-template provider_path do
-  source 'provider.rb.erb'
-  helpers(ChefDK::Generator::TemplateHelper)
-end

data/lib/chef-dk/skeletons/code_generator/recipes/template.rb

@@ -1,7 +1,7 @@
-
+# frozen_string_literal: true
 context = ChefDK::Generator.context
 cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
-template_dir = File.join(cookbook_dir, 'templates', 'default')
+template_dir = File.join(cookbook_dir, 'templates')
 template_filename = context.new_file_basename
 
 unless File.extname(template_filename) == '.erb'
@@ -19,7 +19,7 @@ end
 if context.content_source
 
   file template_path do
-    content(IO.read(context.context_source))
+    content(IO.read(context.content_source))
   end
 
 else

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

@@ -0,0 +1,39 @@
+#
+# Chef Documentation
+# https://docs.chef.io/libraries.html
+#
+
+#
+# This module name was auto-generated from the cookbook name. This name is a
+# single word that starts with a capital letter and then continues to use
+# camel-casing throughout the remainder of the name.
+#
+module <%= @cookbook_class_name %>
+  module <%= @helper_class_name %>
+    #
+    # Define the methods that you would like to assist the work you do in recipes,
+    # resources, or templates.
+    #
+    # def my_helper_method
+    #   # help method implementation
+    # end
+  end
+end
+
+#
+# The module you have defined may be extended within the recipe to grant the
+# recipe the helper methods you define.
+#
+# Within your recipe you would write:
+#
+#     extend <%= @cookbook_class_name %>::<%= @helper_class_name %>
+#
+#     my_helper_method
+#
+# You may also add this to a single resource within a recipe:
+#
+#     template '/etc/app.conf' do
+#       extend <%= @cookbook_class_name %>::<%= @helper_class_name %>
+#       variables specific_key: my_helper_method
+#     end
+#

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

@@ -13,7 +13,7 @@ chef_version '>= 12.1' if respond_to?(:chef_version)
 #
 # issues_url 'https://github.com/<insert_org_here>/<%= cookbook_name %>/issues'
 
-# The `source_url` points to the development reposiory for this cookbook.  A
+# The `source_url` points to the development repository for this cookbook.  A
 # `View Source` link will be displayed on this cookbook's page when uploaded to
 # a Supermarket.
 #

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

@@ -0,0 +1 @@
+# To learn more about Custom Resources, see https://docs.chef.io/custom_resources.html

data/lib/chef-dk/version.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2017, Chef Software Inc.
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,5 +16,5 @@
 #
 
 module ChefDK
-  VERSION = "1.6.11"
+  VERSION = "2.0.26"
 end

data/omnibus_overrides.rb

@@ -1,20 +1,22 @@
-# DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead.
-override :bundler, version: "1.16.0"
-override :rubygems, version: "2.6.14"
+# THIS IS NOW HAND MANAGED, JUST EDIT THE THING
+# .travis.yml and appveyor.yml consume this,
+# try to keep it machine-parsable.
+override :rubygems, version: "2.6.11"
+override :bundler, version: "1.15.1"
 override "libffi", version: "3.2.1"
-override "libiconv", version: "1.15"
+override "libiconv", version: "1.14"
 override "liblzma", version: "5.2.3"
-override "libxml2", version: "2.9.5"
-override "libxslt", version: "1.1.30"
-override "libyaml", version: "0.1.7"
+override "libtool", version: "2.4.2"
+override "libxml2", version: "2.9.4"
+override "libxslt", version: "1.1.29"
+override "libyaml", version: "0.1.6"
 override "makedepend", version: "1.0.5"
 override "ncurses", version: "5.9"
-override "openssl", version: "1.0.2m"
 override "pkg-config-lite", version: "0.28-1"
-override "ruby", version: "2.3.5"
+override "ruby", version: "2.4.1"
+override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
 override "util-macros", version: "1.19.0"
 override "xproto", version: "7.0.28"
 override "zlib", version: "1.2.11"
-override "libtool", version: "2.4.2"
-override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
-override "libzmq", version: "4.0.7"
+override "libzmq", version: "4.0.5"
+override "openssl", version: "1.0.2l"

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

@@ -198,7 +198,7 @@ lint = "chef exec cookstyle"
 # uploaded to Supermarket. We turn off any rules tagged "supermarket"
 # by default. If you plan to share this cookbook you should remove
 # '-t ~supermarket' below to enable supermarket rules.
-syntax = "chef exec foodcritic . --exclude spec -f any -t ~supermarket"
+syntax = "chef exec foodcritic . -t ~supermarket"
 provision = "chef exec kitchen create"
 deploy = "chef exec kitchen converge"
 smoke = "chef exec kitchen verify"
@@ -235,6 +235,9 @@ PROJECT_DOT_TOML
     "name": "build_cookbook",
     "path": ".delivery/build_cookbook"
   },
+  "delivery-truck": {
+    "enable_cookstyle": true
+  },
   "skip_phases": [],
   "job_dispatch": {
     "version": "v2"
@@ -589,6 +592,7 @@ KITCHEN_YML
 
         let(:expected_chefspec_spec_helper_content) do
           <<-SPEC_HELPER
+# frozen_string_literal: true
 require 'chefspec'
 require 'chefspec/policyfile'
 SPEC_HELPER
@@ -608,6 +612,7 @@ SPEC_HELPER
 
         let(:expected_content) do
           <<-POLICYFILE_RB
+# frozen_string_literal: true
 source 'https://supermarket.chef.io'
 
 metadata
@@ -666,6 +671,7 @@ KITCHEN_YML
 
         let(:expected_chefspec_spec_helper_content) do
           <<-SPEC_HELPER
+# frozen_string_literal: true
 require 'chefspec'
 require 'chefspec/berkshelf'
 SPEC_HELPER

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

@@ -0,0 +1,31 @@
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'shared/a_file_generator'
+require 'chef-dk/command/generator_commands/helpers'
+
+describe ChefDK::Command::GeneratorCommands::Helpers do
+
+  include_examples "a file generator" do
+
+    let(:generator_name) { "helpers" }
+    let(:generated_files) { [ "libraries/new_helpers.rb" ] }
+    let(:new_file_name) { "new_helpers" }
+
+  end
+end

data/spec/unit/command/generator_commands/{lwrp_spec.rb → resource_spec.rb}

@@ -17,15 +17,15 @@
 
 require "spec_helper"
 require "shared/a_file_generator"
-require "chef-dk/command/generator_commands/lwrp"
+require "chef-dk/command/generator_commands/resource"
 
-describe ChefDK::Command::GeneratorCommands::LWRP do
+describe ChefDK::Command::GeneratorCommands::Resource do
 
   include_examples "a file generator" do
 
-    let(:generator_name) { "lwrp" }
-    let(:generated_files) { [ "resources/new_lwrp.rb", "providers/new_lwrp.rb" ] }
-    let(:new_file_name) { "new_lwrp" }
+    let(:generator_name) { "resource" }
+    let(:generated_files) { [ "resources/new_resource.rb" ] }
+    let(:new_file_name) { "new_resource" }
 
   end
 end

data/spec/unit/command/install_spec.rb

@@ -78,7 +78,7 @@ describe ChefDK::Command::Install do
 
     it "creates the installer service with a `nil` policyfile path" do
       expect(ChefDK::PolicyfileServices::Install).to receive(:new).
-        with(hash_including(policyfile: nil, ui: command.ui, root_dir: Dir.pwd)).
+        with(hash_including(policyfile: nil, ui: command.ui, root_dir: Dir.pwd, config: Chef::Config)).
         and_return(install_service)
       expect(command.installer).to eq(install_service)
     end
@@ -95,7 +95,7 @@ describe ChefDK::Command::Install do
 
     it "creates the installer service with the specified policyfile path" do
       expect(ChefDK::PolicyfileServices::Install).to receive(:new).
-        with(hash_including(policyfile: "MyPolicy.rb", ui: command.ui, root_dir: Dir.pwd)).
+        with(hash_including(policyfile: "MyPolicy.rb", ui: command.ui, root_dir: Dir.pwd, config: Chef::Config)).
         and_return(install_service)
       expect(command.installer).to eq(install_service)
     end

data/spec/unit/command/update_spec.rb

@@ -77,7 +77,7 @@ describe ChefDK::Command::Update do
     let(:params) { ["-a"] }
 
     it "enables attributes update mode" do
-      expect(command.update_attributes?).to be(true)
+      expect(command.update_attributes_only?).to be(true)
     end
 
     it "creates an attributes update service object" do
@@ -96,7 +96,7 @@ describe ChefDK::Command::Update do
 
     it "creates the installer service with a `nil` policyfile path" do
       expect(ChefDK::PolicyfileServices::Install).to receive(:new).
-        with(policyfile: nil, ui: command.ui, root_dir: Dir.pwd, overwrite: true).
+        with(policyfile: nil, ui: command.ui, root_dir: Dir.pwd, config: Chef::Config, overwrite: true).
         and_return(install_service)
       expect(command.installer).to eq(install_service)
     end
@@ -113,7 +113,7 @@ describe ChefDK::Command::Update do
 
     it "creates the installer service with the specified policyfile path" do
       expect(ChefDK::PolicyfileServices::Install).to receive(:new).
-        with(policyfile: "MyPolicy.rb", ui: command.ui, root_dir: Dir.pwd, overwrite: true).
+        with(policyfile: "MyPolicy.rb", ui: command.ui, root_dir: Dir.pwd, config: Chef::Config, overwrite: true).
         and_return(install_service)
       expect(command.installer).to eq(install_service)
     end
@@ -132,6 +132,10 @@ describe ChefDK::Command::Update do
     context "when the command is successful" do
       before do
         expect(install_service).to receive(:run)
+        expect(ChefDK::PolicyfileServices::UpdateAttributes).to receive(:new).
+          with(policyfile: nil, ui: command.ui, root_dir: Dir.pwd).
+          and_return(update_attrs_service)
+        expect(update_attrs_service).to receive(:run)
       end
 
       it "returns 0" do
@@ -155,6 +159,10 @@ describe ChefDK::Command::Update do
 
       before do
         expect(install_service).to receive(:run).and_raise(exception)
+        expect(ChefDK::PolicyfileServices::UpdateAttributes).to receive(:new).
+          with(policyfile: nil, ui: command.ui, root_dir: Dir.pwd).
+          and_return(update_attrs_service)
+        expect(update_attrs_service).to receive(:run)
       end
 
       it "returns 1" do

data/spec/unit/command/verify_spec.rb

@@ -45,7 +45,6 @@ describe ChefDK::Command::Verify do
       "chef-provisioning",
       "chefspec",
       "generated-cookbooks-pass-chefspec",
-      "rubocop",
       "fauxhai",
       "knife-spork",
       "kitchen-vagrant",
@@ -106,6 +105,7 @@ describe ChefDK::Command::Verify do
 
   describe "when running verify command" do
     let(:stdout_io) { StringIO.new }
+    let(:stderr_io) { StringIO.new }
     let(:ruby_path) { File.join(fixtures_path, "eg_omnibus_dir/valid/embedded/bin/ruby") }
 
     def run_unit_test
@@ -170,6 +170,7 @@ describe ChefDK::Command::Verify do
     before do
       allow(Gem).to receive(:ruby).and_return(ruby_path)
       allow(command_instance).to receive(:stdout).and_return(stdout_io)
+      allow(command_instance).to receive(:stderr).and_return(stderr_io)
       allow(command_instance).to receive(:components).and_return(components)
     end
 

data/spec/unit/policyfile/artifactory_cookbook_source_spec.rb

@@ -0,0 +1,59 @@
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+require "chef-dk/policyfile/source_uri"
+require "chef-dk/policyfile/artifactory_cookbook_source"
+
+describe ChefDK::Policyfile::ArtifactoryCookbookSource do
+  subject { described_class.new(cookbook_source) }
+
+  let(:cookbook_source) { "https://supermarket.chef.io/api/v1" }
+
+  let(:http_connection) { double("Chef::HTTP::Simple") }
+
+  let(:universe_response_encoded) { IO.read(File.join(fixtures_path, "cookbooks_api/small_universe.json")) }
+
+  let(:pruned_universe) { JSON.parse(IO.read(File.join(fixtures_path, "cookbooks_api/pruned_small_universe.json"))) }
+
+  describe "fetching the Universe graph" do
+
+    before do
+      expect(subject).to receive(:http_connection_for).with(cookbook_source).and_return(http_connection)
+      allow(http_connection).to receive(:get).with("/universe").and_return(universe_response_encoded)
+    end
+
+    it "fetches the universe graph" do
+      expect(http_connection).to receive(:get).with("/universe").and_return(universe_response_encoded)
+      actual_universe = subject.universe_graph
+      expect(actual_universe).to have_key("apt")
+      expect(actual_universe["apt"]).to eq(pruned_universe["apt"])
+      expect(subject.universe_graph).to eq(pruned_universe)
+    end
+
+    it "generates location options for a cookbook from the given graph" do
+      cookbook_url = "https://supermarket.chef.io/api/v1/cookbooks/apache2/versions/1.10.4/download"
+      expect(subject).to receive(:http_connection_for).with(cookbook_url).and_return(http_connection)
+      expected_opts = {
+        artifactory: cookbook_url,
+        http_client: http_connection,
+        version: "1.10.4",
+      }
+      expect(subject.source_options_for("apache2", "1.10.4")).to eq(expected_opts)
+    end
+  end
+end

data/spec/unit/policyfile/read_cookbook_for_compat_mode_upload_spec.rb

@@ -85,7 +85,7 @@ describe ChefDK::Policyfile::ReadCookbookForCompatModeUpload do
     end
 
     it "excludes ignored files from the list of cookbook files" do
-      expect(reader_with_ignored_files.cookbook_version.root_filenames).to_not include(chefignored_file)
+      expect(reader_with_ignored_files.cookbook_version.files_for("root_files")).to_not include(chefignored_file)
     end
 
   end

data/spec/unit/policyfile/solution_dependencies_spec.rb

@@ -69,6 +69,31 @@ describe ChefDK::Policyfile::SolutionDependencies do
 
   end
 
+  context 'when populated with dependency data from a complex lockfile' do
+    let(:dependency_data) do
+      {
+        "Policyfile" => [
+          [ "a", ">= 0.0.0"], ["b", ">= 0.0.0" ]
+        ],
+        "dependencies" => {
+          "a (0.1.0)" => [ ["c", "~> 1.0.0"], ["d", "~> 0.0.0"] ],
+          "b (1.0.0)" => [ ["f", ">= 0.0.1"] ],
+          "c (1.0.1)" => [ ["e", ">= 0.0.1"] ],
+          "d (0.0.1)" => [],
+          "e (0.0.1)" => [],
+          "f (0.0.1)" => [],
+        },
+      }
+    end
+    it "can compute list of transitive dependencies" do
+
+      expect(solution_dependencies.transitive_deps(["e"])).to eq(["e"])
+      expect(solution_dependencies.transitive_deps(["c"])).to eq(["c", "e"])
+      expect(solution_dependencies.transitive_deps(["c", "d"])).to eq(["c", "d", "e"])
+      expect(solution_dependencies.transitive_deps(["a"])).to eq(["a", "c", "d", "e"])
+    end
+  end
+
   context "when populated with dependency data" do
 
     let(:expected_deps_for_lock) do

data/spec/unit/policyfile_demands_spec.rb

@@ -861,12 +861,13 @@ MESSAGE
 
     it "includes the policyfile constraint in the solution dependencies" do
       expected_solution_deps = {
-        "Policyfile" => [ [ "remote-cb", "~> 0.1" ], [ "local-cookbook", ">= 0.0.0"] ],
+        "Policyfile" => [ [ "local-cookbook", ">= 0.0.0" ], [ "remote-cb", "~> 0.1" ] ],
         "dependencies" => {
           "local-cookbook (2.3.4)" => [],
           "remote-cb (0.1.0)" => [],
         },
 
+
       }
       expect(policyfile.solution_dependencies.to_lock).to eq(expected_solution_deps)
     end