chef-dk 1.2.22 → 1.3.40

data/spec/unit/pager_spec.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/pager'
+require "spec_helper"
+require "chef-dk/pager"
 
 describe ChefDK::Pager do
 
@@ -34,7 +34,7 @@ describe ChefDK::Pager do
     end
 
     it "enables paging" do
-      expect(pager).to receive(:env).and_return({"PAGER" => "less"})
+      expect(pager).to receive(:env).and_return({ "PAGER" => "less" })
       expect(pager).to receive(:have_tty?).and_return(true)
       expect(pager.pager_enabled?).to be(true)
     end
@@ -44,7 +44,7 @@ describe ChefDK::Pager do
 
     subject(:pager) do
       ChefDK::Pager.new(enable_pager: true).tap do |p|
-        allow(p).to receive(:env).and_return({"PAGER" => "less"})
+        allow(p).to receive(:env).and_return({ "PAGER" => "less" })
         allow(p).to receive(:have_tty?).and_return(true)
       end
     end
@@ -85,7 +85,7 @@ describe ChefDK::Pager do
 
     subject(:pager) do
       ChefDK::Pager.new(enable_pager: false).tap do |p|
-        allow(p).to receive(:env).and_return({"PAGER" => "less"})
+        allow(p).to receive(:env).and_return({ "PAGER" => "less" })
         allow(p).to receive(:have_tty?).and_return(true)
       end
     end
@@ -94,7 +94,6 @@ describe ChefDK::Pager do
       expect(IO).to_not receive(:pipe)
     end
 
-
     it "provides a UI with stdout set to stdout" do
       expect(pager.ui.out_stream).to eq($stdout)
     end
@@ -116,4 +115,3 @@ describe ChefDK::Pager do
 
   end
 end
-

data/spec/unit/policyfile/chef_repo_cookbook_source_spec.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/policyfile/chef_repo_cookbook_source'
+require "spec_helper"
+require "chef-dk/policyfile/chef_repo_cookbook_source"
 
 describe ChefDK::Policyfile::ChefRepoCookbookSource do
 
@@ -28,17 +28,17 @@ describe ChefDK::Policyfile::ChefRepoCookbookSource do
 
   let(:local_repo_universe) {
     {
-      "another-local-cookbook"=>{
-        "0.1.0"=>[],
+      "another-local-cookbook" => {
+        "0.1.0" => [],
       },
-      "local-cookbook"=>{
-        "2.3.4"=>[],
+      "local-cookbook" => {
+        "2.3.4" => [],
       },
-      "cookbook-with-a-dep"=>{
-        "9.9.9"=>[["another-local-cookbook", "~> 0.1"]],
+      "cookbook-with-a-dep" => {
+        "9.9.9" => [["another-local-cookbook", "~> 0.1"]],
       },
-      "noignore"=>{
-        "0.1.0"=>[],
+      "noignore" => {
+        "0.1.0" => [],
       },
     }
   }
@@ -78,7 +78,7 @@ describe ChefDK::Policyfile::ChefRepoCookbookSource do
     end
 
     it "sets the source preferences as given" do
-      expect(cookbook_source.preferred_cookbooks).to eq( %w[ foo bar baz ] )
+      expect(cookbook_source.preferred_cookbooks).to eq( %w{ foo bar baz } )
     end
 
     it "is the preferred source for the requested cookbooks" do

data/spec/unit/policyfile/chef_server_cookbook_source_spec.rb

@@ -15,41 +15,41 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/policyfile/chef_server_cookbook_source'
+require "spec_helper"
+require "chef-dk/policyfile/chef_server_cookbook_source"
 
 describe ChefDK::Policyfile::ChefServerCookbookSource do
   subject { described_class.new(cookbook_source) }
 
-  let(:cookbook_source) { 'https://chef.example.com/organizations/example' }
+  let(:cookbook_source) { "https://chef.example.com/organizations/example" }
 
-  let(:http_connection) { double('ChefDK::AuthenticatedHTTP') }
+  let(:http_connection) { double("ChefDK::AuthenticatedHTTP") }
 
-  let(:universe_response_encoded) { JSON.parse(IO.read(File.join(fixtures_path, 'cookbooks_api/chef_server_universe.json'))) }
+  let(:universe_response_encoded) { JSON.parse(IO.read(File.join(fixtures_path, "cookbooks_api/chef_server_universe.json"))) }
 
   let(:pruned_universe) { JSON.parse(IO.read(File.join(fixtures_path, "cookbooks_api/pruned_chef_server_universe.json"))) }
 
-  describe 'fetching the Universe graph' do
+  describe "fetching the Universe graph" do
 
     before do
       expect(subject).to receive(:http_connection_for).with(cookbook_source).and_return(http_connection)
     end
 
-    it 'fetches the universe graph' do
-      expect(http_connection).to receive(:get).with('/universe').and_return(universe_response_encoded)
+    it "fetches the universe graph" do
+      expect(http_connection).to receive(:get).with("/universe").and_return(universe_response_encoded)
       actual_universe = subject.universe_graph
-      expect(actual_universe).to have_key('apt')
-      expect(actual_universe['apt']).to eq(pruned_universe['apt'])
+      expect(actual_universe).to have_key("apt")
+      expect(actual_universe["apt"]).to eq(pruned_universe["apt"])
       expect(subject.universe_graph).to eq(pruned_universe)
     end
 
-    it 'generates location options for a cookbook from the given graph' do
+    it "generates location options for a cookbook from the given graph" do
       expected_opts = {
         chef_server: "https://chef.example.com/organizations/example",
         http_client: http_connection,
-        version: "4.2.3"
+        version: "4.2.3",
       }
-      expect(subject.source_options_for('ohai', '4.2.3')).to eq(expected_opts)
+      expect(subject.source_options_for("ohai", "4.2.3")).to eq(expected_opts)
     end
   end
 end

data/spec/unit/policyfile/community_cookbook_source_spec.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/policyfile/community_cookbook_source'
+require "spec_helper"
+require "chef-dk/policyfile/community_cookbook_source"
 
 describe ChefDK::Policyfile::CommunityCookbookSource do
 
@@ -68,7 +68,7 @@ describe ChefDK::Policyfile::CommunityCookbookSource do
     end
 
     it "sets the source preferences as given" do
-      expect(cookbook_source.preferred_cookbooks).to eq( %w[ foo bar baz ] )
+      expect(cookbook_source.preferred_cookbooks).to eq( %w{ foo bar baz } )
     end
 
     it "is the preferred source for the requested cookbooks" do
@@ -81,4 +81,3 @@ describe ChefDK::Policyfile::CommunityCookbookSource do
   end
 
 end
-

data/spec/unit/policyfile/comparison_base_spec.rb

@@ -15,13 +15,13 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/policyfile/comparison_base'
+require "spec_helper"
+require "chef-dk/policyfile/comparison_base"
 
 describe "Policyfile Comparison Bases" do
 
   let(:minimal_lockfile_json) do
-        <<-E
+    <<-E
 {
   "revision_id": "6fe753184c8946052d3231bb4212116df28d89a3a5f7ae52832ad408419dd5eb",
   "name": "install-example",
@@ -308,10 +308,8 @@ E
         expect(exception).to_not be_nil
       end
 
-
     end
 
-
     context "when a non-HTTP error occurs fetching the policyfile lock" do
 
       before do
@@ -340,4 +338,3 @@ E
 
   end
 end
-

data/spec/unit/policyfile/cookbook_location_specification_spec.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/policyfile/cookbook_location_specification'
+require "spec_helper"
+require "chef-dk/policyfile/cookbook_location_specification"
 
 describe ChefDK::Policyfile::CookbookLocationSpecification do
 
@@ -64,7 +64,7 @@ describe ChefDK::Policyfile::CookbookLocationSpecification do
     different_constraint = described_class.new(cookbook_name, ">= 1.0.0", source_options, storage_config)
     expect(cookbook_location_spec).to_not eq(different_constraint)
 
-    different_opts = described_class.new(cookbook_name, version_constraint, {git: "git://example.com/wat.git"}, storage_config)
+    different_opts = described_class.new(cookbook_name, version_constraint, { git: "git://example.com/wat.git" }, storage_config)
     expect(cookbook_location_spec).to_not eq(different_opts)
   end
 

data/spec/unit/policyfile/cookbook_locks_spec.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/policyfile/cookbook_locks'
+require "spec_helper"
+require "chef-dk/policyfile/cookbook_locks"
 
 shared_examples_for "Cookbook Lock" do
 
@@ -125,7 +125,7 @@ shared_examples_for "Cookbook Lock" do
         "version" => "1.2.3",
         "source_options" => { "sourcekey" => "location info" },
         "cache_key" => nil,
-        "source" => "cookbooks_local_path"
+        "source" => "cookbooks_local_path",
       }
     end
 
@@ -152,7 +152,6 @@ shared_examples_for "Cookbook Lock" do
 
 end
 
-
 describe ChefDK::Policyfile::CachedCookbook do
 
   let(:cookbook_name) { "nginx" }
@@ -318,9 +317,9 @@ describe ChefDK::Policyfile::LocalCookbook do
         "version" => "1.2.3",
         "source" => "../my_repo/nginx",
         "source_options" => {
-          "path" => "../my_repo/nginx"
+          "path" => "../my_repo/nginx",
         },
-        "cache_key" => nil
+        "cache_key" => nil,
       }
     end
 
@@ -450,10 +449,10 @@ 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" => {}
+      "scm_info" => {},
     }
   end
 
@@ -523,7 +522,6 @@ describe ChefDK::Policyfile::ArchivedCookbook do
       expect(cookbook_lock.to_lock).to eq(wrapped_cookbook_lock_data)
     end
 
-
   end
 
 end

data/spec/unit/policyfile/delivery_supermarket_source_spec.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/policyfile/delivery_supermarket_source'
+require "spec_helper"
+require "chef-dk/policyfile/delivery_supermarket_source"
 
 describe ChefDK::Policyfile::DeliverySupermarketSource do
 
@@ -37,16 +37,16 @@ describe ChefDK::Policyfile::DeliverySupermarketSource do
           "build-essential" => "~> 2.0.0",
           "ohai" => "~> 2.0.0",
           "runit" => "~> 1.2.0",
-          "yum-epel" => "~> 0.3.0"
-        }
+          "yum-epel" => "~> 0.3.0",
+        },
       },
       "mysql" => {
         "5.3.6" => {
-          "yum-mysql-community" => ">= 0.0.0"
-        }
+          "yum-mysql-community" => ">= 0.0.0",
+        },
       },
       "application" => {
-        "4.1.4" => {}
+        "4.1.4" => {},
       },
       "database" => {
         "2.2.0" => {
@@ -54,25 +54,25 @@ describe ChefDK::Policyfile::DeliverySupermarketSource do
           "postgresql" => ">= 1.0.0",
           "aws" => ">= 0.0.0",
           "xfs" => ">= 0.0.0",
-          "mysql-chef_gem" => ">= 0.0.0"
-        }
+          "mysql-chef_gem" => ">= 0.0.0",
+        },
       },
       "postgresql" => {
         "3.4.1" => {
           "apt" => ">= 1.9.0",
           "build-essential" => ">= 0.0.0",
-          "openssl" => ">= 0.0.0"
-        }
+          "openssl" => ">= 0.0.0",
+        },
       },
       "apache2" => {
         "1.10.4" => {
           "iptables" => ">= 0.0.0",
           "logrotate" => ">= 0.0.0",
-          "pacman" => ">= 0.0.0"
-        }
+          "pacman" => ">= 0.0.0",
+        },
       },
-      "apt" => { "2.4.0" => {}},
-      "yum" => { "3.2.2" => {}}
+      "apt" => { "2.4.0" => {} },
+      "yum" => { "3.2.2" => {} },
     }
   end
 
@@ -114,7 +114,7 @@ describe ChefDK::Policyfile::DeliverySupermarketSource do
     end
 
     it "sets the source preferences as given" do
-      expect(cookbook_source.preferred_cookbooks).to eq( %w[ foo bar baz ] )
+      expect(cookbook_source.preferred_cookbooks).to eq( %w{ foo bar baz } )
     end
 
     it "is the preferred source for the requested cookbooks" do
@@ -127,4 +127,3 @@ describe ChefDK::Policyfile::DeliverySupermarketSource do
   end
 
 end
-

data/spec/unit/policyfile/differ_spec.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/policyfile/differ'
+require "spec_helper"
+require "chef-dk/policyfile/differ"
 
 describe ChefDK::Policyfile::Differ do
 
@@ -469,8 +469,8 @@ E
         "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"
-        }
+          "version" => "2.3.2",
+        },
       }
     end
 
@@ -684,4 +684,3 @@ E
   end
 
 end
-

data/spec/unit/policyfile/lister_spec.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/policyfile/lister'
+require "spec_helper"
+require "chef-dk/policyfile/lister"
 
 describe ChefDK::Policyfile::Lister do
 
@@ -24,7 +24,6 @@ describe ChefDK::Policyfile::Lister do
     "https://chef.example/organizations/myorg/#{org_specific_path}"
   end
 
-
   let(:config) do
     double("Chef::Config",
            chef_server_url: "https://localhost:10443",
@@ -45,7 +44,6 @@ describe ChefDK::Policyfile::Lister do
     info_fetcher.http_client
   end
 
-
   context "when the data is fetched successfully from the server" do
 
     before do
@@ -89,8 +87,8 @@ describe ChefDK::Policyfile::Lister do
               "1111111111111111111111111111111111111111" => {},
               "2222222222222222222222222222222222222222" => {},
               "3333333333333333333333333333333333333333" => {},
-              "4444444444444444444444444444444444444444" => {}
-            }
+              "4444444444444444444444444444444444444444" => {},
+            },
           },
           "db" => {
             "uri" => api_url("policies/db"),
@@ -98,16 +96,16 @@ describe ChefDK::Policyfile::Lister do
               "6666666666666666666666666666666666666666" => {},
               "7777777777777777777777777777777777777777" => {},
               "8888888888888888888888888888888888888888" => {},
-              "9999999999999999999999999999999999999999" => {}
-            }
+              "9999999999999999999999999999999999999999" => {},
+            },
           },
           "cache" => {
             "uri" => api_url("policies/cache"),
             "revisions" => {
               "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" => {},
-              "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" => {}
-            }
-          }
+              "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" => {},
+            },
+          },
         }
       end
 
@@ -117,8 +115,8 @@ describe ChefDK::Policyfile::Lister do
           "policies" => {
             "db" => { "revision_id" => "6666666666666666666666666666666666666666" },
             "appserver" => { "revision_id" => "1111111111111111111111111111111111111111" },
-            "cache" => { "revision_id" => "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" }
-          }
+            "cache" => { "revision_id" => "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" },
+          },
         }
       end
 
@@ -128,8 +126,8 @@ describe ChefDK::Policyfile::Lister do
           "policies" => {
             "db" => { "revision_id" => "7777777777777777777777777777777777777777" },
             "appserver" => { "revision_id" => "2222222222222222222222222222222222222222" },
-            "cache" => { "revision_id" => "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" }
-          }
+            "cache" => { "revision_id" => "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" },
+          },
         }
       end
 
@@ -138,8 +136,8 @@ describe ChefDK::Policyfile::Lister do
           "uri" => api_url("policy_groups/prod"),
           "policies" => {
             "db" => { "revision_id" => "8888888888888888888888888888888888888888" },
-            "appserver" => { "revision_id" => "3333333333333333333333333333333333333333" }
-          }
+            "appserver" => { "revision_id" => "3333333333333333333333333333333333333333" },
+          },
         }
       end
 
@@ -147,7 +145,7 @@ describe ChefDK::Policyfile::Lister do
         {
           "dev" => dev_group_data,
           "test" => test_group_data,
-          "prod" => prod_group_data
+          "prod" => prod_group_data,
         }
       end
 
@@ -157,18 +155,18 @@ describe ChefDK::Policyfile::Lister do
             "1111111111111111111111111111111111111111" => {},
             "2222222222222222222222222222222222222222" => {},
             "3333333333333333333333333333333333333333" => {},
-            "4444444444444444444444444444444444444444" => {}
+            "4444444444444444444444444444444444444444" => {},
           },
           "db" => {
             "6666666666666666666666666666666666666666" => {},
             "7777777777777777777777777777777777777777" => {},
             "8888888888888888888888888888888888888888" => {},
-            "9999999999999999999999999999999999999999" => {}
+            "9999999999999999999999999999999999999999" => {},
           },
           "cache" => {
             "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" => {},
-            "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" => {}
-          }
+            "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" => {},
+          },
         }
       end
 
@@ -177,21 +175,20 @@ describe ChefDK::Policyfile::Lister do
           "dev" => {
             "db" => "6666666666666666666666666666666666666666",
             "appserver" => "1111111111111111111111111111111111111111",
-            "cache" => "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+            "cache" => "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
           },
           "test" => {
             "db" => "7777777777777777777777777777777777777777",
             "appserver" => "2222222222222222222222222222222222222222",
-            "cache" => "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+            "cache" => "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
           },
           "prod" => {
-            "db" =>"8888888888888888888888888888888888888888",
-            "appserver" => "3333333333333333333333333333333333333333"
-          }
+            "db" => "8888888888888888888888888888888888888888",
+            "appserver" => "3333333333333333333333333333333333333333",
+          },
         }
       end
 
-
       it "gives a Hash of policy revisions by policy name" do
         expect(info_fetcher.policies_by_name).to eq(expected_policy_list)
       end
@@ -212,8 +209,8 @@ describe ChefDK::Policyfile::Lister do
       end
 
       it "lists orphaned revisions for a given policy" do
-        expect(info_fetcher.orphaned_revisions("db")).to eq(%w[ 9999999999999999999999999999999999999999 ])
-        expect(info_fetcher.orphaned_revisions("appserver")).to eq(%w[ 4444444444444444444444444444444444444444 ])
+        expect(info_fetcher.orphaned_revisions("db")).to eq(%w{ 9999999999999999999999999999999999999999 })
+        expect(info_fetcher.orphaned_revisions("appserver")).to eq(%w{ 4444444444444444444444444444444444444444 })
         expect(info_fetcher.orphaned_revisions("cache")).to eq([])
       end
 
@@ -227,7 +224,7 @@ describe ChefDK::Policyfile::Lister do
         appserver_rev_ids = {
           "dev" => "1111111111111111111111111111111111111111",
           "test" => "2222222222222222222222222222222222222222",
-          "prod" => "3333333333333333333333333333333333333333"
+          "prod" => "3333333333333333333333333333333333333333",
         }
 
         expect(map["appserver"].revision_ids_by_group).to eq(appserver_rev_ids)
@@ -235,7 +232,7 @@ describe ChefDK::Policyfile::Lister do
         db_rev_ids = {
           "dev" => "6666666666666666666666666666666666666666",
           "test" => "7777777777777777777777777777777777777777",
-          "prod" => "8888888888888888888888888888888888888888"
+          "prod" => "8888888888888888888888888888888888888888",
         }
 
         expect(map["db"].revision_ids_by_group).to eq(db_rev_ids)
@@ -243,7 +240,7 @@ describe ChefDK::Policyfile::Lister do
         cache_rev_ids = {
           "dev" => "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
           "test" => "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-          "prod" => nil
+          "prod" => nil,
         }
         expect(map["cache"].revision_ids_by_group).to eq(cache_rev_ids)
       end
@@ -252,7 +249,7 @@ describe ChefDK::Policyfile::Lister do
 
         let(:dev_group_data) do
           {
-            "uri" => api_url("policy_groups/dev")
+            "uri" => api_url("policy_groups/dev"),
           }
         end
 
@@ -269,4 +266,3 @@ describe ChefDK::Policyfile::Lister do
   end
 
 end
-