soloist 0.0.6 → 0.0.7

data/bin/soloist

@@ -39,12 +39,7 @@ config_generator = ChefConfigGenerator.new(soloistrc_contents, soloistrc_path)
 solo_rb = fileify(config_generator.solo_rb)
 metadata_json = fileify(config_generator.json_file)
 
-env_vars = ["PATH=#{ENV['PATH']}"]
-%w{BUNDLE_PATH GEM_HOME GEM_PATH RAILS_ENV RACK_ENV}.each do |v|
-  env_vars << "#{v}=#{ENV[v]}" unless ENV[v].nil?
-end
-
-command = "sudo bash -c '#{env_vars.join(' ')} chef-solo -j #{metadata_json.path} -c #{solo_rb.path} -l #{log_level}'"
+command = "sudo bash -c '#{config_generator.preserved_environment_variables_string} chef-solo -j #{metadata_json.path} -c #{solo_rb.path} -l #{log_level}'"
 
 puts "running chef: " + command
 system(command) || exit(1)

data/lib/soloist/chef_config_generator.rb

@@ -42,4 +42,17 @@ class ChefConfigGenerator
   def json_file
     json_hash.to_json
   end
+  
+  def preserved_environment_variables
+    always_passed = %w{PATH BUNDLE_PATH GEM_HOME GEM_PATH RAILS_ENV RACK_ENV}
+    always_passed += @hash["env_variable_switches"].keys if @hash["env_variable_switches"]
+    always_passed
+  end
+  
+  def preserved_environment_variables_string
+    variable_array = []
+    preserved_environment_variables.map do |env_variable|
+      "#{env_variable}=#{ENV[env_variable]}" unless ENV[env_variable].nil?
+    end.compact.join(" ")
+  end
 end

data/lib/soloist/version.rb

@@ -1,3 +1,3 @@
 module Soloist
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/chef_config_generator_spec.rb

@@ -33,6 +33,37 @@ CONFIG
         "recipes" => ['pivotal_workstation::ack']
       }
     end
+    
+    describe "passing env variables to chef-solo through sudo" do
+      it "has a list of env variables which are passed through" do
+        @generator.preserved_environment_variables.should == %w{PATH BUNDLE_PATH GEM_HOME GEM_PATH RAILS_ENV RACK_ENV}
+      end
+    
+      it "can generate an env_variable_string which is passed through sudo to chef-solo" do
+        ENV["FOO"]="BAR"
+        ENV["FAZ"]="FUZ"
+        @generator.stub!(:preserved_environment_variables).and_return(["FOO", "FAZ"])
+        @generator.preserved_environment_variables_string.should == "FOO=BAR FAZ=FUZ"
+      end
+      
+      it "adds any environment variables that are switched in the config" do
+      @config = <<-CONFIG
+cookbook_paths:
+- ./chef/cookbooks/
+recipes:
+- pivotal_workstation::ack
+env_variable_switches:
+  ME_TOO:
+    development:
+      cookbook_paths:
+      - ./chef/dev_cookbooks/
+      recipes:
+      - pivotal_dev::foo
+      CONFIG
+        @generator = ChefConfigGenerator.new(@config, "")
+        @generator.preserved_environment_variables.should =~ %w{PATH BUNDLE_PATH GEM_HOME GEM_PATH RAILS_ENV RACK_ENV ME_TOO}
+      end
+    end
   end
   
   describe "yaml config values" do
@@ -64,7 +95,6 @@ CONFIG
       @generator.json_hash.should == { "recipes" => ["pivotal_workstation::ack"]}
     end
   end
-      
   
   describe "environment variable merging" do
     before do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soloist
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Matthew Kocher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 -08:00
+date: 2011-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency