chef-dk 0.5.0.rc.1 → 0.5.0

data/spec/unit/policyfile_lock_serialization_spec.rb

@@ -27,6 +27,8 @@ describe ChefDK::PolicyfileLock, "when reading a Policyfile.lock" do
       "cookbook_locks" => {
         # TODO: add some valid locks
       },
+      "default_attributes" => { "foo" => "bar" },
+      "override_attributes" => { "override_foo" => "override_bar" },
       "solution_dependencies" => {
         "Policyfile" => [],
         "dependencies" => {}
@@ -38,6 +40,27 @@ describe ChefDK::PolicyfileLock, "when reading a Policyfile.lock" do
 
   let(:lockfile) { ChefDK::PolicyfileLock.new(storage_config) }
 
+  describe "populating the deserialized lock" do
+
+    before do
+      lockfile.build_from_lock_data(valid_lock_data)
+    end
+
+    it "includes the run list" do
+      expect(lockfile.run_list).to eq(["recipe[cookbook::recipe_name]"])
+    end
+
+    it "includes the cookbook locks" do
+      expect(lockfile.cookbook_locks).to eq({})
+    end
+
+    it "includes the attributes" do
+      expect(lockfile.default_attributes).to eq({"foo" => "bar"})
+      expect(lockfile.override_attributes).to eq({"override_foo" => "override_bar"})
+    end
+
+  end
+
   describe "validating required fields" do
 
     it "does not raise an error when all fields are valid" do
@@ -88,6 +111,30 @@ describe ChefDK::PolicyfileLock, "when reading a Policyfile.lock" do
       expect { lockfile.build_from_lock_data(invalid_locks) }.to raise_error(ChefDK::InvalidLockfile)
     end
 
+    it "requires the `default_attributes` section be present and its value is a Hash" do
+      missing_attrs = valid_lock_data.dup
+      missing_attrs.delete("default_attributes")
+
+      expect { lockfile.build_from_lock_data(missing_attrs) }.to raise_error(ChefDK::InvalidLockfile)
+
+      invalid_attrs = valid_lock_data.dup
+      invalid_attrs["default_attributes"] = []
+
+      expect { lockfile.build_from_lock_data(invalid_attrs) }.to raise_error(ChefDK::InvalidLockfile)
+    end
+
+    it "requires the `override_attributes` section be present and its value is a Hash" do
+      missing_attrs = valid_lock_data.dup
+      missing_attrs.delete("override_attributes")
+
+      expect { lockfile.build_from_lock_data(missing_attrs) }.to raise_error(ChefDK::InvalidLockfile)
+
+      invalid_attrs = valid_lock_data.dup
+      invalid_attrs["override_attributes"] = []
+
+      expect { lockfile.build_from_lock_data(invalid_attrs) }.to raise_error(ChefDK::InvalidLockfile)
+    end
+
     describe "validating solution_dependencies" do
 
       it "requires the `solution_dependencies' section be present" do

data/spec/unit/policyfile_services/export_repo_spec.rb

@@ -123,6 +123,8 @@ describe ChefDK::PolicyfileServices::ExportRepo do
       }
     }
   },
+  "default_attributes": {},
+  "override_attributes": {},
   "solution_dependencies": {
     "Policyfile": [
       [

data/spec/unit/policyfile_services/push_spec.rb

@@ -145,6 +145,8 @@ describe ChefDK::PolicyfileServices::Push do
       }
     }
   },
+  "default_attributes": {},
+  "override_attributes": {},
   "solution_dependencies": {
     "Policyfile": [
       [

data/spec/unit/policyfile_services/update_attributes_spec.rb

@@ -0,0 +1,217 @@
+#
+# Copyright:: Copyright (c) 2015 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'
+require 'chef-dk/policyfile_services/update_attributes'
+
+describe ChefDK::PolicyfileServices::UpdateAttributes do
+
+  include ChefDK::Helpers
+
+  let(:working_dir) do
+    path = File.join(tempdir, "policyfile_services_test_working_dir")
+    Dir.mkdir(path)
+    path
+  end
+
+  let(:policyfile_rb_explicit_name) { nil }
+
+  let(:policyfile_rb_name) { policyfile_rb_explicit_name || "Policyfile.rb" }
+
+  let(:policyfile_lock_name) { "Policyfile.lock.json" }
+
+  let(:policyfile_rb_path) { File.join(working_dir, policyfile_rb_name) }
+
+  let(:policyfile_lock_path) { File.join(working_dir, policyfile_lock_name) }
+
+  let(:local_cookbooks_root) do
+    File.join(fixtures_path, "local_path_cookbooks")
+  end
+
+  let(:local_cookbook_path) { File.join(local_cookbooks_root, "local-cookbook") }
+
+  let(:local_cookbook_copy_path) { File.join(working_dir, "cookbooks/local-cookbook") }
+
+  let(:policyfile_content) do
+    <<-E
+name 'install-example'
+
+run_list 'local-cookbook'
+
+cookbook 'local-cookbook', path: 'cookbooks/local-cookbook'
+
+default["default_attr"] = "new_value_default"
+
+override["override_attr"] = "new_value_override"
+E
+  end
+
+  let(:ui) { TestHelpers::TestUI.new }
+
+  let(:storage_config) do
+    ChefDK::Policyfile::StorageConfig.new( cache_path: nil, relative_paths_root: working_dir )
+  end
+
+  subject(:update_attrs_service) { described_class.new(policyfile: policyfile_rb_name, ui: ui, root_dir: working_dir) }
+
+  before do
+    FileUtils.mkdir_p(File.dirname(local_cookbook_copy_path))
+    FileUtils.cp_r(local_cookbook_path, local_cookbook_copy_path)
+  end
+
+  context "when first created" do
+
+    it "has the UI object it was created with" do
+      expect(update_attrs_service.ui).to eq(ui)
+    end
+
+    it "creates a storage config from the given policyfile path and root dir" do
+      new_storage_config = instance_double("ChefDK::Policyfile::StorageConfig")
+      expect(ChefDK::Policyfile::StorageConfig).to receive(:new).with(no_args).and_return(new_storage_config)
+      expect(new_storage_config).to receive(:use_policyfile).with(policyfile_rb_path).and_return(new_storage_config)
+      expect(update_attrs_service.storage_config).to eq(new_storage_config)
+    end
+
+  end
+
+  context "when no Policyfile is present or specified" do
+
+    it "errors out" do
+      expect { update_attrs_service.assert_policy_and_lock_present! }.to raise_error(ChefDK::PolicyfileNotFound, "Policyfile not found at path #{policyfile_rb_path}")
+      expect { update_attrs_service.run }.to raise_error(ChefDK::PolicyfileUpdateError)
+    end
+
+  end
+
+  context "when no lockfile exists" do
+
+    it "errors out" do
+      with_file(policyfile_rb_path) { |f| f.print(policyfile_content) }
+      expect { update_attrs_service.assert_policy_and_lock_present! }.to raise_error(ChefDK::LockfileNotFound, "Policyfile lock not found at path #{policyfile_lock_path}")
+      expect { update_attrs_service.run }.to raise_error(ChefDK::PolicyfileUpdateError)
+    end
+
+  end
+
+  context "when both the policyfile and lockfile exist" do
+
+    let(:lock_data_with_new_values) do
+      {
+        "revision_id" => "522d740beba4c4e5857bd8bccdb2d7ffd0bbd45ac4350f92b26e4e3b8f68d530",
+        "name" => "install-example",
+        "run_list" => ["recipe[local-cookbook::default]"],
+        "cookbook_locks"=> {
+          "local-cookbook"=> {
+            "version"=>"2.3.4",
+            "identifier"=>"fab501cfaf747901bd82c1bc706beae7dc3a350c",
+            "dotted_decimal_identifier"=> "70567763561641081.489844270461035.258281553147148",
+            "source"=>"cookbooks/local-cookbook",
+            "cache_key"=>nil,
+            "scm_info" => nil,
+            "source_options"=> {
+              "path"=>"cookbooks/local-cookbook"
+            }
+          }
+        },
+        "default_attributes" => {"default_attr"=>"new_value_default"},
+        "override_attributes" => {"override_attr"=>"new_value_override"},
+        "solution_dependencies" => {
+          "Policyfile"=>[["local-cookbook", ">= 0.0.0"]],
+          "dependencies"=>{"local-cookbook (2.3.4)"=>[]}
+        }
+      }
+    end
+
+    let(:previous_policyfile_lock_data) { lock_data_with_new_values }
+
+    let(:policyfile_lock_content) do
+      FFI_Yajl::Encoder.encode(previous_policyfile_lock_data, pretty: true )
+    end
+
+    before do
+      with_file(policyfile_rb_path) { |f| f.print(policyfile_content) }
+      with_file(policyfile_lock_path) { |f| f.print(policyfile_lock_content) }
+    end
+
+    def result_policyfile_lock_data
+      expect(File).to exist(policyfile_lock_path)
+      content = IO.read(policyfile_lock_path)
+      FFI_Yajl::Parser.parse(content)
+    end
+
+    context "when the current lock already has the desired attributes" do
+
+      it "makes no changes to the lockfile" do
+        update_attrs_service.run
+        expect(result_policyfile_lock_data).to eq(lock_data_with_new_values)
+      end
+
+      it "emits a message that no changes have been made to the lockfile" do
+        update_attrs_service.run
+
+        message = "Attributes already up to date"
+        expect(ui.output).to include(message)
+      end
+
+    end
+
+    context "when the Policyfile.rb has different attributes than the lockfile" do
+
+      let(:previous_policyfile_lock_data) do
+        {
+          "revision_id" => "522d740beba4c4e5857bd8bccdb2d7ffd0bbd45ac4350f92b26e4e3b8f68d530",
+          "name" => "install-example",
+          "run_list" => ["recipe[local-cookbook::default]"],
+          "cookbook_locks"=> {
+            "local-cookbook"=> {
+              "version"=>"2.3.4",
+              "identifier"=>"fab501cfaf747901bd82c1bc706beae7dc3a350c",
+              "dotted_decimal_identifier"=> "70567763561641081.489844270461035.258281553147148",
+              "source"=>"cookbooks/local-cookbook",
+              "cache_key" => nil,
+              "scm_info" => nil,
+              "source_options"=> {
+                "path"=>"cookbooks/local-cookbook"
+              }
+            }
+          },
+          "default_attributes" => {"default_attr"=>"old_value_default"},
+          "override_attributes" => {"override_attr"=>"old_value_override"},
+          "solution_dependencies" => {
+            "Policyfile"=>[["local-cookbook", ">= 0.0.0"]],
+            "dependencies"=>{"local-cookbook (2.3.4)"=>[]}
+          }
+        }
+      end
+
+      it "updates the lockfile with the new attributes" do
+        update_attrs_service.run
+        expect(result_policyfile_lock_data).to eq(lock_data_with_new_values)
+      end
+
+      it "emits a messsage stating the attributes have been updated" do
+        update_attrs_service.run
+        expect(ui.output).to include("Updated attributes in #{policyfile_lock_path}")
+      end
+
+    end
+
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-dk
 version: !ruby/object:Gem::Version
-  version: 0.5.0.rc.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Daniel DeLeo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -69,7 +69,7 @@ dependencies:
         version: '12.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.2.0.rc.2
+        version: 12.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ dependencies:
         version: '12.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.2.0.rc.2
+        version: 12.2.1
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: paint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +199,7 @@ files:
 - lib/chef-dk/chef_runner.rb
 - lib/chef-dk/cli.rb
 - lib/chef-dk/command/base.rb
+- lib/chef-dk/command/diff.rb
 - lib/chef-dk/command/exec.rb
 - lib/chef-dk/command/export.rb
 - lib/chef-dk/command/gem.rb
@@ -203,11 +232,15 @@ files:
 - lib/chef-dk/exceptions.rb
 - lib/chef-dk/generator.rb
 - lib/chef-dk/helpers.rb
+- lib/chef-dk/pager.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
+- lib/chef-dk/policyfile/comparison_base.rb
 - lib/chef-dk/policyfile/cookbook_location_specification.rb
 - lib/chef-dk/policyfile/cookbook_locks.rb
 - lib/chef-dk/policyfile/cookbook_sources.rb
+- lib/chef-dk/policyfile/differ.rb
 - lib/chef-dk/policyfile/dsl.rb
 - lib/chef-dk/policyfile/null_cookbook_source.rb
 - lib/chef-dk/policyfile/read_cookbook_for_compat_mode_upload.rb
@@ -222,6 +255,7 @@ files:
 - 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/policyfile_services/update_attributes.rb
 - lib/chef-dk/service_exception_inspectors.rb
 - lib/chef-dk/service_exception_inspectors/base.rb
 - lib/chef-dk/service_exception_inspectors/http.rb
@@ -286,6 +320,7 @@ files:
 - spec/unit/chef_runner_spec.rb
 - spec/unit/cli_spec.rb
 - spec/unit/command/base_spec.rb
+- spec/unit/command/diff_spec.rb
 - spec/unit/command/exec_spec.rb
 - spec/unit/command/export_spec.rb
 - spec/unit/command/generate_spec.rb
@@ -375,6 +410,11 @@ files:
 - spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/chefignore
 - spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/metadata.rb
 - spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/recipes/default.rb
+- spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/Berksfile
+- spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/README.md
+- spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/chefignore
+- spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/metadata.rb
+- spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/recipes/default.rb
 - spec/unit/fixtures/local_path_cookbooks/local-cookbook/.kitchen.yml
 - spec/unit/fixtures/local_path_cookbooks/local-cookbook/Berksfile
 - spec/unit/fixtures/local_path_cookbooks/local-cookbook/README.md
@@ -387,10 +427,14 @@ files:
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/metadata.rb
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/recipes/default.rb
 - spec/unit/generator_spec.rb
+- spec/unit/pager_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
+- spec/unit/policyfile/comparison_base_spec.rb
 - spec/unit/policyfile/cookbook_location_specification_spec.rb
 - spec/unit/policyfile/cookbook_locks_spec.rb
+- spec/unit/policyfile/differ_spec.rb
 - spec/unit/policyfile/null_cookbook_source_spec.rb
 - spec/unit/policyfile/read_cookbook_for_compat_mode_upload_spec.rb
 - spec/unit/policyfile/reports/install_spec.rb
@@ -407,6 +451,7 @@ files:
 - spec/unit/policyfile_services/export_repo_spec.rb
 - spec/unit/policyfile_services/install_spec.rb
 - spec/unit/policyfile_services/push_spec.rb
+- spec/unit/policyfile_services/update_attributes_spec.rb
 - spec/unit/service_exception_inspectors/base_spec.rb
 - spec/unit/service_exception_inspectors/http_spec.rb
 - spec/unit/shell_out_spec.rb
@@ -424,9 +469,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.2
@@ -445,6 +490,7 @@ test_files:
 - spec/unit/chef_runner_spec.rb
 - spec/unit/cli_spec.rb
 - spec/unit/command/base_spec.rb
+- spec/unit/command/diff_spec.rb
 - spec/unit/command/exec_spec.rb
 - spec/unit/command/export_spec.rb
 - spec/unit/command/generate_spec.rb
@@ -534,6 +580,11 @@ test_files:
 - spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/chefignore
 - spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/metadata.rb
 - spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/recipes/default.rb
+- spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/Berksfile
+- spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/README.md
+- spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/chefignore
+- spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/metadata.rb
+- spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/recipes/default.rb
 - spec/unit/fixtures/local_path_cookbooks/local-cookbook/.kitchen.yml
 - spec/unit/fixtures/local_path_cookbooks/local-cookbook/Berksfile
 - spec/unit/fixtures/local_path_cookbooks/local-cookbook/README.md
@@ -546,10 +597,14 @@ test_files:
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/metadata.rb
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/recipes/default.rb
 - spec/unit/generator_spec.rb
+- spec/unit/pager_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
+- spec/unit/policyfile/comparison_base_spec.rb
 - spec/unit/policyfile/cookbook_location_specification_spec.rb
 - spec/unit/policyfile/cookbook_locks_spec.rb
+- spec/unit/policyfile/differ_spec.rb
 - spec/unit/policyfile/null_cookbook_source_spec.rb
 - spec/unit/policyfile/read_cookbook_for_compat_mode_upload_spec.rb
 - spec/unit/policyfile/reports/install_spec.rb
@@ -566,6 +621,7 @@ test_files:
 - spec/unit/policyfile_services/export_repo_spec.rb
 - spec/unit/policyfile_services/install_spec.rb
 - spec/unit/policyfile_services/push_spec.rb
+- spec/unit/policyfile_services/update_attributes_spec.rb
 - spec/unit/service_exception_inspectors/base_spec.rb
 - spec/unit/service_exception_inspectors/http_spec.rb
 - spec/unit/shell_out_spec.rb