chef 14.14.29 → 14.15.6

data/spec/integration/knife/deps_spec.rb

@@ -46,7 +46,7 @@ describe "knife deps", :workstation do
           /cookbooks/quiche
           /cookbooks/soup
           /roles/starring.json
-EOM
+        EOM
       end
     end
 
@@ -65,7 +65,7 @@ EOM
           /cookbooks/quiche
           /cookbooks/soup
           /roles/starring.json
-EOM
+        EOM
       end
     end
 
@@ -99,7 +99,7 @@ EOM
           /cookbooks/quiche
           /cookbooks/soup
           /nodes/mort.json
-EOM
+        EOM
       end
     end
     when_the_repository "has a cookbook with no dependencies" do
@@ -155,7 +155,7 @@ depends "kettle"'
           /cookbooks/soup
           /roles/starring.json
           /nodes/mort.json
-EOM
+        EOM
       end
       it "knife deps * reports all dependencies of all things" do
         knife("deps /nodes/*").should_succeed <<~EOM
@@ -166,7 +166,7 @@ EOM
           /cookbooks/soup
           /roles/starring.json
           /nodes/mort.json
-EOM
+        EOM
       end
       it "knife deps a b reports all dependencies of a and b" do
         knife("deps /nodes/bart.json /nodes/mort.json").should_succeed <<~EOM
@@ -177,7 +177,7 @@ EOM
           /cookbooks/soup
           /roles/starring.json
           /nodes/mort.json
-EOM
+        EOM
       end
       it "knife deps --tree /* shows dependencies in a tree" do
         knife("deps --tree /nodes/*").should_succeed <<~EOM
@@ -189,7 +189,7 @@ EOM
               /roles/minor.json
               /cookbooks/quiche
               /cookbooks/soup
-EOM
+        EOM
       end
       it "knife deps --tree --no-recurse shows only the first level of dependencies" do
         knife("deps --tree --no-recurse /nodes/*").should_succeed <<~EOM
@@ -198,7 +198,7 @@ EOM
           /nodes/mort.json
             /environments/desert.json
             /roles/starring.json
-EOM
+        EOM
       end
     end
 
@@ -237,7 +237,7 @@ depends "foo"'
             /roles/bar.json
             /roles/foo.json
             /roles/self.json
-EOM
+          EOM
         end
         it "knife deps --tree prints each once" do
           knife("deps --tree /roles/foo.json /roles/self.json") do
@@ -383,7 +383,7 @@ EOM
           /cookbooks/quiche
           /cookbooks/soup
           /roles/starring.json
-EOM
+        EOM
       end
     end
 
@@ -400,7 +400,7 @@ EOM
           /cookbooks/quiche
           /cookbooks/soup
           /roles/starring.json
-EOM
+        EOM
       end
     end
 
@@ -432,7 +432,7 @@ EOM
           /cookbooks/quiche
           /cookbooks/soup
           /nodes/mort.json
-EOM
+        EOM
       end
     end
     when_the_chef_server "has a cookbook with no dependencies" do
@@ -484,7 +484,7 @@ depends "kettle"', "recipes" => { "default.rb" => "" } }
           /cookbooks/soup
           /roles/starring.json
           /nodes/mort.json
-EOM
+        EOM
       end
       it "knife deps * reports all dependencies of all things" do
         knife("deps --remote /nodes/*").should_succeed <<~EOM
@@ -495,7 +495,7 @@ EOM
           /cookbooks/soup
           /roles/starring.json
           /nodes/mort.json
-EOM
+        EOM
       end
       it "knife deps a b reports all dependencies of a and b" do
         knife("deps --remote /nodes/bart.json /nodes/mort.json").should_succeed <<~EOM
@@ -506,7 +506,7 @@ EOM
           /cookbooks/soup
           /roles/starring.json
           /nodes/mort.json
-EOM
+        EOM
       end
       it "knife deps --tree /* shows dependencies in a tree" do
         knife("deps --remote --tree /nodes/*").should_succeed <<~EOM
@@ -518,7 +518,7 @@ EOM
               /roles/minor.json
               /cookbooks/quiche
               /cookbooks/soup
-EOM
+        EOM
       end
       it "knife deps --tree --no-recurse shows only the first level of dependencies" do
         knife("deps --remote --tree --no-recurse /nodes/*").should_succeed <<~EOM
@@ -527,18 +527,18 @@ EOM
           /nodes/mort.json
             /environments/desert.json
             /roles/starring.json
-EOM
+        EOM
       end
     end
 
     context "circular dependencies" do
       when_the_chef_server "has cookbooks with circular dependencies" do
         before do
-          cookbook "foo", "1.0.0", { "metadata.rb"  => 'name "foo"
+          cookbook "foo", "1.0.0", { "metadata.rb" => 'name "foo"
 depends "bar"' }
-          cookbook "bar", "1.0.0", { "metadata.rb"  => 'name "bar"
+          cookbook "bar", "1.0.0", { "metadata.rb" => 'name "bar"
 depends "baz"' }
-          cookbook "baz", "1.0.0", { "metadata.rb"  => 'name "baz"
+          cookbook "baz", "1.0.0", { "metadata.rb" => 'name "baz"
 depends "foo"' }
           cookbook "self", "1.0.0", { "metadata.rb" => 'name "self"
 depends "self"' }
@@ -549,7 +549,7 @@ depends "self"' }
             /cookbooks/bar
             /cookbooks/foo
             /cookbooks/self
-EOM
+          EOM
         end
         it "knife deps --tree prints each once" do
           knife("deps --remote --tree /cookbooks/foo /cookbooks/self").should_succeed <<~EOM
@@ -559,7 +559,7 @@ EOM
                   /cookbooks/foo
             /cookbooks/self
               /cookbooks/self
-EOM
+          EOM
         end
       end
       when_the_chef_server "has roles with circular dependencies" do
@@ -575,7 +575,7 @@ EOM
             /roles/bar.json
             /roles/foo.json
             /roles/self.json
-EOM
+          EOM
         end
         it "knife deps --tree prints each once" do
           knife("deps --remote --tree /roles/foo.json /roles/self.json") do

data/spec/integration/knife/diff_spec.rb

@@ -58,7 +58,7 @@ describe "knife diff", :workstation do
             D\t/roles/x.json
             D\t/users/admin.json
             D\t/users/x.json
-EOM
+          EOM
         end
       end
 
@@ -96,13 +96,13 @@ EOM
               {
                 "foo": "bar"
               }
-EOM
+            EOM
           end
 
           it "knife diff reports the role as different" do
             knife("diff --name-status /").should_succeed <<~EOM
               M\t/roles/x.json
-EOM
+            EOM
           end
         end
 
@@ -130,7 +130,7 @@ EOM
               A\t/nodes/y.json
               A\t/roles/y.json
               A\t/users/y.json
-EOM
+            EOM
           end
 
           context "when cwd is the data_bags directory" do
@@ -139,13 +139,13 @@ EOM
               knife("diff --name-status").should_succeed <<~EOM
                 A\tx/z.json
                 A\ty
-EOM
+              EOM
             end
             it "knife diff * reports different data bags" do
               knife("diff --name-status *").should_succeed <<~EOM
                 A\tx/z.json
                 A\ty
-EOM
+              EOM
             end
           end
         end
@@ -161,7 +161,7 @@ EOM
             D\t/nodes
             D\t/roles
             D\t/users
-EOM
+          EOM
         end
       end
     end
@@ -183,14 +183,14 @@ EOM
             M\t/cookbooks/x/metadata.rb
             D\t/cookbooks/x/onlyin1.0.1.rb
             A\t/cookbooks/x/onlyin1.0.0.rb
-EOM
+          EOM
         end
 
         it "knife diff --diff-filter=MAT does not show deleted files" do
           knife("diff --diff-filter=MAT --name-status /cookbooks/x").should_succeed <<~EOM
             M\t/cookbooks/x/metadata.rb
             A\t/cookbooks/x/onlyin1.0.0.rb
-EOM
+          EOM
         end
       end
 
@@ -214,7 +214,7 @@ EOM
             M\t/cookbooks/x/metadata.rb
             D\t/cookbooks/x/onlyin1.0.1.rb
             A\t/cookbooks/x/onlyin1.0.0.rb
-EOM
+          EOM
         end
       end
 
@@ -228,7 +228,7 @@ EOM
             M\t/cookbooks/x/metadata.rb
             D\t/cookbooks/x/onlyin0.9.9.rb
             A\t/cookbooks/x/onlyin1.0.0.rb
-EOM
+          EOM
         end
       end
     end
@@ -309,7 +309,7 @@ EOM
       when_the_repository "has an environment with bad JSON" do
         before { file "environments/x.json", "{" }
         it "knife diff reports an error and does a textual diff" do
-          error_text = "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF"
+          error_text = "WARN: Parse error reading #{path_to("environments/x.json")} as JSON: parse error: premature EOF"
           error_match = Regexp.new(Regexp.escape(error_text))
           knife("diff /environments/x.json").should_succeed(/-  "name": "x"/, stderr: error_match)
         end
@@ -353,7 +353,7 @@ EOM
             D\t/roles/x.json
             D\t/users/admin.json
             D\t/users/x.json
-EOM
+          EOM
         end
       end
 
@@ -390,13 +390,13 @@ EOM
               {
                 "foo": "bar"
               }
-EOM
+            EOM
           end
 
           it "knife diff reports the role as different" do
             knife("diff --name-status /").should_succeed <<~EOM
               M\t/roles/x.json
-EOM
+            EOM
           end
         end
 
@@ -426,7 +426,7 @@ EOM
               A\t/nodes/y.json
               A\t/roles/y.json
               A\t/users/y.json
-EOM
+            EOM
           end
 
           context "when cwd is the data_bags directory" do
@@ -435,13 +435,13 @@ EOM
               knife("diff --name-status").should_succeed <<~EOM
                 A\tx/z.json
                 A\ty
-EOM
+              EOM
             end
             it "knife diff * reports different data bags" do
               knife("diff --name-status *").should_succeed <<~EOM
                 A\tx/z.json
                 A\ty
-EOM
+              EOM
             end
           end
         end
@@ -457,7 +457,7 @@ EOM
             D\t/nodes
             D\t/roles
             D\t/users
-EOM
+          EOM
         end
       end
     end
@@ -477,7 +477,7 @@ EOM
         it "knife diff /cookbooks shows differences" do
           knife("diff --name-status /cookbooks").should_succeed <<~EOM
             D\t/cookbooks/x-1.0.1
-EOM
+          EOM
         end
 
         it "knife diff --diff-filter=MAT does not show deleted files" do
@@ -504,7 +504,7 @@ EOM
           knife("diff --name-status /cookbooks").should_succeed <<~EOM
             D\t/cookbooks/x-1.0.1
             A\t/cookbooks/x-1.0.0
-EOM
+          EOM
         end
       end
 
@@ -517,7 +517,7 @@ EOM
           knife("diff --name-status /cookbooks").should_succeed <<~EOM
             D\t/cookbooks/x-0.9.9
             A\t/cookbooks/x-1.0.0
-EOM
+          EOM
         end
       end
     end
@@ -592,7 +592,7 @@ EOM
       when_the_repository "has an environment with bad JSON" do
         before { file "environments/x.json", "{" }
         it "knife diff reports an error and does a textual diff" do
-          error_text = "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF"
+          error_text = "WARN: Parse error reading #{path_to("environments/x.json")} as JSON: parse error: premature EOF"
           error_match = Regexp.new(Regexp.escape(error_text))
           knife("diff /environments/x.json").should_succeed(/-  "name": "x"/, stderr: error_match)
         end

data/spec/integration/knife/download_spec.rb

@@ -62,7 +62,7 @@ describe "knife download", :workstation do
             Created /roles/x.json
             Created /users/admin.json
             Created /users/x.json
-EOM
+          EOM
           knife("diff --name-status /").should_succeed ""
         end
       end
@@ -110,7 +110,7 @@ EOM
 
                 ]
               }
-EOM
+            EOM
           end
 
           it "knife download changes the role" do
@@ -142,7 +142,7 @@ EOM
 
                 ]
               }
-EOM
+            EOM
           end
 
           it "knife download / does not change anything" do
@@ -176,7 +176,7 @@ EOM
               A\t/nodes/y.json
               A\t/roles/y.json
               A\t/users/y.json
-EOM
+            EOM
           end
 
           it "knife download --purge deletes the extra files" do
@@ -190,7 +190,7 @@ EOM
               Deleted extra entry /nodes/y.json (purge is on)
               Deleted extra entry /roles/y.json (purge is on)
               Deleted extra entry /users/y.json (purge is on)
-EOM
+            EOM
             knife("diff --name-status /").should_succeed ""
           end
         end
@@ -219,7 +219,7 @@ EOM
             Created /users
             Created /users/admin.json
             Created /users/x.json
-EOM
+          EOM
           knife("diff --name-status /").should_succeed ""
         end
 
@@ -245,7 +245,7 @@ EOM
             Created /users
             Created /users/admin.json
             Created /users/x.json
-EOM
+          EOM
           knife("diff --name-status /").should_succeed ""
         end
 
@@ -273,10 +273,10 @@ EOM
             Created /data_bags
             Created /data_bags/x
             Created /data_bags/x/y.json
-EOM
+          EOM
           knife("diff --name-status /data_bags").should_succeed <<~EOM
             D\t/data_bags/x/z.json
-EOM
+          EOM
         end
 
         it "knife download /data_bags/x /data_bags/x/y.json downloads x once" do
@@ -285,7 +285,7 @@ EOM
             Created /data_bags/x
             Created /data_bags/x/y.json
             Created /data_bags/x/z.json
-EOM
+          EOM
         end
       end
     end
@@ -296,17 +296,17 @@ EOM
           {
             "id": "deleted"
           }
-EOM
+        EOM
         file "data_bags/x/modified.json", <<~EOM
           {
             "id": "modified"
           }
-EOM
+        EOM
         file "data_bags/x/unmodified.json", <<~EOM
           {
             "id": "unmodified"
           }
-EOM
+        EOM
       end
 
       when_the_chef_server "has a modified, unmodified, added and deleted data bag item" do
@@ -321,11 +321,11 @@ EOM
         it "knife download of the modified file succeeds" do
           knife("download /data_bags/x/modified.json").should_succeed <<~EOM
             Updated /data_bags/x/modified.json
-EOM
+          EOM
           knife("diff --name-status /data_bags").should_succeed <<~EOM
             D\t/data_bags/x/added.json
             A\t/data_bags/x/deleted.json
-EOM
+          EOM
         end
         it "knife download of the unmodified file does nothing" do
           knife("download /data_bags/x/unmodified.json").should_succeed ""
@@ -333,16 +333,16 @@ EOM
             D\t/data_bags/x/added.json
             M\t/data_bags/x/modified.json
             A\t/data_bags/x/deleted.json
-EOM
+          EOM
         end
         it "knife download of the added file succeeds" do
           knife("download /data_bags/x/added.json").should_succeed <<~EOM
             Created /data_bags/x/added.json
-EOM
+          EOM
           knife("diff --name-status /data_bags").should_succeed <<~EOM
             M\t/data_bags/x/modified.json
             A\t/data_bags/x/deleted.json
-EOM
+          EOM
         end
         it "knife download of the deleted file does nothing" do
           knife("download /data_bags/x/deleted.json").should_succeed ""
@@ -350,32 +350,32 @@ EOM
             D\t/data_bags/x/added.json
             M\t/data_bags/x/modified.json
             A\t/data_bags/x/deleted.json
-EOM
+          EOM
         end
         it "knife download --purge of the deleted file deletes it" do
           knife("download --purge /data_bags/x/deleted.json").should_succeed <<~EOM
             Deleted extra entry /data_bags/x/deleted.json (purge is on)
-EOM
+          EOM
           knife("diff --name-status /data_bags").should_succeed <<~EOM
             D\t/data_bags/x/added.json
             M\t/data_bags/x/modified.json
-EOM
+          EOM
         end
         it "knife download of the entire data bag downloads everything" do
           knife("download /data_bags/x").should_succeed <<~EOM
             Created /data_bags/x/added.json
             Updated /data_bags/x/modified.json
-EOM
+          EOM
           knife("diff --name-status /data_bags").should_succeed <<~EOM
             A\t/data_bags/x/deleted.json
-EOM
+          EOM
         end
         it "knife download --purge of the entire data bag downloads everything" do
           knife("download --purge /data_bags/x").should_succeed <<~EOM
             Created /data_bags/x/added.json
             Updated /data_bags/x/modified.json
             Deleted extra entry /data_bags/x/deleted.json (purge is on)
-EOM
+          EOM
           knife("diff --name-status /data_bags").should_succeed ""
         end
         context "when cwd is the /data_bags directory" do
@@ -390,7 +390,7 @@ EOM
               Created x/added.json
               Updated x/modified.json
               Deleted extra entry x/deleted.json (purge is on)
-EOM
+            EOM
             knife("diff --name-status /data_bags").should_succeed ""
           end
           it "knife download --purge * downloads everything" do
@@ -398,7 +398,7 @@ EOM
               Created x/added.json
               Updated x/modified.json
               Deleted extra entry x/deleted.json (purge is on)
-EOM
+            EOM
             knife("diff --name-status /data_bags").should_succeed ""
           end
         end
@@ -421,7 +421,7 @@ EOM
           knife("diff --name-status /cookbooks").should_succeed <<~EOM
             D\t/cookbooks/x/y.rb
             A\t/cookbooks/x/z.rb
-EOM
+          EOM
         end
         it "knife download of a deleted file does nothing" do
           knife("download /cookbooks/x/z.rb").should_succeed ""
@@ -429,37 +429,37 @@ EOM
             M\t/cookbooks/x/metadata.rb
             D\t/cookbooks/x/y.rb
             A\t/cookbooks/x/z.rb
-EOM
+          EOM
         end
         it "knife download --purge of a deleted file succeeds" do
           knife("download --purge /cookbooks/x/z.rb").should_succeed "Deleted extra entry /cookbooks/x/z.rb (purge is on)\n"
           knife("diff --name-status /cookbooks").should_succeed <<~EOM
             M\t/cookbooks/x/metadata.rb
             D\t/cookbooks/x/y.rb
-EOM
+          EOM
         end
         it "knife download of an added file succeeds" do
           knife("download /cookbooks/x/y.rb").should_succeed "Created /cookbooks/x/y.rb\n"
           knife("diff --name-status /cookbooks").should_succeed <<~EOM
             M\t/cookbooks/x/metadata.rb
             A\t/cookbooks/x/z.rb
-EOM
+          EOM
         end
         it "knife download of the cookbook itself succeeds" do
           knife("download /cookbooks/x").should_succeed <<~EOM
             Updated /cookbooks/x/metadata.rb
             Created /cookbooks/x/y.rb
-EOM
+          EOM
           knife("diff --name-status /cookbooks").should_succeed <<~EOM
             A\t/cookbooks/x/z.rb
-EOM
+          EOM
         end
         it "knife download --purge of the cookbook itself succeeds" do
           knife("download --purge /cookbooks/x").should_succeed <<~EOM
             Updated /cookbooks/x/metadata.rb
             Created /cookbooks/x/y.rb
             Deleted extra entry /cookbooks/x/z.rb (purge is on)
-EOM
+          EOM
           knife("diff --name-status /cookbooks").should_succeed ""
         end
       end
@@ -482,7 +482,7 @@ EOM
             Updated /cookbooks/x/metadata.rb
             Created /cookbooks/x/onlyin1.0.1.rb
             Deleted extra entry /cookbooks/x/onlyin1.0.0.rb (purge is on)
-EOM
+          EOM
           knife("diff --name-status /cookbooks").should_succeed ""
         end
       end
@@ -496,7 +496,7 @@ EOM
         it "knife download /cookbooks/x downloads the updated file" do
           knife("download --purge /cookbooks/x").should_succeed <<~EOM
             Updated /cookbooks/x/onlyin1.0.0.rb
-EOM
+          EOM
           knife("diff --name-status /cookbooks").should_succeed ""
         end
       end
@@ -511,7 +511,7 @@ EOM
             Updated /cookbooks/x/metadata.rb
             Created /cookbooks/x/onlyin1.0.1.rb
             Deleted extra entry /cookbooks/x/onlyin1.0.0.rb (purge is on)
-EOM
+          EOM
           knife("diff --name-status /cookbooks").should_succeed ""
         end
       end
@@ -526,7 +526,7 @@ EOM
             Updated /cookbooks/x/metadata.rb
             Created /cookbooks/x/onlyin0.9.9.rb
             Deleted extra entry /cookbooks/x/onlyin1.0.0.rb (purge is on)
-EOM
+          EOM
           knife("diff --name-status /cookbooks").should_succeed ""
         end
       end
@@ -541,7 +541,7 @@ EOM
           file "roles/x.rb", <<~EOM
             name "x"
             description "x"
-EOM
+          EOM
         end
 
         it "knife download refuses to change the role" do
@@ -561,11 +561,11 @@ EOM
         end
         it "knife download succeeds" do
           warning = <<~EOH
-            WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF
+            WARN: Parse error reading #{path_to("environments/x.json")} as JSON: parse error: premature EOF
                                                    {
                                  (right here) ------^
 
-EOH
+          EOH
           knife("download /environments/x.json").should_succeed "Updated /environments/x.json\n", stderr: warning
           knife("diff --name-status /environments/x.json").should_succeed ""
         end
@@ -631,7 +631,7 @@ EOH
             Created /roles/x.json
             Created /users/admin.json
             Created /users/x.json
-EOM
+          EOM
           knife("diff --name-status /").should_succeed ""
         end
       end
@@ -690,7 +690,7 @@ EOM
 
                 ]
               }
-EOM
+            EOM
           end
 
           it "knife download / does not change anything" do
@@ -726,7 +726,7 @@ EOM
               A\t/nodes/y.json
               A\t/roles/y.json
               A\t/users/y.json
-EOM
+            EOM
           end
 
           it "knife download --purge deletes the extra files" do
@@ -741,7 +741,7 @@ EOM
               Deleted extra entry /nodes/y.json (purge is on)
               Deleted extra entry /roles/y.json (purge is on)
               Deleted extra entry /users/y.json (purge is on)
-EOM
+            EOM
             knife("diff --name-status /").should_succeed ""
           end
         end
@@ -770,7 +770,7 @@ EOM
             Created /users
             Created /users/admin.json
             Created /users/x.json
-EOM
+          EOM
           knife("diff --name-status /").should_succeed ""
         end
 
@@ -797,10 +797,10 @@ EOM
             Created /data_bags
             Created /data_bags/x
             Created /data_bags/x/y.json
-EOM
+          EOM
           knife("diff --name-status /data_bags").should_succeed <<~EOM
             D\t/data_bags/x/z.json
-EOM
+          EOM
         end
       end
     end
@@ -811,17 +811,17 @@ EOM
           {
             "id": "deleted"
           }
-EOM
+        EOM
         file "data_bags/x/modified.json", <<~EOM
           {
             "id": "modified"
           }
-EOM
+        EOM
         file "data_bags/x/unmodified.json", <<~EOM
           {
             "id": "unmodified"
           }
-EOM
+        EOM
       end
 
       when_the_chef_server "has a modified, unmodified, added and deleted data bag item" do
@@ -836,11 +836,11 @@ EOM
         it "knife download of the modified file succeeds" do
           knife("download /data_bags/x/modified.json").should_succeed <<~EOM
             Updated /data_bags/x/modified.json
-EOM
+          EOM
           knife("diff --name-status /data_bags").should_succeed <<~EOM
             D\t/data_bags/x/added.json
             A\t/data_bags/x/deleted.json
-EOM
+          EOM
         end
         it "knife download of the unmodified file does nothing" do
           knife("download /data_bags/x/unmodified.json").should_succeed ""
@@ -848,16 +848,16 @@ EOM
             D\t/data_bags/x/added.json
             M\t/data_bags/x/modified.json
             A\t/data_bags/x/deleted.json
-EOM
+          EOM
         end
         it "knife download of the added file succeeds" do
           knife("download /data_bags/x/added.json").should_succeed <<~EOM
             Created /data_bags/x/added.json
-EOM
+          EOM
           knife("diff --name-status /data_bags").should_succeed <<~EOM
             M\t/data_bags/x/modified.json
             A\t/data_bags/x/deleted.json
-EOM
+          EOM
         end
         it "knife download of the deleted file does nothing" do
           knife("download /data_bags/x/deleted.json").should_succeed ""
@@ -865,32 +865,32 @@ EOM
             D\t/data_bags/x/added.json
             M\t/data_bags/x/modified.json
             A\t/data_bags/x/deleted.json
-EOM
+          EOM
         end
         it "knife download --purge of the deleted file deletes it" do
           knife("download --purge /data_bags/x/deleted.json").should_succeed <<~EOM
             Deleted extra entry /data_bags/x/deleted.json (purge is on)
-EOM
+          EOM
           knife("diff --name-status /data_bags").should_succeed <<~EOM
             D\t/data_bags/x/added.json
             M\t/data_bags/x/modified.json
-EOM
+          EOM
         end
         it "knife download of the entire data bag downloads everything" do
           knife("download /data_bags/x").should_succeed <<~EOM
             Created /data_bags/x/added.json
             Updated /data_bags/x/modified.json
-EOM
+          EOM
           knife("diff --name-status /data_bags").should_succeed <<~EOM
             A\t/data_bags/x/deleted.json
-EOM
+          EOM
         end
         it "knife download --purge of the entire data bag downloads everything" do
           knife("download --purge /data_bags/x").should_succeed <<~EOM
             Created /data_bags/x/added.json
             Updated /data_bags/x/modified.json
             Deleted extra entry /data_bags/x/deleted.json (purge is on)
-EOM
+          EOM
           knife("diff --name-status /data_bags").should_succeed ""
         end
         context "when cwd is the /data_bags directory" do
@@ -905,7 +905,7 @@ EOM
               Created x/added.json
               Updated x/modified.json
               Deleted extra entry x/deleted.json (purge is on)
-EOM
+            EOM
             knife("diff --name-status /data_bags").should_succeed ""
           end
           it "knife download --purge * downloads everything" do
@@ -913,7 +913,7 @@ EOM
               Created x/added.json
               Updated x/modified.json
               Deleted extra entry x/deleted.json (purge is on)
-EOM
+            EOM
             knife("diff --name-status /data_bags").should_succeed ""
           end
         end
@@ -936,7 +936,7 @@ EOM
           knife("diff --name-status /cookbooks").should_succeed <<~EOM
             D\t/cookbooks/x-1.0.0/y.rb
             A\t/cookbooks/x-1.0.0/z.rb
-EOM
+          EOM
         end
         it "knife download of a deleted file does nothing" do
           knife("download /cookbooks/x-1.0.0/z.rb").should_succeed ""
@@ -944,37 +944,37 @@ EOM
             M\t/cookbooks/x-1.0.0/metadata.rb
             D\t/cookbooks/x-1.0.0/y.rb
             A\t/cookbooks/x-1.0.0/z.rb
-EOM
+          EOM
         end
         it "knife download --purge of a deleted file succeeds" do
           knife("download --purge /cookbooks/x-1.0.0/z.rb").should_succeed "Deleted extra entry /cookbooks/x-1.0.0/z.rb (purge is on)\n"
           knife("diff --name-status /cookbooks").should_succeed <<~EOM
             M\t/cookbooks/x-1.0.0/metadata.rb
             D\t/cookbooks/x-1.0.0/y.rb
-EOM
+          EOM
         end
         it "knife download of an added file succeeds" do
           knife("download /cookbooks/x-1.0.0/y.rb").should_succeed "Created /cookbooks/x-1.0.0/y.rb\n"
           knife("diff --name-status /cookbooks").should_succeed <<~EOM
             M\t/cookbooks/x-1.0.0/metadata.rb
             A\t/cookbooks/x-1.0.0/z.rb
-EOM
+          EOM
         end
         it "knife download of the cookbook itself succeeds" do
           knife("download /cookbooks/x-1.0.0").should_succeed <<~EOM
             Updated /cookbooks/x-1.0.0/metadata.rb
             Created /cookbooks/x-1.0.0/y.rb
-EOM
+          EOM
           knife("diff --name-status /cookbooks").should_succeed <<~EOM
             A\t/cookbooks/x-1.0.0/z.rb
-EOM
+          EOM
         end
         it "knife download --purge of the cookbook itself succeeds" do
           knife("download --purge /cookbooks/x-1.0.0").should_succeed <<~EOM
             Updated /cookbooks/x-1.0.0/metadata.rb
             Created /cookbooks/x-1.0.0/y.rb
             Deleted extra entry /cookbooks/x-1.0.0/z.rb (purge is on)
-EOM
+          EOM
           knife("diff --name-status /cookbooks").should_succeed ""
         end
       end
@@ -998,7 +998,7 @@ EOM
             Created /cookbooks/x-1.0.1
             Created /cookbooks/x-1.0.1/metadata.rb
             Created /cookbooks/x-1.0.1/onlyin1.0.1.rb
-EOM
+          EOM
           knife("diff --name-status /cookbooks").should_succeed ""
         end
       end
@@ -1015,7 +1015,7 @@ EOM
             Created /cookbooks/x-0.9.9/metadata.rb
             Created /cookbooks/x-0.9.9/onlyin0.9.9.rb
             Updated /cookbooks/x-1.0.0/onlyin1.0.0.rb
-EOM
+          EOM
           knife("diff --name-status /cookbooks").should_succeed ""
         end
       end
@@ -1031,7 +1031,7 @@ EOM
             Created /cookbooks/x-1.0.1/metadata.rb
             Created /cookbooks/x-1.0.1/onlyin1.0.1.rb
             Deleted extra entry /cookbooks/x-1.0.0 (purge is on)
-EOM
+          EOM
           knife("diff --name-status /cookbooks").should_succeed ""
         end
       end
@@ -1047,7 +1047,7 @@ EOM
             Created /cookbooks/x-0.9.9/metadata.rb
             Created /cookbooks/x-0.9.9/onlyin0.9.9.rb
             Deleted extra entry /cookbooks/x-1.0.0 (purge is on)
-EOM
+          EOM
           knife("diff --name-status /cookbooks").should_succeed ""
         end
       end
@@ -1106,7 +1106,7 @@ EOM
           Created /cookbooks
           Created /cookbooks/x
           Created /cookbooks/x/metadata.rb
-EOM
+        EOM
       end
     end
   end
@@ -1189,7 +1189,7 @@ EOM
           Created /policies
           Created /policy_groups
           Created /roles
-EOM
+        EOM
       end
 
       context "and the server has one of each thing" do
@@ -1232,7 +1232,7 @@ EOM
             Created /acls/roles/x.json
             Updated /groups/clients.json
             Updated /groups/users.json
-EOM
+          EOM
         end
 
         it "knife download / downloads everything" do
@@ -1254,7 +1254,7 @@ EOM
             Created /policies/x-1.0.0.json
             Created /policy_groups/x.json
             Created /roles/x.json
-EOM
+          EOM
           knife("diff --name-status /").should_succeed ""
         end
 
@@ -1323,7 +1323,7 @@ EOM
               Updated /policies/x-1.0.0.json
               Updated /policy_groups/x.json
               Updated /roles/x.json
-EOM
+            EOM
             knife("diff --name-status /").should_succeed ""
           end
         end