capistrano_chef_solo 0.0.2 → 0.0.3

data/README.md

@@ -46,6 +46,7 @@ a simple VM first.
 ## Todo
 
 * Support roles in both Capistrano and Chef.
+* Support remote cookbooks
 
 ## Tips
 

data/lib/capistrano_chef_solo.rb

@@ -256,6 +256,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       if run_list.empty?
         abort "Please specify a run list, before('deploy') { chef.solo('recipe[foo]', 'recipe[bar]') }"
       end
+      ensure_cookbooks
       default
       deploy.setup
       run "mkdir -p /tmp/chef"
@@ -265,14 +266,18 @@ Capistrano::Configuration.instance(:must_exist).load do
       stream_or_run "#{sudo} chef-solo -c /tmp/chef/solo.rb -j /tmp/chef/solo.json"
     end
 
-    def cookbooks
-      fetch :cookbooks do
-        [ "config/cookbooks", "vendor/cookbooks" ].select { |path| File.exist?(path) }
+    def ensure_cookbooks
+      if cookbooks.empty?
+        abort "Please put some cookbooks in `config/cookbooks` or `vendor/cookbooks` or set :cookbooks to a path where the cookbooks are located"
       end
     end
 
+    def cookbooks
+      Array(fetch(:cookbooks) { [ "config/cookbooks", "vendor/cookbooks" ].select { |path| File.exist?(path) } })
+    end
+
     def generate_config
-      cookbook_paths = Array(cookbooks).map { |c| "File.join(root, #{c.to_s.inspect})" }.join(', ')
+      cookbook_paths = cookbooks.map { |c| "File.join(root, #{c.to_s.inspect})" }.join(', ')
       solo_rb = <<-RUBY
         root = File.absolute_path(File.dirname(__FILE__))
         file_cache_path File.join(root, "cache")
@@ -304,7 +309,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       tar_file = Tempfile.new("cookbooks.tar")
       begin
         tar_file.close
-        system "tar -cjf #{tar_file.path} #{Array(cookbooks).join(' ')}"
+        system "tar -cjf #{tar_file.path} #{cookbooks.join(' ')}"
         upload tar_file.path, "/tmp/chef/cookbooks.tar", :via => :scp
         run "cd /tmp/chef && tar -xjf cookbooks.tar"
       ensure

data/lib/capistrano_chef_solo/version.rb

@@ -1,3 +1,3 @@
 module CapistranoChefSolo
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_chef_solo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2173516120 !ruby/object:Gem::Requirement
+  requirement: &2165615400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2173516120
+  version_requirements: *2165615400
 description: This gem provides Capistrano tasks to run chef-solo with Capistrano,
   with hardly any configuration needed.
 email: