chef-dk 0.2.0 → 0.2.1

data/spec/unit/policyfile_evaluation_spec.rb

@@ -20,6 +20,8 @@ require 'chef-dk/policyfile_compiler'
 
 describe ChefDK::PolicyfileCompiler do
 
+  let(:storage_config) { ChefDK::Policyfile::StorageConfig.new.use_policyfile("TestPolicyfile.rb") }
+
   let(:policyfile) { ChefDK::PolicyfileCompiler.evaluate(policyfile_rb, "TestPolicyfile.rb") }
 
   describe "Evaluate a policyfile" do
@@ -60,7 +62,7 @@ TestPolicyfile.rb:1: syntax error, unexpected end-of-input, expecting tCONSTANT
 {{{{::::{{::
             ^
 E
-          expect(policyfile).to have(1).errors
+          expect(policyfile.errors.size).to eq(1)
           expect(policyfile.errors.first).to eq(expected_error.chomp)
         end
 
@@ -71,7 +73,7 @@ E
         let(:policyfile_rb) { "raise 'oops'" }
 
         it "has an error message with code context" do
-          expect(policyfile).to have(1).errors
+          expect(policyfile.errors.size).to eq(1)
           expected_message = <<-E
 Evaluation of policyfile 'TestPolicyfile.rb' raised an exception
   Exception: RuntimeError "oops"
@@ -105,7 +107,7 @@ E
         end
 
         it "has an invalid source error" do
-          expect(policyfile).to have(1).errors
+          expect(policyfile.errors.size).to eq(1)
           expect(policyfile.errors.first).to eq("Invalid default_source type ':herp'")
         end
       end
@@ -119,17 +121,35 @@ E
         end
 
         it "has an invalid source error" do
-          expect(policyfile).to have(1).errors
+          expect(policyfile.errors.size).to eq(1)
           expect(policyfile.errors.first).to eq("You must specify the server's URI when using a default_source :chef_server")
         end
 
       end
+
+      context "when a per-cookbook source is specified with invalid options" do
+        let(:policyfile_rb) do
+          <<-EOH
+            run_list "foo"
+
+            cookbook "foo", herp: "derp"
+          EOH
+        end
+
+        it "has an invalid source error" do
+          expect(policyfile.errors.size).to eq(1)
+          message = "Cookbook `foo' has invalid source options `{:herp=>\"derp\"}'"
+          expect(policyfile.errors.first).to eq(message)
+        end
+      end
     end
 
     context "Given a minimal valid policyfile" do
 
       let(:policyfile_rb) do
         <<-EOH
+          name "hello"
+
           run_list "foo", "bar"
         EOH
       end
@@ -138,6 +158,10 @@ E
         expect(policyfile.errors).to eq([])
       end
 
+      it "has a name" do
+        expect(policyfile.name).to eq("hello")
+      end
+
       it "has a run_list" do
         expect(policyfile.run_list).to eq(%w[foo bar])
       end
@@ -194,6 +218,8 @@ E
         end
 
         it "has a default source" do
+          skip "Chef server isn't yet supported in cookbook-omnifetch (pending /universe endpoint in Chef Server)"
+
           expect(policyfile.errors).to eq([])
           expected = ChefDK::Policyfile::ChefServerCookbookSource.new("https://mychef.example.com")
           expect(policyfile.default_source).to eq(expected)
@@ -219,8 +245,8 @@ E
         end
 
         it "sets the source of the cookbook to the local path" do
-          expected_cb_spec = ChefDK::Policyfile::CookbookSpec.new("foo", ">= 0.0.0", {path: "local_cookbooks/foo"}, "TestPolicyfile.rb")
-          expect(policyfile.policyfile_cookbook_specs).to eq("foo" => expected_cb_spec)
+          expected_cb_spec = ChefDK::Policyfile::CookbookLocationSpecification.new("foo", ">= 0.0.0", {path: "local_cookbooks/foo"}, storage_config)
+          expect(policyfile.cookbook_location_specs).to eq("foo" => expected_cb_spec)
         end
 
       end
@@ -234,8 +260,8 @@ E
         end
 
         it "sets the source of the cookbook to the git URL" do
-          expected_cb_spec = ChefDK::Policyfile::CookbookSpec.new("foo", ">= 0.0.0", {git: "git://example.com:me/foo-cookbook.git"}, "TestPolicyfile.rb")
-          expect(policyfile.policyfile_cookbook_specs).to eq("foo" => expected_cb_spec)
+          expected_cb_spec = ChefDK::Policyfile::CookbookLocationSpecification.new("foo", ">= 0.0.0", {git: "git://example.com:me/foo-cookbook.git"}, storage_config)
+          expect(policyfile.cookbook_location_specs).to eq("foo" => expected_cb_spec)
         end
 
       end
@@ -248,9 +274,11 @@ E
           EOH
         end
 
-        it "sets the source of the cookbook to the git URL" do
-          expected_cb_spec = ChefDK::Policyfile::CookbookSpec.new("foo", ">= 0.0.0", {chef_server: "https://mychefserver.example.com"}, "TestPolicyfile.rb")
-          expect(policyfile.policyfile_cookbook_specs).to eq("foo" => expected_cb_spec)
+        # Chef server isn't yet supported in cookbook-omnifetch (pending /universe endpoint in Chef Server)
+        # We have to skip at the example definition level or else we fail in the before block
+        skip "sets the source of the cookbook to the git URL" do
+          expected_cb_spec = ChefDK::Policyfile::CookbookLocationSpecification.new("foo", ">= 0.0.0", {chef_server: "https://mychefserver.example.com"}, storage_config)
+          expect(policyfile.cookbook_location_specs).to eq("foo" => expected_cb_spec)
         end
 
       end
@@ -273,7 +301,7 @@ Cookbook 'foo' assigned to conflicting sources
 Previous source: {:path=>"local_cookbooks/foo"}
 Conflicts with: {:chef_server=>"https://mychefserver.example.com"}
 EOH
-        expect(policyfile).to have(1).errors
+        expect(policyfile.errors.size).to eq(1)
         expect(policyfile.errors.first).to eq(expected)
       end
 

data/spec/unit/{policyfile_builder_spec.rb → policyfile_lock_build_spec.rb}

@@ -17,17 +17,13 @@
 
 require 'spec_helper'
 require 'shared/setup_git_cookbooks'
+require 'shared/fixture_cookbook_checksums'
+require 'chef-dk/policyfile/storage_config'
 require 'chef-dk/policyfile_lock.rb'
 
-describe ChefDK::PolicyfileLock do
+describe ChefDK::PolicyfileLock, "building a lockfile" do
 
-  def id_to_dotted(sha1_id)
-    major = sha1_id[0...14]
-    minor = sha1_id[14...28]
-    patch = sha1_id[28..40]
-    decimal_integers =[major, minor, patch].map {|hex| hex.to_i(16) }
-    decimal_integers.join(".")
-  end
+  include_context "fixture cookbooks checksums"
 
   # For debugging giant nested hashes...
   def expect_hash_equal(actual, expected)
@@ -50,35 +46,73 @@ describe ChefDK::PolicyfileLock do
     File.expand_path("spec/unit/fixtures/", project_root)
   end
 
-  let(:policyfile_lock_options) do
-    { cache_path: cache_path, relative_paths_root: relative_paths_root }
+  let(:storage_config) do
+    ChefDK::Policyfile::StorageConfig.new( cache_path: cache_path, relative_paths_root: relative_paths_root )
   end
 
-  describe "when first created" do
+  context "when a cached cookbook omits the cache key" do
 
     let(:policyfile_lock) do
-      described_class.new(policyfile_lock_options)
+      ChefDK::PolicyfileLock.build(storage_config) do |p|
+
+        p.name = "invalid_cache_key_policyfile"
+
+        p.run_list = [ "recipe[foo]" ]
+
+        p.cached_cookbook("nosuchthing") do |cb|
+        end
+      end
     end
 
-    it "uses CWD for relative_paths_root if none is given" do
-      policyfile_lock = described_class.new
-      expect(policyfile_lock.relative_paths_root).to eq(Dir.pwd)
+    it "raises a descriptive error" do
+      expect { policyfile_lock.to_lock }.to raise_error(ChefDK::CachedCookbookNotFound)
     end
 
-    it "uses the provided option for relative_paths_root" do
-      expect(policyfile_lock.relative_paths_root).to eq(relative_paths_root)
+  end
+
+  context "when a local cookbook omits the path" do
+
+    let(:policyfile_lock) do
+      ChefDK::PolicyfileLock.build(storage_config) do |p|
+
+        p.name = "invalid_local_cookbook"
+
+        p.run_list = [ "recipe[foo]" ]
+
+        p.local_cookbook("nosuchthing") do |cb|
+        end
+      end
     end
 
-    it "uses the provided cache_path" do
-      expect(policyfile_lock.cache_path).to eq(cache_path)
+    it "raises a descriptive error" do
+      expect { policyfile_lock.to_lock }.to raise_error(ChefDK::LocalCookbookNotFound)
+    end
+  end
+
+  context "when a local cookbook has an incorrect path" do
+
+    let(:policyfile_lock) do
+      ChefDK::PolicyfileLock.build(storage_config) do |p|
+
+        p.name = "invalid_local_cookbook"
+
+        p.run_list = [ "recipe[foo]" ]
+
+        p.local_cookbook("nosuchthing") do |cb|
+          cb.source = "nopenopenope"
+        end
+      end
     end
 
+    it "raises a descriptive error" do
+      expect { policyfile_lock.to_lock }.to raise_error(ChefDK::LocalCookbookNotFound)
+    end
   end
 
   context "when a cookbook is not in the cache" do
 
     let(:policyfile_lock) do
-      ChefDK::PolicyfileLock.build(policyfile_lock_options) do |p|
+      ChefDK::PolicyfileLock.build(storage_config) do |p|
 
         p.name = "invalid_cache_key_policyfile"
 
@@ -99,7 +133,7 @@ describe ChefDK::PolicyfileLock do
   context "with a minimal policyfile" do
 
     let(:policyfile_lock) do
-      ChefDK::PolicyfileLock.build(policyfile_lock_options) do |p|
+      ChefDK::PolicyfileLock.build(storage_config) do |p|
 
         p.name = "minimal_policyfile"
 
@@ -122,12 +156,14 @@ describe ChefDK::PolicyfileLock do
 
           "foo" => {
             "version" => "1.0.0",
-            "identifier" => "e4611e9b5ec0636a18979e7dd22537222a2eab47",
-            "dotted_decimal_identifier" => id_to_dotted("e4611e9b5ec0636a18979e7dd22537222a2eab47"),
+            "identifier" => cookbook_foo_cksum,
+            "dotted_decimal_identifier" => cookbook_foo_cksum_dotted,
             "cache_key" => "foo-1.0.0",
-            "origin" => nil
+            "origin" => nil,
+            "source_options" => nil
           },
-        }
+        },
+        "solution_dependencies" => { "Policyfile" => [], "dependencies" => {} }
       }
     end
 
@@ -151,7 +187,7 @@ describe ChefDK::PolicyfileLock do
     end
 
     let(:policyfile_lock) do
-      ChefDK::PolicyfileLock.build(policyfile_lock_options) do |p|
+      ChefDK::PolicyfileLock.build(storage_config) do |p|
 
         p.name = "dev_cookbook"
 
@@ -174,8 +210,8 @@ describe ChefDK::PolicyfileLock do
 
           "bar" => {
             "version" => "0.1.0",
-            "identifier" => "f7694dbebe4109dfc857af7e2e4475c322c65259",
-            "dotted_decimal_identifier" => id_to_dotted("f7694dbebe4109dfc857af7e2e4475c322c65259"),
+            "identifier" => cookbook_bar_cksum,
+            "dotted_decimal_identifier" => cookbook_bar_cksum_dotted,
 
             "source" => "bar",
             "cache_key" => nil,
@@ -187,8 +223,10 @@ describe ChefDK::PolicyfileLock do
               "published" => true,
               "synchronized_remote_branches"=>["origin/master"]
             },
+            "source_options" => nil
           },
-        }
+        },
+        "solution_dependencies" => { "Policyfile" => [], "dependencies" => {} }
       }
     end
 
@@ -207,7 +245,7 @@ describe ChefDK::PolicyfileLock do
     end
 
     let(:policyfile_lock) do
-      ChefDK::PolicyfileLock.build(policyfile_lock_options) do |p|
+      ChefDK::PolicyfileLock.build(storage_config) do |p|
 
         p.name = "custom_identifier"
 
@@ -245,7 +283,8 @@ describe ChefDK::PolicyfileLock do
             "identifier" => "1.0.0",
             "dotted_decimal_identifier" => "1.0.0",
             "cache_key" => "foo-1.0.0",
-            "origin" => nil
+            "origin" => nil,
+            "source_options" => nil
           },
 
           "bar" => {
@@ -263,8 +302,10 @@ describe ChefDK::PolicyfileLock do
               "published" => false,
               "synchronized_remote_branches"=>[]
             },
+            "source_options" => nil
           },
-        }
+        },
+        "solution_dependencies" => { "Policyfile" => [], "dependencies" => {} }
       }
     end
 
@@ -284,7 +325,7 @@ describe ChefDK::PolicyfileLock do
 
     let(:policyfile_lock) do
 
-      ChefDK::PolicyfileLock.build(policyfile_lock_options) do |p|
+      ChefDK::PolicyfileLock.build(storage_config) do |p|
 
         # Required
         p.name = "basic_example"
@@ -332,16 +373,17 @@ describe ChefDK::PolicyfileLock do
 
           "foo" => {
             "version" => "1.0.0",
-            "identifier" => "e4611e9b5ec0636a18979e7dd22537222a2eab47",
-            "dotted_decimal_identifier" => id_to_dotted("e4611e9b5ec0636a18979e7dd22537222a2eab47"),
+            "identifier" => cookbook_foo_cksum,
+            "dotted_decimal_identifier" => cookbook_foo_cksum_dotted,
             "origin" => "https://community.getchef.com/api/cookbooks/foo/1.0.0",
-            "cache_key" => "foo-1.0.0"
+            "cache_key" => "foo-1.0.0",
+            "source_options" => nil
           },
 
           "bar" => {
             "version" => "0.1.0",
-            "identifier" => "f7694dbebe4109dfc857af7e2e4475c322c65259",
-            "dotted_decimal_identifier" => id_to_dotted("f7694dbebe4109dfc857af7e2e4475c322c65259"),
+            "identifier" => cookbook_bar_cksum,
+            "dotted_decimal_identifier" => cookbook_bar_cksum_dotted,
             "source" => "bar",
             "cache_key" => nil,
 
@@ -353,27 +395,32 @@ describe ChefDK::PolicyfileLock do
               "published" => false,
               "synchronized_remote_branches"=>[]
             },
+            "source_options" => nil
           },
 
           "baz" => {
             "version" => "1.2.3",
-            "identifier"=>"08c6ac1d202f4d59ad67953559084886f6ba710a",
-            "dotted_decimal_identifier" => id_to_dotted("08c6ac1d202f4d59ad67953559084886f6ba710a"),
+            "identifier"=> cookbook_baz_cksum,
+            "dotted_decimal_identifier" => cookbook_baz_cksum_dotted,
             "cache_key" => "baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb",
-            "origin" => "git://github.com/opscode-cookbooks/bar.git"
+            "origin" => "git://github.com/opscode-cookbooks/bar.git",
+            "source_options" => nil
           },
 
           "dep_of_bar" => {
             "version" => "1.2.3",
-            "identifier" => "e6c08ea35bce8009386710d8c9bcd6caa036e8bc",
-            "dotted_decimal_identifier" => id_to_dotted("e6c08ea35bce8009386710d8c9bcd6caa036e8bc"),
+            "identifier" => cookbook_dep_of_bar_cksum,
+            "dotted_decimal_identifier" => cookbook_dep_of_bar_cksum_dotted,
             "origin" => "https://chef-server.example.com/cookbooks/dep_of_bar/1.2.3",
             "cache_key" => "dep_of_bar-1.2.3",
+            "source_options" => nil
 
           },
 
         },
 
+        "solution_dependencies" => { "Policyfile" => [], "dependencies" => {} }
+
       }
     end
 
@@ -396,6 +443,55 @@ describe ChefDK::PolicyfileLock do
 
   end
 
+  context "with solution dependencies specified" do
+
+    let(:policyfile_lock) do
+      ChefDK::PolicyfileLock.build(storage_config) do |p|
+
+        p.name = "minimal_policyfile"
+
+        p.run_list = [ "recipe[foo]" ]
+        p.cached_cookbook("foo") do |cb|
+          cb.cache_key = "foo-1.0.0"
+        end
+
+        p.dependencies do |deps|
+          deps.add_cookbook_dep("foo", "1.0.0", [])
+        end
+
+      end
+    end
+
+    let(:compiled_policyfile) do
+      {
+
+        "name" => "minimal_policyfile",
+
+        "run_list" => ["recipe[foo]"],
+
+        "cookbook_locks" => {
+
+          "foo" => {
+            "version" => "1.0.0",
+            "identifier" => cookbook_foo_cksum,
+            "dotted_decimal_identifier" => cookbook_foo_cksum_dotted,
+            "cache_key" => "foo-1.0.0",
+            "origin" => nil,
+            "source_options" => nil
+          },
+        },
+        "solution_dependencies" => {
+          "Policyfile" => [],
+          "dependencies" => {"foo (1.0.0)" => []}
+        }
+      }
+    end
+
+    it "computes a minimal policyfile" do
+      expect(policyfile_lock.to_lock).to eq(compiled_policyfile)
+    end
+
+  end
   describe "building a policyfile lock from a policyfile compiler" do
 
     include_context "setup git cookbooks"
@@ -404,52 +500,66 @@ describe ChefDK::PolicyfileLock do
       tempdir
     end
 
-    let(:cached_cookbook_spec) do
-      double( "ChefDK::Policyfile::CookbookSpec",
+    let(:cached_cookbook_uri) { "https://supermarket.getchef.com/api/v1/cookbooks/foo/versions/1.0.0/download" }
+
+    let(:cached_location_spec) do
+      double( "ChefDK::Policyfile::CookbookLocationSpecification",
               mirrors_canonical_upstream?: true,
               cache_key: "foo-1.0.0",
-              uri: "https://supermarket.getchef.com/api/v1/cookbooks/foo/versions/1.0.0/download")
+              uri: cached_cookbook_uri,
+              source_options_for_lock: { "artifactserver" => cached_cookbook_uri, "version" => "1.0.0" })
     end
 
-    let(:local_cookbook_spec) do
-      double( "ChefDK::Policyfile::CookbookSpec",
+    let(:local_location_spec) do
+      double( "ChefDK::Policyfile::CookbookLocationSpecification",
               mirrors_canonical_upstream?: false,
               relative_paths_root: relative_paths_root,
-              relative_path: "bar")
+              relative_path: "bar",
+              source_options_for_lock: { "path" => "bar" })
     end
 
+    let(:policyfile_solution_dependencies) do
+      ChefDK::Policyfile::SolutionDependencies.new.tap do |s|
+        s.add_policyfile_dep("foo", "~> 1.0")
+        s.add_cookbook_dep("foo", "1.0.0", [])
+        s.add_cookbook_dep("bar", "0.1.0", [])
+      end
+    end
 
     let(:policyfile_compiler) do
       double( "ChefDK::PolicyfileCompiler",
-              expanded_run_list: %w[foo bar],
-              all_cookbook_specs: {"foo" => cached_cookbook_spec, "bar" => local_cookbook_spec})
+              name: "my-policyfile",
+              normalized_run_list: %w[recipe[foo::default] recipe[bar::default]],
+              all_cookbook_location_specs: {"foo" => cached_location_spec, "bar" => local_location_spec},
+              solution_dependencies: policyfile_solution_dependencies )
     end
 
     let(:policyfile_lock) do
-      ChefDK::PolicyfileLock.build_from_compiler(policyfile_compiler, cache_path: cache_path)
+      ChefDK::PolicyfileLock.build_from_compiler(policyfile_compiler, storage_config)
     end
 
     let(:compiled_policyfile) do
       {
 
-        "name" => nil,
+        "name" => "my-policyfile",
 
-        "run_list" => ["foo", "bar"],
+        "run_list" => ["recipe[foo::default]", "recipe[bar::default]"],
 
         "cookbook_locks" => {
 
           "foo" => {
             "version" => "1.0.0",
-            "identifier" => "e4611e9b5ec0636a18979e7dd22537222a2eab47",
-            "dotted_decimal_identifier" => id_to_dotted("e4611e9b5ec0636a18979e7dd22537222a2eab47"),
+            "identifier" => cookbook_foo_cksum,
+            "dotted_decimal_identifier" => cookbook_foo_cksum_dotted,
             "cache_key" => "foo-1.0.0",
-            "origin" => cached_cookbook_spec.uri
+            "origin" => cached_cookbook_uri,
+            "source_options" => { "artifactserver" => cached_cookbook_uri, "version" => "1.0.0" }
           },
 
           "bar" => {
             "version" => "0.1.0",
-            "identifier" => "f7694dbebe4109dfc857af7e2e4475c322c65259",
-            "dotted_decimal_identifier" => id_to_dotted("f7694dbebe4109dfc857af7e2e4475c322c65259"),
+            "identifier" => cookbook_bar_cksum,
+            "dotted_decimal_identifier" => cookbook_bar_cksum_dotted,
             "source" => "bar",
             "cache_key" => nil,
 
@@ -460,24 +570,29 @@ describe ChefDK::PolicyfileLock do
               "working_tree_clean" => true,
               "published" => false,
               "synchronized_remote_branches"=>[]
-            }
+            },
+            "source_options" => { "path" => "bar" }
           }
+        },
+
+        "solution_dependencies" => {
+          "Policyfile" => [ [ "foo", "~> 1.0" ] ],
+          "dependencies" => { "foo (1.0.0)" => [], "bar (0.1.0)" => [] }
         }
       }
     end
 
-
     it "adds a cached cookbook lock generator for the compiler's cached cookbook" do
       expect(policyfile_lock.cookbook_locks).to have_key("foo")
       cb_lock = policyfile_lock.cookbook_locks["foo"]
-      expect(cb_lock.origin).to eq(cached_cookbook_spec.uri)
-      expect(cb_lock.cache_key).to eq(cached_cookbook_spec.cache_key)
+      expect(cb_lock.origin).to eq(cached_location_spec.uri)
+      expect(cb_lock.cache_key).to eq(cached_location_spec.cache_key)
     end
 
     it "adds a local cookbook lock generator for the compiler's local cookbook" do
       expect(policyfile_lock.cookbook_locks).to have_key("bar")
       cb_lock = policyfile_lock.cookbook_locks["bar"]
-      expect(cb_lock.source).to eq(local_cookbook_spec.relative_path)
+      expect(cb_lock.source).to eq(local_location_spec.relative_path)
     end
 
     it "generates a lockfile data structure" do