chef-dk 0.2.0 → 0.2.1

data/spec/unit/cookbook_profiler/git_spec.rb

@@ -46,11 +46,11 @@ describe ChefDK::CookbookProfiler::Git do
     end
 
     it "reports that the repo is clean" do
-      expect(git_profiler.clean?).to be_true
+      expect(git_profiler.clean?).to be true
     end
 
     it "reports that the commits are unpublished" do
-      expect(git_profiler.unpublished_commits?).to be_true
+      expect(git_profiler.unpublished_commits?).to be true
     end
 
     it "reports that no remotes have the commits" do
@@ -74,11 +74,11 @@ describe ChefDK::CookbookProfiler::Git do
       end
 
       it "reports that the repo is clean" do
-        expect(git_profiler.clean?).to be_true
+        expect(git_profiler.clean?).to be true
       end
 
       it "reports that all commits are published to the upstream" do
-        expect(git_profiler.unpublished_commits?).to be_false
+        expect(git_profiler.unpublished_commits?).to be false
       end
 
       it "lists the remotes that commits are published to" do
@@ -97,11 +97,11 @@ describe ChefDK::CookbookProfiler::Git do
       end
 
       it "reports that the repo is clean" do
-        expect(git_profiler.clean?).to be_true
+        expect(git_profiler.clean?).to be true
       end
 
       it "reports that there are unpublished changes" do
-        expect(git_profiler.unpublished_commits?).to be_true
+        expect(git_profiler.unpublished_commits?).to be true
       end
 
       it "reports that no remotes have the commits" do
@@ -118,7 +118,7 @@ describe ChefDK::CookbookProfiler::Git do
     end
 
     it "reports that the repo is dirty" do
-      expect(git_profiler.clean?).to be_false
+      expect(git_profiler.clean?).to be false
     end
 
   end

data/spec/unit/cookbook_profiler/identifiers_spec.rb

@@ -17,6 +17,7 @@
 
 require 'spec_helper'
 require 'chef-dk/cookbook_profiler/identifiers'
+require 'chef-dk/policyfile/read_cookbook_for_compat_mode_upload'
 
 describe ChefDK::CookbookProfiler::Identifiers do
 
@@ -28,15 +29,22 @@ describe ChefDK::CookbookProfiler::Identifiers do
     File.join(cache_path, "foo-1.0.0")
   end
 
+  let(:cookbook_version) do
+    chefignore = Chef::Cookbook::Chefignore.new(File.join(foo_cookbook_path, "chefignore"))
+    cbvl = Chef::Cookbook::CookbookVersionLoader.new(foo_cookbook_path, chefignore)
+    cbvl.load!
+    cbvl.cookbook_version
+  end
+
+
   let(:identifiers) do
-    ChefDK::CookbookProfiler::Identifiers.new(foo_cookbook_path)
+    ChefDK::CookbookProfiler::Identifiers.new(cookbook_version)
   end
 
   let(:cookbook_files_with_cksums) do
     # Entries must be sorted lexically.
     {
       ".kitchen.yml" => "85ba09a085dab072722cb197e04fa805",
-      "Berksfile" => "a668a1df3121f22875e754466f535d8a",
       "README.md" => "0f15038071e5a131bef176cbe2a956d1",
       "chefignore" => "03485640b005eb1083c76518764053dd",
       "metadata.rb" => "4879d0004b177546cfbcfb2fd26df7c8",
@@ -44,10 +52,6 @@ describe ChefDK::CookbookProfiler::Identifiers do
     }
   end
 
-  it "has the cookbook's path" do
-    expect(identifiers.cookbook_path).to eq(foo_cookbook_path)
-  end
-
   it "has the cookbook's semver version" do
     expect(identifiers.semver_version).to eq("1.0.0")
   end
@@ -68,11 +72,11 @@ describe ChefDK::CookbookProfiler::Identifiers do
   end
 
   it "generates a Hash of the cookbook's content" do
-    expect(identifiers.content_identifier).to eq("e4611e9b5ec0636a18979e7dd22537222a2eab47")
+    expect(identifiers.content_identifier).to eq("467dc855408ce8b74f991c5dc2fd72a6aa369b60")
   end
 
   it "generates a dotted decimal representation of the content hash" do
-    expect(identifiers.dotted_decimal_identifier).to eq("64283078773620835.29863387009503781.60619876117319")
+    expect(identifiers.dotted_decimal_identifier).to eq("19841547746970856.51597439762547453.126060145843040")
   end
 
 end

data/spec/unit/fixtures/cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/Berksfile

@@ -1,3 +1,3 @@
-source "https://api.berkshelf.com"
+source "https://supermarket.getchef.com"
 
 metadata

data/spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/Berksfile

@@ -1,3 +1,3 @@
-source "https://api.berkshelf.com"
+source "https://supermarket.getchef.com"
 
 metadata

data/spec/unit/fixtures/cookbook_cache/foo-1.0.0/Berksfile

@@ -1,3 +1,3 @@
-source "https://api.berkshelf.com"
+source "https://supermarket.getchef.com"
 
 metadata

data/spec/unit/fixtures/example_cookbook/Berksfile

@@ -1,3 +1,3 @@
-source "https://api.berkshelf.com"
+source "https://supermarket.getchef.com"
 
 metadata

data/spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/README.md

@@ -0,0 +1,4 @@
+# another-local-cookbook
+
+TODO: Enter the cookbook description here.
+

data/spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/chefignore

@@ -0,0 +1,96 @@
+# Put files/directories that should be ignored in this file when uploading
+# or sharing to the community site.
+# Lines that start with '# ' are comments.
+
+# OS generated files #
+######################
+.DS_Store
+Icon?
+nohup.out
+ehthumbs.db
+Thumbs.db
+
+# SASS #
+########
+.sass-cache
+
+# EDITORS #
+###########
+\#*
+.#*
+*~
+*.sw[a-z]
+*.bak
+REVISION
+TAGS*
+tmtags
+*_flymake.*
+*_flymake
+*.tmproj
+.project
+.settings
+mkmf.log
+
+## COMPILED ##
+##############
+a.out
+*.o
+*.pyc
+*.so
+*.com
+*.class
+*.dll
+*.exe
+*/rdoc/
+
+# Testing #
+###########
+.watchr
+.rspec
+spec/*
+spec/fixtures/*
+test/*
+features/*
+Guardfile
+Procfile
+
+# SCM #
+#######
+.git
+*/.git
+.gitignore
+.gitmodules
+.gitconfig
+.gitattributes
+.svn
+*/.bzr/*
+*/.hg/*
+*/.svn/*
+
+# Berkshelf #
+#############
+Berksfile
+Berksfile.lock
+cookbooks/*
+tmp
+
+# Cookbooks #
+#############
+CONTRIBUTING
+CHANGELOG*
+
+# Strainer #
+############
+Colanderfile
+Strainerfile
+.colander
+.strainer
+
+# Vagrant #
+###########
+.vagrant
+Vagrantfile
+
+# Travis #
+##########
+.travis.yml

data/spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/metadata.rb

@@ -0,0 +1,8 @@
+name             'another-local-cookbook'
+maintainer       ''
+maintainer_email ''
+license          ''
+description      'Installs/Configures another-local-cookbook'
+long_description 'Installs/Configures another-local-cookbook'
+version          '0.1.0'
+

data/spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/recipes/default.rb

@@ -0,0 +1,8 @@
+#
+# Cookbook Name:: another-local-cookbook
+# Recipe:: default
+#
+# Copyright (C) 2014 
+#
+# 
+#

data/spec/unit/fixtures/local_path_cookbooks/local-cookbook/Berksfile

@@ -1,3 +1,3 @@
-source "https://api.berkshelf.com"
+source "https://supermarket.getchef.com"
 
 metadata

data/spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/.kitchen.yml

@@ -0,0 +1,16 @@
+---
+driver:
+  name: vagrant
+
+provisioner:
+  name: chef_solo
+
+platforms:
+  - name: ubuntu-12.04
+  - name: centos-6.4
+
+suites:
+  - name: default
+    run_list:
+      - recipe[noignore::default]
+    attributes:

data/spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/README.md

@@ -0,0 +1,4 @@
+# noignore
+
+TODO: Enter the cookbook description here.
+

data/spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/metadata.rb

@@ -0,0 +1,8 @@
+name             'noignore'
+maintainer       ''
+maintainer_email ''
+license          ''
+description      'a cookbook w/o chefignore'
+long_description 'a cookbook w/o chefignore'
+version          '0.1.0'
+

data/spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/recipes/default.rb

@@ -0,0 +1,8 @@
+#
+# Cookbook Name:: noignore
+# Recipe:: default
+#
+# Copyright (C) 2014 
+#
+# 
+#

data/spec/unit/generator_spec.rb

@@ -0,0 +1,120 @@
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'chef-dk/generator'
+
+describe ChefDK::Generator do
+
+  before(:each) do
+    ChefDK::Generator.reset
+  end
+
+  describe "self.add_attr_to_context" do
+    it "adds an accessor for the symbol to the context object" do
+      ChefDK::Generator.add_attr_to_context(:snakes)
+      expect(ChefDK::Generator.context.snakes = 5).to be_eql(5)
+      expect(ChefDK::Generator.context.snakes).to be_eql(5)
+    end
+
+    it "delegates the accessor from the template helper" do
+      ChefDK::Generator.add_attr_to_context(:snakes)
+      ChefDK::Generator.context.snakes = 5
+      expect(ChefDK::Generator::TemplateHelper.instance_methods).to include(:snakes)
+    end
+
+    it "sets a value" do
+      ChefDK::Generator.add_attr_to_context(:snakes, 5)
+      expect(ChefDK::Generator.context.snakes).to be_eql(5)
+    end
+  end
+end
+
+class TmplTest
+  include ChefDK::Generator::TemplateHelper
+end
+
+describe ChefDK::Generator::TemplateHelper do
+  let(:license) { 'all_rights' }
+  let(:copyright_holder) { 'Adam Jacob' }
+  let(:helper) { TmplTest.new }
+
+  before(:each) do
+    ChefDK::Generator.reset
+    ChefDK::Generator.add_attr_to_context(:license, license)
+    ChefDK::Generator.add_attr_to_context(:copyright_holder, 'Adam Jacob')
+  end
+
+  describe 'license_description' do
+    let(:license) { "all_rights" }
+    context "all_rights" do
+      it "should match the license" do
+        expect(helper.license_description).to match(/^Copyright \(c\)/)
+      end
+
+      it "should comment if requested" do
+        expect(helper.license_description('#')).to match(/^# Copyright/)
+      end
+    end
+
+    context "apache2" do
+      let(:license) { 'apache2' }
+      it "should match the license" do
+        expect(helper.license_description).to match(/Licensed under the Apache/)
+      end
+
+      it "should comment if requested" do
+        expect(helper.license_description('#')).to match(/# Licensed under the Apache/)
+      end
+    end
+
+    context "mit" do
+      let(:license) { 'mit' }
+      it "should match the license" do
+        expect(helper.license_description).to match(/Permission is hereby granted/)
+      end
+
+      it "should comment if requested" do
+        expect(helper.license_description('#')).to match(/# Permission is hereby granted/)
+      end
+    end
+
+    context "gplv2" do
+      let(:license) { 'gplv2' }
+      it "should match the license" do
+        expect(helper.license_description).to match(/This program is free software;/)
+      end
+
+      it "should comment if requested" do
+        expect(helper.license_description('#')).to match(/# This program is free software;/)
+      end
+    end
+
+    context "gplv3" do
+      let(:license) { 'gplv3' }
+      it "should match the license" do
+        expect(helper.license_description).to match(/This program is free software:/)
+      end
+
+      it "should comment if requested" do
+        expect(helper.license_description('#')).to match(/# This program is free software:/)
+      end
+    end
+  end
+
+end
+

data/spec/unit/policyfile/{cookbook_spec_spec.rb → cookbook_location_specification_spec.rb}

@@ -16,9 +16,9 @@
 #
 
 require 'spec_helper'
-require 'chef-dk/policyfile/cookbook_spec'
+require 'chef-dk/policyfile/cookbook_location_specification'
 
-describe ChefDK::Policyfile::CookbookSpec do
+describe ChefDK::Policyfile::CookbookLocationSpecification do
 
   let(:policyfile_filename) { File.join(fixtures_path, "example_app/Policyfile.rb") }
 
@@ -32,84 +32,95 @@ describe ChefDK::Policyfile::CookbookSpec do
 
   let(:installer) { double("CookbookOmnifetch location", cached_cookbook: cached_cookbook) }
 
-  let(:cookbook_spec) { described_class.new(cookbook_name, version_constraint, source_options, policyfile_filename) }
+  let(:storage_config) do
+    ChefDK::Policyfile::StorageConfig.new.use_policyfile(policyfile_filename)
+  end
+
+  let(:cookbook_location_spec) { described_class.new(cookbook_name, version_constraint, source_options, storage_config) }
 
   it "has a name" do
-    expect(cookbook_spec.name).to eq(cookbook_name)
+    expect(cookbook_location_spec.name).to eq(cookbook_name)
   end
 
   it "has a version constraint" do
-    expect(cookbook_spec.version_constraint).to eq(Semverse::Constraint.new(version_constraint))
+    expect(cookbook_location_spec.version_constraint).to eq(Semverse::Constraint.new(version_constraint))
   end
 
   it "has source options it was created with" do
-    expect(cookbook_spec.source_options).to eq(source_options)
+    expect(cookbook_location_spec.source_options).to eq(source_options)
   end
 
   it "is equal to another cookbook spec with the same name, constraint, and options" do
-    equal_spec = described_class.new(cookbook_name, version_constraint, source_options, policyfile_filename)
-    expect(cookbook_spec).to eq(equal_spec)
+    equal_spec = described_class.new(cookbook_name, version_constraint, source_options, storage_config)
+    expect(cookbook_location_spec).to eq(equal_spec)
   end
 
   it "is not equal to another cookbook spec if the name, constraint or option differ" do
-    different_name = described_class.new("wut", version_constraint, source_options, policyfile_filename)
-    expect(cookbook_spec).to_not eq(different_name)
+    different_name = described_class.new("wut", version_constraint, source_options, storage_config)
+    expect(cookbook_location_spec).to_not eq(different_name)
 
-    different_constraint = described_class.new(cookbook_name, ">= 1.0.0", source_options, policyfile_filename)
-    expect(cookbook_spec).to_not eq(different_constraint)
+    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"}, policyfile_filename)
-    expect(cookbook_spec).to_not eq(different_opts)
+    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
 
   it "gives the base directory from which relative paths will be expanded" do
-    expect(cookbook_spec.relative_paths_root).to eq(File.join(fixtures_path, "example_app"))
+    expect(cookbook_location_spec.relative_paths_root).to eq(File.join(fixtures_path, "example_app"))
+  end
+
+  it "gives source options for locking via the installer" do
+    lock_data = double("Installer lock data")
+    expect(installer).to receive(:lock_data).and_return(lock_data)
+    expect(cookbook_location_spec).to receive(:installer).and_return(installer)
+    expect(cookbook_location_spec.source_options_for_lock).to eq(lock_data)
   end
 
   describe "fetching and querying a cookbook" do
 
     before do
-      expect(CookbookOmnifetch).to receive(:init).with(cookbook_spec, source_options).and_return(installer)
+      expect(CookbookOmnifetch).to receive(:init).with(cookbook_location_spec, source_options).and_return(installer)
     end
 
     it "initializes a CookbookOmnifetch location class to handle installation" do
-      expect(cookbook_spec.installer).to eq(installer)
+      expect(cookbook_location_spec.installer).to eq(installer)
     end
 
     it "delegates installation to the installer" do
       expect(installer).to receive(:installed?).and_return(false)
       expect(installer).to receive(:install)
-      cookbook_spec.ensure_cached
+      cookbook_location_spec.ensure_cached
     end
 
     it "does not install the cookbook if it's already cached" do
       expect(installer).to receive(:installed?).and_return(true)
       expect(installer).to_not receive(:install)
-      cookbook_spec.ensure_cached
+      cookbook_location_spec.ensure_cached
     end
 
     it "delegates cache_key to the installer" do
       expect(installer).to receive(:cache_key).and_return("my_cookbook-1.2.3-supermarket.getchef.com")
-      expect(cookbook_spec.cache_key).to eq("my_cookbook-1.2.3-supermarket.getchef.com")
+      expect(cookbook_location_spec.cache_key).to eq("my_cookbook-1.2.3-supermarket.getchef.com")
     end
 
     it "delegates relative_path to the installer" do
       expect(installer).to receive(:relative_path).and_return(Pathname.new("../my_stuff/my_cookbook"))
-      expect(cookbook_spec.relative_path).to eq("../my_stuff/my_cookbook")
+      expect(cookbook_location_spec.relative_path).to eq("../my_stuff/my_cookbook")
     end
 
     it "loads the cookbook metadata via the installer" do
-      expect(cookbook_spec.cached_cookbook).to eq(cached_cookbook)
+      expect(cookbook_location_spec.cached_cookbook).to eq(cached_cookbook)
     end
 
     it "gives the cookbook's version via the metadata" do
       expect(cached_cookbook).to receive(:version).and_return("1.2.3")
-      expect(cookbook_spec.version).to eq("1.2.3")
+      expect(cookbook_location_spec.version).to eq("1.2.3")
     end
 
     it "gives the cookbook's dependencies via the metadata" do
       expect(cached_cookbook).to receive(:dependencies).and_return("apt" => "~> 1.2.3")
-      expect(cookbook_spec.dependencies).to eq("apt" => "~> 1.2.3")
+      expect(cookbook_location_spec.dependencies).to eq("apt" => "~> 1.2.3")
     end
 
   end
@@ -117,11 +128,24 @@ describe ChefDK::Policyfile::CookbookSpec do
   describe "when created with no source" do
 
     it "has a nil installer" do
-      expect(cookbook_spec.installer).to be_nil
+      expect(cookbook_location_spec.installer).to be_nil
     end
 
     it "is not at a fixed version" do
-      expect(cookbook_spec.version_fixed?).to be false
+      expect(cookbook_location_spec.version_fixed?).to be false
+    end
+
+  end
+
+  describe "when created with invalid source options" do
+
+    let(:source_options) { { herp: "derp" } }
+
+    it "is invalid" do
+      expect(cookbook_location_spec).to_not be_valid
+      expect(cookbook_location_spec.errors.size).to eq(1)
+      error = cookbook_location_spec.errors.first
+      expect(error).to eq("Cookbook `my_cookbook' has invalid source options `{:herp=>\"derp\"}'")
     end
 
   end
@@ -131,15 +155,20 @@ describe ChefDK::Policyfile::CookbookSpec do
     let(:source_options) { { git: "git@github.com:example/my_cookbook.git" } }
 
     it "has a git installer" do
-      expect(cookbook_spec.installer).to be_a_kind_of(CookbookOmnifetch::GitLocation)
+      expect(cookbook_location_spec.installer).to be_a_kind_of(CookbookOmnifetch::GitLocation)
     end
 
     it "has a fixed version" do
-      expect(cookbook_spec.version_fixed?).to be true
+      expect(cookbook_location_spec.version_fixed?).to be true
     end
 
     it "mirrors a canonical upstream" do
-      expect(cookbook_spec.mirrors_canonical_upstream?).to be true
+      expect(cookbook_location_spec.mirrors_canonical_upstream?).to be true
+    end
+
+    it "is valid" do
+      expect(cookbook_location_spec.errors.size).to eq(0)
+      expect(cookbook_location_spec).to be_valid
     end
 
   end
@@ -149,15 +178,20 @@ describe ChefDK::Policyfile::CookbookSpec do
     let(:source_options) { { github: "my_org/my_cookbook" } }
 
     it "has a github installer" do
-      expect(cookbook_spec.installer).to be_a_kind_of(CookbookOmnifetch::GithubLocation)
+      expect(cookbook_location_spec.installer).to be_a_kind_of(CookbookOmnifetch::GithubLocation)
     end
 
     it "has a fixed version" do
-      expect(cookbook_spec.version_fixed?).to be true
+      expect(cookbook_location_spec.version_fixed?).to be true
     end
 
     it "mirrors a canonical upstream" do
-      expect(cookbook_spec.mirrors_canonical_upstream?).to be true
+      expect(cookbook_location_spec.mirrors_canonical_upstream?).to be true
+    end
+
+    it "is valid" do
+      expect(cookbook_location_spec.errors.size).to eq(0)
+      expect(cookbook_location_spec).to be_valid
     end
 
   end
@@ -167,15 +201,20 @@ describe ChefDK::Policyfile::CookbookSpec do
     let(:source_options) { { path: "../example_cookbook" } }
 
     it "has a path installer" do
-      expect(cookbook_spec.installer).to be_a_kind_of(CookbookOmnifetch::PathLocation)
+      expect(cookbook_location_spec.installer).to be_a_kind_of(CookbookOmnifetch::PathLocation)
     end
 
     it "has a fixed version" do
-      expect(cookbook_spec.version_fixed?).to be true
+      expect(cookbook_location_spec.version_fixed?).to be true
     end
 
     it "isnt a mirror of a canonical upstream" do
-      expect(cookbook_spec.mirrors_canonical_upstream?).to be false
+      expect(cookbook_location_spec.mirrors_canonical_upstream?).to be false
+    end
+
+    it "is valid" do
+      expect(cookbook_location_spec.errors.size).to eq(0)
+      expect(cookbook_location_spec).to be_valid
     end
 
   end
@@ -185,16 +224,22 @@ describe ChefDK::Policyfile::CookbookSpec do
     let(:source_options) { { artifactserver: "https://supermarket.getchef.com:/api/v1/cookbooks/my_cookbook/versions/2.0.0/download" } }
 
     it "has a artifactserver installer" do
-      expect(cookbook_spec.installer).to be_a_kind_of(CookbookOmnifetch::ArtifactserverLocation)
+      expect(cookbook_location_spec.installer).to be_a_kind_of(CookbookOmnifetch::ArtifactserverLocation)
     end
 
     it "does not have a fixed version" do
-      expect(cookbook_spec.version_fixed?).to be false
+      expect(cookbook_location_spec.version_fixed?).to be false
     end
 
     it "is a mirror of a canonical upstream" do
-      expect(cookbook_spec.mirrors_canonical_upstream?).to be true
+      expect(cookbook_location_spec.mirrors_canonical_upstream?).to be true
+    end
+
+    it "is valid" do
+      expect(cookbook_location_spec.errors.size).to eq(0)
+      expect(cookbook_location_spec).to be_valid
     end
 
+
   end
 end