soloist 0.9.7 → 1.0.0.pre

data/soloist.gemspec

@@ -6,11 +6,11 @@ Gem::Specification.new do |s|
   s.name        = "soloist"
   s.version     = Soloist::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Matthew Kocher"]
-  s.email       = ["kocher@gmail.com"]
+  s.authors     = ["Matthew Kocher", "Doc Ritezel"]
+  s.email       = ["kocher@gmail.com", "ritezel@gmail.com"]
   s.homepage    = "http://github.com/mkocher/soloist"
-  s.summary     = %q{Soloist is a simple way of running chef-solo}
-  s.description = %q{Soloist is an easy way of running chef solo, but it's not doing much.}
+  s.summary     = "Soloist is a simple way of running chef-solo"
+  s.description = "Makes running chef-solo easy."
 
   s.rubyforge_project = "soloist"
 
@@ -20,4 +20,14 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "chef"
-end
+  s.add_dependency "librarian"
+  s.add_dependency "thor"
+  s.add_dependency "hashie"
+
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "guard-rspec"
+  s.add_development_dependency "guard-bundler"
+  s.add_development_dependency "rb-fsevent"
+  s.add_development_dependency "terminal-notifier-guard"
+  s.add_development_dependency "gem-release"
+end

data/spec/lib/soloist/cli_spec.rb

@@ -0,0 +1,133 @@
+require "spec_helper"
+
+describe Soloist::CLI do
+  let(:cli) { Soloist::CLI.new }
+  let(:base_path) { Dir.mktmpdir }
+  let(:soloistrc_path) { File.expand_path("soloistrc", base_path) }
+
+  before { FileUtils.mkdir_p(base_path) }
+
+  describe "#chef" do
+    context "when the soloistrc file does not exist" do
+      it "raises an error" do
+        expect do
+          begin
+            Dir.chdir(base_path) { cli.chef }
+          rescue Soloist::NotFound => e
+            e.message.should == "Could not find soloistrc or .soloistrc"
+            raise
+          end
+        end.to raise_error(Soloist::NotFound)
+      end
+    end
+
+    context "when the soloistrc file exists" do
+      before do
+        File.open(soloistrc_path, "w") do |file|
+          file.write(YAML.dump("recipes" => ["stinky::feet"]))
+        end
+      end
+
+      it "runs the proper recipes" do
+        cli.stub(:exec)
+        Dir.chdir(base_path) { cli.chef }
+        cli.config.royal_crown.recipes.should =~ ["stinky::feet"]
+      end
+
+      context "when the Cheffile does not exist" do
+        it "runs chef" do
+          cli.should_receive(:exec)
+          Dir.chdir(base_path) { cli.chef }
+        end
+
+        it "does not run librarian" do
+          cli.stub(:exec)
+          Librarian::Chef::Cli.should_not_receive(:with_environment)
+          Dir.chdir(base_path) { cli.chef }
+        end
+      end
+
+      context "when the Cheffile exists" do
+        let(:cli_instance) { double(:cli_instance) }
+
+        before do
+          FileUtils.touch(File.expand_path("Cheffile", base_path))
+          cli.stub(:exec)
+        end
+
+        it "runs librarian" do
+          Librarian::Chef::Cli.should_receive(:with_environment).and_yield
+          Librarian::Chef::Cli.should_receive(:new).and_return(cli_instance)
+          cli_instance.should_receive(:install)
+          Dir.chdir(base_path) { cli.chef }
+        end
+
+        it "runs chef" do
+          cli.should_receive(:exec)
+          Dir.chdir(base_path) { cli.chef }
+        end
+      end
+    end
+  end
+
+  describe "#DO_IT_LIVE" do
+    context "when the soloistrc does not exist" do
+      it "raises an error" do
+        expect do
+          Dir.chdir(base_path) { cli.DO_IT_LIVE("pineapple::wut") }
+        end.to raise_error(Soloist::NotFound)
+      end
+    end
+
+    context "when the soloistrc file exists" do
+      before do
+        File.open(soloistrc_path, "w") do |file|
+          file.write(YAML.dump("recipes" => ["pineapple::wutcake"]))
+        end
+      end
+
+      it "sets a recipe to run" do
+        Dir.chdir(base_path) do
+          cli.should_receive(:chef)
+          cli.DO_IT_LIVE("angst::teenage", "ennui::default")
+          cli.config.royal_crown.recipes.should =~ ["angst::teenage", "ennui::default"]
+        end
+      end
+    end
+  end
+
+  describe "#ensure_chef_cache_path" do
+    context "when the cache path does not exist" do
+      before { File.stub(:directory? => false) }
+
+      it "creates the cache path" do
+        cli.should_receive(:system).with("sudo mkdir -p /var/chef/cache")
+        cli.ensure_chef_cache_path
+      end
+    end
+
+    context "when the cache path exists" do
+      before { File.stub(:directory? => true) }
+
+      it "does not create the cache path" do
+        cli.should_not_receive(:system)
+        cli.ensure_chef_cache_path
+      end
+    end
+  end
+
+  describe "#chef_solo" do
+    before do
+      ENV["AUTREYISM"] = "pathological-yodeling"
+      FileUtils.touch(File.expand_path("soloistrc", base_path))
+    end
+
+    it "receives the outside environment" do
+      cli.stub(:chef_solo).and_return('echo $AUTREYISM')
+      cli.should_receive(:exec) do |chef_solo|
+        `#{chef_solo}`.chomp.should == "pathological-yodeling"
+      end
+      Dir.chdir(base_path) { cli.chef }
+    end
+  end
+end

data/spec/lib/soloist/config_spec.rb

@@ -0,0 +1,107 @@
+require "spec_helper"
+
+describe Soloist::Config do
+  let(:soloist_rc) { Soloist::RoyalCrown.new(:path => "/tmp/soloist/soloistrc") }
+  let(:config) { Soloist::Config.new(soloist_rc) }
+
+  describe "#as_solo_rb" do
+    context "without extra cookbook paths" do
+      it "can generate solo.rb" do
+        config.as_solo_rb.should == 'cookbook_path ["/tmp/soloist/cookbooks"]'
+      end
+    end
+
+    context "with a cookbook path" do
+      before { soloist_rc.cookbook_paths = ["/opt/holla/at/yo/soloist"] }
+
+      it "can have multiple cookbook paths" do
+        config.as_solo_rb.should == 'cookbook_path ["/tmp/soloist/cookbooks", "/opt/holla/at/yo/soloist"]'
+      end
+
+      it "removes duplicate cookbook paths" do
+        expect do
+          soloist_rc.cookbook_paths << "/opt/holla/at/yo/soloist"
+        end.not_to change { config.as_solo_rb }
+      end
+    end
+
+    context "with relative paths" do
+      let(:pwd) { File.expand_path(".") }
+
+      before { soloist_rc.cookbook_paths << "./meth/cookbooks" }
+
+      it "can have multiple cookbook paths" do
+        config.as_solo_rb.should == 'cookbook_path ["/tmp/soloist/cookbooks", "/tmp/soloist/meth/cookbooks"]'
+      end
+    end
+
+    context "with unixisms in the cookbook path" do
+      let(:home) { File.expand_path("~") }
+
+      before { soloist_rc.cookbook_paths << "~/yo/homes" }
+
+      it "expands paths" do
+        config.as_solo_rb.should include "#{home}/yo/homes"
+      end
+    end
+  end
+
+  describe "#as_json" do
+    context "with recipes" do
+      before { soloist_rc.recipes = ["waffles"] }
+
+      it "can generate json" do
+        config.as_json["recipes"].should include "waffles"
+      end
+    end
+  end
+
+  describe "#compiled_rc" do
+    let(:switch) { {"OX_TONGUES" => {"FINE" => {"recipes" => ["hobo_fist"]}}} }
+
+    before do
+      soloist_rc.env_variable_switches =  switch
+    end
+
+    context "when a switch is active" do
+      before { ENV.stub(:[]).and_return("FINE") }
+
+      it "merges the environment variable switch" do
+        config.compiled_rc.recipes.should include "hobo_fist"
+      end
+    end
+
+    context "when a switch is inactive" do
+      before { ENV.stub(:[]).and_return("WHAT_NO_EW") }
+
+      it "outputs an empty list" do
+        config.compiled_rc.recipes.should be_empty
+      end
+    end
+
+    context "when switches are nested" do
+      let(:inner) { {"GOAT" => {"TASTY" => {"node_attributes" => {"bbq" => "satan"}}}} }
+      let(:outer) { {"recipes" => ["stinkditch"], "env_variable_switches" => inner} }
+
+      before { ENV.stub(:[]).and_return("TASTY") }
+
+      context "when the inner switch is active" do
+        let(:switch) { {"HORSE" => {"TASTY" => outer }} }
+
+        it "evalutes all switches" do
+          config.compiled_rc.node_attributes.bbq.should == "satan"
+          config.compiled_rc.recipes.should == ["stinkditch"]
+        end
+      end
+
+      context "when the outer switch is inactive" do
+        let(:switch) { {"HORSE" => {"GROSS" => outer }} }
+
+        it "does not evaluate deeper" do
+          config.compiled_rc.recipes.should be_empty
+          config.compiled_rc.node_attributes.should be_empty
+        end
+      end
+    end
+  end
+end

data/spec/lib/soloist/royal_crown_spec.rb

@@ -0,0 +1,54 @@
+require "spec_helper"
+
+describe Soloist::RoyalCrown do
+  let(:contents) { { "recipes" => ["broken_vim"] } }
+  let(:tempfile) do
+    Tempfile.new("soloist-royalcrown").tap do |file|
+      file.write(YAML.dump(contents))
+      file.close
+    end
+  end
+
+  let(:royal_crown) { Soloist::RoyalCrown.from_file(tempfile.path) }
+
+  describe ".from_file" do
+    context "when the rc file is empty" do
+      let(:tempfile) do
+        Tempfile.new("soloist-royalcrown").tap do |file|
+          file.close
+        end
+      end
+
+      it "loads an empty file" do
+        expect { royal_crown }.not_to raise_error
+      end
+    end
+
+    it "loads from a yaml file" do
+      royal_crown.recipes.should =~ ["broken_vim"]
+    end
+
+    it "defaults nil fields to an empty primitive" do
+      royal_crown.node_attributes.should == {}
+    end
+  end
+
+  describe "#save" do
+    it "writes the values to a file" do
+      royal_crown.recipes = ["hot_rats", "tissue_paper"]
+      royal_crown.save
+      royal_crown = Soloist::RoyalCrown.from_file(tempfile.path)
+      royal_crown.recipes.should =~ ["hot_rats", "tissue_paper"]
+    end
+  end
+
+  describe "#to_yaml" do
+    it "skips the path attribute" do
+      royal_crown.to_yaml.keys.should_not include "path"
+    end
+
+    it "nils out fields that have not been set" do
+      royal_crown.to_yaml["node_attributes"].should be_nil
+    end
+  end
+end

data/spec/lib/soloist/spotlight_spec.rb

@@ -0,0 +1,67 @@
+require "spec_helper"
+
+describe Soloist::Spotlight do
+  let(:tempdir) { Dir.mktmpdir }
+  let(:shallow_path) { File.expand_path("beans/roger", tempdir) }
+  let(:spotlight) { Soloist::Spotlight.new(shallow_path) }
+
+  before { FileUtils.mkdir_p(shallow_path) }
+
+  describe "#find" do
+    context "with non-existent files" do
+      it "raises an error with three files" do
+        expect do
+          begin
+            spotlight.find!("larry", "moe", "curly")
+          rescue Soloist::NotFound => e
+            e.message.should == "Could not find larry, moe or curly"
+            raise
+          end
+        end.to raise_error(Soloist::NotFound)
+      end
+
+      it "raises an error with two files" do
+        expect do
+          begin
+            spotlight.find!("lulz", "wut")
+          rescue Soloist::NotFound => e
+            e.message.should == "Could not find lulz or wut"
+            raise
+          end
+        end.to raise_error(Soloist::NotFound)
+      end
+
+      it "raises an error with one file" do
+        expect do
+          begin
+            spotlight.find!("whatever.dude")
+          rescue Soloist::NotFound => e
+            e.message.should == "Could not find whatever.dude"
+            raise
+          end
+        end.to raise_error(Soloist::NotFound)
+      end
+    end
+
+    context "when the file exists" do
+      let(:file_path) { File.expand_path("soloistrc", shallow_path) }
+
+      before { FileUtils.touch(file_path) }
+
+      it "finds a soloistrc in the current directory" do
+        spotlight.find("soloistrc").to_s.should == tempdir + "/beans/roger/soloistrc"
+      end
+
+      context "inside a deeper directory" do
+        let(:deep_path) { File.expand_path("meat/hi", shallow_path) }
+        let(:spotlight) { Soloist::Spotlight.new(deep_path) }
+
+        before { FileUtils.mkdir_p(deep_path) }
+
+        it "finds a soloistrc upwards" do
+          spotlight.find("soloistrc").to_s.should == file_path
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,9 +1,6 @@
-require 'rspec'
-require File.dirname(__FILE__) + '/../lib/soloist'
+$: << File.expand_path("../../lib", __FILE__)
 
-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
+require "soloist"
+require "tempfile"
+require "json"
+require "tmpdir"

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: soloist
 version: !ruby/object:Gem::Version
-  version: 0.9.7
-  prerelease: 
+  version: 1.0.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Matthew Kocher
+- Doc Ritezel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-29 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -27,34 +28,182 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Soloist is an easy way of running chef solo, but it's not doing much.
+- !ruby/object:Gem::Dependency
+  name: librarian
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier-guard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Makes running chef-solo easy.
 email:
 - kocher@gmail.com
+- ritezel@gmail.com
 executables:
 - soloist
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .rvmrc
 - .travis.yml
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - MIT-LICENSE
 - README.markdown
-- Rakefile
 - bin/soloist
 - lib/soloist.rb
-- lib/soloist/chef_config_generator.rb
-- lib/soloist/cookbook_gem_linker.rb
-- lib/soloist/util.rb
+- lib/soloist/cli.rb
+- lib/soloist/config.rb
+- lib/soloist/royal_crown.rb
+- lib/soloist/spotlight.rb
 - lib/soloist/version.rb
+- script/ci.sh
 - soloist.gemspec
-- spec/chef_config_generator_spec.rb
-- spec/cookbook_gem_linker_spec.rb
-- spec/pivotal_workstation_cookbook.rb
+- spec/lib/soloist/cli_spec.rb
+- spec/lib/soloist/config_spec.rb
+- spec/lib/soloist/royal_crown_spec.rb
+- spec/lib/soloist/spotlight_spec.rb
 - spec/spec_helper.rb
-- spec/util_spec.rb
 homepage: http://github.com/mkocher/soloist
 licenses: []
 post_install_message: 
@@ -70,9 +219,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: soloist
 rubygems_version: 1.8.24
@@ -80,8 +229,8 @@ signing_key:
 specification_version: 3
 summary: Soloist is a simple way of running chef-solo
 test_files:
-- spec/chef_config_generator_spec.rb
-- spec/cookbook_gem_linker_spec.rb
-- spec/pivotal_workstation_cookbook.rb
+- spec/lib/soloist/cli_spec.rb
+- spec/lib/soloist/config_spec.rb
+- spec/lib/soloist/royal_crown_spec.rb
+- spec/lib/soloist/spotlight_spec.rb
 - spec/spec_helper.rb
-- spec/util_spec.rb

data/Rakefile

@@ -1,10 +0,0 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-task :default => [:spec]
-task :test => [:spec]
-
-desc "Run the test suite"
-task :spec do
-  exec "rspec spec/"
-end