chef-dk 1.6.11 → 2.0.26

data/tasks/github_changelog_generator.rb

@@ -38,9 +38,6 @@ begin
       config.between_tags = ["v#{latest_stable_version}", "v#{ChefDK::VERSION}"]
       config.max_issues = 0
       config.add_issues_wo_labels = false
-      config.enhancement_labels = "enhancement,Enhancement,New Feature,Feature".split(",")
-      config.bug_labels = "bug,Bug,Improvement,Upstream Bug".split(",")
-      config.exclude_labels = "duplicate,question,invalid,wontfix,no_changelog,Exclude From Changelog,Question,Discussion".split(",")
       config.header = "This changelog reflects the current state of chef-dk's master branch on github and may not reflect the current released version of chef-dk, which is [![Gem Version](https://badge.fury.io/rb/chef-dk.svg)](https://badge.fury.io/rb/chef-dk)."
     end
   end

data/tasks/templates/prerelease.md.erb

@@ -1,6 +1,6 @@
 Ohai Chefs!
 
-We have selected <%= @version %> as our ChefDK v<%= @version %> release candidate which is scheduled for release on <%= @date.strftime('%A %B %-d, %Y') %>.
+We have selected <%= @version %> as our ChefDK v<%= @maj_minor %> release candidate which is scheduled for release on <%= @date.strftime('%A %B %-d, %Y') %>.
 
 # Release Highlights
 

data/tasks/templates/release.md.erb

@@ -1,6 +1,6 @@
 Ohai Chefs!
 
-We're happy to announce the release of ChefDK v<%= @version %>!
+We're happy to announce the release of ChefDK v<%= @maj_minor %>!
 
 # Release Highlights
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-dk
 version: !ruby/object:Gem::Version
-  version: 1.6.11
+  version: 2.0.26
 platform: ruby
 authors:
 - Daniel DeLeo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -80,14 +80,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.5'
+        version: '13.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.5'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
@@ -184,20 +184,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
@@ -300,10 +286,11 @@ files:
 - lib/chef-dk/command/generator_commands/cookbook_code_file.rb
 - lib/chef-dk/command/generator_commands/cookbook_file.rb
 - lib/chef-dk/command/generator_commands/generator_generator.rb
-- lib/chef-dk/command/generator_commands/lwrp.rb
+- lib/chef-dk/command/generator_commands/helpers.rb
 - lib/chef-dk/command/generator_commands/policyfile.rb
 - lib/chef-dk/command/generator_commands/recipe.rb
 - lib/chef-dk/command/generator_commands/repo.rb
+- lib/chef-dk/command/generator_commands/resource.rb
 - lib/chef-dk/command/generator_commands/template.rb
 - lib/chef-dk/command/install.rb
 - lib/chef-dk/command/provision.rb
@@ -329,6 +316,7 @@ files:
 - lib/chef-dk/generator.rb
 - lib/chef-dk/helpers.rb
 - lib/chef-dk/pager.rb
+- lib/chef-dk/policyfile/artifactory_cookbook_source.rb
 - lib/chef-dk/policyfile/chef_repo_cookbook_source.rb
 - lib/chef-dk/policyfile/chef_server_cookbook_source.rb
 - lib/chef-dk/policyfile/community_cookbook_source.rb
@@ -400,10 +388,11 @@ files:
 - lib/chef-dk/skeletons/code_generator/recipes/build_cookbook.rb
 - lib/chef-dk/skeletons/code_generator/recipes/cookbook.rb
 - lib/chef-dk/skeletons/code_generator/recipes/cookbook_file.rb
-- lib/chef-dk/skeletons/code_generator/recipes/lwrp.rb
+- lib/chef-dk/skeletons/code_generator/recipes/helpers.rb
 - lib/chef-dk/skeletons/code_generator/recipes/policyfile.rb
 - lib/chef-dk/skeletons/code_generator/recipes/recipe.rb
 - lib/chef-dk/skeletons/code_generator/recipes/repo.rb
+- lib/chef-dk/skeletons/code_generator/recipes/resource.rb
 - lib/chef-dk/skeletons/code_generator/recipes/template.rb
 - lib/chef-dk/skeletons/code_generator/templates/default/LICENSE.all_rights.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/LICENSE.apachev2.erb
@@ -417,11 +406,11 @@ files:
 - lib/chef-dk/skeletons/code_generator/templates/default/build_cookbook/metadata.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/build_cookbook/recipe.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/cookbook_file.erb
+- lib/chef-dk/skeletons/code_generator/templates/default/helpers.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/inspec_default_test.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/kitchen.yml.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/kitchen_policyfile.yml.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/metadata.rb.erb
-- lib/chef-dk/skeletons/code_generator/templates/default/provider.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/recipe.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/recipe_spec.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/repo/gitignore.erb
@@ -461,10 +450,11 @@ files:
 - spec/unit/command/generator_commands/cookbook_file_spec.rb
 - spec/unit/command/generator_commands/cookbook_spec.rb
 - spec/unit/command/generator_commands/generator_generator_spec.rb
-- spec/unit/command/generator_commands/lwrp_spec.rb
+- spec/unit/command/generator_commands/helpers_spec.rb
 - spec/unit/command/generator_commands/policyfile_spec.rb
 - spec/unit/command/generator_commands/recipe_spec.rb
 - spec/unit/command/generator_commands/repo_spec.rb
+- spec/unit/command/generator_commands/resource_spec.rb
 - spec/unit/command/generator_commands/template_spec.rb
 - spec/unit/command/install_spec.rb
 - spec/unit/command/provision_spec.rb
@@ -569,10 +559,9 @@ files:
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/README.md
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/metadata.rb
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/recipes/default.rb
-- spec/unit/gemfile_util_spec.rb
 - spec/unit/generator_spec.rb
-- spec/unit/helpers_spec.rb
 - spec/unit/pager_spec.rb
+- spec/unit/policyfile/artifactory_cookbook_source_spec.rb
 - spec/unit/policyfile/chef_repo_cookbook_source_spec.rb
 - spec/unit/policyfile/chef_server_cookbook_source_spec.rb
 - spec/unit/policyfile/community_cookbook_source_spec.rb
@@ -609,24 +598,17 @@ files:
 - spec/unit/policyfile_services/show_policy_spec.rb
 - spec/unit/policyfile_services/undelete_spec.rb
 - spec/unit/policyfile_services/update_attributes_spec.rb
+- spec/unit/policyfile_services/update_spec.rb
 - spec/unit/service_exception_inspectors/base_spec.rb
 - spec/unit/service_exception_inspectors/http_spec.rb
 - spec/unit/shell_out_spec.rb
-- spec/unit/tasks/helpers_spec.rb
 - tasks/announce.rb
-- tasks/bin/bundle-platform
 - tasks/bin/bundle-platform.bat
-- tasks/bin/create-override-gemfile
-- tasks/bundle.rb
-- tasks/bundle_util.rb
 - tasks/dependencies.rb
-- tasks/gemfile_util.rb
 - tasks/github_changelog_generator.rb
-- tasks/helpers.rb
 - tasks/templates/prerelease.md.erb
 - tasks/templates/release.md.erb
 - tasks/version.rb
-- version_policy.rb
 - warning.txt
 homepage: https://www.chef.io/
 licenses: []
@@ -648,7 +630,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -656,7 +638,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A streamlined development and deployment workflow for Chef platform.
@@ -691,10 +673,11 @@ test_files:
 - spec/unit/command/generator_commands/cookbook_file_spec.rb
 - spec/unit/command/generator_commands/cookbook_spec.rb
 - spec/unit/command/generator_commands/generator_generator_spec.rb
-- spec/unit/command/generator_commands/lwrp_spec.rb
+- spec/unit/command/generator_commands/helpers_spec.rb
 - spec/unit/command/generator_commands/policyfile_spec.rb
 - spec/unit/command/generator_commands/recipe_spec.rb
 - spec/unit/command/generator_commands/repo_spec.rb
+- spec/unit/command/generator_commands/resource_spec.rb
 - spec/unit/command/generator_commands/template_spec.rb
 - spec/unit/command/install_spec.rb
 - spec/unit/command/provision_spec.rb
@@ -799,10 +782,9 @@ test_files:
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/README.md
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/metadata.rb
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/recipes/default.rb
-- spec/unit/gemfile_util_spec.rb
 - spec/unit/generator_spec.rb
-- spec/unit/helpers_spec.rb
 - spec/unit/pager_spec.rb
+- spec/unit/policyfile/artifactory_cookbook_source_spec.rb
 - spec/unit/policyfile/chef_repo_cookbook_source_spec.rb
 - spec/unit/policyfile/chef_server_cookbook_source_spec.rb
 - spec/unit/policyfile/community_cookbook_source_spec.rb
@@ -839,7 +821,7 @@ test_files:
 - spec/unit/policyfile_services/show_policy_spec.rb
 - spec/unit/policyfile_services/undelete_spec.rb
 - spec/unit/policyfile_services/update_attributes_spec.rb
+- spec/unit/policyfile_services/update_spec.rb
 - spec/unit/service_exception_inspectors/base_spec.rb
 - spec/unit/service_exception_inspectors/http_spec.rb
 - spec/unit/shell_out_spec.rb
-- spec/unit/tasks/helpers_spec.rb

data/spec/unit/gemfile_util_spec.rb

@@ -1,41 +0,0 @@
-require "spec_helper"
-require_relative "../../tasks/gemfile_util"
-
-class GemfileSuper
-  def gem(*args)
-    :superclass
-  end
-end
-
-class GemfileUtilUser < GemfileSuper
-  include GemfileUtil
-end
-
-describe GemfileUtil do
-  let (:gem_name) { "uncle_bobs_json_parser" }
-  let (:gemfile_util) { GemfileUtilUser.new }
-
-  context "#gem", :skip do
-    it "calls the superclass method by default" do
-      expect(gemfile_util).to receive(:gem).and_return(:superclass)
-      gemfile_util.gem(gem_name)
-    end
-
-    # :path and :override follow the same code path, but for clarity get unrefactored specs.
-    it "overrides gems with :path" do
-      expect(gemfile_util).to receive(:warn_if_replacing)
-      expect(gemfile_util.gem(gem_name, path: true)).to be_nil
-      expect(gemfile_util.overridden_gems).to eq({ gem_name => [{ path: true }] })
-    end
-
-    it "overrides gems with :override" do
-      expect(gemfile_util).to receive(:warn_if_replacing)
-      expect(gemfile_util.gem(gem_name, override: true)).to be_nil
-      expect(gemfile_util.overridden_gems).to eq({ gem_name => [{}] })
-    end
-
-    it "does not override gems with :overrideable" do
-      expect(gemfile_util.gem(gem_name, override: true)).to be_nil
-    end
-  end
-end

data/spec/unit/helpers_spec.rb

@@ -1,120 +0,0 @@
-#
-# 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/helpers"
-
-describe ChefDK::Helpers do
-
-  let (:helpers) do
-    ChefDK::Helpers.send(:reset!)
-    ChefDK::Helpers
-  end
-
-  let(:env) { {} }
-
-  describe "chefdk_home" do
-    before do
-      allow(ENV).to receive(:[]) do |k|
-        env[k]
-      end
-      allow(Chef::Platform).to receive(:windows?).and_return(false)
-    end
-
-    context "when CHEFDK_HOME is set" do
-      let(:env) { { "CHEFDK_HOME" => "foo" } }
-      it "returns CHEFDK_HOME" do
-        expect(helpers.chefdk_home).to eq(env["CHEFDK_HOME"])
-      end
-    end
-
-    context "when CHEFDK_HOME is not set" do
-      context "on windows" do
-        before do
-          allow(Chef::Platform).to receive(:windows?).and_return(true)
-        end
-
-        let(:env) { { "LOCALAPPDATA" => 'C:\\foo' } }
-
-        it "uses LOCALAPPDATA" do
-          expect(File).to receive(:join).with(env["LOCALAPPDATA"], "chefdk").and_return("chefdkdefaulthome")
-          expect(helpers.chefdk_home).to eq("chefdkdefaulthome")
-        end
-      end
-
-      context "on *nix" do
-        it "uses LOCALAPPDATA" do
-          expect(File).to receive(:expand_path).with("~/.chefdk").and_return("chefdkdefaulthome")
-          expect(helpers.chefdk_home).to eq("chefdkdefaulthome")
-        end
-      end
-    end
-
-    context "using usr_bin_prefix" do
-      before do
-        stub_const("RUBY_PLATFORM", ruby_platform_string)
-      end
-
-      context "on Mac" do
-        let(:ruby_platform_string) { "x86_64-darwin12.0" }
-
-        it "uses /usr/local/bin" do
-          expect(helpers.usr_bin_prefix).to eq("/usr/local/bin")
-          expect(helpers.usr_bin_path("berks")).to eq("/usr/local/bin/berks")
-        end
-      end
-
-      context "on other systems" do
-        let(:ruby_platform_string) { "x86_64-linux" }
-
-        it "uses /usr/bin" do
-          expect(helpers.usr_bin_prefix).to eq("/usr/bin")
-          expect(helpers.usr_bin_path("berks")).to eq("/usr/bin/berks")
-        end
-      end
-    end
-
-  end
-
-  describe "omnibus_env" do
-    let(:git_tools_path) { File.join("embedded", "git", "usr", "bin") }
-    let(:custom_gitbin_path) { File.join("gitbin") }
-    before do
-      allow(helpers).to receive(:omnibus_expand_path) { |*paths| File.expand_path(File.join(paths)) }
-      allow(Dir).to receive(:exists?).with(/#{custom_gitbin_path}/).and_return false
-      allow(Dir).to receive(:exists?).with(/#{git_tools_path}/).and_return false
-    end
-
-    it "does not include the git tools in the path" do
-      expect(helpers.omnibus_env["PATH"]).to_not match(/#{git_tools_path}/)
-    end
-
-    context "when the custom gitbin directory exists" do
-      it "includes them in the path" do
-        expect(Dir).to receive(:exists?).with(/#{custom_gitbin_path}/).and_return true
-        expect(helpers.omnibus_env["PATH"]).to match(/#{custom_gitbin_path}$/)
-      end
-    end
-
-    context "when the git tools directory exists" do
-      it "includes them in the path" do
-        expect(Dir).to receive(:exists?).with(/#{git_tools_path}/).and_return true
-        expect(helpers.omnibus_env["PATH"]).to match(/#{git_tools_path}$/)
-      end
-    end
-  end
-end

data/spec/unit/tasks/helpers_spec.rb

@@ -1,75 +0,0 @@
-#
-# 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_relative "../../../tasks/helpers"
-
-class RakeMock
-
-end
-
-describe "Rake 'dependencies' task" do
-  let(:rake_mock) { Class.new { include RakeDependenciesTaskHelpers }.new }
-  let(:product_name) { "chef" }
-  let(:gemfile_name) { "chef" }
-  let(:gemfile) { 'gem "chef", github: "chef/chef", branch: "0.0.0"' }
-  let(:expected_version) { "0.0.1" }
-
-  before do
-    allow(rake_mock).to receive(:puts)
-    allow(rake_mock).to receive(:get_latest_version_for).with(product_name).and_return(expected_version)
-  end
-
-  describe "update_gemfile_from_stable" do
-    context "when gemfile does not contain the expected string" do
-      let(:gemfile) { "These are not the droids you are looking for." }
-
-      it "raises an error" do
-        expect { rake_mock.update_gemfile_from_stable(gemfile, product_name, gemfile_name) }.to raise_error(/Gemfile does not have a line of the form/)
-      end
-    end
-
-    context "when gemfile does contain the expected string" do
-      let(:prefix) { "" }
-      let(:expected_output) { "gem \"chef\", github: \"chef/chef\", branch: \"#{prefix}#{expected_version}\"" }
-
-      context "and the version string does not have a prefix" do
-        it "updates the gemfile entry to the newer version" do
-          expect(rake_mock.update_gemfile_from_stable(gemfile, product_name, gemfile_name))
-            .to eq(expected_output)
-        end
-      end
-
-      context "and the version is the same" do
-        let(:expected_version) { "0.0.0" }
-        it "warns the user that the version is not being updated" do
-          expect(rake_mock).to receive(:puts).with(/version in Gemfile already at latest stable/)
-          expect(rake_mock.update_gemfile_from_stable(gemfile, product_name, gemfile_name))
-            .to eq(expected_output)
-        end
-      end
-
-      context "and a prefix is specified" do
-        let(:prefix) { "v" }
-        it "updates the gemfile entry to the newer version" do
-          expect(rake_mock.update_gemfile_from_stable(gemfile, product_name, gemfile_name, prefix))
-            .to eq(expected_output)
-        end
-      end
-    end
-  end
-end