soloist 0.9.6 → 0.9.7

data/.rvmrc

@@ -1 +1 @@
-rvm ruby-1.8.7-p299@soloist
+rvm --create ruby-1.9.3-p194@soloist

data/.travis.yml

@@ -5,5 +5,5 @@ rvm:
   - rbx-19mode
   - rbx-18mode
   - jruby
-  - ruby-head
+#  - ruby-head
   - ree

data/Gemfile.lock

@@ -1,53 +1,58 @@
 PATH
   remote: .
   specs:
-    soloist (0.9.4)
+    soloist (0.9.6)
       chef
 
 GEM
   remote: http://rubygems.org/
   specs:
-    bunny (0.7.6)
-    chef (0.10.4)
+    bunny (0.8.0)
+    chef (10.12.0)
       bunny (>= 0.6.0)
       erubis
-      highline
-      json (>= 1.4.4, <= 1.5.2)
+      highline (>= 1.6.9)
+      json (>= 1.4.4, <= 1.6.1)
       mixlib-authentication (>= 1.1.0)
       mixlib-cli (>= 1.1.0)
       mixlib-config (>= 1.1.2)
       mixlib-log (>= 1.3.0)
+      mixlib-shellout
       moneta
-      net-ssh (~> 2.1.3)
+      net-ssh (~> 2.2.2)
       net-ssh-multi (~> 1.1.0)
       ohai (>= 0.6.0)
       rest-client (>= 1.0.4, < 1.7.0)
       treetop (~> 1.4.9)
       uuidtools
+      yajl-ruby (~> 1.1)
     diff-lcs (1.1.2)
     erubis (2.7.0)
-    highline (1.6.2)
-    json (1.5.2)
-    mime-types (1.16)
-    mixlib-authentication (1.1.4)
+    highline (1.6.14)
+    ipaddress (0.8.0)
+    json (1.6.1)
+    mime-types (1.19)
+    mixlib-authentication (1.3.0)
       mixlib-log
     mixlib-cli (1.2.2)
     mixlib-config (1.1.2)
-    mixlib-log (1.3.0)
+    mixlib-log (1.4.1)
+    mixlib-shellout (1.1.0)
     moneta (0.6.0)
-    net-ssh (2.1.4)
+    net-ssh (2.2.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     net-ssh-multi (1.1)
       net-ssh (>= 2.1.4)
       net-ssh-gateway (>= 0.99.0)
-    ohai (0.6.8)
+    ohai (6.14.0)
+      ipaddress
       mixlib-cli
       mixlib-config
       mixlib-log
       systemu
       yajl-ruby
-    polyglot (0.3.2)
+    polyglot (0.3.3)
     rake (0.8.7)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -59,12 +64,12 @@ GEM
     rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.4.0)
-    systemu (2.4.0)
+    systemu (2.5.2)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    uuidtools (2.1.2)
-    yajl-ruby (1.0.0)
+    uuidtools (2.1.3)
+    yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby

data/README.markdown

@@ -1,3 +1,5 @@
+[![Build Status](https://secure.travis-ci.org/mkocher/soloist.png)](http://travis-ci.org/mkocher/soloist)
+
 Soloist: Making chef-solo easier
 ================================
 
@@ -33,42 +35,39 @@ Example soloistrc Files
 directory layout:
 
     /Users/mkocher/workspace/project/soloistrc <-Config File
-    /Users/mkocher/workspace/project/chef/
-    /Users/mkocher/workspace/project/chef/cookbooks/pivotal_workstation/
+    /Users/mkocher/workspace/project/cookbooks/pivotal_workstation/
 
 
 soloistrc
 ---------
 	cookbook_paths:
-	- ./chef/cookbooks/
+	- ./cookbooks/
 	recipes:
 	- pivotal_workstation::ack
 	- pivotal_workstation::bash_path_order
-	- pivotal_workstation::bash_profile
 	- pivotal_workstation::bash_profile-better_history
 	- pivotal_workstation::defaults_fast_key_repeat_rate
-	- pivotal_workstation::dock_preferences
-	- pivotal_workstation::ec2_api_tools
 	- pivotal_workstation::finder_display_full_path
-	- pivotal_workstation::git
 	- pivotal_workstation::git_config_global_defaults
 	- pivotal_workstation::git_scripts
 	- pivotal_workstation::google_chrome
 	- pivotal_workstation::inputrc
-	- pivotal_workstation::mysql
-	- pivotal_workstation::osx_turn_on_locate
 	- pivotal_workstation::rvm
-	- pivotal_workstation::safari_preferences
-	- pivotal_workstation::set_multitouch_preferences
-	- pivotal_workstation::text_mate
-	- pivotal_workstation::textmate_set_defaults
 	- pivotal_workstation::turn_on_ssh
-	- pivotal_workstation::user_owns_usr_local
-	- pivotal_workstation::workspace_directory
+
+Packaging Gems as Cookbooks (alpha)
+===========================
+
+If you're a ruby developer, you're probably very comfortable wrangling gems.  Bundler makes it easy to lock your dependencies and keep them in sync in all your environments.  Soloist adds the ability to load cookbooks out of these gems.  This means you can install the  pivotal_workstation_cookbook gem, and add it to your soloistrc like so:
+
+	cookbook_gems:
+	- pivotal_workstation_cookbook
+
+Easy cookbook dependency tracking, no more git cloning, no more chef recipes that aren't yours checked into your project and easy forking with bundler and github.
 
 Environment Variable Switching
 ==============================
-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 on deploy, 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 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)
+The soloistrc file allows for selecting all options based on environment variables.  Cap should allow setting environment variables fairly easily on deploy, 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 variable.  It's easier than it sounds - see the example below.
 
 	cookbook_paths:
 	- ./chef/cookbooks/
@@ -97,7 +96,7 @@ Log Level
 =========
 Soloist runs chef at log level info by default.  Debug is very verbose, but makes debugging chef recipes much easier.  Just set the LOG_LEVEL environment variable to 'debug' (or other valid chef log level) and it will be passed through.
 
-Local Overrides (experimental)
+Local Overrides
 ==============================
 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.
 

data/bin/soloist

@@ -19,7 +19,8 @@ end
 solo_rb = fileify(config_generator.solo_rb)
 metadata_json = fileify(config_generator.json_file)
 
-command = "sudo bash -c '#{config_generator.preserved_environment_variables_string} chef-solo -j #{metadata_json.path} -c #{solo_rb.path} -l #{log_level}'"
+system "sudo mkdir -p /var/chef/cache" unless File.directory?("/var/chef/cache")
 
+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.rb

@@ -3,7 +3,9 @@ require "json"
 require 'fileutils'
 require 'yaml'
 require 'tempfile'
+require 'tmpdir'
+require 'set'
 
 require File.join(File.dirname(__FILE__), 'soloist', 'util')
 require File.join(File.dirname(__FILE__), 'soloist', 'chef_config_generator')
-
+require File.join(File.dirname(__FILE__), 'soloist', 'cookbook_gem_linker')

data/lib/soloist/chef_config_generator.rb

@@ -55,14 +55,11 @@ module Soloist
     end
   
     def solo_rb
-      all_cookbook_paths = cookbook_paths
-      cookbook_gems.each do |gem_cookbook|
-        require gem_cookbook
-        all_cookbook_paths << Kernel.const_get(camelize(gem_cookbook)).const_get('COOKBOOK_PATH')
-      end
-      "cookbook_path #{all_cookbook_paths.inspect}"
+      linker = CookbookGemLinker.new(cookbook_gems)
+      linker.link_gem_cookbooks
+      "cookbook_path #{(cookbook_paths+[linker.cookbook_gem_temp_dir]).inspect}"
     end
-  
+
     def json_hash
       {
         "recipes" => @recipes

data/lib/soloist/cookbook_gem_linker.rb

@@ -0,0 +1,54 @@
+class CookbookGemLinker
+  include Soloist::Util
+  attr_reader :gems_and_dependencies
+  def initialize(gems=[])
+    @gems = gems
+  end
+
+  def link_gem_cookbooks
+    gems_and_dependencies.each do |gem_cookbook|
+      link_cookbook(gem_cookbook)
+    end
+  end
+
+  def gems_and_dependencies
+    unless @gems_and_dependencies
+      @gems_and_dependencies = Set.new
+      calculate_gems_and_dependencies
+    end
+    @gems_and_dependencies
+  end
+
+  def cookbook_gem_temp_dir
+    @cookbook_gem_temp_dir ||= Dir.mktmpdir
+  end
+
+  def path_to(gem_name)
+    require gem_name
+    path = Kernel.const_get(camelize(gem_name)).const_get('COOKBOOK_PATH')
+  end
+
+  def link_cookbook(gem_name)
+    File.symlink(path_to(gem_name), File.join(cookbook_gem_temp_dir, gem_name.chomp("_cookbook")))
+  end
+
+  private
+
+  def dependencies_of(gem_name)
+    if Gem::Specification.respond_to?(:find_by_name)
+      Gem::Specification.find_by_name(gem_name)
+    else
+      Gem.searcher.find(gem_name)
+    end.dependencies.map(&:name)
+  end
+
+  def calculate_gems_and_dependencies(gems=@gems)
+    gems.each do |gem_cookbook|
+      @gems_and_dependencies.add(gem_cookbook)
+      dependencies_of(gem_cookbook).each do |dependency|
+        @gems_and_dependencies.add(dependency)
+        calculate_gems_and_dependencies([dependency])
+      end
+    end
+  end
+end

data/lib/soloist/util.rb

@@ -6,6 +6,7 @@ module Soloist
     
     def fileify(contents)
       file = Tempfile.new("soloist")
+      puts "==== Temp File Contents ====\n#{contents}" if ENV['LOG_LEVEL'] == 'debug'
       file << contents
       file.flush
       file

data/lib/soloist/version.rb

@@ -1,3 +1,3 @@
 module Soloist
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

data/spec/chef_config_generator_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec'
-require File.dirname(__FILE__) + '/../lib/soloist'
+require 'spec_helper'
 
 describe Soloist::ChefConfigGenerator do
   describe "generation" do
@@ -15,6 +14,7 @@ CONFIG
       @config = YAML.load(@config)
       FileUtils.stub(:pwd).and_return("/current/working/directory")
       @generator = Soloist::ChefConfigGenerator.new(@config, "../..")
+      mock_gem("pivotal_workstation_cookbook")
     end
 
     it "appends the current path and relative path to the cookbooks directory" do
@@ -26,20 +26,24 @@ CONFIG
       @generator = Soloist::ChefConfigGenerator.new(@config, "../..")
       @generator.cookbook_paths.should == ["/foo/bar"]
     end
-  
-    it "can generate a solo.rb contents" do
-      module ::PivotalWorkstationCookbook
-        COOKBOOK_PATH = "/var/lib/ruby/gems/pivotal_workstation/cookbooks/"
+
+    describe ".solo_rb" do
+      it "can generate a solo.rb contents" do
+        @generator.solo_rb.should =~ %r{cookbook_path \["/current/working/directory/../.././chef/cookbooks/"}
+      end
+
+      it "should include a tempdir with pivotal_workstation in it" do
+        @generator.solo_rb.match(%r{cookbook_path \[".*", "(.*)"\]})
+        File.exist?("#{$1}/pivotal_workstation").should be
       end
-      @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
       @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']

data/spec/cookbook_gem_linker_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+describe CookbookGemLinker do
+  let(:linker) { CookbookGemLinker.new(["pivotal_workstation_cookbook"]) }
+
+  describe ".cookbook_gem_temp_dir" do
+    it "returns a tmpdir" do
+      Dir.should_receive(:mktmpdir).once.and_return("/tmp/foo")
+      2.times { linker.cookbook_gem_temp_dir.should == "/tmp/foo" }
+    end
+  end
+
+  describe ".path_to" do
+    it "returns the path to the gem" do
+      linker.path_to("pivotal_workstation_cookbook").should == File.expand_path('../..', __FILE__)
+    end
+  end
+
+  describe ".link_cookbook" do
+    it "creates a symbolic link in the tempdir" do
+      linker.link_cookbook("pivotal_workstation_cookbook")
+      File.exist?(File.expand_path('pivotal_workstation', linker.cookbook_gem_temp_dir)).should be
+    end
+  end
+
+  describe '.gems_and_dependencies' do
+    it "returns what you pass in dependencies" do
+      mock_gem("pivotal_workstation_cookbook")
+
+      linker.gems_and_dependencies.to_a.should == ["pivotal_workstation_cookbook"]
+    end
+
+    it "gets the dependencies from rubygems" do
+      mock_gem("pivotal_workstation_cookbook", ['osx_dmg_cookbook'])
+      mock_gem("osx_dmg_cookbook")
+
+      linker.gems_and_dependencies.to_a.should =~ ["pivotal_workstation_cookbook", 'osx_dmg_cookbook']
+    end
+
+    it "gets dependencies for dependencies" do
+      mock_gem("pivotal_workstation_cookbook", ['osx_dmg_cookbook'])
+      mock_gem("osx_dmg_cookbook", ["osx_installer_thing"])
+      mock_gem("osx_installer_thing")
+
+      linker.gems_and_dependencies.to_a.should =~ ["pivotal_workstation_cookbook", 'osx_dmg_cookbook', 'osx_installer_thing']
+    end
+
+    it "works on old rubygems" do
+      Gem::Specification.stub('respond_to?').with(:find_by_name).and_return(false)
+      Gem::Specification.should_receive(:find_by_name).exactly(0).times
+      mock_gem("pivotal_workstation_cookbook")
+
+      linker.gems_and_dependencies.to_a.should == ["pivotal_workstation_cookbook"]
+    end
+  end
+
+  describe ".link_gem_cookbooks" do
+    it "creates a directory of symlinks" do
+      mock_gem("pivotal_workstation_cookbook")
+      linker.link_gem_cookbooks
+      File.exist?(File.expand_path('pivotal_workstation', linker.cookbook_gem_temp_dir)).should be
+    end
+  end
+end

data/spec/pivotal_workstation_cookbook.rb

@@ -1 +1,6 @@
-# this file is loaded by the tests instead of the actual pivotal_workstation_cookbook
+# this file is loaded by the tests instead of the actual pivotal_workstation_cookbook
+
+module PivotalWorkstationCookbook
+  COOKBOOK_PATH = File.expand_path('../..', __FILE__)
+  VERSION = "1.0.0"
+end

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+require 'rspec'
+require File.dirname(__FILE__) + '/../lib/soloist'
+
+def mock_gem(name, dependencies=[])
+  mock_dependencies = dependencies.map { |depenency| mock(:name => depenency) }
+  mock_gemspec = mock("#{name} gemspec", :dependencies => mock_dependencies)
+  Gem::Specification.stub(:find_by_name).with(name).and_return(mock_gemspec)
+  Gem.stub(:searcher).and_return(mock({:find => mock_gemspec}))
+end

data/spec/util_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec'
-require File.dirname(__FILE__) + '/../lib/soloist'
+require 'spec_helper'
 
 describe Soloist::Util do
   class TestClass

metadata

@@ -1,46 +1,40 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: soloist
-version: !ruby/object:Gem::Version 
-  hash: 55
+version: !ruby/object:Gem::Version
+  version: 0.9.7
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 6
-  version: 0.9.6
 platform: ruby
-authors: 
+authors:
 - Matthew Kocher
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: chef
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Soloist is an easy way of running chef solo, but it's not doing much.
-email: 
+email:
 - kocher@gmail.com
-executables: 
+executables:
 - soloist
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - .travis.yml
@@ -52,46 +46,42 @@ files:
 - bin/soloist
 - lib/soloist.rb
 - lib/soloist/chef_config_generator.rb
+- lib/soloist/cookbook_gem_linker.rb
 - lib/soloist/util.rb
 - lib/soloist/version.rb
 - soloist.gemspec
 - spec/chef_config_generator_spec.rb
+- spec/cookbook_gem_linker_spec.rb
 - spec/pivotal_workstation_cookbook.rb
+- spec/spec_helper.rb
 - spec/util_spec.rb
 homepage: http://github.com/mkocher/soloist
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: soloist
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 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
+- spec/cookbook_gem_linker_spec.rb
 - spec/pivotal_workstation_cookbook.rb
+- spec/spec_helper.rb
 - spec/util_spec.rb