chef-dk 0.3.5 → 0.4.0

data/spec/unit/policyfile_services/install_spec.rb

@@ -52,9 +52,11 @@ cookbook 'local-cookbook', path: '#{local_cookbooks_root}/local-cookbook'
 E
   end
 
+  let(:overwrite) { false }
+
   let(:ui) { TestHelpers::TestUI.new }
 
-  let(:install_service) { described_class.new(policyfile: policyfile_rb_name, ui: ui, root_dir: working_dir) }
+  let(:install_service) { described_class.new(policyfile: policyfile_rb_name, ui: ui, root_dir: working_dir, overwrite: overwrite) }
 
   let(:storage_config) do
     ChefDK::Policyfile::StorageConfig.new( cache_path: nil, relative_paths_root: local_cookbooks_root )
@@ -111,6 +113,23 @@ E
 
     end
 
+    context "and a lockfile exists and `overwrite` is specified" do
+
+      let(:overwrite) { true }
+
+      before do
+        File.binwrite(policyfile_lock_path, "This is the old lockfile content")
+      end
+
+      it "solves the Policyfile demands, installs cookbooks, emits a lockfile" do
+        install_service.run
+        generated_lock = result_policyfile_lock
+        expect(generated_lock.name).to eq('install-example')
+        expect(generated_lock.cookbook_locks).to have_key("local-cookbook")
+      end
+
+    end
+
     context "and a lockfile exists" do
 
       before do

data/spec/unit/policyfile_services/push_spec.rb

@@ -44,8 +44,14 @@ describe ChefDK::PolicyfileServices::Push do
     File.join(fixtures_path, "local_path_cookbooks")
   end
 
+  let(:policy_document_native_api) { false }
+
   let(:config) do
-    double("Chef::Config", chef_server_url: "https://localhost:10443", client_key: "/path/to/client/key.pem", node_name: "deuce")
+    double("Chef::Config",
+           chef_server_url: "https://localhost:10443",
+           client_key: "/path/to/client/key.pem",
+           node_name: "deuce",
+           policy_document_native_api: policy_document_native_api)
   end
 
   let(:ui) { TestHelpers::TestUI.new }
@@ -166,21 +172,42 @@ E
         expect(push_service).to receive(:http_client).and_return(http_client)
 
         expect(ChefDK::Policyfile::Uploader).to receive(:new).
-               with(push_service.policyfile_lock, policy_group, http_client: http_client, ui: ui).
+               with(push_service.policyfile_lock, policy_group, http_client: http_client, ui: ui, policy_document_native_api: policy_document_native_api).
                and_return(uploader)
       end
 
+      context "when the policy document native API is disabled" do
+
+        it "configures a Policyfile Uploader" do
+          push_service.uploader
+        end
+
+        it "validates the lockfile, writes any updates, and uploads the cookbooks" do
+          allow(File).to receive(:open).and_call_original
+          expect(File).to receive(:open).with(policyfile_lock_path, "wb+").and_yield(updated_lockfile_io)
+          expect(uploader).to receive(:upload)
+
+          push_service.run
+        end
 
-      it "configures a Policyfile Uploader" do
-        push_service.uploader
       end
 
-      it "validates the lockfile, writes any updates, and uploads the cookbooks" do
-        allow(File).to receive(:open).and_call_original
-        expect(File).to receive(:open).with(policyfile_lock_path, "wb+").and_yield(updated_lockfile_io)
-        expect(uploader).to receive(:upload)
+      context "when the policy document native API is enabled" do
+
+        let(:policy_document_native_api) { true }
+
+        it "configures a Policyfile Uploader with the policy document native API option" do
+          push_service.uploader
+        end
+
+        it "validates the lockfile, writes any updates, and uploads the cookbooks" do
+          allow(File).to receive(:open).and_call_original
+          expect(File).to receive(:open).with(policyfile_lock_path, "wb+").and_yield(updated_lockfile_io)
+          expect(uploader).to receive(:upload)
+
+          push_service.run
+        end
 
-        push_service.run
       end
 
       describe "when an error occurs in upload" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-dk
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Daniel DeLeo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -66,14 +66,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.0.0.alpha.2
+        version: '12.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.0.0.alpha.2
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
@@ -146,9 +146,9 @@ dependencies:
         version: '3.0'
 description: A streamlined development and deployment workflow for Chef platform.
 email:
-- dan@getchef.com
-- lamont@getchef.com
-- serdar@getchef.com
+- dan@chef.io
+- lamont@chef.io
+- serdar@chef.io
 executables:
 - chef
 extensions: []
@@ -166,6 +166,7 @@ files:
 - lib/chef-dk/cli.rb
 - lib/chef-dk/command/base.rb
 - lib/chef-dk/command/exec.rb
+- lib/chef-dk/command/export.rb
 - lib/chef-dk/command/gem.rb
 - lib/chef-dk/command/generate.rb
 - lib/chef-dk/command/generator_commands.rb
@@ -183,9 +184,11 @@ files:
 - lib/chef-dk/command/install.rb
 - lib/chef-dk/command/push.rb
 - lib/chef-dk/command/shell_init.rb
+- lib/chef-dk/command/update.rb
 - lib/chef-dk/command/verify.rb
 - lib/chef-dk/commands_map.rb
 - lib/chef-dk/component_test.rb
+- lib/chef-dk/configurable.rb
 - lib/chef-dk/cookbook_metadata.rb
 - lib/chef-dk/cookbook_omnifetch.rb
 - lib/chef-dk/cookbook_profiler/git.rb
@@ -210,6 +213,7 @@ files:
 - lib/chef-dk/policyfile/uploader.rb
 - lib/chef-dk/policyfile_compiler.rb
 - lib/chef-dk/policyfile_lock.rb
+- lib/chef-dk/policyfile_services/export_repo.rb
 - lib/chef-dk/policyfile_services/install.rb
 - lib/chef-dk/policyfile_services/push.rb
 - lib/chef-dk/service_exception_inspectors.rb
@@ -219,7 +223,6 @@ files:
 - lib/chef-dk/shell_out.rb
 - lib/chef-dk/skeletons/code_generator/files/default/Berksfile
 - lib/chef-dk/skeletons/code_generator/files/default/chefignore
-- lib/chef-dk/skeletons/code_generator/files/default/converge_spec.rb
 - lib/chef-dk/skeletons/code_generator/files/default/gitignore
 - lib/chef-dk/skeletons/code_generator/files/default/repo/README.md
 - lib/chef-dk/skeletons/code_generator/files/default/repo/Rakefile
@@ -229,6 +232,7 @@ files:
 - lib/chef-dk/skeletons/code_generator/files/default/repo/data_bags/README.md
 - lib/chef-dk/skeletons/code_generator/files/default/repo/environments/README.md
 - lib/chef-dk/skeletons/code_generator/files/default/repo/roles/README.md
+- lib/chef-dk/skeletons/code_generator/files/default/serverspec_spec_helper.rb
 - lib/chef-dk/skeletons/code_generator/files/default/spec_helper.rb
 - lib/chef-dk/skeletons/code_generator/metadata.rb
 - lib/chef-dk/skeletons/code_generator/recipes/app.rb
@@ -249,19 +253,23 @@ files:
 - lib/chef-dk/skeletons/code_generator/templates/default/README.md.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/attribute.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/cookbook_file.erb
-- lib/chef-dk/skeletons/code_generator/templates/default/default_recipe.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/kitchen.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/config/rake.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/repo/gitignore.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/resource.rb.erb
+- lib/chef-dk/skeletons/code_generator/templates/default/serverspec_default_spec.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/template.erb
 - lib/chef-dk/ui.rb
 - lib/chef-dk/version.rb
+- lib/kitchen/provisioner/policyfile_zero.rb
 - spec/shared/a_file_generator.rb
 - spec/shared/a_generated_file.rb
+- spec/shared/command_with_ui_object.rb
+- spec/shared/custom_generator_cookbook.rb
 - spec/shared/fixture_cookbook_checksums.rb
 - spec/shared/setup_git_cookbooks.rb
 - spec/spec_helper.rb
@@ -270,6 +278,7 @@ files:
 - spec/unit/cli_spec.rb
 - spec/unit/command/base_spec.rb
 - spec/unit/command/exec_spec.rb
+- spec/unit/command/export_spec.rb
 - spec/unit/command/generate_spec.rb
 - spec/unit/command/generator_commands/app_spec.rb
 - spec/unit/command/generator_commands/attribute_spec.rb
@@ -283,6 +292,7 @@ files:
 - spec/unit/command/install_spec.rb
 - spec/unit/command/push_spec.rb
 - spec/unit/command/shell_init_spec.rb
+- spec/unit/command/update_spec.rb
 - spec/unit/command/verify_spec.rb
 - spec/unit/commands_map_spec.rb
 - spec/unit/component_test_spec.rb
@@ -332,19 +342,6 @@ files:
 - spec/unit/fixtures/eg_omnibus_dir/valid/embedded/apps/test-kitchen/verify_me
 - spec/unit/fixtures/eg_omnibus_dir/valid/embedded/bin/.keep
 - spec/unit/fixtures/example_app/Policyfile.rb
-- spec/unit/fixtures/example_cookbook/.git/HEAD
-- spec/unit/fixtures/example_cookbook/.git/config
-- spec/unit/fixtures/example_cookbook/.git/description
-- spec/unit/fixtures/example_cookbook/.git/hooks/applypatch-msg.sample
-- spec/unit/fixtures/example_cookbook/.git/hooks/commit-msg.sample
-- spec/unit/fixtures/example_cookbook/.git/hooks/post-update.sample
-- spec/unit/fixtures/example_cookbook/.git/hooks/pre-applypatch.sample
-- spec/unit/fixtures/example_cookbook/.git/hooks/pre-commit.sample
-- spec/unit/fixtures/example_cookbook/.git/hooks/pre-push.sample
-- spec/unit/fixtures/example_cookbook/.git/hooks/pre-rebase.sample
-- spec/unit/fixtures/example_cookbook/.git/hooks/prepare-commit-msg.sample
-- spec/unit/fixtures/example_cookbook/.git/hooks/update.sample
-- spec/unit/fixtures/example_cookbook/.git/info/exclude
 - spec/unit/fixtures/example_cookbook/.gitignore
 - spec/unit/fixtures/example_cookbook/.kitchen.yml
 - spec/unit/fixtures/example_cookbook/Berksfile
@@ -352,6 +349,19 @@ files:
 - spec/unit/fixtures/example_cookbook/chefignore
 - spec/unit/fixtures/example_cookbook/metadata.rb
 - spec/unit/fixtures/example_cookbook/recipes/default.rb
+- spec/unit/fixtures/example_cookbook_metadata_json_only/.gitignore
+- spec/unit/fixtures/example_cookbook_metadata_json_only/.kitchen.yml
+- spec/unit/fixtures/example_cookbook_metadata_json_only/Berksfile
+- spec/unit/fixtures/example_cookbook_metadata_json_only/README.md
+- spec/unit/fixtures/example_cookbook_metadata_json_only/chefignore
+- spec/unit/fixtures/example_cookbook_metadata_json_only/metadata.json
+- spec/unit/fixtures/example_cookbook_metadata_json_only/recipes/default.rb
+- spec/unit/fixtures/example_cookbook_no_metadata/.gitignore
+- spec/unit/fixtures/example_cookbook_no_metadata/.kitchen.yml
+- spec/unit/fixtures/example_cookbook_no_metadata/Berksfile
+- spec/unit/fixtures/example_cookbook_no_metadata/README.md
+- spec/unit/fixtures/example_cookbook_no_metadata/chefignore
+- spec/unit/fixtures/example_cookbook_no_metadata/recipes/default.rb
 - spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/README.md
 - spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/chefignore
 - spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/metadata.rb
@@ -385,12 +395,13 @@ files:
 - spec/unit/policyfile_lock_install_spec.rb
 - spec/unit/policyfile_lock_serialization_spec.rb
 - spec/unit/policyfile_lock_validation_spec.rb
+- spec/unit/policyfile_services/export_repo_spec.rb
 - spec/unit/policyfile_services/install_spec.rb
 - spec/unit/policyfile_services/push_spec.rb
 - spec/unit/service_exception_inspectors/base_spec.rb
 - spec/unit/service_exception_inspectors/http_spec.rb
 - spec/unit/shell_out_spec.rb
-homepage: http://www.getchef.com/
+homepage: https://www.chef.io/
 licenses: []
 metadata: {}
 post_install_message: 
@@ -409,13 +420,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: A streamlined development and deployment workflow for Chef platform.
 test_files:
 - spec/shared/a_file_generator.rb
 - spec/shared/a_generated_file.rb
+- spec/shared/command_with_ui_object.rb
+- spec/shared/custom_generator_cookbook.rb
 - spec/shared/fixture_cookbook_checksums.rb
 - spec/shared/setup_git_cookbooks.rb
 - spec/spec_helper.rb
@@ -424,6 +437,7 @@ test_files:
 - spec/unit/cli_spec.rb
 - spec/unit/command/base_spec.rb
 - spec/unit/command/exec_spec.rb
+- spec/unit/command/export_spec.rb
 - spec/unit/command/generate_spec.rb
 - spec/unit/command/generator_commands/app_spec.rb
 - spec/unit/command/generator_commands/attribute_spec.rb
@@ -437,6 +451,7 @@ test_files:
 - spec/unit/command/install_spec.rb
 - spec/unit/command/push_spec.rb
 - spec/unit/command/shell_init_spec.rb
+- spec/unit/command/update_spec.rb
 - spec/unit/command/verify_spec.rb
 - spec/unit/commands_map_spec.rb
 - spec/unit/component_test_spec.rb
@@ -486,19 +501,6 @@ test_files:
 - spec/unit/fixtures/eg_omnibus_dir/valid/embedded/apps/test-kitchen/verify_me
 - spec/unit/fixtures/eg_omnibus_dir/valid/embedded/bin/.keep
 - spec/unit/fixtures/example_app/Policyfile.rb
-- spec/unit/fixtures/example_cookbook/.git/HEAD
-- spec/unit/fixtures/example_cookbook/.git/config
-- spec/unit/fixtures/example_cookbook/.git/description
-- spec/unit/fixtures/example_cookbook/.git/hooks/applypatch-msg.sample
-- spec/unit/fixtures/example_cookbook/.git/hooks/commit-msg.sample
-- spec/unit/fixtures/example_cookbook/.git/hooks/post-update.sample
-- spec/unit/fixtures/example_cookbook/.git/hooks/pre-applypatch.sample
-- spec/unit/fixtures/example_cookbook/.git/hooks/pre-commit.sample
-- spec/unit/fixtures/example_cookbook/.git/hooks/pre-push.sample
-- spec/unit/fixtures/example_cookbook/.git/hooks/pre-rebase.sample
-- spec/unit/fixtures/example_cookbook/.git/hooks/prepare-commit-msg.sample
-- spec/unit/fixtures/example_cookbook/.git/hooks/update.sample
-- spec/unit/fixtures/example_cookbook/.git/info/exclude
 - spec/unit/fixtures/example_cookbook/.gitignore
 - spec/unit/fixtures/example_cookbook/.kitchen.yml
 - spec/unit/fixtures/example_cookbook/Berksfile
@@ -506,6 +508,19 @@ test_files:
 - spec/unit/fixtures/example_cookbook/chefignore
 - spec/unit/fixtures/example_cookbook/metadata.rb
 - spec/unit/fixtures/example_cookbook/recipes/default.rb
+- spec/unit/fixtures/example_cookbook_metadata_json_only/.gitignore
+- spec/unit/fixtures/example_cookbook_metadata_json_only/.kitchen.yml
+- spec/unit/fixtures/example_cookbook_metadata_json_only/Berksfile
+- spec/unit/fixtures/example_cookbook_metadata_json_only/README.md
+- spec/unit/fixtures/example_cookbook_metadata_json_only/chefignore
+- spec/unit/fixtures/example_cookbook_metadata_json_only/metadata.json
+- spec/unit/fixtures/example_cookbook_metadata_json_only/recipes/default.rb
+- spec/unit/fixtures/example_cookbook_no_metadata/.gitignore
+- spec/unit/fixtures/example_cookbook_no_metadata/.kitchen.yml
+- spec/unit/fixtures/example_cookbook_no_metadata/Berksfile
+- spec/unit/fixtures/example_cookbook_no_metadata/README.md
+- spec/unit/fixtures/example_cookbook_no_metadata/chefignore
+- spec/unit/fixtures/example_cookbook_no_metadata/recipes/default.rb
 - spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/README.md
 - spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/chefignore
 - spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/metadata.rb
@@ -539,9 +554,9 @@ test_files:
 - spec/unit/policyfile_lock_install_spec.rb
 - spec/unit/policyfile_lock_serialization_spec.rb
 - spec/unit/policyfile_lock_validation_spec.rb
+- spec/unit/policyfile_services/export_repo_spec.rb
 - spec/unit/policyfile_services/install_spec.rb
 - spec/unit/policyfile_services/push_spec.rb
 - spec/unit/service_exception_inspectors/base_spec.rb
 - spec/unit/service_exception_inspectors/http_spec.rb
 - spec/unit/shell_out_spec.rb
-has_rdoc: 

data/lib/chef-dk/skeletons/code_generator/files/default/converge_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe 'demo::default' do
-  let(:chef_run) { ChefSpec::Runner.new.converge("demo::default") }
-
-  it "converges successfully" do
-    chef_run # This should not raise an error
-  end
-end

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

@@ -1,5 +0,0 @@
-#
-# Cookbook Name:: <%= cookbook_name %>
-# Recipe:: default
-#
-<%= license_description('#') %>