solid 0.0.6 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.1.2

data/lib/solid/chef.rb

@@ -1,6 +1,30 @@
 module Solid
 
   class Chef
+    APT_GET = %w{ ruby ruby1.8-dev libopenssl-ruby1.8 rdoc ri irb build-essential git-core xfsprogs }
+    RUBYGEMS_DIR = 'rubygems-1.3.7'
+    RUBYGEMS_FILE = "#{RUBYGEMS_DIR}.tgz"
+    RUBYGEMS_URL = "http://rubyforge.org/frs/download.php/70696/#{RUBYGEMS_FILE}"
+    
+    CHEF_GEMS = [
+        {:name => 'uuidtools', :version => '2.1.1'},
+        {:name => 'highline', :version => '1.6.1'},
+        {:name => 'moneta', :version => '0.6.0'},
+        {:name => 'extlib', :version => '0.9.15'},
+        {:name => 'abstract', :version => '1.0.0'},
+        {:name => 'erubis', :version => '2.6.6'},
+        {:name => 'json', :version => '1.4.2'},
+        {:name => 'bunny', :version => '0.6.0'},
+        {:name => 'mime-types', :version => '1.16'},        
+        {:name => 'rest-client', :version => '1.5.1'},
+        {:name => 'systemu', :version => '1.2.0'},
+        {:name => 'mixlib-log', :version => '1.1.0'},
+        {:name => 'mixlib-authentication', :version => '1.1.4'},
+        {:name => 'mixlib-cli', :version => '1.2.0'},
+        {:name => 'mixlib-config', :version => '1.1.2'},
+        {:name => 'ohai', :version => '0.5.6'},
+        {:name => 'chef', :version => '0.9.8'}      
+      ]
     
     def initialize(server, user, options = {})
       @server = server
@@ -12,11 +36,9 @@ module Solid
       unless installed?
         Net::SSH.start(@server, @user, @options) do |ssh|
           puts "installing..."
-          puts ssh.exec! sudo_cmd + "apt-get update -y"
-          ssh.exec! "sudo apt-get install ruby ruby1.8-dev libopenssl-ruby1.8 rdoc ri irb build-essential git-core xfsprogs -y"
-          ssh.exec! "wget http://rubyforge.org/frs/download.php/70696/rubygems-1.3.7.tgz && tar zxf rubygems-1.3.7.tgz && cd rubygems-1.3.7 && sudo ruby setup.rb && sudo ln -sfv /usr/bin/gem1.8 /usr/bin/gem"
-          ssh.exec! "sudo gem update --system"
-          puts ssh.exec! "sudo gem install chef -v 0.9.6 --no-ri --no-rdoc"          
+          install_chef_prereqs ssh
+          install_chef_gems ssh
+          build_solo_rb ssh
         end
       end
     end
@@ -34,8 +56,8 @@ module Solid
       puts @options.inspect
       Net::SSH.start(@server, @user, @options) do |ssh|
         puts "deploying..."
-        ssh.exec!("echo \"#{dna.to_json.gsub('"','\"')}\" > dna.json")
-        puts ssh.exec!(sudo_cmd + " chef-solo -l debug -j dna.json -r #{cookbooks}")
+        build_json dna, ssh
+        run_solo cookbooks, ssh
       end      
     end
     
@@ -44,5 +66,36 @@ module Solid
     def sudo_cmd
       'sudo '
     end
+    
+    def install_chef_prereqs ssh
+      [ sudo_cmd + "apt-get update -y",
+        sudo_cmd + "apt-get install #{APT_GET.join(' ')}  -y",
+        "wget #{RUBYGEMS_URL} && tar zxf #{RUBYGEMS_FILE} && cd #{RUBYGEMS_DIR} && sudo ruby setup.rb && sudo ln -sfv /usr/bin/gem1.8 /usr/bin/gem",
+        sudo_cmd + "gem update --system"].each do |line|
+        ssh.exec! line 
+      end
+    end
+    
+    def install_chef_gems ssh
+      CHEF_GEMS.each do |gem|
+        puts ssh.exec! sudo_cmd + %Q{ gem install #{gem[:name]} -v #{gem[:version]} --no-ri --no-rdoc }         
+      end
+    end
+    
+    def build_solo_rb ssh
+      ['file_cache_path "/tmp/chef-solo"', 
+      'cookbook_path ["/tmp/chef-solo/cookbooks", "/tmp/chef-solo/site-cookbooks"]'].each do |line|
+        ssh.exec! "echo '#{line}' >> solo.rb" 
+      end
+    end
+    
+    def build_json dna, ssh
+      ssh.exec!("echo \"#{dna.to_json.gsub('"','\"')}\" > dna.json")
+    end
+    
+    def run_solo cookbooks, ssh
+      puts ssh.exec!(sudo_cmd + " chef-solo -c ~/solo.rb -l debug -j dna.json -r #{cookbooks}")      
+    end
+    
   end
 end

data/solid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{solid}
-  s.version = "0.0.6"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thing-3"]
-  s.date = %q{2010-08-05}
+  s.date = %q{2010-08-07}
   s.default_executable = %q{solid}
   s.description = %q{ssh deployment application}
   s.email = %q{thing3@jackhq.com}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: solid
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: false
   segments: 
   - 0
-  - 0
-  - 6
-  version: 0.0.6
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Thing-3
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-05 00:00:00 -04:00
+date: 2010-08-07 00:00:00 -04:00
 default_executable: solid
 dependencies: 
 - !ruby/object:Gem::Dependency