soloist 1.0.0.pre → 1.0.0

data/.gitignore

@@ -1,3 +1,6 @@
 pkg/*
 *.gem
 .bundle
+/.vagrant
+/examples/cookbooks
+/examples/tmp

data/.pairs

@@ -0,0 +1,14 @@
+# This file is managed by chef! Override node.default["git_pairs_authors"] in attributes/git_pairs.rb to modify.
+
+pairs:
+  mk: Matthew Kocher; mkocher
+  bc: Brian Cunnie; cunnie
+  dr: Doc Ritezel; doc
+  ap: aram price; aram
+  sc: Santa Claus
+
+email:
+  prefix: pair
+  domain: pivotallabs.com
+
+global: true

data/.rvmrc

@@ -1 +1 @@
-rvm --create use ruby-1.9.3-p286@soloist
+rvm --create use ruby-1.9.3-p327@soloist

data/.travis.yml

@@ -4,7 +4,5 @@ rvm:
   - 1.9.3
   - rbx-19mode
   - rbx-18mode
-  - jruby
-#  - ruby-head
   - ree
 script: script/ci.sh

data/Gemfile.lock

@@ -2,15 +2,18 @@ PATH
   remote: .
   specs:
     soloist (1.0.0.pre)
+      awesome_print
       chef
       hashie
       librarian
+      net-ssh
       thor
 
 GEM
   remote: http://rubygems.org/
   specs:
     archive-tar-minitar (0.5.2)
+    awesome_print (1.1.0)
     bunny (0.7.9)
     chef (10.16.2)
       bunny (>= 0.6.0, < 0.8.0)
@@ -42,19 +45,22 @@ GEM
     guard-bundler (1.0.0)
       bundler (~> 1.0)
       guard (~> 1.1)
-    guard-rspec (2.1.1)
+    guard-rspec (2.2.0)
       guard (>= 1.1)
       rspec (~> 2.11)
+    guard-shell (0.5.1)
+      guard (>= 1.1.0)
     hashie (1.2.0)
     highline (1.6.15)
     ipaddress (0.8.0)
     json (1.6.1)
+    json (1.6.1-java)
     librarian (0.0.25)
       archive-tar-minitar (>= 0.5.2)
       chef (>= 0.10)
       highline
       thor (~> 0.15)
-    listen (0.5.3)
+    listen (0.6.0)
     lumberjack (1.0.2)
     method_source (0.8.1)
     mime-types (1.19)
@@ -83,18 +89,24 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
+    pry (0.9.10-java)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
+      spoon (~> 0.0)
     rb-fsevent (0.9.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.0)
+    rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
+    rspec-mocks (2.12.0)
     slop (3.3.3)
+    spoon (0.0.1)
     systemu (2.5.2)
     terminal-notifier-guard (1.5.3)
     thor (0.16.0)
@@ -105,12 +117,14 @@ GEM
     yajl-ruby (1.1.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   gem-release
   guard-bundler
   guard-rspec
+  guard-shell
   rb-fsevent
   rspec
   soloist!

data/Guardfile

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-guard 'rspec', cli: '--fail-fast --tag ~@slow:true' do
+guard 'rspec', :cli => '--fail-fast --tag ~@slow:true' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
@@ -10,3 +10,8 @@ guard 'bundler' do
   watch('Gemfile')
   watch('soloist.gemspec')
 end
+
+guard 'shell' do
+  watch('Vagrantfile') { system("unset RUBYOPT; vagrant provision") }
+  watch('script/bootstrap.sh') { system("unset RUBYOPT; vagrant provision") }
+end

data/{MIT-LICENSE → LICENSE}

@@ -1,20 +1,20 @@
-# Copyright (c) 2010, 2011 Matthew Kocher
-#  
-# Permission is hereby granted, free of charge, to any person obtaining 
-# a copy of this software and associated documentation files (the 
-# "Software"), to deal in the Software without restriction, including 
-# without limitation the rights to use, copy, modify, merge, publish, 
-# distribute, sublicense, and/or sell copies of the Software, and to 
-# permit persons to whom the Software is furnished to do so, subject to 
-# the following conditions: 
-#  
-# The above copyright notice and this permission notice shall be 
-# included in all copies or substantial portions of the Software. 
-#  
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE 
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# Copyright (c) 2012 Matthew Kocher and Doc Ritezel
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/{README.markdown → README.md}

@@ -94,7 +94,7 @@ If we set `MEGA_PRODUCTION=godspeed`, the `embarrassment::parental` recipe is no
 
 Soloist can also run one-off recipes:
 
-    $ soloist DO_IT_LIVE lice::box
+    $ soloist run_recipe lice::box
     Installing lice (1.0.0)
     … chef output …
     INFO: Run List expands to [lice::box]
@@ -113,4 +113,4 @@ Soloist runs `chef-solo` at log level `info` by default, which is helpful when y
 License
 =======
 
-See MIT-LICENSE for details.
+See LICENSE for details.

data/Vagrantfile

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+Vagrant::Config.run do |config|
+  ssh_key = File.read(File.expand_path("~/.ssh/id_rsa.pub"))
+
+  config.vm.box = "precise64"
+  config.vm.box_url = "http://files.vagrantup.com/#{config.vm.box}.box"
+  config.vm.network :hostonly, "192.168.6.66"
+
+  config.vm.provision :shell, :inline => "test -d /etc/skel/.ssh || mkdir /etc/skel/.ssh"
+  config.vm.provision :shell do |shell|
+    shell.inline = "echo $@ | tee /etc/skel/.ssh/authorized_keys"
+    shell.args = ssh_key
+  end
+  config.vm.provision :shell do |shell|
+    shell.path = File.expand_path("../script/bootstrap.sh", __FILE__)
+    shell.args = `whoami`.chomp
+  end
+  config.vm.provision :shell, :inline => "bash -lc 'rvm use --install --default ruby-1.9.3'"
+  config.vm.provision :shell, :inline => "bash -lc 'gem install chef --no-rdoc --no-ri'"
+end

data/examples/Guardfile

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+guard 'bundler' do
+  watch('../Gemfile')
+  watch('../soloist.gemspec')
+end
+
+guard 'shell' do
+  watch('soloistrc') { system("../bin/soloist -r 192.168.6.66") }
+  watch(%r{^cookbooks/(.+)\.rb$}) { system("unset RUBYOPT; bundle exec ../bin/soloist -r 192.168.6.66") }
+  watch('Vagrantfile') { system("unset RUBYOPT; vagrant provision") }
+  watch('script/bootstrap.sh') { system("unset RUBYOPT; vagrant provision") }
+end

data/examples/soloistrc

@@ -0,0 +1,2 @@
+recipes:
+  - pivotal_workstation::bash_it

data/lib/soloist/cli.rb

@@ -1,47 +1,36 @@
 require "librarian/chef/cli"
+require "soloist/remote_config"
 require "soloist/spotlight"
-require "soloist/config"
-require "tempfile"
+require "awesome_print"
 require "thor"
 
 module Soloist
   class CLI < Thor
+    attr_writer :soloist_config
     default_task :chef
 
-    desc "chef", "Runs chef-solo like a baws"
+    desc "chef", "Run chef-solo"
+    method_option :remote, :aliases => "-r", :desc => "Run chef-solo on user@host"
+    method_option :identity, :aliases => "-i", :desc => "The SSH identity file"
     def chef
-      ensure_chef_cache_path
-      write_solo_rb
-      write_node_json
       install_cookbooks if cheffile_exists?
-      exec("sudo -E bash -c '#{chef_solo}'")
+      soloist_config.run_chef
     end
 
-    desc "run_recipe", "Runs an individual recipe with chef-solo"
-    def DO_IT_LIVE(*recipes)
-      config.royal_crown.recipes = recipes
+    desc "run_recipe [cookbook::recipe, ...]", "Run individual recipes"
+    method_option :remote, :aliases => "-r", :desc => "Run recipes on user@host"
+    method_option :identity, :aliases => "-i", :desc => "The SSH identity file"
+    def run_recipe(*recipes)
+      soloist_config.royal_crown.recipes = recipes
       chef
     end
 
-    no_tasks do
-      def write_solo_rb
-        content = config.as_solo_rb
-        content.each{ |line| puts line } if log_level == "debug"
-        File.open(solo_rb.path, "w") { |f| f.write(content) }
-      end
-
-      def write_node_json
-        content = config.as_json
-        puts JSON.pretty_generate(content) if log_level == "debug"
-        File.open(node_json.path, "w") { |f| f.write(JSON.dump(content)) }
-      end
-
-      def ensure_chef_cache_path
-        unless File.directory?("/var/chef/cache")
-          system("sudo mkdir -p /var/chef/cache")
-        end
-      end
+    desc "config", "Dumps configuration data for Soloist"
+    def config
+      Kernel.ap(soloist_config.as_node_json)
+    end
 
+    no_tasks do
       def install_cookbooks
         Dir.chdir(File.dirname(rc_path)) do
           Librarian::Chef::Cli.with_environment do
@@ -50,34 +39,40 @@ module Soloist
         end
       end
 
-      def config
-        @config ||= Soloist::Config.from_file(rc_path)
-      end
-
-      def chef_solo
-        "chef-solo -j '#{node_json.path}' -c '#{solo_rb.path}' -l '#{log_level}'"
+      def soloist_config
+        @soloist_config ||= if options[:remote]
+          Soloist::RemoteConfig.from_file(rc_path, remote)
+        else
+          Soloist::Config.from_file(rc_path)
+        end.tap do |config|
+          config.merge!(rc_local) if rc_local_path
+        end
       end
     end
 
     private
-    def cheffile_exists?
-      File.exists?(File.expand_path("../Cheffile", rc_path))
-    end
-
-    def log_level
-      ENV["LOG_LEVEL"] || "info"
+    def rc_local
+      Soloist::Config.from_file(rc_local_path)
     end
 
-    def solo_rb
-      @solo_rb ||= Tempfile.new(["solo", ".rb"])
+    def remote
+      @remote ||= if options[:identity]
+        Soloist::Remote.from_uri(options[:remote], options[:identity])
+      else
+        Soloist::Remote.from_uri(options[:remote])
+      end
     end
 
-    def node_json
-      @node_json ||= Tempfile.new(["node", ".json"])
+    def cheffile_exists?
+      File.exists?(File.expand_path("../Cheffile", rc_path))
     end
 
     def rc_path
       @rc_path ||= Soloist::Spotlight.find!("soloistrc", ".soloistrc")
     end
+
+    def rc_local_path
+      @rc_local_path ||= Soloist::Spotlight.find("soloistrc_local", ".soloistrc_local")
+    end
   end
 end

data/lib/soloist/config.rb

@@ -1,7 +1,9 @@
 require "soloist/royal_crown"
+require "tempfile"
 
 module Soloist
   class Config
+    attr_writer :solo_rb_path, :node_json_path
     attr_reader :royal_crown
 
     def self.from_file(royal_crown_path)
@@ -13,21 +15,66 @@ module Soloist
       @royal_crown = royal_crown
     end
 
+    def run_chef
+      exec(conditional_sudo("bash -c '#{chef_solo}'"))
+    end
+
+    def chef_solo
+      "chef-solo -c '#{solo_rb_path}' -l '#{log_level}'"
+    end
+
     def as_solo_rb
-      paths = cookbook_paths.uniq.map do |cookbook_path|
-        File.expand_path(cookbook_path, bash_path)
+      <<-SOLO_RB
+        file_cache_path "#{chef_cache_path}"
+        cookbook_path #{cookbook_paths.inspect}
+        json_attribs "#{node_json_path}"
+      SOLO_RB
+    end
+
+    def as_node_json
+      compiled.node_attributes.to_hash.merge({ "recipes" => compiled.recipes })
+    end
+
+    def chef_cache_path
+      "/var/chef/cache".tap do |cache_path|
+        system(conditional_sudo("mkdir -p #{cache_path}")) \
+          unless File.directory?(cache_path)
       end
-      "cookbook_path #{paths.inspect}"
     end
 
-    def as_json
-      {
-        "recipes" => compiled_rc.recipes
-      }
+    def cookbook_paths
+      ([royal_crown_cookbooks_directory] + compiled.cookbook_paths).map do |path|
+        File.expand_path(path, royal_crown_path)
+      end.uniq.select do |path|
+        File.directory?(path)
+      end
+    end
+
+    def solo_rb_path
+      @solo_rb_path ||= Tempfile.new(["solo", ".rb"]).tap do |file|
+        puts as_solo_rb if debug?
+        file.write(as_solo_rb)
+        file.close
+      end.path
+    end
+
+    def node_json_path
+      @node_json_path ||= Tempfile.new(["node", ".json"]).tap do |file|
+        puts JSON.pretty_generate(as_node_json) if debug?
+        file.write(JSON.dump(as_node_json))
+        file.close
+      end.path
     end
 
-    def compiled_rc
-      @compiled_rc ||= royal_crown.dup.tap do |rc|
+    def merge!(other)
+      royal_crown.recipes += other.royal_crown.recipes
+      royal_crown.cookbook_paths += other.royal_crown.cookbook_paths
+      royal_crown.node_attributes.merge!(other.royal_crown.node_attributes)
+      royal_crown.env_variable_switches.merge!(other.royal_crown.env_variable_switches)
+    end
+
+    def compiled
+      @compiled ||= royal_crown.dup.tap do |rc|
         while rc["env_variable_switches"]
           rc.delete("env_variable_switches").each do |variable, switch|
             switch.each do |value, inner|
@@ -38,13 +85,29 @@ module Soloist
       end
     end
 
+    def log_level
+      ENV["LOG_LEVEL"] || "info"
+    end
+
+    def debug?
+      log_level == "debug"
+    end
+
     private
-    def bash_path
-      File.dirname(royal_crown.path)
+    def conditional_sudo(command)
+      root? ? command : "sudo -E #{command}"
     end
 
-    def cookbook_paths
-      ["cookbooks"] + compiled_rc.cookbook_paths
+    def root?
+      Process.uid == 0
+    end
+
+    def royal_crown_cookbooks_directory
+      File.expand_path("cookbooks", royal_crown_path)
+    end
+
+    def royal_crown_path
+      File.dirname(royal_crown.path)
     end
   end
 end

data/lib/soloist/remote.rb

@@ -0,0 +1,66 @@
+require "net/ssh"
+require "shellwords"
+require "etc"
+
+module Soloist
+  class RemoteError < RuntimeError; end
+
+  class Remote
+    attr_reader :user, :host, :key, :timeout, :stdout, :stderr, :exitstatus
+    attr_writer :connection
+
+    def self.from_uri(uri, key = "~/.ssh/id_rsa")
+      parsed = URI.parse("ssh://#{uri}")
+      new(parsed.user || Etc.getlogin, parsed.host, key)
+    end
+
+    def initialize(user, host, key, options = {})
+      @user = user
+      @host = host
+      @key = key
+      @timeout = options[:timeout] || 10000
+    end
+
+    def backtick(command)
+      @stdout = ""
+      @stderr = ""
+      exec(command)
+      @stdout
+    end
+
+    def system(command)
+      @stdout = STDOUT
+      @stderr = STDERR
+      exec(command)
+      exitstatus
+    end
+
+    def system!(*command)
+      system(*command).tap do |status|
+        raise RemoteError.new("#{command.join(" ")} exited #{status}") unless status == 0
+      end
+    end
+
+    def upload(from, to, opts = "--exclude .git")
+      Kernel.system("rsync -e 'ssh -i #{key}' -avz --delete #{from} #{user}@#{host}:#{to} #{opts}")
+    end
+
+    private
+    def connection
+      @connection ||= Net::SSH.start(host, user, :keys => [key], :timeout => timeout)
+    end
+
+    def exec(*command)
+      connection.open_channel do |channel|
+        channel.exec(*command) do |stream, success|
+          raise RemoteError.new("Could not run #{command.join(" ")}") unless success
+          stream.on_data { |_, data| stdout << data }
+          stream.on_extended_data { |_, type, data| stderr << data }
+          stream.on_request("exit-status") { |_, data| @exitstatus = data.read_long }
+        end
+      end
+      connection.loop
+      @exitstatus ||= 0
+    end
+  end
+end

data/lib/soloist/remote_config.rb

@@ -0,0 +1,62 @@
+require "soloist/config"
+require "soloist/remote"
+
+module Soloist
+  class RemoteConfig < Config
+    attr_reader :remote
+
+    def self.from_file(royal_crown_path, remote)
+      rc = Soloist::RoyalCrown.from_file(royal_crown_path)
+      new(rc, remote)
+    end
+
+    def initialize(royal_crown, remote)
+      @royal_crown = royal_crown
+      @remote = remote
+    end
+
+    def run_chef
+      remote.system!(conditional_sudo(%(/bin/bash -lc "#{chef_solo}")))
+    end
+
+    def node_json_path
+      @node_json_path ||= File.expand_path("node.json", chef_config_path).tap do |path|
+        remote.system!(%(echo '#{JSON.dump(as_node_json)}' | #{conditional_sudo("tee #{path}")}))
+      end
+    end
+
+    def solo_rb_path
+      @solo_rb_path ||= File.expand_path("solo.rb", chef_config_path).tap do |path|
+        remote.system!(%(echo '#{as_solo_rb}' | #{conditional_sudo("tee #{path}")}))
+      end
+    end
+
+    def chef_cache_path
+      @chef_cache_path ||= "/var/chef/cache".tap do |cache_path|
+        remote.system!(conditional_sudo("/bin/mkdir -m 777 -p #{cache_path}"))
+      end
+    end
+
+    def chef_config_path
+      @chef_config_path ||= "/etc/chef".tap do |path|
+        remote.system!(conditional_sudo("/bin/mkdir -m 777 -p #{path}"))
+      end
+    end
+
+    def cookbook_paths
+      @cookbook_paths ||= ["/var/chef/cookbooks".tap do |remote_path|
+        remote.system!(conditional_sudo("/bin/mkdir -m 777 -p #{remote_path}"))
+        super.each { |path| remote.upload("#{path}/", remote_path) }
+      end]
+    end
+
+    protected
+    def conditional_sudo(command)
+      root? ? command : "/usr/bin/sudo -E #{command}"
+    end
+
+    def root?
+      remote.user == "root"
+    end
+  end
+end

data/lib/soloist/version.rb

@@ -1,3 +1,3 @@
 module Soloist
-  VERSION = "1.0.0.pre"
+  VERSION = "1.0.0"
 end

data/script/bootstrap.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+set -e
+
+echo "Updating package list"
+sudo apt-get update > /dev/null
+
+echo "Ensuring curl is available"
+sudo apt-get install -y curl > /dev/null
+
+echo "Setting up RVM"
+
+user=$1
+[ -z "$user" ] && user="ubuntu"
+
+test -d /usr/local/rvm || curl -L https://get.rvm.io | sudo bash -s stable
+
+test -e /usr/local/rvm || sudo tee /etc/profile.d/rvm.sh > /dev/null <<RVMSH_CONTENT
+[[ -s "/usr/local/rvm/scripts/rvm" ]] && source "/usr/local/rvm/scripts/rvm"
+RVMSH_CONTENT
+
+test -x /usr/local/rvm || sudo chmod +x /etc/profile.d/rvm.sh
+
+grep "^$user:" /etc/passwd > /dev/null || sudo useradd -m $user -G sudo,rvm,admin -s /bin/bash
+
+test -e /etc/rvmrc || sudo tee /etc/rvmrc > /dev/null <<RVMRC_CONTENTS
+rvm_install_on_use_flag=1
+rvm_trust_rvmrcs_flag=1
+rvm_gemset_create_on_use_flag=1
+RVMRC_CONTENTS
+
+echo "Detecting RVM requirements"
+
+bash -lc 'rvm requirements' | tee /tmp/rvm-requirements > /dev/null
+packages=`grep "  ruby: /usr/bin/apt-get install" /tmp/rvm-requirements | sed "s/  ruby: \/usr\/bin\/apt-get install //g"`
+
+echo "Detected RVM requirements: $packages"
+
+selections=`dpkg --get-selections`
+for package in $packages
+do
+  if ! echo "$selections" | grep "^$package\s" > /dev/null
+  then
+    to_install="$to_install $package"
+  fi
+done
+
+if [ -z "$to_install" ]
+then
+  echo "Satisfied RVM requirements"
+else
+  echo "Installing missing RVM requirements: $to_install"
+  sudo apt-get install -y $to_install
+fi