chef-dk 0.4.0 → 0.5.0.rc.1

data/spec/unit/policyfile_evaluation_spec.rb

@@ -206,6 +206,22 @@ E
 
         end
 
+        context "with an added cookbook with no options" do
+
+          let(:policyfile_rb) do
+            <<-EOH
+              run_list "foo", "bar"
+              cookbook "baz"
+            EOH
+          end
+
+          it "adds the cookbook to the list of location specs" do
+            expect(policyfile.errors).to eq([])
+            expected_cb_spec = ChefDK::Policyfile::CookbookLocationSpecification.new("baz", ">= 0.0.0", {}, storage_config)
+            expect(policyfile.cookbook_location_specs).to eq("baz" => expected_cb_spec)
+          end
+        end
+
       end
 
       context "with the default source set to a chef server" do

data/spec/unit/policyfile_lock_build_spec.rb

@@ -145,8 +145,21 @@ describe ChefDK::PolicyfileLock, "building a lockfile" do
       end
     end
 
+    let(:expected_canonical_revision_string) do
+      <<-REVISION_STRING
+name:minimal_policyfile
+run-list-item:recipe[foo]
+cookbook:foo;id:467dc855408ce8b74f991c5dc2fd72a6aa369b60
+REVISION_STRING
+    end
+
+    let(:expected_revision_id) do
+      Digest::SHA1.new.hexdigest(expected_canonical_revision_string)
+    end
+
     let(:compiled_policyfile) do
       {
+        "revision_id" => expected_revision_id,
 
         "name" => "minimal_policyfile",
 
@@ -175,6 +188,14 @@ describe ChefDK::PolicyfileLock, "building a lockfile" do
       expect(policyfile_lock.to_lock).to eq(compiled_policyfile)
     end
 
+    it "generates a canonical revision string" do
+      expect(policyfile_lock.canonical_revision_string).to eq(expected_canonical_revision_string)
+    end
+
+    it "generates a revision id" do
+      expect(policyfile_lock.revision_id).to eq(expected_revision_id)
+    end
+
   end
 
   context "with a policyfile containing a local cookbook" do
@@ -199,9 +220,23 @@ describe ChefDK::PolicyfileLock, "building a lockfile" do
       end
     end
 
+    let(:expected_canonical_revision_string) do
+      <<-REVISION_STRING
+name:dev_cookbook
+run-list-item:recipe[bar]
+cookbook:bar;id:#{cookbook_bar_cksum}
+REVISION_STRING
+    end
+
+    let(:expected_revision_id) do
+      Digest::SHA1.new.hexdigest(expected_canonical_revision_string)
+    end
+
     let(:compiled_policyfile) do
       {
 
+        "revision_id" => expected_revision_id,
+
         "name" => "dev_cookbook",
 
         "run_list" => ["recipe[bar]"],
@@ -234,6 +269,15 @@ describe ChefDK::PolicyfileLock, "building a lockfile" do
       actual_lock = policyfile_lock.to_lock
       expect(actual_lock).to eq(compiled_policyfile)
     end
+
+    it "generates a canonical revision string" do
+      expect(policyfile_lock.canonical_revision_string).to eq(expected_canonical_revision_string)
+    end
+
+    it "generates a revision id" do
+      expect(policyfile_lock.revision_id).to eq(expected_revision_id)
+    end
+
   end
 
   context "with a policyfile using custom identifiers" do
@@ -269,9 +313,24 @@ describe ChefDK::PolicyfileLock, "building a lockfile" do
 
     end
 
+    let(:expected_canonical_revision_string) do
+      <<-REVISION_STRING
+name:custom_identifier
+run-list-item:recipe[foo]
+cookbook:foo;id:1.0.0
+cookbook:bar;id:0.1.0
+REVISION_STRING
+    end
+
+    let(:expected_revision_id) do
+      Digest::SHA1.new.hexdigest(expected_canonical_revision_string)
+    end
+
     let(:compiled_policyfile) do
       {
 
+        "revision_id" => expected_revision_id,
+
         "name" => "custom_identifier",
 
         "run_list" => ["recipe[foo]"],
@@ -313,6 +372,14 @@ describe ChefDK::PolicyfileLock, "building a lockfile" do
       expect(policyfile_lock.to_lock).to eq(compiled_policyfile)
     end
 
+    it "generates a canonical revision string" do
+      expect(policyfile_lock.canonical_revision_string).to eq(expected_canonical_revision_string)
+    end
+
+    it "generates a revision id" do
+      expect(policyfile_lock.revision_id).to eq(expected_revision_id)
+    end
+
   end
 
   context "with a policyfile lock with a mix of cached and local cookbooks" do
@@ -361,10 +428,28 @@ describe ChefDK::PolicyfileLock, "building a lockfile" do
 
     end
 
+    let(:expected_canonical_revision_string) do
+      <<-REVISION_STRING
+name:basic_example
+run-list-item:recipe[foo]
+run-list-item:recipe[bar]
+run-list-item:recipe[baz::non_default]
+cookbook:foo;id:#{cookbook_foo_cksum}
+cookbook:bar;id:#{cookbook_bar_cksum}
+cookbook:baz;id:#{cookbook_baz_cksum}
+cookbook:dep_of_bar;id:#{cookbook_dep_of_bar_cksum}
+REVISION_STRING
+    end
+
+    let(:expected_revision_id) do
+      Digest::SHA1.new.hexdigest(expected_canonical_revision_string)
+    end
 
     let(:compiled_policyfile) do
       {
 
+        "revision_id" => expected_revision_id,
+
         "name" => "basic_example",
 
         "run_list" => ["recipe[foo]", "recipe[bar]", "recipe[baz::non_default]"],
@@ -441,6 +526,14 @@ describe ChefDK::PolicyfileLock, "building a lockfile" do
       expect(policyfile_lock.to_lock).to eq(compiled_policyfile)
     end
 
+    it "generates a canonical revision string" do
+      expect(policyfile_lock.canonical_revision_string).to eq(expected_canonical_revision_string)
+    end
+
+    it "generates a revision id" do
+      expect(policyfile_lock.revision_id).to eq(expected_revision_id)
+    end
+
   end
 
   context "with solution dependencies specified" do
@@ -462,9 +555,23 @@ describe ChefDK::PolicyfileLock, "building a lockfile" do
       end
     end
 
+    let(:expected_canonical_revision_string) do
+      <<-REVISION_STRING
+name:minimal_policyfile
+run-list-item:recipe[foo]
+cookbook:foo;id:#{cookbook_foo_cksum}
+REVISION_STRING
+    end
+
+    let(:expected_revision_id) do
+      Digest::SHA1.new.hexdigest(expected_canonical_revision_string)
+    end
+
     let(:compiled_policyfile) do
       {
 
+        "revision_id" => expected_revision_id,
+
         "name" => "minimal_policyfile",
 
         "run_list" => ["recipe[foo]"],
@@ -511,9 +618,24 @@ describe ChefDK::PolicyfileLock, "building a lockfile" do
       end
     end
 
+    let(:expected_canonical_revision_string) do
+      <<-REVISION_STRING
+name:minimal_policyfile
+run-list-item:recipe[foo]
+named-run-list:rl2;run-list-item:recipe[foo::bar]
+cookbook:foo;id:#{cookbook_foo_cksum}
+REVISION_STRING
+    end
+
+    let(:expected_revision_id) do
+      Digest::SHA1.new.hexdigest(expected_canonical_revision_string)
+    end
+
     let(:compiled_policyfile) do
       {
 
+        "revision_id" => expected_revision_id,
+
         "name" => "minimal_policyfile",
 
         "run_list" => ["recipe[foo]"],
@@ -540,6 +662,14 @@ describe ChefDK::PolicyfileLock, "building a lockfile" do
       expect(policyfile_lock.to_lock).to eq(compiled_policyfile)
     end
 
+    it "generates a canonical revision string" do
+      expect(policyfile_lock.canonical_revision_string).to eq(expected_canonical_revision_string)
+    end
+
+    it "generates a revision id" do
+      expect(policyfile_lock.revision_id).to eq(expected_revision_id)
+    end
+
   end
 
   describe "building a policyfile lock from a policyfile compiler" do
@@ -589,9 +719,27 @@ describe ChefDK::PolicyfileLock, "building a lockfile" do
       ChefDK::PolicyfileLock.build_from_compiler(policyfile_compiler, storage_config)
     end
 
+
+    let(:expected_canonical_revision_string) do
+      <<-REVISION_STRING
+name:my-policyfile
+run-list-item:recipe[foo::default]
+run-list-item:recipe[bar::default]
+named-run-list:rl2;run-list-item:recipe[bar::default]
+cookbook:foo;id:#{cookbook_foo_cksum}
+cookbook:bar;id:#{cookbook_bar_cksum}
+REVISION_STRING
+    end
+
+    let(:expected_revision_id) do
+      Digest::SHA1.new.hexdigest(expected_canonical_revision_string)
+    end
+
     let(:compiled_policyfile) do
       {
 
+        "revision_id" => expected_revision_id,
+
         "name" => "my-policyfile",
 
         "run_list" => ["recipe[foo::default]", "recipe[bar::default]"],
@@ -656,6 +804,14 @@ describe ChefDK::PolicyfileLock, "building a lockfile" do
       expect(policyfile_lock.to_lock).to eq(compiled_policyfile)
     end
 
+    it "generates a canonical revision string" do
+      expect(policyfile_lock.canonical_revision_string).to eq(expected_canonical_revision_string)
+    end
+
+    it "generates a revision id" do
+      expect(policyfile_lock.revision_id).to eq(expected_revision_id)
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-dk
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0.rc.1
 platform: ruby
 authors:
 - Daniel DeLeo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -67,6 +67,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.2.0.rc.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,6 +77,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.2.0.rc.2
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
@@ -223,15 +229,19 @@ files:
 - lib/chef-dk/shell_out.rb
 - lib/chef-dk/skeletons/code_generator/files/default/Berksfile
 - lib/chef-dk/skeletons/code_generator/files/default/chefignore
+- lib/chef-dk/skeletons/code_generator/files/default/cookbook_readmes/README-policy.md
+- lib/chef-dk/skeletons/code_generator/files/default/cookbook_readmes/README.md
 - lib/chef-dk/skeletons/code_generator/files/default/gitignore
 - lib/chef-dk/skeletons/code_generator/files/default/repo/README.md
-- lib/chef-dk/skeletons/code_generator/files/default/repo/Rakefile
-- lib/chef-dk/skeletons/code_generator/files/default/repo/certificates/README.md
-- lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/README-policy.md
-- lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/README.md
+- lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/attributes/default.rb
+- lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/metadata.rb
+- lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/recipes/default.rb
 - lib/chef-dk/skeletons/code_generator/files/default/repo/data_bags/README.md
+- lib/chef-dk/skeletons/code_generator/files/default/repo/data_bags/example/example_item.json
 - lib/chef-dk/skeletons/code_generator/files/default/repo/environments/README.md
+- lib/chef-dk/skeletons/code_generator/files/default/repo/environments/example.json
 - lib/chef-dk/skeletons/code_generator/files/default/repo/roles/README.md
+- lib/chef-dk/skeletons/code_generator/files/default/repo/roles/example.json
 - lib/chef-dk/skeletons/code_generator/files/default/serverspec_spec_helper.rb
 - lib/chef-dk/skeletons/code_generator/files/default/spec_helper.rb
 - lib/chef-dk/skeletons/code_generator/metadata.rb
@@ -258,7 +268,6 @@ files:
 - lib/chef-dk/skeletons/code_generator/templates/default/provider.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/recipe.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/recipe_spec.rb.erb
-- lib/chef-dk/skeletons/code_generator/templates/default/repo/config/rake.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/repo/gitignore.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/resource.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/serverspec_default_spec.rb.erb
@@ -415,9 +424,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.2

data/lib/chef-dk/skeletons/code_generator/files/default/repo/Rakefile

@@ -1,65 +0,0 @@
-#
-# Rakefile for Chef Server Repository
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, 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 'rubygems'
-require 'chef'
-require 'json'
-
-# Load constants from rake config file.
-require File.join(File.dirname(__FILE__), 'config', 'rake')
-
-# Detect the version control system and assign to $vcs. Used by the update
-# task in chef_repo.rake (below). The install task calls update, so this
-# is run whenever the repo is installed.
-#
-# Comment out these lines to skip the update.
-
-if File.directory?(File.join(TOPDIR, ".svn"))
-  $vcs = :svn
-elsif File.directory?(File.join(TOPDIR, ".git"))
-  $vcs = :git
-end
-
-# Load common, useful tasks from Chef.
-# rake -T to see the tasks this loads.
-
-load 'chef/tasks/chef_repo.rake'
-
-desc "Bundle a single cookbook for distribution"
-task :bundle_cookbook => [ :metadata ]
-task :bundle_cookbook, :cookbook do |t, args|
-  tarball_name = "#{args.cookbook}.tar.gz"
-  temp_dir = File.join(Dir.tmpdir, "chef-upload-cookbooks")
-  temp_cookbook_dir = File.join(temp_dir, args.cookbook)
-  tarball_dir = File.join(TOPDIR, "pkgs")
-  FileUtils.mkdir_p(tarball_dir)
-  FileUtils.mkdir(temp_dir)
-  FileUtils.mkdir(temp_cookbook_dir)
-
-  child_folders = [ "cookbooks/#{args.cookbook}", "site-cookbooks/#{args.cookbook}" ]
-  child_folders.each do |folder|
-    file_path = File.join(TOPDIR, folder, ".")
-    FileUtils.cp_r(file_path, temp_cookbook_dir) if File.directory?(file_path)
-  end
-
-  system("tar", "-C", temp_dir, "-cvzf", File.join(tarball_dir, tarball_name), "#{args.cookbook}")
-
-  FileUtils.rm_rf temp_dir
-end

data/lib/chef-dk/skeletons/code_generator/files/default/repo/certificates/README.md

@@ -1,19 +0,0 @@
-Creating SSL certificates is a common task done in web application infrastructures, so a rake task is provided to generate certificates.  These certificates are stored here by the ssl_cert task.  
-
-Configure the values used in the SSL certificate by modifying `config/rake.rb`.
-
-To generate a certificate set for a new monitoring server, for example:
-
-    rake ssl_cert FQDN=monitoring.example.com
-
-Once the certificates are generated, copy them into the cookbook(s) where you want to use them.
-
-    cp certificates/monitoring.example.com.* cookbooks/COOKBOOK/files/default
-
-In the recipe for that cookbook, create a `cookbook_file` resource to configure a resource that puts them in place on the destination server.
-
-    cookbook_file '/etc/apache2/ssl/monitoring.example.com.pem'
-      owner 'root'
-      group 'root'
-      mode 0600
-    end