slushy 0.1.2 → 0.1.3

data/lib/slushy/instance.rb

@@ -87,10 +87,11 @@ class Slushy::Instance
   def converge(cookbooks_path) # TODO: find the standard Chef term for this
     puts "Copying chef resources from provision directory..."
     cookbooks_path = "#{cookbooks_path}/" unless cookbooks_path.to_s.end_with?('/')
+    run_command!('sudo rm -rf /tmp/chef-solo') # scp does not clobber existing files
     scp(cookbooks_path, '/tmp/chef-solo', :recursive => true)
     puts "Converging server, this may take a while (10-20 minutes)"
     path_part = 'PATH=/var/lib/gems/1.8/bin:/usr/local/bin:$PATH'
-    cmd = "cd /tmp/chef-solo && #{path_part} sudo chef-solo -c solo.rb -j dna.json"
+    cmd = %Q{cd /tmp/chef-solo && sudo sh -c "#{path_part} chef-solo -c solo.rb -j dna.json"}
     run_command!(cmd)
   end
 

data/lib/slushy/version.rb

@@ -1,3 +1,3 @@
 module Slushy
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/lib/instance_spec.rb

@@ -187,8 +187,9 @@ describe Slushy::Instance do
 
   describe "#converge" do
     it "converges the given instance" do
+      instance.should_receive(:run_command!).ordered.with("sudo rm -rf /tmp/chef-solo")
       instance.should_receive(:scp).ordered.with('some_path/', "/tmp/chef-solo", :recursive => true).and_return(true)
-      instance.should_receive(:run_command).ordered.with("cd /tmp/chef-solo && sudo /var/lib/gems/1.8/bin/chef-solo -c solo.rb -j dna.json").and_return(true)
+      instance.should_receive(:run_command!).ordered.with(%Q{cd /tmp/chef-solo && sudo sh -c "PATH=/var/lib/gems/1.8/bin:/usr/local/bin:$PATH chef-solo -c solo.rb -j dna.json"}).and_return(true)
       capture_stdout { instance.converge(Pathname.new('some_path')) }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slushy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -113,18 +113,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3387664004883499874
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3387664004883499874
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24