soloist 0.9.4 → 0.9.5

data/.travis.yml

@@ -2,7 +2,8 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - rbx-2.0
+  - rbx-19mode
+  - rbx-18mode
   - jruby
   - ruby-head
   - ree

data/README.markdown

@@ -101,6 +101,23 @@ Local Overrides (experimental)
 ==============================
 Soloist is an easy way to share configuration across workstations.  If you want to have configuration in chef that you don't want to share with the rest of the project, you can create a soloistrc_local file in addition to the soloistrc file.  This file will be processed after the soloistrc, and everything in it will be added to the run list.  Be careful that you are clear what goes where - if it's a dependency of the project, it should be checked into the soloistrc file in the project.
 
+Setting Node Attributes
+=======================
+You can set node attributes in your soloistrc file that will be included in the JSON attributes file passed to chef-solo.
+
+    cookbook_paths:
+    - ./chef/cookbooks/
+    recipes:
+    - pivotal_workstation::github_ssh_keys
+    - pivotal_workstation::rvm
+    node_attributes:
+      github_username: john.smith
+      github_password: pas$w0rd
+      rvm:
+        rubies:
+          ruby-1.8.7-p299: {}
+          jruby-1.6.6: {}
+
 License
 =======
 Soloist is MIT Licensed.  See MIT-LICENSE for details.

data/lib/soloist/chef_config_generator.rb

@@ -9,6 +9,7 @@ module Soloist
       @cookbook_paths = []
       @cookbook_gems = []
       @preserved_environment_variables = %w{PATH BUNDLE_PATH GEM_HOME GEM_PATH RAILS_ENV RACK_ENV}
+      @node_attributes = config['node_attributes'] || {}
       merge_config(config, relative_path_to_soloistrc)
     end
     
@@ -65,7 +66,7 @@ module Soloist
     def json_hash
       {
         "recipes" => @recipes
-      }
+      }.merge(@node_attributes)
     end
   
     def json_file

data/lib/soloist/version.rb

@@ -1,3 +1,3 @@
 module Soloist
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

data/spec/chef_config_generator_spec.rb

@@ -106,6 +106,12 @@ env_variable_switches:
       @generator = Soloist::ChefConfigGenerator.new(YAML.load(@config), "")
       @generator.json_hash.should == { "recipes" => ["pivotal_workstation::ack"]}
     end
+    
+    it "should set node attributes" do
+      @config = "node_attributes:\n  github_username: avh4"
+      @generator = Soloist::ChefConfigGenerator.new(YAML.load(@config), "")
+      @generator.json_hash.should == { "recipes" => [], "github_username" => "avh4" }
+    end
   end
   
   describe "environment variable merging" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soloist
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Matthew Kocher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 Z
+date: 2012-05-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: soloist
-rubygems_version: 1.8.6
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Soloist is a simple way of running chef-solo