soloist 0.9.1 → 0.9.2

data/lib/soloist/chef_config_generator.rb

@@ -2,14 +2,17 @@ require 'yaml'
 
 module Soloist
   class Soloist::ChefConfigGenerator
+    include Soloist::Util
+    
     def initialize(config, relative_path_to_soloistrc)
       @recipes = []
       @cookbook_paths = []
+      @cookbook_gems = []
       @preserved_environment_variables = %w{PATH BUNDLE_PATH GEM_HOME GEM_PATH RAILS_ENV RACK_ENV}
       merge_config(config, relative_path_to_soloistrc)
     end
     
-    attr_reader :preserved_environment_variables, :cookbook_paths
+    attr_reader :preserved_environment_variables, :cookbook_paths, :cookbook_gems
     attr_accessor :recipes
     
     def support_old_format(hash)
@@ -32,6 +35,9 @@ module Soloist
       if sub_hash["cookbook_paths"]
         @cookbook_paths = (@cookbook_paths + append_path(sub_hash["cookbook_paths"], relative_path_to_soloistrc)).uniq
       end
+      if sub_hash["cookbook_gems"]
+        (@cookbook_gems += sub_hash["cookbook_gems"]).uniq!
+      end
       if sub_hash["env_variable_switches"]
         merge_env_variable_switches(sub_hash["env_variable_switches"], relative_path_to_soloistrc)
       end
@@ -48,7 +54,12 @@ module Soloist
     end
   
     def solo_rb
-      "cookbook_path #{cookbook_paths.inspect}"
+      all_cookbook_paths = cookbook_paths
+      cookbook_gems.each do |gem_cookbook|
+        Kernel.require gem_cookbook
+        all_cookbook_paths << Kernel.const_get(camelize(gem_cookbook)).const_get('COOKBOOK_PATH')
+      end
+      "cookbook_path #{all_cookbook_paths.inspect}"
     end
   
     def json_hash

data/lib/soloist/util.rb

@@ -30,5 +30,12 @@ module Soloist
         raise Errno::ENOENT, "#{filenames.join(" or ")} not found" unless file || opts[:required] == false
       end
     end
+
+    # stolen from activesupport
+    def camelize(term)
+      string = term.to_s
+      string = string.sub(/^[a-z\d]*/) { $&.capitalize }
+      string.gsub(/(?:_|(\/))([a-z\d]*)/i) { "#{$1}#{$2.capitalize}" }.gsub('/', '::')
+    end
   end
 end

data/lib/soloist/version.rb

@@ -1,3 +1,3 @@
 module Soloist
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/lib/soloist.rb

@@ -4,6 +4,6 @@ require 'fileutils'
 require 'yaml'
 require 'tempfile'
 
-require File.join(File.dirname(__FILE__), 'soloist', 'chef_config_generator')
 require File.join(File.dirname(__FILE__), 'soloist', 'util')
+require File.join(File.dirname(__FILE__), 'soloist', 'chef_config_generator')
 

data/spec/chef_config_generator_spec.rb

@@ -7,6 +7,8 @@ describe Soloist::ChefConfigGenerator do
       @config = <<-CONFIG
 Cookbook_Paths:
 - ./chef/cookbooks/
+cookbook_gems:
+- pivotal_workstation_cookbook
 Recipes:
 - pivotal_workstation::ack
 CONFIG
@@ -26,7 +28,11 @@ CONFIG
     end
   
     it "can generate a solo.rb contents" do
-      @generator.solo_rb.should == 'cookbook_path ["/current/working/directory/../.././chef/cookbooks/"]'
+      module ::PivotalWorkstationCookbook
+        COOKBOOK_PATH = "/var/lib/ruby/gems/pivotal_workstation/cookbooks/"
+      end
+      Kernel.stub!(:require).with("pivotal_workstation_cookbook").and_return(true)
+      @generator.solo_rb.should == 'cookbook_path ["/current/working/directory/../.././chef/cookbooks/", "/var/lib/ruby/gems/pivotal_workstation/cookbooks/"]'
     end
   
     it "can generate the json contents" do
@@ -134,6 +140,24 @@ env_variable_switches:
         ]
     end
     
+    it "merges cookbook_gems" do
+      @config = <<-CONFIG
+      cookbook_gems:
+      - pivotal_shared
+      env_variable_switches:
+        RACK_ENV:
+          development:
+            cookbook_gems:
+            - pivotal_shared
+            - pivotal_workstation
+            CONFIG
+      @generator = Soloist::ChefConfigGenerator.new(YAML.load(@config), "../..")
+      @generator.cookbook_gems.should =~ [
+        "pivotal_shared",
+        "pivotal_workstation"
+        ]
+    end
+    
     it "splits the value on comma and applies all matching" do
       ENV["ROLES"]="application,database"
       @config = <<-CONFIG

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soloist
 version: !ruby/object:Gem::Version 
-  hash: 57
-  prerelease: false
+  hash: 63
+  prerelease: 
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Matthew Kocher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-21 00:00:00 -07:00
+date: 2011-07-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: soloist
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Soloist is a simple way of running chef-solo