chef-dk 0.3.0 → 0.3.5

data/spec/unit/command/install_spec.rb

@@ -125,9 +125,8 @@ describe ChefDK::Command::Install do
       it "displays the exception and cause" do
         expected_error_text=<<-E
 Error: install failed
-Reason: StandardError
+Reason: (StandardError) some operation failed
 
-some operation failed
 E
 
         command.run
@@ -141,9 +140,9 @@ E
         it "displays the exception and cause with backtrace" do
           expected_error_text=<<-E
 Error: install failed
-Reason: StandardError
+Reason: (StandardError) some operation failed
+
 
-some operation failed
 E
 
           expected_error_text << backtrace.join("\n") << "\n"

data/spec/unit/command/push_spec.rb

@@ -147,7 +147,7 @@ describe ChefDK::Command::Push do
         end
 
         let(:exception) do
-          ChefDK::PolicyfilePushError.new("install failed", cause)
+          ChefDK::PolicyfilePushError.new("push failed", cause)
         end
 
         before do
@@ -162,10 +162,9 @@ describe ChefDK::Command::Push do
           command.run(params)
 
           expected_output=<<-E
-Error: install failed
-Reason: StandardError
+Error: push failed
+Reason: (StandardError) some operation failed
 
-some operation failed
 E
 
           expect(ui.output).to eq(expected_output)
@@ -182,10 +181,10 @@ E
             command.run(params)
 
             expected_output=<<-E
-Error: install failed
-Reason: StandardError
+Error: push failed
+Reason: (StandardError) some operation failed
+
 
-some operation failed
 E
             expected_output << backtrace.join("\n") << "\n"
 

data/spec/unit/command/shell_init_spec.rb

@@ -30,11 +30,15 @@ describe ChefDK::Command::ShellInit do
     end
   end
 
+  before do
+    stub_const("File::PATH_SEPARATOR", ':')
+  end
+
   let(:argv) { ['bash'] }
 
   let(:user_bin_dir) { File.expand_path(File.join(Gem.user_dir, 'bin')) }
 
-  let(:expected_path) { "#{omnibus_bin_dir}:#{user_bin_dir}:#{omnibus_embedded_bin_dir}:#{ENV['PATH']}" }
+  let(:expected_path) { [omnibus_bin_dir, user_bin_dir, omnibus_embedded_bin_dir, ENV['PATH']].join(File::PATH_SEPARATOR) }
 
   let(:expected_gem_root) { Gem.default_dir.to_s }
 

data/spec/unit/cookbook_profiler/git_spec.rb

@@ -32,7 +32,7 @@ describe ChefDK::CookbookProfiler::Git do
   end
 
   def edit_repo
-    File.open(File.join(cookbook_path, "README.md"), "a+") { |f| f.puts "some unpublished changes" }
+    with_file(File.join(cookbook_path, "README.md"), "ab+") { |f| f.puts "some unpublished changes" }
   end
 
   context "given a clean repo with no remotes" do
@@ -93,7 +93,7 @@ describe ChefDK::CookbookProfiler::Git do
         edit_repo
         system_command('git config --local user.name "Alice"', cwd: cookbook_path).error!
         system_command('git config --local user.email "alice@example.com"', cwd: cookbook_path).error!
-        system_command("git commit -a -m 'update readme' --author 'Alice <alice@example.com>'", cwd: cookbook_path).error!
+        system_command('git commit -a -m "update readme" --author "Alice <alice@example.com>"', cwd: cookbook_path).error!
       end
 
       it "reports that the repo is clean" do

data/spec/unit/policyfile/cookbook_locks_spec.rb

@@ -244,6 +244,64 @@ describe ChefDK::Policyfile::LocalCookbook do
 
   end
 
+  describe "selecting an SCM profiler" do
+
+    let(:cookbook_source_relpath) { "nginx" }
+
+    let(:cookbook_source_path) do
+      path = File.join(tempdir, cookbook_source_relpath)
+      FileUtils.mkdir_p(path)
+      path
+    end
+
+    before do
+      cookbook_lock.source = cookbook_source_path
+    end
+
+    after do
+      clear_tempdir
+    end
+
+    context "when the cookbook is in a git-repo" do
+
+      before do
+        FileUtils.mkdir_p(git_dir_path)
+      end
+
+      context "when the cookbook is a self-contained git repo" do
+
+        let(:git_dir_path) { File.join(cookbook_source_path, ".git") }
+
+        it "selects the git profiler" do
+          expect(cookbook_lock.scm_profiler).to be_an_instance_of(ChefDK::CookbookProfiler::Git)
+        end
+
+      end
+
+      context "when the cookbook is a subdirectory of a git repo" do
+
+        let(:cookbook_source_relpath) { "cookbook_repo/nginx" }
+
+        let(:git_dir_path) { File.join(tempdir, "cookbook_repo/.git") }
+
+        it "selects the git profiler" do
+          expect(cookbook_lock.scm_profiler).to be_an_instance_of(ChefDK::CookbookProfiler::Git)
+        end
+
+      end
+
+    end
+
+    context "when the cookbook is not in a git repo" do
+
+      it "selects the null profiler" do
+        expect(cookbook_lock.scm_profiler).to be_an_instance_of(ChefDK::CookbookProfiler::NullSCM)
+      end
+
+    end
+
+  end
+
   context "when loading data from a serialized form" do
 
     let(:previous_lock_data) do

data/spec/unit/policyfile/read_cookbook_for_compat_mode_upload_spec.rb

@@ -17,9 +17,12 @@
 
 require 'spec_helper'
 require 'chef-dk/policyfile/read_cookbook_for_compat_mode_upload'
+require 'chef-dk/helpers'
 
 describe ChefDK::Policyfile::ReadCookbookForCompatModeUpload do
 
+  include ChefDK::Helpers
+
   let(:cookbook_name) { "noignore" }
 
   let(:version_override) { "123.456.789" }
@@ -56,6 +59,10 @@ describe ChefDK::Policyfile::ReadCookbookForCompatModeUpload do
     expect(reader.cookbook_version.frozen_version?).to be true
   end
 
+  it "fixes up the cookbook manifest name" do
+    expect(reader.cookbook_version.manifest["name"]).to eq("noignore-#{version_override}")
+  end
+
   context "when a cookbook has a chefignore file" do
 
     let(:directory_path) { File.join(fixtures_path, "cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb") }
@@ -70,7 +77,7 @@ describe ChefDK::Policyfile::ReadCookbookForCompatModeUpload do
 
     before do
       FileUtils.cp_r(directory_path, copied_cookbook_path)
-      File.open(chefignored_file, "w+") { |f| f.puts "This file should not affect the cookbooks checksum" }
+      with_file(chefignored_file) { |f| f.puts "This file should not affect the cookbooks checksum" }
     end
 
     after do

data/spec/unit/policyfile/storage_config_spec.rb

@@ -74,6 +74,47 @@ describe ChefDK::Policyfile::StorageConfig do
       expect(storage_config.policyfile_filename).to eq("/path/to/Policyfile.rb")
     end
 
+    it "generates the location of the policyfile lock" do
+      expect(storage_config.policyfile_lock_filename).to eq("/path/to/Policyfile.lock.json")
+    end
+
+    it "gives the expanded path to the policyfile" do
+      expect(storage_config.policyfile_expanded_path).to eq(File.expand_path('/path/to/Policyfile.rb'))
+    end
+
+    context "when the policyfile is given as a relative path" do
+
+      before do
+        storage_config.use_policyfile("Policyfile.rb")
+      end
+
+      it "updates the relative_paths_root to be relative to a policyfile" do
+        expect(storage_config.relative_paths_root).to eq(".")
+      end
+
+      it "stores the location of the policyfile" do
+        expect(storage_config.policyfile_filename).to eq("Policyfile.rb")
+      end
+
+      it "generates the location of the policyfile lock" do
+        expect(storage_config.policyfile_lock_filename).to eq("Policyfile.lock.json")
+      end
+
+      it "gives the expanded path to the policyfile" do
+        expect(storage_config.policyfile_expanded_path).to eq(File.expand_path("Policyfile.rb", "."))
+      end
+
+    end
+
+    context "when the policyfile file name doesn't have a .rb extension" do
+
+      it "raises an error" do
+        err_string = %q{Policyfile filenames must end with `.rb' extension (you gave: `Policyfile')}
+        expect { storage_config.use_policyfile("Policyfile") }.to raise_error(ChefDK::InvalidPolicyfileFilename, err_string)
+      end
+
+    end
+
   end
 
 
@@ -87,10 +128,43 @@ describe ChefDK::Policyfile::StorageConfig do
       expect(storage_config.relative_paths_root).to eq("/path/to")
     end
 
-    it "stores the location of the policyfile" do
+    it "stores the location of the policyfile lock" do
       expect(storage_config.policyfile_lock_filename).to eq("/path/to/Policyfile.lock.json")
     end
 
+    it "stores the location of the policyfile" do
+      expect(storage_config.policyfile_filename).to eq("/path/to/Policyfile.rb")
+    end
+
+    it "gives the expanded path to the policyfile lock" do
+      expect(storage_config.policyfile_lock_expanded_path).to eq(File.expand_path("/path/to/Policyfile.lock.json"))
+    end
+
+    context "when given a relative path to the policyfile lock" do
+
+      before do
+        storage_config.use_policyfile_lock("Policyfile.lock.json")
+      end
+
+      it "updates the relative_paths_root to be relative to a policyfile" do
+        expect(storage_config.relative_paths_root).to eq(".")
+      end
+
+      it "stores the location of the policyfile" do
+        expect(storage_config.policyfile_filename).to eq("Policyfile.rb")
+      end
+
+      it "generates the location of the policyfile lock" do
+        expect(storage_config.policyfile_lock_filename).to eq("Policyfile.lock.json")
+      end
+
+      it "gives the expanded path to the policyfile" do
+        expect(storage_config.policyfile_lock_expanded_path).to eq(File.expand_path("Policyfile.lock.json", "."))
+      end
+
+
+    end
+
   end
 
 

data/spec/unit/policyfile/uploader_spec.rb

@@ -283,6 +283,37 @@ describe ChefDK::Policyfile::Uploader do
 
     end
 
+    context "with a set of cookbooks that all exist on the server" do
+
+      before do
+        # Have this one:
+        lock_double("build-essential", "67369247788170534.26353953100055918.55660493423796")
+      end
+
+      let(:expected_cookbooks_for_upload) do
+        []
+      end
+
+      it "lists no cookbooks as needing to be uploaded" do
+        expect(policyfile_lock).to receive(:validate_cookbooks!)
+        expect(http_client).to receive(:get).with('cookbooks?num_versions=all').and_return(existing_cookbook_on_remote)
+
+        expect(uploader.cookbook_versions_to_upload).to eq(expected_cookbooks_for_upload)
+      end
+
+      it "skips cookbooks uploads, then uploads the policy" do
+        expect(policyfile_lock).to receive(:validate_cookbooks!)
+        expect(http_client).to receive(:get).with('cookbooks?num_versions=all').and_return(existing_cookbook_on_remote)
+
+        expect(uploader.uploader).to_not receive(:upload_cookbooks)
+
+        # behavior for these tested above
+        expect(uploader).to receive(:data_bag_create)
+        expect(uploader).to receive(:data_bag_item_create)
+
+        uploader.upload
+      end
+    end
   end
 
 end

data/spec/unit/policyfile_lock_validation_spec.rb

@@ -20,6 +20,8 @@ require 'chef-dk/policyfile_lock.rb'
 
 describe ChefDK::PolicyfileLock, "validating locked cookbooks" do
 
+  include ChefDK::Helpers
+
   let(:pristine_cache_path) do
     File.expand_path("spec/unit/fixtures/cookbook_cache", project_root)
   end
@@ -158,7 +160,7 @@ E
 
       before do
         ensure_metadata_as_expected!
-        File.open(metadata_path, "w+") { |f| f.print(new_metadata) }
+        with_file(metadata_path) { |f| f.print(new_metadata) }
       end
 
       it "reports the unexpected cookbook and fails validation" do
@@ -187,7 +189,7 @@ E
 
       before do
         ensure_metadata_as_expected!
-        File.open(metadata_path, "w+") { |f| f.print(new_metadata) }
+        with_file(metadata_path) { |f| f.print(new_metadata) }
         policyfile_lock.validate_cookbooks! # no error
       end
 
@@ -197,7 +199,6 @@ E
 
       it "updates the content identifier" do
         old_id = lock_generator.lock_data_for("local-cookbook").identifier
-
         expect(cookbook_lock_data.identifier).to_not eq(old_id)
         expect(cookbook_lock_data.identifier).to eq("d71622904ed89b1e0066bb4ae823b2a7b49a615a")
       end
@@ -235,7 +236,7 @@ E
 
       before do
         ensure_metadata_as_expected!
-        File.open(metadata_path, "w+") { |f| f.print(new_metadata) }
+        with_file(metadata_path) { |f| f.print(new_metadata) }
       end
 
       it "reports the dependency conflict and fails validation" do
@@ -259,7 +260,7 @@ E
 
       before do
         ensure_metadata_as_expected!
-        File.open(recipe_path, "w+") { |f| f.print(new_recipe) }
+        with_file(recipe_path) { |f| f.print(new_recipe) }
         policyfile_lock.validate_cookbooks! # no error
       end
 
@@ -297,7 +298,7 @@ E
 
       before do
         ensure_metadata_as_expected!
-        File.open(metadata_path, "w+") { |f| f.print(new_metadata) }
+        with_file(metadata_path) { |f| f.print(new_metadata) }
         policyfile_lock.validate_cookbooks! # no error
       end
 
@@ -344,7 +345,7 @@ E
 
       before do
         ensure_metadata_as_expected!
-        File.open(metadata_path, "w+") { |f| f.print(new_metadata) }
+        with_file(metadata_path) { |f| f.print(new_metadata) }
       end
 
       it "reports the not-satisfied dependency and validation fails" do
@@ -384,7 +385,7 @@ E
 
       before do
         ensure_metadata_as_expected!
-        File.open(metadata_path, "w+") { |f| f.print(new_metadata) }
+        with_file(metadata_path) { |f| f.print(new_metadata) }
         policyfile_lock.validate_cookbooks! # no error
       end
 
@@ -418,7 +419,7 @@ E
 
       before do
         ensure_metadata_as_expected!
-        File.open(metadata_path, "w+") { |f| f.print(new_metadata) }
+        with_file(metadata_path) { |f| f.print(new_metadata) }
       end
 
       it "reports the not-satisfied dependency and validation fails" do
@@ -509,8 +510,8 @@ E
 
       before do
         ensure_metadata_as_expected!
-        File.open(metadata_path, "w+") { |f| f.print(new_metadata_local_cookbook) }
-        File.open(metadata_path_another_local_cookbook, "w+") { |f| f.print(new_metadata_another_local_cookbook) }
+        with_file(metadata_path) { |f| f.print(new_metadata_local_cookbook) }
+        with_file(metadata_path_another_local_cookbook) { |f| f.print(new_metadata_another_local_cookbook) }
         policyfile_lock.validate_cookbooks! # no error
       end
 
@@ -597,7 +598,7 @@ E
       before do
         ensure_metadata_as_expected!
         policyfile_lock
-        File.open(metadata_path, "w+") { |f| f.print(new_metadata) }
+        with_file(metadata_path) { |f| f.print(new_metadata) }
       end
 
       it "reports the modified cached cookbook and validation fails" do

data/spec/unit/policyfile_services/install_spec.rb

@@ -20,6 +20,8 @@ require 'chef-dk/policyfile_services/install'
 
 describe ChefDK::PolicyfileServices::Install do
 
+  include ChefDK::Helpers
+
   let(:working_dir) do
     path = File.join(tempdir, "policyfile_services_test_working_dir")
     Dir.mkdir(path)
@@ -76,11 +78,11 @@ E
   context "when a Policyfile exists" do
 
     before do
-      File.open(policyfile_rb_path, "w+") { |f| f.print(policyfile_content) }
+      with_file(policyfile_rb_path) { |f| f.print(policyfile_content) }
     end
 
     it "infers that the Policyfile.rb is located at $CWD/Policyfile.rb" do
-      expect(install_service.policyfile_path).to eq(policyfile_rb_path)
+      expect(install_service.policyfile_expanded_path).to eq(policyfile_rb_path)
     end
 
     it "reads the policyfile from disk" do
@@ -156,7 +158,7 @@ E
       let(:policyfile_lock_name) { "MyPolicy.lock.json" }
 
       it "infers that the Policyfile.rb is located at $CWD/$POLICYFILE_NAME" do
-        expect(install_service.policyfile_path).to eq(policyfile_rb_path)
+        expect(install_service.policyfile_expanded_path).to eq(policyfile_rb_path)
       end
 
       it "reads the policyfile from disk" do