saucier 0.0.2 → 0.0.3

data/lib/saucier/helpers.rb

@@ -3,3 +3,7 @@ def _cset(name, *args, &block)
     set(name, *args, &block)
   end
 end
+
+def rvm_wrapper(command)
+  "rvm #{chef_ruby}@#{chef_gemset} --create do #{command}"
+end

data/lib/saucier/recipes/chef_librarian.rb

@@ -17,10 +17,8 @@ module Capistrano::Saucier
 
             task :install do
               command = []
-              command << ". /etc/profile.d/rvm.sh"
               command << "cd #{current_release}"
-              command << "rvm use #{chef_ruby}@#{chef_gemset} --create"
-              command << "bundle exec librarian-chef install"
+              command << rvm_wrapper("bundle exec librarian-chef install")
               run command.join(" && ")
             end
           end

data/lib/saucier/recipes/chef_solo.rb

@@ -19,12 +19,10 @@ module Capistrano::Saucier
             task :install do
               servers = find_servers_for_task(current_task)
               servers.each do |s|
-                node_name = s.options[:node_name] ||= 'chef-node'
+                node_name = s.options[:node_name] || 'chef-node'
                 command = []
-                command << ". /etc/profile.d/rvm.sh"
                 command << "cd #{current_release}"
-                command << "rvm use #{chef_ruby}@#{chef_gemset} --create"
-                command << "rvmsudo env SSH_AUTH_SOCK=$SSH_AUTH_SOCK chef-solo -c #{current_release}/#{chef_solo_config} -j #{current_release}/#{chef_node_config} -N #{node_name}"
+                command << rvm_wrapper("rvmsudo env SSH_AUTH_SOCK=$SSH_AUTH_SOCK chef-solo -c #{current_release}/#{chef_solo_config} -j #{current_release}/#{chef_node_config} -N #{node_name}")
                 run command.join(" && ")
               end
             end

data/lib/saucier.rb

@@ -43,10 +43,8 @@ module Capistrano::Saucier
 
         task :bundle_install do
           command = []
-          command << ". /etc/profile.d/rvm.sh"
           command << "cd #{current_release}"
-          command << "rvm use #{chef_ruby}@#{chef_gemset} --create"
-          command << "bundle install"
+          command << rvm_wrapper("bundle install")
           run command.join(" && ")
         end
       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.2"
+  s.version     = "0.0.3"
   s.authors     = ["Shaun Dern"]
   s.email       = ["shaun@substantial.com"]
   s.homepage    = "http://github.com/substantial/saucier"

data/spec/chef_librarian_spec.rb

@@ -27,10 +27,8 @@ describe Capistrano::Saucier::Recipes::ChefLibrarian do
   describe "task :install" do
     let(:install_command) {
       command = []
-      command << ". /etc/profile.d/rvm.sh"
       command << "cd current/release/path"
-      command << "rvm use default@global --create"
-      command << "bundle exec librarian-chef install"
+      command << "rvm default@global --create do bundle exec librarian-chef install"
       command.join(" && ")
     }
     before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saucier
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2012-09-05 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: -2137213671960445821
+      hash: 1308848195273489696
 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: -2137213671960445821
+      hash: 1308848195273489696
 requirements: []
 rubyforge_project: saucier
 rubygems_version: 1.8.24