capistrano-paratrooper-chef 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1709b90a60e5e58f7b058244cb5e984ee5b3d6c0
-  data.tar.gz: 706ca5d5aa700e596b6a83957747f7306db6de46
+  metadata.gz: b4590b846a1a7a6109a2a3ab2636e488f7d5300a
+  data.tar.gz: 50a5c13c58a9cf446b1bf90132e9bd8c3ee1c38f
 SHA512:
-  metadata.gz: f7691d026c82465560421fbccbfd2db1e964a1716824be9ec631ae2566e3f78530a7cac017ebb57a25647e6aa8bed27cba9080000e081d7a84f47f66ec186565
-  data.tar.gz: 1a362311ae34da0fa56ed2c64c7be8bf0a3b084072f54449034b86871ce33a82421da27ca4d63ae04c225229ef0ab0f927688fd76f09d06ae528f4aa8fd4ffd1
+  metadata.gz: d5955f75d2567e37d8c7bf35cf85044a3eb8f332c0ea3ba4e6d82ab7a3be40d22aa6d7032edca932f861e02329feb8eb1889faafc1a7cddd6697822525be3897
+  data.tar.gz: 0c87ad33f5c47362fe99349921b0b19a1c965daa8e22f056737e5dce764fb8bc39aae30aebb35a0fc52e5554b82adf2ae35718326bba80d62d1cd5e78254d907

data/README.md

@@ -29,8 +29,9 @@ To setup paratrooper-chef for your application, add following in you config/depl
 And then, put your chef-kitchen files to config/ directory. 
 by default, paratrooper-chef uses following files and directories.
 
+* config/Berksfile
+* config/Cheffile
 * config/solo.rb
-* config/cookbooks
 * config/site-cookbooks
 * config/roles
 * config/environments
@@ -120,7 +121,8 @@ Following options are available.
 
     * `:chef_kitchen_path` - root directory of kitchen. use `config` by default.
     * `:chef_default_solo_json_path` - default attribute file a.k.a solo.json. use `solo.json` by default. 
-    * `:chef_cookbooks_path` - cookbooks directories list. use `["cookbooks", "site-cookbooks"]` by default.
+    * `:chef_cookbooks_path` - cookbooks directory (or list of directories). use `site-cookbooks` by default.
+    * `:chef_vendor_cookbooks_path` - cookbooks directory for berkshelf/librarian. use `vendor/cookbooks` by default.
     * `:chef_nodes_path` - nodes directory. use `nodes` by default.
     * `:chef_roles_path` - roles directory. use `roles` by default.
     * `:chef_environment` - environment setting. empty by default.

data/lib/capistrano-paratrooper-chef/chef.rb

@@ -26,7 +26,8 @@ Capistrano::Configuration.instance.load do
     set :chef_kitchen_path, "config"
     set :chef_default_solo_json_path, "solo.json"
     set :chef_nodes_path, "nodes"
-    set :chef_cookbooks_path, ["cookbooks", "site-cookbooks"]
+    set :chef_cookbooks_path, ["site-cookbooks"]
+    set :chef_vendor_cookbooks_path, "vendor/cookbooks"
     set :chef_roles_path, "roles"
     set :chef_environment, nil
     set :chef_environment_path, "environments"
@@ -82,7 +83,12 @@ Capistrano::Configuration.instance.load do
     end
 
     def cookbooks_paths
-      fetch(:chef_cookbooks_path).collect{|path| File.join(fetch(:chef_kitchen_path), path)}
+      dirs = [fetch(:chef_cookbooks_path), fetch(:chef_vendor_cookbooks_path)].flatten
+      dirs.collect{|path| File.join(fetch(:chef_kitchen_path), path)}
+    end
+
+    def vendor_cookbooks_path
+      File.join(fetch(:chef_kitchen_path), fetch(:chef_vendor_cookbooks_path))
     end
 
     def roles_path
@@ -239,7 +245,14 @@ Capistrano::Configuration.instance.load do
 
           if File.exist? 'Berksfile'
             logger.debug("executing berkshelf")
-            Berkshelf::Berksfile.from_file('Berksfile').install(:path => cookbooks_paths[0])
+            berksfile = Berkshelf::Berksfile.from_file('Berksfile')
+            if berksfile.respond_to?(:vendor)
+              FileUtils.rm_rf(vendor_cookbooks_path)
+              FileUtils.mkdir_p(File.dirname(vendor_cookbooks_path))
+              berksfile.vendor(vendor_cookbooks_path)
+            else
+              berksfile.install(:path => vendor_cookbooks_path)
+            end
           end
         rescue LoadError
           # pass
@@ -262,7 +275,7 @@ Capistrano::Configuration.instance.load do
 
         def librarian_env
           @librarian_env ||= Librarian::Chef::Environment.new
-          @librarian_env.config_db.local["path"] = cookbooks_paths[0]
+          @librarian_env.config_db.local["path"] = vendor_cookbooks_path
           @librarian_env
         end
       end

data/lib/capistrano-paratrooper-chef/version.rb

@@ -16,7 +16,7 @@
 module Capistrano
   module Paratrooper
     module Chef
-      VERSION = "0.4.0"
+      VERSION = "0.4.1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-paratrooper-chef
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Takeshi KOMIYA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano