saucier 0.0.3 → 0.0.4

data/lib/saucier.rb

@@ -14,6 +14,7 @@ module Capistrano::Saucier
 
       namespace :provision do
         after 'deploy:setup', 'provision:set_ownership'
+        after 'deploy:update_code', 'provision:symlink_cookbooks'
         after 'deploy:update_code', 'provision:bundle_install'
 
         set :deploy_to, chef_deploy_to
@@ -23,7 +24,7 @@ module Capistrano::Saucier
             deploy.update_code
             chef_librarian.default
             chef_solo.default
-            provision.symlink_cookbooks
+            deploy.create_symlink
           end
         end
 
@@ -36,9 +37,9 @@ module Capistrano::Saucier
         end
 
         task :symlink_cookbooks do
-          shared_dir = File.join(shared_path, 'cookbooks')
-          release_dir = File.join(current_release, 'cookbooks')
-          run "mkdir -p #{shared_dir}; ln -s #{shared_dir} #{release_dir}"
+          shared_librarian= File.join(shared_path, 'tmp', 'librarian')
+          run "mkdir -p #{shared_librarian}"
+          run "ln -sF #{shared_librarian} #{current_release}/tmp/"
         end
 
         task :bundle_install do

data/lib/saucier/helpers.rb

@@ -1,3 +1,5 @@
+RVM_BIN_PATH='/usr/local/rvm/bin/rvm'
+
 def _cset(name, *args, &block)
   unless exists?(name)
     set(name, *args, &block)
@@ -5,5 +7,6 @@ def _cset(name, *args, &block)
 end
 
 def rvm_wrapper(command)
-  "rvm #{chef_ruby}@#{chef_gemset} --create do #{command}"
+  "#{RVM_BIN_PATH} #{chef_ruby}@#{chef_gemset} --create do #{command}"
 end
+

data/lib/saucier/recipes/chef_librarian.rb

@@ -18,7 +18,7 @@ module Capistrano::Saucier
             task :install do
               command = []
               command << "cd #{current_release}"
-              command << rvm_wrapper("bundle exec librarian-chef install")
+              command << rvm_wrapper("bundle exec librarian-chef install --verbose")
               run command.join(" && ")
             end
           end

data/lib/saucier/recipes/chef_solo.rb

@@ -36,3 +36,4 @@ end
 if instance = Capistrano::Configuration.instance
   Capistrano::Saucier::Recipes::ChefSolo.load_into(instance)
 end
+

data/saucier.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "saucier"
-  s.version     = "0.0.3"
+  s.version     = "0.0.4"
   s.authors     = ["Shaun Dern"]
   s.email       = ["shaun@substantial.com"]
   s.homepage    = "http://github.com/substantial/saucier"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saucier
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1308848195273489696
+      hash: -3872926599791731742
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1308848195273489696
+      hash: -3872926599791731742
 requirements: []
 rubyforge_project: saucier
 rubygems_version: 1.8.24