soloist 0.0.3 → 0.0.4

data/Gemfile

@@ -2,3 +2,5 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in soloist.gemspec
 gemspec
+
+gem "rspec", "2.4.0"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    soloist (0.0.2)
+    soloist (0.0.3)
       chef (= 0.9.12)
       json (= 1.4.6)
 
@@ -24,6 +24,7 @@ GEM
       ohai (>= 0.5.7)
       rest-client (>= 1.0.4, < 1.7.0)
       uuidtools
+    diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     extlib (0.9.15)
@@ -45,13 +46,20 @@ GEM
       systemu
     rest-client (1.6.1)
       mime-types (>= 1.16)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
     systemu (1.2.0)
-    uuidtools (2.1.1)
+    uuidtools (2.1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  chef (= 0.9.12)
-  json (= 1.4.6)
+  rspec (= 2.4.0)
   soloist!

data/README.markdown

@@ -39,9 +39,9 @@ directory layout:
 
 soloistrc
 ---------
-	Cookbook_Paths:
+	cookbook_paths:
 	- ./chef/cookbooks/
-	Recipes:
+	recipes:
 	- pivotal_workstation::ack
 	- pivotal_workstation::bash_path_order
 	- pivotal_workstation::bash_profile
@@ -65,3 +65,19 @@ soloistrc
 	- pivotal_workstation::turn_on_ssh
 	- pivotal_workstation::user_owns_usr_local
 	- pivotal_workstation::workspace_directory
+
+Environment Variable Switching (Alpha)
+======================================
+I'm undecided on how recipes should be selected once you get to the point of running chef on various platforms and on boxes with different roles.  I'm trying out adding support in the soloistrc file for selecting recipes based on environment variables.  Cap should allow setting environment variables fairly easily, and they can be set permanently on the machine if desired.  To use these, add a env_variable_switches key to your soloistrc.  They keys of the hash should be the environment variable you wish to change the configuration based on, and the value should be a hash keyed by the value of the environment variable.  It's easier than it sounds - see the example below. (NB: Note that the CamelSnake is gone in the soloistrc, and while the basic config accepts the old keys, environment variable switching requires snake case keys)
+
+	cookbook_paths:
+	- ./chef/cookbooks/
+	recipes:
+	- pivotal_workstation::ack
+	env_variable_switches:
+	  RACK_ENV:
+	    development:
+	      cookbook_paths:
+	      - ./chef/dev_cookbooks/
+	      recipes:
+	      - pivotal_dev::foo

data/bin/soloist

@@ -1,9 +1,6 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-require "json"
-require 'fileutils'
-require 'yaml'
-require 'tempfile'
+require 'soloist'
 
 def fileify(contents)
   file = Tempfile.new("soloist")
@@ -29,18 +26,7 @@ end
 log_level = ENV['LOG_LEVEL'] || "info"
 
 soloistrc_contents, soloistrc_path = walk_up_and_find_file(["soloistrc"])
-soloistrc = YAML.load(soloistrc_contents)
-
-json_contents = {
-  :recipes => soloistrc["Recipes"]
-}
-
-cookbook_paths = soloistrc["Cookbook_Paths"].map do |v|
-  (v =~ /\//) == 0 ? v : "#{FileUtils.pwd}/#{soloistrc_path}/#{v}"
-end
-puts FileUtils.pwd
-puts cookbook_paths.inspect
-solo_rb_contents = "cookbook_path #{cookbook_paths.inspect}"
+config_generator = ChefConfigGenerator.new(soloistrc_contents, soloistrc_path)
 
 # if ARGV.length >= 1
 #   json_config = JSON.parse(File.read(json_file))
@@ -50,8 +36,8 @@ solo_rb_contents = "cookbook_path #{cookbook_paths.inspect}"
 #   File.open(json_file, "w+"){|f| f<<JSON.pretty_generate(json_config) }
 # end
 
-solo_rb = fileify(solo_rb_contents)
-metadata_json = fileify(json_contents.to_json)
+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}.each do |v|

data/lib/soloist/chef_config_generator.rb

@@ -0,0 +1,43 @@
+require 'yaml'
+
+class ChefConfigGenerator
+  def initialize(yaml_string, relative_path_to_soloistrc)
+    @hash = YAML.load(yaml_string)
+    @relative_path_to_soloistrc = relative_path_to_soloistrc
+    merge_env_variable_switches
+  end
+  
+  def merge_env_variable_switches
+    return unless @hash["env_variable_switches"]
+    @hash["env_variable_switches"].keys.each do |variable|
+      sub_hash = @hash["env_variable_switches"][variable][ENV[variable]]
+      if sub_hash && sub_hash["recipes"]
+        @hash["recipes"] = (@hash["recipes"] + sub_hash["recipes"]).uniq
+      end
+      if sub_hash && sub_hash["cookbook_paths"]
+        @hash["cookbook_paths"] = (@hash["cookbook_paths"] + sub_hash["cookbook_paths"]).uniq
+      end
+    end
+  end
+  
+  def cookbook_paths
+    (@hash["cookbook_paths"] || @hash["Cookbook_Paths"]).map do |v|
+      (v =~ /\//) == 0 ? v : "#{FileUtils.pwd}/#{@relative_path_to_soloistrc}/#{v}"
+    end
+  end
+  
+  def solo_rb
+    "cookbook_path #{cookbook_paths.inspect}"
+  end
+  
+  def json_hash
+    recipes = @hash["Recipes"] || @hash["recipes"]
+    {
+      "recipes" => recipes
+    }
+  end
+  
+  def json_file
+    json_hash.to_json
+  end
+end

data/lib/soloist/version.rb

@@ -1,3 +1,3 @@
 module Soloist
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/soloist.rb

@@ -1,3 +1,10 @@
+require 'soloist/chef_config_generator'
+require "json"
+require 'fileutils'
+require 'yaml'
+require 'tempfile'
+
+
 module Soloist
   # Your code goes here...
 end

data/spec/chef_config_generator_spec.rb

@@ -0,0 +1,100 @@
+require 'rspec'
+require 'lib/soloist'
+
+describe "ChefConfigGenerator" do
+  describe "generation" do
+    before do
+      @config = <<-CONFIG
+Cookbook_Paths:
+- ./chef/cookbooks/
+Recipes:
+- pivotal_workstation::ack
+CONFIG
+      @generator = ChefConfigGenerator.new(@config, "../..")
+      FileUtils.stub(:pwd).and_return("/current/working/directory")
+    end
+
+    it "appends the current path and relative path to the cookbooks directory" do
+      @generator.cookbook_paths.should == ["/current/working/directory/../.././chef/cookbooks/"]
+    end
+  
+    it "can generate a solo.rb contents" do
+      @generator.solo_rb.should == 'cookbook_path ["/current/working/directory/../.././chef/cookbooks/"]'
+    end
+  
+    it "can generate the json contents" do
+      @generator.json_hash.should == {
+        "recipes" => ['pivotal_workstation::ack']
+      }
+    end
+  
+    it "can generate json files" do
+      JSON.parse(@generator.json_file).should == {
+        "recipes" => ['pivotal_workstation::ack']
+      }
+    end
+  end
+  
+  describe "yaml config values" do
+    before do
+      FileUtils.stub(:pwd).and_return("/")
+    end
+      
+    it "accepts Cookbook_Paths, because the CamelSnake is a typo that must be supported" do
+      @config = "Cookbook_Paths:\n- ./chef/cookbooks/\n"
+      @generator = ChefConfigGenerator.new(@config, "")
+      @generator.cookbook_paths.should == ["///./chef/cookbooks/"]
+    end
+    
+    it "accepts cookbook_paths, because it is sane" do
+      @config = "cookbook_paths:\n- ./chef/cookbooks/\n"
+      @generator = ChefConfigGenerator.new(@config, "")
+      @generator.cookbook_paths.should == ["///./chef/cookbooks/"]
+    end
+    
+    it "accepts Recipes, because that's the way it was" do
+      @config = "Recipes:\n- pivotal_workstation::ack"
+      @generator = ChefConfigGenerator.new(@config, "")
+      @generator.json_hash.should == { "recipes" => ["pivotal_workstation::ack"]}
+    end
+
+    it "accepts recipes, because it's snake now" do
+      @config = "recipes:\n- pivotal_workstation::ack"
+      @generator = ChefConfigGenerator.new(@config, "")
+      @generator.json_hash.should == { "recipes" => ["pivotal_workstation::ack"]}
+    end
+  end
+      
+  
+  describe "environment variable merging" do
+    before do
+      @config = <<-CONFIG
+cookbook_paths:
+- ./chef/cookbooks/
+recipes:
+- pivotal_workstation::ack
+env_variable_switches:
+  RACK_ENV:
+    development:
+      cookbook_paths:
+      - ./chef/dev_cookbooks/
+      recipes:
+      - pivotal_dev::foo
+      CONFIG
+      FileUtils.stub(:pwd).and_return("/")
+    end
+
+    it "merges in if the variable is set to the the value" do
+      ENV["RACK_ENV"]="development"
+      @generator = ChefConfigGenerator.new(@config, "../..")
+      @generator.cookbook_paths.should == [
+        "//../.././chef/cookbooks/",
+        "//../.././chef/dev_cookbooks/"
+        ]
+      @generator.json_hash["recipes"].should == [
+        "pivotal_workstation::ack", 
+        "pivotal_dev::foo"
+        ]
+    end
+  end     
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soloist
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Matthew Kocher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-27 00:00:00 -08:00
+date: 2011-02-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,8 +67,10 @@ files:
 - Rakefile
 - bin/soloist
 - lib/soloist.rb
+- lib/soloist/chef_config_generator.rb
 - lib/soloist/version.rb
 - soloist.gemspec
+- spec/chef_config_generator_spec.rb
 has_rdoc: true
 homepage: http://rubygems.org/gems/soloist
 licenses: []
@@ -103,5 +105,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Soloist is a simple way of running chef-solo
-test_files: []
-
+test_files: 
+- spec/chef_config_generator_spec.rb