poolparty 1.6.3 → 1.6.4

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :minor: 6
-:patch: 3
+:patch: 4
 :major: 1
 :build: 

data/lib/poolparty/chef.rb

@@ -55,16 +55,17 @@ module PoolParty
     end
 
     def node_bootsrapped?(remote_instance)
-      remote_instance.ssh(["(gem list; dpkg -l chef) | grep -q chef && echo 'chef installed'"], :do_sudo => false).empty?
+      # "(gem list; dpkg -l chef) | grep -q chef && echo 'chef installed'"
+      remote_instance.ssh(['if [ ! -n "$(gem list 2>/dev/null | grep chef)" ]; then echo "chef installed"; fi'], :do_sudo => false).empty? rescue false
     end
-   def node_bootstrap!(remote_instance)
+   def node_bootstrap(remote_instance)
       remote_instance.ssh([
         'apt-get update',
         'apt-get autoremove -y',
         'apt-get install -y ruby ruby-dev rubygems git-core libopenssl-ruby',
         'gem sources -a http://gems.opscode.com',
         'gem install chef ohai --no-rdoc --no-ri' ])
-      remote_instance.ssh(remote_instance.bootstrap_gems.collect { |gem| "gem install #{gem} --no-rdoc --no-ri" } )
+      remote_instance.ssh(remote_instance.bootstrap_gems.collect { |g| "gem install #{g} --no-rdoc --no-ri" } )
     end
     private
     
@@ -73,7 +74,11 @@ module PoolParty
     end
 
     def method_missing(m,*args,&block)
-      cloud.send(m,*args,&block) if cloud.respond_to?(m)
+      if cloud.respond_to?(m)
+        cloud.send(m,*args,&block)
+      else
+        super
+      end
     end
     
   end

data/lib/poolparty/chef_solo.rb

@@ -16,22 +16,28 @@ module PoolParty
     # The NEW actual chef resolver.
     def build_tmp_dir
       base_directory = tmp_path/"etc"/"chef"
-      FileUtils.rm_rf base_directory
+      roles_dir = "#{base_directory}/roles"
+      FileUtils.rm_rf base_directory # cleanup old chef temp directory
       puts "Copying the chef-repo into the base directory from #{repo}"
-      FileUtils.mkdir_p base_directory/"roles"   
+      
+      FileUtils.mkdir_p base_directory
       if File.directory?(repo)
         if File.exist?(base_directory)
           # First remove the directory
           FileUtils.remove_entry base_directory, :force => true
         end
-        FileUtils.cp_r "#{repo}/.", base_directory 
+        cookbook_path = "#{base_directory}/cookbooks"
+        FileUtils.mkdir_p cookbook_path
+        FileUtils.cp_r "#{repo}/.", cookbook_path
       else
         raise "#{repo} chef repo directory does not exist"
       end
       puts "Creating the dna.json"
       attributes.to_dna [], base_directory/"dna.json", {:run_list => ["role[#{cloud.name}]"]}
       write_solo_dot_rb
-      write_chef_role_json tmp_path/"etc"/"chef"/"roles/#{cloud.name}.json"
+      # Make sure the roles directory exists
+      FileUtils.mkdir_p roles_dir
+      write_chef_role_json "#{roles_dir}/#{cloud.name}.json"
     end
     
     def write_solo_dot_rb(to=tmp_path/"etc"/"chef"/"solo.rb")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors: 
 - Ari Lerner
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 -08:00
+date: 2010-03-18 00:00:00 -07:00
 default_executable: 
 dependencies: []