Merge pull request #115 from chef/windows_chef_manifest

Ensure chef manifest exists before trying to read it

components/chef-cli/lib/chef-cli/target_host.rb

@@ -114,12 +114,9 @@ def installed_chef_version
 
     def get_chef_version_manifest
       path = MANIFEST_PATHS[base_os()]
-      content = backend.file(path).content
-      if content
-        JSON.parse(content)
-      else
-        :not_found
-      end
+      manifest = backend.file(path)
+      return :not_found unless manifest.file?
+      JSON.parse(manifest.content)
     end
 
     class RemoteExecutionFailed < ChefCLI::ErrorNoLogs

components/chef-cli/spec/unit/target_host_spec.rb

@@ -85,7 +85,7 @@
   end
 
   context "#get_chef_version_manifest" do
-    let(:manifest_content) { nil }
+    let(:manifest_content) { '{"build_version" : "1.2.3"}' }
     let(:expected_manifest_path) do
       {
         windows: "c:\\opscode\\chef\\version-manifest.json",
@@ -94,7 +94,7 @@
     end
     let(:base_os) { :unknown }
     before do
-      remote_file_mock = double("remote_file", content: manifest_content)
+      remote_file_mock = double("remote_file", file?: manifest_exists, content: manifest_content)
       backend_mock = double("backend")
       expect(backend_mock).to receive(:file).
         with(expected_manifest_path[base_os]).
@@ -104,6 +104,7 @@
     end
 
     context "when manifest is missing" do
+      let(:manifest_exists) { false }
       context "on windows" do
         let(:base_os) { :windows }
         it "returns :not_found" do
@@ -120,17 +121,16 @@
     end
 
     context "when manifest is present" do
+      let(:manifest_exists) { true }
       context "on windows" do
         let(:base_os) { :windows }
-        let(:manifest_content) { '{"build_version" : "1.2.3"}' }
         it "should return the parsed manifest" do
           expect(subject.get_chef_version_manifest).to eq({ "build_version" => "1.2.3" })
         end
       end
 
       context "on linux" do
         let(:base_os) { :linux }
-        let(:manifest_content) { '{"build_version" : "1.2.3"}' }
         it "should return the parsed manifest" do
           expect(subject.get_chef_version_manifest).to eq({ "build_version" => "1.2.3" })
         end