chef-dk 3.3.23 → 3.4.38

data/spec/unit/command/show_policy_spec.rb

@@ -188,9 +188,9 @@ describe ChefDK::Command::ShowPolicy do
       it "prints a debugging message and exits non-zero" do
         expect(command.run([])).to eq(1)
 
-        expected_output = <<-E
-Error: Failed to list policies
-Reason: (StandardError) some operation failed
+        expected_output = <<~E
+          Error: Failed to list policies
+          Reason: (StandardError) some operation failed
 
 E
 
@@ -203,9 +203,9 @@ E
 
           command.run(%w{ -D })
 
-          expected_output = <<-E
-Error: Failed to list policies
-Reason: (StandardError) some operation failed
+          expected_output = <<~E
+            Error: Failed to list policies
+            Reason: (StandardError) some operation failed
 
 
 E

data/spec/unit/command/undelete_spec.rb

@@ -196,9 +196,9 @@ describe ChefDK::Command::Undelete do
       it "prints a debugging message and exits non-zero" do
         expect(command.run(params)).to eq(1)
 
-        expected_output = <<-E
-Error: Failed to undelete.
-Reason: (StandardError) some operation failed
+        expected_output = <<~E
+          Error: Failed to undelete.
+          Reason: (StandardError) some operation failed
 
 E
 
@@ -211,9 +211,9 @@ E
 
           command.run(params + %w{ -D })
 
-          expected_output = <<-E
-Error: Failed to undelete.
-Reason: (StandardError) some operation failed
+          expected_output = <<~E
+            Error: Failed to undelete.
+            Reason: (StandardError) some operation failed
 
 
 E

data/spec/unit/command/update_spec.rb

@@ -63,9 +63,9 @@ describe ChefDK::Command::Update do
     end
 
     it "loads the config from the given path" do
-      expect(Chef::WorkstationConfigLoader).to receive(:new).
-        with("~/.chef/alternate_config.rb").
-        and_return(chef_config_loader)
+      expect(Chef::WorkstationConfigLoader).to receive(:new)
+        .with("~/.chef/alternate_config.rb")
+        .and_return(chef_config_loader)
       expect(chef_config_loader).to receive(:load)
       expect(command.chef_config).to eq(Chef::Config)
     end
@@ -81,9 +81,9 @@ describe ChefDK::Command::Update do
     end
 
     it "creates an attributes update service object" do
-      expect(ChefDK::PolicyfileServices::UpdateAttributes).to receive(:new).
-        with(policyfile: nil, ui: command.ui, root_dir: Dir.pwd, chef_config: anything).
-        and_return(update_attrs_service)
+      expect(ChefDK::PolicyfileServices::UpdateAttributes).to receive(:new)
+        .with(policyfile: nil, ui: command.ui, root_dir: Dir.pwd, chef_config: anything)
+        .and_return(update_attrs_service)
       expect(command.attributes_updater).to eq(update_attrs_service)
     end
   end
@@ -95,9 +95,9 @@ describe ChefDK::Command::Update do
     end
 
     it "creates the installer service with a `nil` policyfile path" do
-      expect(ChefDK::PolicyfileServices::Install).to receive(:new).
-        with(policyfile: nil, ui: command.ui, root_dir: Dir.pwd, config: Chef::Config, overwrite: true).
-        and_return(install_service)
+      expect(ChefDK::PolicyfileServices::Install).to receive(:new)
+        .with(policyfile: nil, ui: command.ui, root_dir: Dir.pwd, config: Chef::Config, overwrite: true)
+        .and_return(install_service)
       expect(command.installer).to eq(install_service)
     end
 
@@ -112,9 +112,9 @@ describe ChefDK::Command::Update do
     end
 
     it "creates the installer service with the specified policyfile path" do
-      expect(ChefDK::PolicyfileServices::Install).to receive(:new).
-        with(policyfile: "MyPolicy.rb", ui: command.ui, root_dir: Dir.pwd, config: Chef::Config, overwrite: true).
-        and_return(install_service)
+      expect(ChefDK::PolicyfileServices::Install).to receive(:new)
+        .with(policyfile: "MyPolicy.rb", ui: command.ui, root_dir: Dir.pwd, config: Chef::Config, overwrite: true)
+        .and_return(install_service)
       expect(command.installer).to eq(install_service)
     end
 
@@ -132,9 +132,9 @@ describe ChefDK::Command::Update do
     context "when the command is successful" do
       before do
         expect(install_service).to receive(:run)
-        expect(ChefDK::PolicyfileServices::UpdateAttributes).to receive(:new).
-          with(policyfile: nil, ui: command.ui, root_dir: Dir.pwd, chef_config: anything).
-          and_return(update_attrs_service)
+        expect(ChefDK::PolicyfileServices::UpdateAttributes).to receive(:new)
+          .with(policyfile: nil, ui: command.ui, root_dir: Dir.pwd, chef_config: anything)
+          .and_return(update_attrs_service)
         expect(update_attrs_service).to receive(:run)
       end
 
@@ -159,9 +159,9 @@ describe ChefDK::Command::Update do
 
       before do
         expect(install_service).to receive(:run).and_raise(exception)
-        expect(ChefDK::PolicyfileServices::UpdateAttributes).to receive(:new).
-          with(policyfile: nil, ui: command.ui, root_dir: Dir.pwd, chef_config: anything).
-          and_return(update_attrs_service)
+        expect(ChefDK::PolicyfileServices::UpdateAttributes).to receive(:new)
+          .with(policyfile: nil, ui: command.ui, root_dir: Dir.pwd, chef_config: anything)
+          .and_return(update_attrs_service)
         expect(update_attrs_service).to receive(:run)
       end
 
@@ -170,9 +170,9 @@ describe ChefDK::Command::Update do
       end
 
       it "displays the exception and cause" do
-        expected_error_text = <<-E
-Error: install failed
-Reason: (StandardError) some operation failed
+        expected_error_text = <<~E
+          Error: install failed
+          Reason: (StandardError) some operation failed
 
 E
 
@@ -185,9 +185,9 @@ E
         let(:params) { ["-D"] }
 
         it "displays the exception and cause with backtrace" do
-          expected_error_text = <<-E
-Error: install failed
-Reason: (StandardError) some operation failed
+          expected_error_text = <<~E
+            Error: install failed
+            Reason: (StandardError) some operation failed
 
 
 E
@@ -248,9 +248,9 @@ E
       end
 
       it "displays the exception and cause" do
-        expected_error_text = <<-E
-Error: Failed to update Policyfile lock
-Reason: (StandardError) some operation failed
+        expected_error_text = <<~E
+          Error: Failed to update Policyfile lock
+          Reason: (StandardError) some operation failed
 
 E
 
@@ -263,9 +263,9 @@ E
         let(:params) { ["-a", "-D"] }
 
         it "displays the exception and cause with backtrace" do
-          expected_error_text = <<-E
-Error: Failed to update Policyfile lock
-Reason: (StandardError) some operation failed
+          expected_error_text = <<~E
+            Error: Failed to update Policyfile lock
+            Reason: (StandardError) some operation failed
 
 
 E

data/spec/unit/fixtures/command/cli_test_command.rb

@@ -17,7 +17,7 @@ module ChefDK
       end
 
       def run(params)
-        self.class.test_result = { :status => :success, :params => params }
+        self.class.test_result = { status: :success, params: params }
         23
       end
 

data/spec/unit/policyfile/chef_server_lock_fetcher_spec.rb

@@ -23,42 +23,42 @@ describe ChefDK::Policyfile::ChefServerLockFetcher do
   let(:revision_id) { "6fe753184c8946052d3231bb4212116df28d89a3a5f7ae52832ad408419dd5eb" }
   let(:identifier) { "fab501cfaf747901bd82c1bc706beae7dc3a350c" }
   let(:minimal_lockfile_json) do
-    <<-E
-{
-  "revision_id": "#{revision_id}",
-  "name": "install-example",
-  "run_list": [
-    "recipe[local-cookbook::default]"
-  ],
-  "cookbook_locks": {
-    "local-cookbook": {
-      "version": "2.3.4",
-      "identifier": "#{identifier}",
-      "dotted_decimal_identifier": "70567763561641081.489844270461035.258281553147148",
-      "source": "cookbooks/local-cookbook",
-      "cache_key": null,
-      "scm_info": null,
-      "source_options": {
-        "path": "cookbooks/local-cookbook"
+    <<~E
+      {
+        "revision_id": "#{revision_id}",
+        "name": "install-example",
+        "run_list": [
+          "recipe[local-cookbook::default]"
+        ],
+        "cookbook_locks": {
+          "local-cookbook": {
+            "version": "2.3.4",
+            "identifier": "#{identifier}",
+            "dotted_decimal_identifier": "70567763561641081.489844270461035.258281553147148",
+            "source": "cookbooks/local-cookbook",
+            "cache_key": null,
+            "scm_info": null,
+            "source_options": {
+              "path": "cookbooks/local-cookbook"
+            }
+          }
+        },
+        "default_attributes": {},
+        "override_attributes": {},
+        "solution_dependencies": {
+          "Policyfile": [
+            [
+              "local-cookbook",
+              ">= 0.0.0"
+            ]
+          ],
+          "dependencies": {
+            "local-cookbook (2.3.4)": [
+
+            ]
+          }
+        }
       }
-    }
-  },
-  "default_attributes": {},
-  "override_attributes": {},
-  "solution_dependencies": {
-    "Policyfile": [
-      [
-        "local-cookbook",
-        ">= 0.0.0"
-      ]
-    ],
-    "dependencies": {
-      "local-cookbook (2.3.4)": [
-
-      ]
-    }
-  }
-}
 E
   end
 
@@ -104,8 +104,8 @@ E
     end
 
     it "calls the chef server to get the policy" do
-      expect(http_client).to receive(:get).with("policies/#{policy_name}/revisions/#{policy_revision_id}").
-        and_return(minimal_lockfile)
+      expect(http_client).to receive(:get).with("policies/#{policy_name}/revisions/#{policy_revision_id}")
+        .and_return(minimal_lockfile)
       expect(fetcher.lock_data).to eq(minimal_lockfile_modified)
     end
 
@@ -118,8 +118,8 @@ E
       end
 
       it "calls the chef server to get the policy with the dsl name" do
-        expect(http_client).to receive(:get).with("policies/#{policy_name}/revisions/#{policy_revision_id}").
-          and_return(minimal_lockfile)
+        expect(http_client).to receive(:get).with("policies/#{policy_name}/revisions/#{policy_revision_id}")
+          .and_return(minimal_lockfile)
         expect(fetcher.lock_data).to eq(minimal_lockfile_modified)
       end
     end
@@ -139,8 +139,8 @@ E
     end
 
     it "calls the chef server to get the policy" do
-      expect(http_client).to receive(:get).with("policy_groups/#{policy_group}/policies/#{policy_name}").
-        and_return(minimal_lockfile)
+      expect(http_client).to receive(:get).with("policy_groups/#{policy_group}/policies/#{policy_name}")
+        .and_return(minimal_lockfile)
       expect(fetcher.lock_data).to eq(minimal_lockfile_modified)
     end
 

data/spec/unit/policyfile/comparison_base_spec.rb

@@ -21,42 +21,42 @@ require "chef-dk/policyfile/comparison_base"
 describe "Policyfile Comparison Bases" do
 
   let(:minimal_lockfile_json) do
-    <<-E
-{
-  "revision_id": "6fe753184c8946052d3231bb4212116df28d89a3a5f7ae52832ad408419dd5eb",
-  "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": null,
-      "scm_info": null,
-      "source_options": {
-        "path": "cookbooks/local-cookbook"
+    <<~E
+      {
+        "revision_id": "6fe753184c8946052d3231bb4212116df28d89a3a5f7ae52832ad408419dd5eb",
+        "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": null,
+            "scm_info": null,
+            "source_options": {
+              "path": "cookbooks/local-cookbook"
+            }
+          }
+        },
+        "default_attributes": {},
+        "override_attributes": {},
+        "solution_dependencies": {
+          "Policyfile": [
+            [
+              "local-cookbook",
+              ">= 0.0.0"
+            ]
+          ],
+          "dependencies": {
+            "local-cookbook (2.3.4)": [
+
+            ]
+          }
+        }
       }
-    }
-  },
-  "default_attributes": {},
-  "override_attributes": {},
-  "solution_dependencies": {
-    "Policyfile": [
-      [
-        "local-cookbook",
-        ">= 0.0.0"
-      ]
-    ],
-    "dependencies": {
-      "local-cookbook (2.3.4)": [
-
-      ]
-    }
-  }
-}
 E
   end
 
@@ -325,9 +325,9 @@ E
     context "when the policyfile lock is fetched from the server" do
 
       before do
-        expect(http_client).to receive(:get).
-          with("policy_groups/acceptance/policies/chatserver").
-          and_return(minimal_lockfile)
+        expect(http_client).to receive(:get)
+          .with("policy_groups/acceptance/policies/chatserver")
+          .and_return(minimal_lockfile)
       end
 
       it "returns the policyfile lock data" do

data/spec/unit/policyfile/cookbook_locks_spec.rb

@@ -74,7 +74,7 @@ shared_examples_for "Cookbook Lock" do
       cookbook_lock.identifier = "my-opaque-id"
       cookbook_lock.dotted_decimal_identifier = "123.456.789"
       cookbook_lock.version = "1.2.3"
-      cookbook_lock.source_options = { :sourcekey => "location info" }
+      cookbook_lock.source_options = { sourcekey: "location info" }
     end
 
     it "includes the identifier in the lock data" do
@@ -90,7 +90,7 @@ shared_examples_for "Cookbook Lock" do
     end
 
     it "includes the source_options in lock data" do
-      expect(cookbook_lock_data["source_options"]).to eq({ :sourcekey => "location info" })
+      expect(cookbook_lock_data["source_options"]).to eq({ sourcekey: "location info" })
     end
 
     it "creates a CookbookLocationSpecification with the source and version data" do
@@ -449,7 +449,7 @@ describe ChefDK::Policyfile::ArchivedCookbook do
         # when getting the cookbook location spec, source options needs to have
         # symbolic keys, so a round trip via LocalCookbook#build_from_lock_data
         # will result in this being a symbol
-        :path => "../my_repo/nginx",
+        path: "../my_repo/nginx",
       },
       "cache_key" => nil,
       "scm_info" => {},

data/spec/unit/policyfile/differ_spec.rb

@@ -21,215 +21,215 @@ require "chef-dk/policyfile/differ"
 describe ChefDK::Policyfile::Differ do
 
   let(:old_lock_json) do
-    <<-E
-{
-  "revision_id": "cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b",
-  "name": "jenkins",
-  "run_list": [
-    "recipe[java::default]",
-    "recipe[jenkins::master]",
-    "recipe[policyfile_demo::whatever]",
-    "recipe[policyfile_demo::default]"
-  ],
-  "named_run_lists": {
-    "update_jenkins": [
-      "recipe[jenkins::master]",
-      "recipe[policyfile_demo::default]"
-    ]
-  },
-  "cookbook_locks": {
-    "policyfile_demo": {
-      "version": "0.1.0",
-      "identifier": "ea96c99da079db9ff3cb22601638fabd5df49599",
-      "dotted_decimal_identifier": "66030937227426267.45022575077627448.275691232073113",
-      "source": "cookbooks/policyfile_demo",
-      "cache_key": null,
-      "scm_info": {
-        "scm": "git",
-        "remote": "git@github.com:danielsdeleo/policyfile-jenkins-demo.git",
-        "revision": "6f92fe8f24fd953a1c40ebb1d7cdb2a4fbbf4d4d",
-        "working_tree_clean": false,
-        "published": true,
-        "synchronized_remote_branches": [
-          "mine/master"
-        ]
-      },
-      "source_options": {
-        "path": "cookbooks/policyfile_demo"
-      }
-    },
-    "apt": {
-      "version": "2.7.0",
-      "identifier": "16c57abbd056543f7d5a15dabbb03261024a9c5e",
-      "dotted_decimal_identifier": "6409580415309396.17870749399956400.55392231660638",
-      "cache_key": "apt-2.7.0-supermarket.chef.io",
-      "origin": "https://supermarket.chef.io/api/v1/cookbooks/apt/versions/2.7.0/download",
-      "source_options": {
-        "artifactserver": "https://supermarket.chef.io/api/v1/cookbooks/apt/versions/2.7.0/download",
-        "version": "2.7.0"
-      }
-    },
-    "java": {
-      "version": "1.31.0",
-      "identifier": "9178a38ad3e3baa55b49c1b8d9f4bf6a43dbc358",
-      "dotted_decimal_identifier": "40946515427189690.46543743498115572.210463125914456",
-      "cache_key": "java-1.31.0-supermarket.chef.io",
-      "origin": "https://supermarket.chef.io/api/v1/cookbooks/java/versions/1.31.0/download",
-      "source_options": {
-        "artifactserver": "https://supermarket.chef.io/api/v1/cookbooks/java/versions/1.31.0/download",
-        "version": "1.31.0"
-      }
-    },
-    "jenkins": {
-      "version": "2.2.2",
-      "identifier": "0be380429add00d189b4431059ac967a60052323",
-      "dotted_decimal_identifier": "3346364756581632.58979677444790700.165452341125923",
-      "cache_key": "jenkins-2.2.2-supermarket.chef.io",
-      "origin": "https://supermarket.chef.io/api/v1/cookbooks/jenkins/versions/2.2.2/download",
-      "source_options": {
-        "artifactserver": "https://supermarket.chef.io/api/v1/cookbooks/jenkins/versions/2.2.2/download",
-        "version": "2.2.2"
-      }
-    },
-    "runit": {
-      "version": "1.5.18",
-      "identifier": "1a0aeb2c167a24e0c5120ca7b06ba8c4cff4610c",
-      "dotted_decimal_identifier": "7330354567739940.63267076095586411.185563255955724",
-      "cache_key": "runit-1.5.18-supermarket.chef.io",
-      "origin": "https://supermarket.chef.io/api/v1/cookbooks/runit/versions/1.5.18/download",
-      "source_options": {
-        "artifactserver": "https://supermarket.chef.io/api/v1/cookbooks/runit/versions/1.5.18/download",
-        "version": "1.5.18"
-      }
-    },
-    "build-essential": {
-      "version": "2.2.2",
-      "identifier": "d8ce58401d154378599b0fead81d2c390615602b",
-      "dotted_decimal_identifier": "61025473397593411.33875519727130653.48623426822187",
-      "cache_key": "build-essential-2.2.2-supermarket.chef.io",
-      "origin": "https://supermarket.chef.io/api/v1/cookbooks/build-essential/versions/2.2.2/download",
-      "source_options": {
-        "artifactserver": "https://supermarket.chef.io/api/v1/cookbooks/build-essential/versions/2.2.2/download",
-        "version": "2.2.2"
-      }
-    },
-    "yum": {
-      "version": "3.5.4",
-      "identifier": "f9c778c3cd3908071e0c55722682f96e653b5642",
-      "dotted_decimal_identifier": "70306590695962888.2003363158959746.274252540106306",
-      "cache_key": "yum-3.5.4-supermarket.chef.io",
-      "origin": "https://supermarket.chef.io/api/v1/cookbooks/yum/versions/3.5.4/download",
-      "source_options": {
-        "artifactserver": "https://supermarket.chef.io/api/v1/cookbooks/yum/versions/3.5.4/download",
-        "version": "3.5.4"
-      }
-    },
-    "yum-epel": {
-      "version": "0.6.0",
-      "identifier": "cd74f541ba0341abcc168c74471c349ca68f77b7",
-      "dotted_decimal_identifier": "57830966944203585.48356618235299612.57847413962679",
-      "cache_key": "yum-epel-0.6.0-supermarket.chef.io",
-      "origin": "https://supermarket.chef.io/api/v1/cookbooks/yum-epel/versions/0.6.0/download",
-      "source_options": {
-        "artifactserver": "https://supermarket.chef.io/api/v1/cookbooks/yum-epel/versions/0.6.0/download",
-        "version": "0.6.0"
-      }
-    }
-  },
-  "default_attributes": {
-    "greeting": "Attributes, f*** yeah"
-  },
-  "override_attributes": {
-    "attr_only_updating": "use -a"
-  },
-  "solution_dependencies": {
-    "Policyfile": [
-      [
-        "policyfile_demo",
-        ">= 0.0.0"
-      ],
-      [
-        "apt",
-        "= 2.7.0"
-      ],
-      [
-        "java",
-        "= 1.31.0"
-      ],
-      [
-        "jenkins",
-        "= 2.2.2"
-      ],
-      [
-        "runit",
-        "= 1.5.18"
-      ],
-      [
-        "build-essential",
-        "= 2.2.2"
-      ],
-      [
-        "yum",
-        "= 3.5.4"
-      ],
-      [
-        "yum-epel",
-        "= 0.6.0"
-      ]
-    ],
-    "dependencies": {
-      "apt (2.7.0)": [
-
-      ],
-      "java (1.31.0)": [
-
-      ],
-      "jenkins (2.2.2)": [
-        [
-          "apt",
-          "~> 2.0"
-        ],
-        [
-          "runit",
-          "~> 1.5"
-        ],
-        [
-          "yum",
-          "~> 3.0"
-        ]
-      ],
-      "runit (1.5.18)": [
-        [
-          "build-essential",
-          ">= 0.0.0"
-        ],
-        [
-          "yum",
-          "~> 3.0"
+    <<~E
+      {
+        "revision_id": "cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b",
+        "name": "jenkins",
+        "run_list": [
+          "recipe[java::default]",
+          "recipe[jenkins::master]",
+          "recipe[policyfile_demo::whatever]",
+          "recipe[policyfile_demo::default]"
         ],
-        [
-          "yum-epel",
-          ">= 0.0.0"
-        ]
-      ],
-      "build-essential (2.2.2)": [
-
-      ],
-      "yum (3.5.4)": [
-
-      ],
-      "yum-epel (0.6.0)": [
-        [
-          "yum",
-          "~> 3.0"
-        ]
-      ],
-      "policyfile_demo (0.1.0)": [
-
-      ]
-    }
-  }
-}
+        "named_run_lists": {
+          "update_jenkins": [
+            "recipe[jenkins::master]",
+            "recipe[policyfile_demo::default]"
+          ]
+        },
+        "cookbook_locks": {
+          "policyfile_demo": {
+            "version": "0.1.0",
+            "identifier": "ea96c99da079db9ff3cb22601638fabd5df49599",
+            "dotted_decimal_identifier": "66030937227426267.45022575077627448.275691232073113",
+            "source": "cookbooks/policyfile_demo",
+            "cache_key": null,
+            "scm_info": {
+              "scm": "git",
+              "remote": "git@github.com:danielsdeleo/policyfile-jenkins-demo.git",
+              "revision": "6f92fe8f24fd953a1c40ebb1d7cdb2a4fbbf4d4d",
+              "working_tree_clean": false,
+              "published": true,
+              "synchronized_remote_branches": [
+                "mine/master"
+              ]
+            },
+            "source_options": {
+              "path": "cookbooks/policyfile_demo"
+            }
+          },
+          "apt": {
+            "version": "2.7.0",
+            "identifier": "16c57abbd056543f7d5a15dabbb03261024a9c5e",
+            "dotted_decimal_identifier": "6409580415309396.17870749399956400.55392231660638",
+            "cache_key": "apt-2.7.0-supermarket.chef.io",
+            "origin": "https://supermarket.chef.io/api/v1/cookbooks/apt/versions/2.7.0/download",
+            "source_options": {
+              "artifactserver": "https://supermarket.chef.io/api/v1/cookbooks/apt/versions/2.7.0/download",
+              "version": "2.7.0"
+            }
+          },
+          "java": {
+            "version": "1.31.0",
+            "identifier": "9178a38ad3e3baa55b49c1b8d9f4bf6a43dbc358",
+            "dotted_decimal_identifier": "40946515427189690.46543743498115572.210463125914456",
+            "cache_key": "java-1.31.0-supermarket.chef.io",
+            "origin": "https://supermarket.chef.io/api/v1/cookbooks/java/versions/1.31.0/download",
+            "source_options": {
+              "artifactserver": "https://supermarket.chef.io/api/v1/cookbooks/java/versions/1.31.0/download",
+              "version": "1.31.0"
+            }
+          },
+          "jenkins": {
+            "version": "2.2.2",
+            "identifier": "0be380429add00d189b4431059ac967a60052323",
+            "dotted_decimal_identifier": "3346364756581632.58979677444790700.165452341125923",
+            "cache_key": "jenkins-2.2.2-supermarket.chef.io",
+            "origin": "https://supermarket.chef.io/api/v1/cookbooks/jenkins/versions/2.2.2/download",
+            "source_options": {
+              "artifactserver": "https://supermarket.chef.io/api/v1/cookbooks/jenkins/versions/2.2.2/download",
+              "version": "2.2.2"
+            }
+          },
+          "runit": {
+            "version": "1.5.18",
+            "identifier": "1a0aeb2c167a24e0c5120ca7b06ba8c4cff4610c",
+            "dotted_decimal_identifier": "7330354567739940.63267076095586411.185563255955724",
+            "cache_key": "runit-1.5.18-supermarket.chef.io",
+            "origin": "https://supermarket.chef.io/api/v1/cookbooks/runit/versions/1.5.18/download",
+            "source_options": {
+              "artifactserver": "https://supermarket.chef.io/api/v1/cookbooks/runit/versions/1.5.18/download",
+              "version": "1.5.18"
+            }
+          },
+          "build-essential": {
+            "version": "2.2.2",
+            "identifier": "d8ce58401d154378599b0fead81d2c390615602b",
+            "dotted_decimal_identifier": "61025473397593411.33875519727130653.48623426822187",
+            "cache_key": "build-essential-2.2.2-supermarket.chef.io",
+            "origin": "https://supermarket.chef.io/api/v1/cookbooks/build-essential/versions/2.2.2/download",
+            "source_options": {
+              "artifactserver": "https://supermarket.chef.io/api/v1/cookbooks/build-essential/versions/2.2.2/download",
+              "version": "2.2.2"
+            }
+          },
+          "yum": {
+            "version": "3.5.4",
+            "identifier": "f9c778c3cd3908071e0c55722682f96e653b5642",
+            "dotted_decimal_identifier": "70306590695962888.2003363158959746.274252540106306",
+            "cache_key": "yum-3.5.4-supermarket.chef.io",
+            "origin": "https://supermarket.chef.io/api/v1/cookbooks/yum/versions/3.5.4/download",
+            "source_options": {
+              "artifactserver": "https://supermarket.chef.io/api/v1/cookbooks/yum/versions/3.5.4/download",
+              "version": "3.5.4"
+            }
+          },
+          "yum-epel": {
+            "version": "0.6.0",
+            "identifier": "cd74f541ba0341abcc168c74471c349ca68f77b7",
+            "dotted_decimal_identifier": "57830966944203585.48356618235299612.57847413962679",
+            "cache_key": "yum-epel-0.6.0-supermarket.chef.io",
+            "origin": "https://supermarket.chef.io/api/v1/cookbooks/yum-epel/versions/0.6.0/download",
+            "source_options": {
+              "artifactserver": "https://supermarket.chef.io/api/v1/cookbooks/yum-epel/versions/0.6.0/download",
+              "version": "0.6.0"
+            }
+          }
+        },
+        "default_attributes": {
+          "greeting": "Attributes, f*** yeah"
+        },
+        "override_attributes": {
+          "attr_only_updating": "use -a"
+        },
+        "solution_dependencies": {
+          "Policyfile": [
+            [
+              "policyfile_demo",
+              ">= 0.0.0"
+            ],
+            [
+              "apt",
+              "= 2.7.0"
+            ],
+            [
+              "java",
+              "= 1.31.0"
+            ],
+            [
+              "jenkins",
+              "= 2.2.2"
+            ],
+            [
+              "runit",
+              "= 1.5.18"
+            ],
+            [
+              "build-essential",
+              "= 2.2.2"
+            ],
+            [
+              "yum",
+              "= 3.5.4"
+            ],
+            [
+              "yum-epel",
+              "= 0.6.0"
+            ]
+          ],
+          "dependencies": {
+            "apt (2.7.0)": [
+
+            ],
+            "java (1.31.0)": [
+
+            ],
+            "jenkins (2.2.2)": [
+              [
+                "apt",
+                "~> 2.0"
+              ],
+              [
+                "runit",
+                "~> 1.5"
+              ],
+              [
+                "yum",
+                "~> 3.0"
+              ]
+            ],
+            "runit (1.5.18)": [
+              [
+                "build-essential",
+                ">= 0.0.0"
+              ],
+              [
+                "yum",
+                "~> 3.0"
+              ],
+              [
+                "yum-epel",
+                ">= 0.0.0"
+              ]
+            ],
+            "build-essential (2.2.2)": [
+
+            ],
+            "yum (3.5.4)": [
+
+            ],
+            "yum-epel (0.6.0)": [
+              [
+                "yum",
+                "~> 3.0"
+              ]
+            ],
+            "policyfile_demo (0.1.0)": [
+
+            ]
+          }
+        }
+      }
     E
   end
 
@@ -283,8 +283,8 @@ describe ChefDK::Policyfile::Differ do
     end
 
     it "reports that there are no updates" do
-      expected_message = <<-E
-No changes for policy lock 'jenkins' between 'git: HEAD' and 'local disk'
+      expected_message = <<~E
+        No changes for policy lock 'jenkins' between 'git: HEAD' and 'local disk'
 E
       differ.run_report
       expect(output).to include(expected_message)
@@ -312,27 +312,27 @@ E
     end
 
     it "reports the updated rev_id and run_list" do
-      expected_message = <<-E
-Policy lock 'jenkins' differs between 'git: HEAD' and 'local disk':
+      expected_message = <<~E
+        Policy lock 'jenkins' differs between 'git: HEAD' and 'local disk':
 
-REVISION ID CHANGED
-===================
+        REVISION ID CHANGED
+        ===================
 
-@@ -1,2 +1,2 @@
--cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b
-+304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5
+        @@ -1,2 +1,2 @@
+        -cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b
+        +304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5
 
-RUN LIST CHANGED
-================
+        RUN LIST CHANGED
+        ================
 
-@@ -1,5 +1,7 @@
- recipe[java::default]
- recipe[jenkins::master]
--recipe[policyfile_demo::whatever]
- recipe[policyfile_demo::default]
-+recipe[one::one]
-+recipe[two::two]
-+recipe[three::three]
+        @@ -1,5 +1,7 @@
+         recipe[java::default]
+         recipe[jenkins::master]
+        -recipe[policyfile_demo::whatever]
+         recipe[policyfile_demo::default]
+        +recipe[one::one]
+        +recipe[two::two]
+        +recipe[three::three]
 
 E
       differ.run_report
@@ -363,33 +363,33 @@ E
       end
 
       it "prints the correct changes with context for the run list" do
-        expected_message = <<-E
-Policy lock 'jenkins' differs between 'git: HEAD' and 'local disk':
-
-REVISION ID CHANGED
-===================
-
-@@ -1,2 +1,2 @@
--cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b
-+304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5
-
-RUN LIST CHANGED
-================
-
-@@ -1,5 +1,4 @@
- recipe[a::default]
--recipe[b::default]
- recipe[c::default]
- recipe[d::default]
- recipe[e::default]
-@@ -12,4 +11,8 @@
- recipe[l::default]
- recipe[m::default]
- recipe[n::default]
-+recipe[o::new]
-+recipe[p::new]
-+recipe[q::new]
-+recipe[r::new]
+        expected_message = <<~E
+          Policy lock 'jenkins' differs between 'git: HEAD' and 'local disk':
+
+          REVISION ID CHANGED
+          ===================
+
+          @@ -1,2 +1,2 @@
+          -cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b
+          +304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5
+
+          RUN LIST CHANGED
+          ================
+
+          @@ -1,5 +1,4 @@
+           recipe[a::default]
+          -recipe[b::default]
+           recipe[c::default]
+           recipe[d::default]
+           recipe[e::default]
+          @@ -12,4 +11,8 @@
+           recipe[l::default]
+           recipe[m::default]
+           recipe[n::default]
+          +recipe[o::new]
+          +recipe[p::new]
+          +recipe[q::new]
+          +recipe[r::new]
 
 E
         differ.run_report
@@ -422,34 +422,34 @@ E
     end
 
     it "reports the updated revision_id and removed cookbooks" do
-      expected_message = <<-E
-Policy lock 'jenkins' differs between 'git: HEAD' and 'local disk':
-
-REVISION ID CHANGED
-===================
-
-@@ -1,2 +1,2 @@
--cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b
-+304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5
-
-REMOVED COOKBOOKS
-=================
-
-apt
----
-
-@@ -1,12 +1 @@
--{
--  "version": "2.7.0",
--  "identifier": "16c57abbd056543f7d5a15dabbb03261024a9c5e",
--  "dotted_decimal_identifier": "6409580415309396.17870749399956400.55392231660638",
--  "cache_key": "apt-2.7.0-supermarket.chef.io",
--  "origin": "https://supermarket.chef.io/api/v1/cookbooks/apt/versions/2.7.0/download",
--  "source_options": {
--    "artifactserver": "https://supermarket.chef.io/api/v1/cookbooks/apt/versions/2.7.0/download",
--    "version": "2.7.0"
--  }
--}
+      expected_message = <<~E
+        Policy lock 'jenkins' differs between 'git: HEAD' and 'local disk':
+
+        REVISION ID CHANGED
+        ===================
+
+        @@ -1,2 +1,2 @@
+        -cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b
+        +304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5
+
+        REMOVED COOKBOOKS
+        =================
+
+        apt
+        ---
+
+        @@ -1,12 +1 @@
+        -{
+        -  "version": "2.7.0",
+        -  "identifier": "16c57abbd056543f7d5a15dabbb03261024a9c5e",
+        -  "dotted_decimal_identifier": "6409580415309396.17870749399956400.55392231660638",
+        -  "cache_key": "apt-2.7.0-supermarket.chef.io",
+        -  "origin": "https://supermarket.chef.io/api/v1/cookbooks/apt/versions/2.7.0/download",
+        -  "source_options": {
+        -    "artifactserver": "https://supermarket.chef.io/api/v1/cookbooks/apt/versions/2.7.0/download",
+        -    "version": "2.7.0"
+        -  }
+        -}
 
 E
       differ.run_report
@@ -495,34 +495,34 @@ E
     end
 
     it "reports the updated revision_id and added cookbook" do
-      expected_message = <<-E
-Policy lock 'jenkins' differs between 'git: HEAD' and 'local disk':
-
-REVISION ID CHANGED
-===================
-
-@@ -1,2 +1,2 @@
--cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b
-+304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5
-
-ADDED COOKBOOKS
-===============
-
-bluepill
---------
-
-@@ -1 +1,12 @@
-+{
-+  "version": "2.3.2",
-+  "identifier": "9c6990944d9a347dec8bd375e707ba0aecdc17cd",
-+  "dotted_decimal_identifier": "69437059924760478.24393100994078142.115593340606828",
-+  "cache_key": "bluepill-2.3.2-supermarket.chef.io",
-+  "origin": "https://supermarket.chef.io/api/v1/cookbooks/bluepill/versions/2.3.2/download",
-+  "source_options": {
-+    "artifactserver": "https://supermarket.chef.io/api/v1/cookbooks/bluepill/versions/2.3.2/download",
-+    "version": "2.3.2"
-+  }
-+}
+      expected_message = <<~E
+        Policy lock 'jenkins' differs between 'git: HEAD' and 'local disk':
+
+        REVISION ID CHANGED
+        ===================
+
+        @@ -1,2 +1,2 @@
+        -cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b
+        +304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5
+
+        ADDED COOKBOOKS
+        ===============
+
+        bluepill
+        --------
+
+        @@ -1 +1,12 @@
+        +{
+        +  "version": "2.3.2",
+        +  "identifier": "9c6990944d9a347dec8bd375e707ba0aecdc17cd",
+        +  "dotted_decimal_identifier": "69437059924760478.24393100994078142.115593340606828",
+        +  "cache_key": "bluepill-2.3.2-supermarket.chef.io",
+        +  "origin": "https://supermarket.chef.io/api/v1/cookbooks/bluepill/versions/2.3.2/download",
+        +  "source_options": {
+        +    "artifactserver": "https://supermarket.chef.io/api/v1/cookbooks/bluepill/versions/2.3.2/download",
+        +    "version": "2.3.2"
+        +  }
+        +}
 
 E
       differ.run_report
@@ -557,32 +557,32 @@ E
     end
 
     it "reports the updated revision_id and modified policyfile_demo cookbook" do
-      expected_message = <<-E
-Policy lock 'jenkins' differs between 'git: HEAD' and 'local disk':
+      expected_message = <<~E
+        Policy lock 'jenkins' differs between 'git: HEAD' and 'local disk':
 
-REVISION ID CHANGED
-===================
+        REVISION ID CHANGED
+        ===================
 
-@@ -1,2 +1,2 @@
--cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b
-+304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5
+        @@ -1,2 +1,2 @@
+        -cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b
+        +304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5
 
-MODIFIED COOKBOOKS
-==================
+        MODIFIED COOKBOOKS
+        ==================
 
-policyfile_demo
----------------
+        policyfile_demo
+        ---------------
 
-@@ -1,7 +1,7 @@
- {
-   "version": "0.1.0",
--  "identifier": "ea96c99da079db9ff3cb22601638fabd5df49599",
--  "dotted_decimal_identifier": "66030937227426267.45022575077627448.275691232073113",
-+  "identifier": "f04cc40faf628253fe7d9566d66a1733fb1afbe9",
-+  "dotted_decimal_identifier": "67638399371010690.23642238397896298.25512023620585",
-   "source": "cookbooks/policyfile_demo",
-   "cache_key": null,
-   "scm_info": {
+        @@ -1,7 +1,7 @@
+         {
+           "version": "0.1.0",
+        -  "identifier": "ea96c99da079db9ff3cb22601638fabd5df49599",
+        -  "dotted_decimal_identifier": "66030937227426267.45022575077627448.275691232073113",
+        +  "identifier": "f04cc40faf628253fe7d9566d66a1733fb1afbe9",
+        +  "dotted_decimal_identifier": "67638399371010690.23642238397896298.25512023620585",
+           "source": "cookbooks/policyfile_demo",
+           "cache_key": null,
+           "scm_info": {
 
 E
       differ.run_report
@@ -610,25 +610,25 @@ E
     end
 
     it "reports the updated revision_id and modified attributes" do
-      expected_output = <<-E
-Policy lock 'jenkins' differs between 'git: HEAD' and 'local disk':
+      expected_output = <<~E
+        Policy lock 'jenkins' differs between 'git: HEAD' and 'local disk':
 
-REVISION ID CHANGED
-===================
+        REVISION ID CHANGED
+        ===================
 
-@@ -1,2 +1,2 @@
--cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b
-+304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5
+        @@ -1,2 +1,2 @@
+        -cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b
+        +304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5
 
-DEFAULT ATTRIBUTES CHANGED
-==========================
+        DEFAULT ATTRIBUTES CHANGED
+        ==========================
 
-@@ -1,4 +1,5 @@
- {
--  "greeting": "Attributes, f*** yeah"
-+  "greeting": "Attributes, f*** yeah",
-+  "new_attr": "hello"
- }
+        @@ -1,4 +1,5 @@
+         {
+        -  "greeting": "Attributes, f*** yeah"
+        +  "greeting": "Attributes, f*** yeah",
+        +  "new_attr": "hello"
+         }
 
 E
       differ.run_report
@@ -656,25 +656,25 @@ E
     end
 
     it "reports the updated revision_id and override_attributes" do
-      expected_output = <<-E
-Policy lock 'jenkins' differs between 'git: HEAD' and 'local disk':
+      expected_output = <<~E
+        Policy lock 'jenkins' differs between 'git: HEAD' and 'local disk':
 
-REVISION ID CHANGED
-===================
+        REVISION ID CHANGED
+        ===================
 
-@@ -1,2 +1,2 @@
--cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b
-+304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5
+        @@ -1,2 +1,2 @@
+        -cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b
+        +304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5
 
-OVERRIDE ATTRIBUTES CHANGED
-===========================
+        OVERRIDE ATTRIBUTES CHANGED
+        ===========================
 
-@@ -1,4 +1,5 @@
- {
--  "attr_only_updating": "use -a"
-+  "attr_only_updating": "use -a",
-+  "new_attr": "ALL THE DIFF"
- }
+        @@ -1,4 +1,5 @@
+         {
+        -  "attr_only_updating": "use -a"
+        +  "attr_only_updating": "use -a",
+        +  "new_attr": "ALL THE DIFF"
+         }
 
 E