relevance_rails 0.1.2 → 0.2.0

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+*v0.2.0*
+
+* Depend on slushy for provisioning
+* Depend on elzar as a gem
+** elzar's chef recipes stay in elzar
+** relevance_rails has no knowledge of elzar's recipe internals
+* Search for local ssh public keys before querying ssh-agent
+* Improved UX around retrying failed commands
+* Fix fixtures generator
+* Generated Rails app depends on haml <= 3.1.4 due to haml 3.1.5 bug
+
 *v0.1.2*
 
 * add streaming output from chef convergence using a fog monkeypatch

data/Guardfile

@@ -0,0 +1,7 @@
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
+
+  watch('spec/spec_helper.rb') { "spec" }
+  watch(%r{^spec/support/.+\.rb$}) { "spec" }
+end

data/Rakefile

@@ -9,3 +9,11 @@ task :acceptance do
   ENV["ACCEPTANCE"] = "true"
   Rake::Task[:spec].invoke
 end
+
+# Do not run using bundle exec!
+# FakeFS causes issues when bundler injects it into the require chain.
+desc 'Run the elzar nightly specs'
+RSpec::Core::RakeTask.new :elzar_nightly do |t|
+  t.pattern = 'spec/elzar_recipes_spec.rb'
+  t.rspec_opts = '-t ci'
+end

data/USAGE.md

@@ -13,10 +13,11 @@ $ rails g provision_config postgresql
 Configuring bundled ssh keys
 ----------------------------
 
-By default, relevance_rails bundles all your keys from `ssh-add -L` with your instance. For bundling
-additional keys, you can create a ~/.relevance_rails/keys_git_url file and point it to a git repo that
-has additional keys. Keys in that git repo should exist as top level *.pub files. You *MUST* have at
-least one key to provision.
+By default, relevance_rails bundles one of your local keys (~/.ssh/id_rsa.pub, ~/.ssh/id_dsa.pub, or
+~/.ssh/id_ecdsa.pub) with your instance. If none are found it bundles all your keys from `ssh-add
+-L`. For bundling additional keys, you can create a ~/.relevance_rails/keys_git_url file and point it
+to a git repo that has additional keys. Keys in that git repo should exist as top level *.pub files.
+You *MUST* have at least one key to provision.
 
 Provisioning on EC2
 -------------------

data/lib/generators/fixtures/fixtures_generator.rb

@@ -11,8 +11,7 @@ STR
 %h1 WELCOME HOME
 STR
     create_file "app/views/relevance_rails/db.html.haml", <<-STR
-= conn = ActiveRecord::Base.connection
-= results = conn.execute("select 4200+42 as advanced_math")
+- results = ActiveRecord::Base.connection.select_all("select 4200+42 as advanced_math")
 %h1.advanced_math= results.first["advanced_math"]
 STR
   end

data/lib/generators/provision_config/provision_config_generator.rb

@@ -1,5 +1,7 @@
 require 'relevance_rails'
+require 'tempfile'
 require 'rails/generators'
+require 'elzar'
 
 class ProvisionConfigGenerator < Rails::Generators::Base
   include RelevanceRails::GeneratorOverrides
@@ -27,7 +29,14 @@ class ProvisionConfigGenerator < Rails::Generators::Base
 
   def check_authorized_keys
     if (@authorized_keys = fetch_keys).empty?
-      abort "No ssh keys were found! Check ssh-add -L and your keys_git_url config."
+      abort <<-EOF
+No SSH public keys were found!
+
+To ensure you have remote access to your servers, an SSH public key must be available from at least one of these sources:
+- local file (~/.ssh/id_rsa.pub, ~/.ssh/id_dsa.pub, or ~/.ssh/id_ecdsa.pub)
+- ssh-agent (by running `ssh-add -L`)
+- public keys git repo (URL to repo specified in ~/.relevance_rails/key_git_url)
+      EOF
     end
   end
 
@@ -39,42 +48,23 @@ class ProvisionConfigGenerator < Rails::Generators::Base
     git :commit => '-m "Add Capistrano files"'
   end
 
-  def fetch_elzar
-    git :remote => 'add -f elzar git://github.com/relevance/elzar.git'
-    git :merge => '-s ours --no-commit elzar/master'
-    git :"read-tree" => '--prefix=provision/ -u elzar/master'
-    gsub_file 'provision/Vagrantfile', /config\.vm\.host_name(\s+)= .*$/,
-      "config.vm.host_name\\1= '#{name.gsub('_','-')}.local'"
-  end
-
-  def create_authorized_key_data_bag
-    @authorized_keys.map! {|key| "\"#{key}\""}
-    template('authorized_keys.json.erb', 'provision/data_bags/deploy/authorized_keys.json', {:force => true})
-  end
-
-  def create_dna_json
-    path = File.expand_path('provision/dna.json', destination_root)
-    json = JSON.parse File.binread(path)
-    json['rails_app']['name'] = name
-    RelevanceRails::ChefDNA.gene_splice(json,database)
-    create_file('provision/dna.json', JSON.generate(json), {:force => true})
+  def create_provision_directory
+    Elzar.create_provision_directory Rails.root.join('provision'),
+      :ruby_version => RelevanceRails.ruby_version, :database => database,
+      :authorized_keys => @authorized_keys, :app_name => name
   end
 
   def create_rvmrc
     if File.exists?(rvmrc = Rails.root.join('.rvmrc'))
-      create_file('provision/.rvmrc', File.read(rvmrc), :force => true)
-      git :add => 'provision/.rvmrc'
+      copy_file(rvmrc, 'provision/.rvmrc', :force => true)
     else
       remove_file 'provision/.rvmrc'
-      git :rm => 'provision/.rvmrc'
     end
   end
 
   def commit_changes
-    git :add => 'provision/data_bags/deploy/authorized_keys.json'
-    git :add => 'provision/Vagrantfile'
-    git :add => 'provision/dna.json'
-    git :commit => '-m "Merge Elzar as our provision subdirectory"'
+    git :add => 'provision/'
+    git :commit => "-m 'Provision directory auto-created by elzar #{Elzar::VERSION}'"
   end
 
   private
@@ -104,10 +94,28 @@ class ProvisionConfigGenerator < Rails::Generators::Base
     git :add => destination
   end
 
-
   def fetch_keys
-    local_keys = `ssh-add -L`.split("\n")
-    local_keys = [] unless $?.success?
-    (local_keys + RelevanceRails::PublicKeyFetcher.public_keys).uniq
+    keys = local_keys
+    keys = ssh_agent_keys if keys.empty?
+    keys += RelevanceRails::PublicKeyFetcher.public_keys
+    keys.uniq
+  end
+
+  def local_keys
+    key_files = [
+      File.expand_path("~/.ssh/id_dsa.pub"),
+      File.expand_path("~/.ssh/id_ecdsa.pub"),
+      File.expand_path("~/.ssh/id_rsa.pub"),
+    ]
+    key_files.select { |p| File.exist?(p) }.take(1).map { |p| split_keys(File.read(p)) }.flatten(1)
+  end
+
+  def ssh_agent_keys
+    keys = split_keys(`ssh-add -L`)
+    $?.success? ? keys : []
+  end
+
+  def split_keys(s)
+    s.split("\n").reject { |k| k.blank? }
   end
 end

data/lib/generators/relevance_file/templates/Gemfile.erb

@@ -1,7 +1,10 @@
 source :rubygems
 
 gem 'rails', '~> 3.2.2'
-gem 'haml', '~> 3.1.4'
+# Avoiding 3.1.5 which has a bug with aliasing
+# AbstractController::Rendering#render_to_body
+# https://github.com/haml/haml/issues/519
+gem 'haml', '>= 3.1.0', '<= 3.1.4'
 gem 'configatron', '~> 2.8.3'
 gem 'airbrake', '~> 3.0.4'
 gem 'factory_girl_rails', '~> 1.2.0'
@@ -29,7 +32,7 @@ end
 group "development", "test" do
   gem 'capybara', '~> 1.1.1'
   gem 'selenium-webdriver', '~> 2.5.0'
-  gem 'rspec-rails', '~> 2.6.0'
+  gem 'rspec-rails', '~> 2.9.0'
   gem 'mocha', '~> 0.9.12'
   gem 'guard-rspec', '~> 0.5.0', :require => false
   gem 'growl', '~> 1.0.3', :require => false

data/lib/relevance_rails/provision.rb

@@ -1,49 +1,59 @@
 require 'fog'
 require 'thor'
-require 'timeout'
 require 'relevance_rails/fog_ext/ssh'
+require 'slushy'
+require 'elzar'
 
 module RelevanceRails
   module Provision
-    class AptInstallError < StandardError
-    end
+    CONFIG_FILE = 'config/ec2_instance.txt'
 
     def self.create_ec2(name = nil)
       abort "Please provide a $NAME" unless name
-      server = provision_ec2_instances(name)
-      wait_for_ssh server
-      run_commands server
+      slushy = provision_ec2_instances(name)
+      slushy.bootstrap
+      tmpdir = Elzar.merge_and_create_temp_directory Rails.root.join('provision')
+      slushy.converge tmpdir
+      server = slushy.server
+      puts "Server Instance: #{server.id}"
+      puts "Server IP: #{server.public_ip_address}"
+      server
     end
 
     def self.stop_ec2
-      return unless ENV["FORCE"] == "true" || Thor::Shell::Basic.new.yes?("Are you sure you want to shut down EC2 instance #{instance_id}?")
+      return unless (ENV["FORCE"] == "true") || Thor::Shell::Basic.new.yes?("Are you sure you want to shut down EC2 instance #{instance_id}?")
       puts "Shutting down EC2 instance #{instance_id}..."
-      server = fog_connection.servers.get(instance_id)
-      server.stop
-      server.wait_for { state == "stopped" }
+      slushy = Slushy::Instance.new(fog_connection, instance_id)
+      slushy.stop
       puts "Done!"
     end
 
     def self.destroy_ec2
-      return unless ENV["FORCE"] == "true" || Thor::Shell::Basic.new.yes?("Are you sure you want to destroy EC2 instance #{instance_id}?")
+      return unless (ENV["FORCE"] == "true") || Thor::Shell::Basic.new.yes?("Are you sure you want to destroy EC2 instance #{instance_id}?")
       puts "Destroying EC2 instance #{instance_id}..."
-      server = fog_connection.servers.get(instance_id)
-      server.destroy
-      server.wait_for { state == "terminated" }
-      puts "Removing config/ec2_instance.txt..."
-      File.delete('config/ec2_instance.txt')
+      slushy = Slushy::Instance.new(fog_connection, instance_id)
+      slushy.terminate
+      puts "Removing #{CONFIG_FILE}..."
+      File.delete(CONFIG_FILE)
       puts "Done!"
     end
 
     def self.current_dns
-      server = fog_connection.servers.get(instance_id)
-      puts server.reload.dns_name
+      puts current_server.reload.dns_name
+    end
+
+    def self.current_server
+      fog_connection.servers.get(instance_id)
+    end
+
+    def self.private_key
+      config['server']['private_key']
     end
 
     private
 
     def self.instance_id
-      @instance_id ||= File.read('config/ec2_instance.txt').chomp
+      @instance_id ||= File.read(CONFIG_FILE).chomp
     end
 
     def self.config
@@ -56,97 +66,14 @@ module RelevanceRails
 
     def self.provision_ec2_instances(name)
       puts "Provisioning an instance..."
-      server = fog_connection.servers.create(config['server']['creation_config'])
-      fog_connection.tags.create(:key => 'Name',
-                      :value => "#{name}",
-                      :resource_id => server.id)
-      server.private_key = config['server']['private_key']
-
-      File.open("config/ec2_instance.txt", "w") do |f|
-        f.puts(server.id)
-      end
+      conf = config['server']['creation_config']
+      conf['tags'] = {'Name' => name}
 
+      slushy = Slushy::Instance.launch(fog_connection, conf)
+      slushy.server.private_key = private_key
+      File.open(CONFIG_FILE, "w") { |f| f.puts(slushy.server.id) }
       puts "Provisioned!"
-      server
+      slushy
     end
-
-    def self.run_commands(server)
-      apt_installs(server)
-      puts "Installing chef..."
-      run_command(server, 'sudo gem install chef --no-ri --no-rdoc --version 0.10.8')
-      puts "Copying chef resources from provision directory..."
-      server.scp("#{Rails.root.join('provision')}/", '/tmp/chef-solo', :recursive => true)
-      puts "Converging server, this may take a while (10-20 minutes)"
-      run_command(server, 'cd /tmp/chef-solo && sudo /var/lib/gems/1.8/bin/chef-solo -c solo.rb -j dna.json')
-
-      puts "Server Instance: #{server.id}"
-      puts "Server IP: #{server.public_ip_address}"
-      server
-    end
-
-    def self.retry_block(times, errors, failure)
-      succeeded = false
-      attempts = 0
-      last_error = nil
-      until succeeded || attempts > times-1
-        begin
-          retval = yield
-          succeeded = true
-        rescue *errors => e
-          puts failure
-          attempts +=1
-          last_error = e
-        end
-      end
-      if succeeded
-        return retval
-      else
-        exit 1
-      end
-    end
-
-    def self.apt_installs(server)
-      retry_block(3, [AptInstallError], "Apt-cache came from corrupt mirror, retrying update...") do
-        puts "Updating apt cache..."
-        run_apt_command(server, 'sudo apt-get update')
-        puts "Installing ruby..."
-        run_apt_command(server, 'sudo apt-get -y install ruby')
-        puts "Installing rubygems..."
-        run_apt_command(server, 'sudo apt-get -y install rubygems1.8')
-      end
-    end
-
-    def self.run_apt_command(server, command)
-      jobs = server.ssh(command)
-      raise AptInstallError unless jobs_succeeded?(jobs)
-    end
-
-    def self.run_command(server, command)
-      jobs = server.ssh(command)
-      exit 1 unless jobs_succeeded?(jobs)
-    end
-
-    def self.wait_for_ssh(server)
-      puts "Waiting for ssh connectivity..."
-      server.wait_for { ready? }
-      retry_block(5, [Errno::ECONNREFUSED, Timeout::Error], "Connecting to Amazon refused. Retrying...") do
-        sleep 10
-        Timeout.timeout(60) { server.ssh('ls') }
-      end
-      puts "Server up and listening for SSH!"
-    end
-
-    def self.jobs_succeeded?(jobs)
-      return true if jobs.all? { |job| job.status == 0 }
-      jobs.each do |job|
-        puts "----------------------"
-        puts "Command '#{job.command}'"
-        puts "STDOUT: #{job.stdout}"
-        puts "STDERR: #{job.stderr}"
-        puts "----------------------"
-      end
-      false
-    end
-
   end
 end

data/lib/relevance_rails/public_key_fetcher.rb

@@ -3,8 +3,8 @@ require 'tmpdir'
 module RelevanceRails::PublicKeyFetcher
   def self.public_keys
     pubkeys = []
-    return pubkeys unless File.exist? user_git_url
-    git_url = File.read user_git_url
+    return pubkeys unless File.exist?(user_git_url)
+    git_url = File.read(user_git_url)
     return pubkeys unless git_url =~ /\/(.*)\.git/
     repo_name = $1
     Dir.mktmpdir('public_keys') { |dir|

data/lib/relevance_rails/runner.rb

@@ -3,17 +3,17 @@ require 'relevance_rails'
 module RelevanceRails
   class Runner
     def self.start(argv=ARGV)
-      if argv.empty? || argv[0] == '--help' || argv[0] == '-h'
+      if argv.empty? || (argv[0] == '--help') || (argv[0] == '-h')
         print_help
-      elsif argv.delete '--version'
+      elsif argv.delete('--version')
         puts "RelevanceRails #{RelevanceRails::VERSION}"
       elsif argv[0] == 'new'
         add_default_options! argv
-        if ENV['rvm_path'].nil?
+        if ENV['rvm_path'].nil? || ENV['NO_RVM']
           exec 'rails', *argv
         else
           app_name = argv[1]
-          env = setup_rvm app_name
+          env = setup_rvm(app_name)
 
           new_rvm_string = "#{env.environment_name.split('@')[0]}@#{app_name}"
           install_relevance_rails argv, new_rvm_string, env.environment_name
@@ -54,9 +54,7 @@ STR
         # in 1.12.0, so you don't use this trick anymore.
         $LOAD_PATH.unshift "#{ENV['rvm_path']}/lib"
       end
-
       require 'rvm'
-
       env = RVM::Environment.current
       env.gemset_create(app_name)
       env
@@ -66,13 +64,19 @@ STR
       child_env = RVM::Environment.new(new_rvm_string)
       puts "Installing relevance_rails into the app's gemset..."
 
-      result = if argv.delete '--relevance-dev'
-        rubygem = "#{ENV['rvm_path']}/gems/#{current_gemset}/cache/relevance_rails-#{RelevanceRails::VERSION}.gem"
-        child_env.run('gem', 'install', rubygem)
+      result = if argv.delete('--relevance-dev')
+        gem_dir = "#{ENV['rvm_path']}/gems/#{current_gemset}/cache"
+        require 'elzar'
+        child_env.run('gem', 'install', "#{gem_dir}/elzar-#{Elzar::VERSION}.gem")
+        child_env.run('gem', 'install', "#{gem_dir}/relevance_rails-#{RelevanceRails::VERSION}.gem")
       else
         child_env.run('gem', 'install', 'relevance_rails', '-v', RelevanceRails::VERSION)
       end
-      abort "Unable to install relevance_rails into the new gemset" if result.exit_status != 0
+      if result.exit_status != 0
+        abort "Unable to install relevance_rails into the new gemset. " +
+          "\nExit code: #{result.exit_status}" +
+          "\nFailed with:\n#{result.stderr}"
+      end
     end
 
     def self.add_default_options!(argv)

data/lib/relevance_rails/version.rb

@@ -1,3 +1,3 @@
 module RelevanceRails
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/relevance_rails.rb

@@ -1,7 +1,6 @@
 require "relevance_rails/version"
 require "relevance_rails/public_key_fetcher"
-require "relevance_rails/chef_dna"
-require 'relevance_rails/railtie' if defined? Rails
+require 'relevance_rails/railtie' if defined?(Rails)
 require 'relevance_rails/generator_overrides'
 
 module RelevanceRails

data/relevance_rails.gemspec

@@ -8,31 +8,28 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/relevance/relevance_rails"
   s.authors     = ["Alex Redington"]
   s.email       = ["alex.redington@thinkrelevance.com"]
-  s.homepage    = ""
   s.summary     = %q{Rails 3 Relevance style, with all infrastructure bits automated away.}
   s.description = %q{A Rails 3 wrapper which forces template use and includes a plethora of generators for standard Relevance bits.}
 
-  s.rubyforge_project = "relevance_rails"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
 
-  s.bindir        = 'bin'
   s.executables   = ['relevance_rails']
 
-  # specify any dependencies here; for example:
-  s.add_runtime_dependency 'rails', '~> 3.2'
-
   # be aware that we're monkey-patching fog in fog_ext/ssh.rb;
   # if we update fog, that monkey-patch might need to be
   # revisited
   s.add_runtime_dependency 'fog', '1.3.1'
-
+  s.add_runtime_dependency 'rails', '~> 3.2'
+  s.add_runtime_dependency 'slushy', '~> 0.1.1'
   s.add_runtime_dependency 'thor', '~> 0.14.6'
-  s.add_development_dependency 'pry'
+  s.add_runtime_dependency 'elzar', '~> 0.1.0'
+
   s.add_development_dependency 'capybara'
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'fakefs'
+  s.add_development_dependency 'guard-rspec'
+  s.add_development_dependency 'pry'
   s.add_development_dependency 'rake', '~> 0.9.2.2'
+  s.add_development_dependency 'rspec'
 end

data/script/ci

@@ -25,9 +25,13 @@ function files_must_NOT_exist {
 RAILS_APP="app_for_ci"
 TARGET_HOST="placeholder.example.com"
 
+# Set overrideable defaults
+: ${CI_DATABASE:="postgresql"}
+: ${CI_RUBY_VERSION:="ruby-1.9.2"}
+
 # Setup RVM
 source "$HOME/.rvm/scripts/rvm"
-rvm use "ruby-1.9.2@relevance_rails"
+rvm use "$CI_RUBY_VERSION@relevance_rails"
 echo "RVM is now using:` rvm current`"
 
 # exit if any statement fails;
@@ -50,7 +54,7 @@ rvm --force gemset delete $RAILS_APP
 set -e
 echo "Done"
 
-relevance_rails new $RAILS_APP --database=postgresql --relevance-dev
+relevance_rails new $RAILS_APP --database=$CI_DATABASE --relevance-dev
 
 # NOTE: this does NOT change the RVM gemset; we set it manually below
 builtin cd $RAILS_APP

data/script/ci_nightly

@@ -13,36 +13,53 @@ function stop_server_and_exit {
     echo "Stopping newly-created server..."
     bundle exec rake provision:stop FORCE=true --trace
     echo "Done."
+  else
+    echo "No server to stop (i.e. can't find config/ec2_instance.txt)."
   fi  
 
   echo "BUILD FAILED"
   exit 1
 }
 
+function cd_rails_app {
+  builtin cd $RAILS_APP
+  rvm gemset use $RAILS_APP
+}
+
 echo "RVM is now using:` rvm current`"
 
+if [ -z $CI_RUBY_VERSION ]; then
+  echo 'You must specify $CI_RUBY_VERSION!'
+  exit 1
+fi
+
+if [ -z $CI_DATABASE ]; then
+  echo 'You must specify $CI_DATABASE!'
+  exit 1
+fi
+
 set -e
 ./script/ci 
 set +e 
 
 source "$HOME/.rvm/scripts/rvm"
-rvm use "ruby-1.9.2@$RAILS_APP"
+rvm use "$CI_RUBY_VERSION@$RAILS_APP"
 echo "RVM is now using:` rvm current`"
 
 builtin cd $RAILS_APP
-
+ 
 echo "Provisioning an EC2 instance..."
 rm -f $EC2_MEMENTO_FILE
 server_name="Nightly Build Testing - `date "+%Y-%m-%d %H:%M:%S"` "
 bundle exec rake --trace provision:ec2 NAME="$server_name"
 [ $? -ne 0 ] && stop_server_and_exit
 echo "Done!"
-
+ 
 echo "Determine the EC2 instance's DNS name..."
 TARGET_HOST=`bundle exec rake provision:current_dns`
 [ $? -ne 0 ] && stop_server_and_exit
 echo "Done."
-
+ 
 echo "Generating relevance_rails deployment scripts..."
 ./script/rails generate deployment staging $TARGET_HOST --force
 [ $? -ne 0 ] && stop_server_and_exit
@@ -67,11 +84,10 @@ echo "RVM is now using:` rvm current`"
 
 echo "Running the acceptance tests against our newly-created server..."
 ACCEPTANCE_HOST=$TARGET_HOST rake acceptance --trace
-[ $? -ne 0 ] && stop_server_and_exit
+[ $? -ne 0 ] && cd_rails_app && stop_server_and_exit
 echo "Done."
 
-builtin cd $RAILS_APP
-rvm gemset use $RAILS_APP
+cd_rails_app
 
 echo "Terminating our newly-created server..."
 bundle exec rake provision:destroy FORCE=true --trace 

data/script/elzar_nightly

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+RAILS_APP="elzar_nightly_app"
+EC2_MEMENTO_FILE="config/ec2_instance.txt"
+
+function stop_server_and_exit {
+  if [ -f $EC2_MEMENTO_FILE ]; then
+    echo "Stopping newly-created server..."
+    bundle exec rake provision:stop FORCE=true --trace
+  else
+    echo "No server to stop (i.e. can't find config/ec2_instance.txt)."
+  fi  
+
+  echo "BUILD FAILED"
+  exit 1
+}
+
+source "$HOME/.rvm/scripts/rvm"
+export CI_GEMSET=elzar_nightly
+# Tests and app are all running in CI_GEMSET
+export NO_RVM=true
+
+rvm use "$CI_RUBY_VERSION@$CI_GEMSET"
+gem install bundler
+bundle install
+
+# DO NOT bundle exec rake - fakefs activation borks everything
+rake elzar_nightly
+
+[ $? -ne 0 ] && builtin cd $RAILS_APP && stop_server_and_exit
+
+builtin cd $RAILS_APP
+bundle exec rake provision:destroy FORCE=true --trace 

data/spec/elzar_recipes_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+require 'fileutils'
+require 'relevance_rails/provision'
+
+describe "Elzar recipes", :ci => true do
+  let(:rails_app) { ENV['RAILS_APP'] || 'elzar_nightly_app' }
+  let(:server_name) { "Elzar Nightly (#{database} / #{ruby_version}) - #{Time.now.strftime("%Y-%m-%d %H:%M:%S")}" }
+  let(:database) { ENV['CI_DATABASE'] || 'mysql' }
+  let(:database_cmd) { { 'mysql' => 'mysql', 'postgresql' => 'psql'}[database] }
+  let(:ruby_version) { ENV['CI_RUBY_VERSION'] || 'ruby-1.9.3-p125' }
+  let(:ruby_bin_path) {
+    ruby_version.start_with?('ree-') ? '/opt/ruby-enterprise/bin' : '/opt/relevance-ruby/bin'
+  }
+  let(:gemset) { ENV['CI_GEMSET'] || 'elzar_nightly' }
+
+  # wrapper around system
+  def shell(cmd)
+    puts "Executing #{cmd}..."
+    system(cmd)
+    abort "Command '#{cmd}' failed" unless $?.success?
+  end
+
+  def sh(cmd)
+    shell "#{ruby_version}@#{gemset} -S #{cmd}"
+  end
+
+  def rake(cmd)
+    sh "bundle exec rake #{cmd}"
+  end
+
+  # New app is created in current gemset
+  def create_new_app
+    rake 'install --trace'
+    FileUtils.rm_rf(rails_app)
+    sh "relevance_rails new #{rails_app} --database=#{database} --relevance-dev"
+  end
+
+  def ssh(cmd)
+    server = RelevanceRails::Provision.current_server
+    server.username = 'relevance'
+    server.private_key = RelevanceRails::Provision.private_key
+    job = nil
+    capture_stdout { job = server.ssh(cmd).first }
+    job
+  end
+
+  def command_succeeds(cmd)
+    ssh(cmd).status.should == 0
+  end
+
+  before(:all) do
+    create_new_app
+    Dir.chdir rails_app
+    rake %[provision:ec2 NAME="#{server_name}" --trace]
+  end
+
+  it "installs the right ruby" do
+    job = ssh "#{ruby_bin_path}/ruby -v"
+    if ruby_version.start_with?('ree-')
+      job.stdout.include?("Ruby Enterprise Edition").should be_true
+    else
+      version_number = ruby_version.sub(/^ruby/, '').tr('-', '')
+      job.stdout.start_with?("ruby #{version_number}").should be_true
+    end
+  end
+
+  it "installs the correct database" do
+    command_succeeds("#{database_cmd} --version")
+  end
+
+  it "creates a deploy user" do
+    command_succeeds("ls /home/deploy")
+  end
+
+  it "creates nginx and configures it" do
+    # TODO: get nginx version from elzar
+    command_succeeds "/opt/nginx-1.0.10/sbin/nginx -h"
+    command_succeeds "ls /etc/nginx/nginx.conf"
+    command_succeeds "ls /etc/init.d/nginx"
+    command_succeeds "ls /etc/nginx/sites-enabled/#{rails_app}"
+  end
+
+  it "installs passenger gem and configures it" do
+    command_succeeds "#{ruby_bin_path}/gem list passenger$ |grep passenger -q"
+    command_succeeds "ls /etc/nginx/conf.d/passenger.conf"
+    command_succeeds %[grep -q "passenger_ruby #{ruby_bin_path}/ruby;" /etc/nginx/conf.d/passenger.conf]
+  end
+end

data/spec/lib/generators/provision_config/provision_config_generator_spec.rb

@@ -0,0 +1,116 @@
+require 'spec_helper'
+require 'fileutils'
+require 'fakefs/spec_helpers'
+require 'generators/provision_config/provision_config_generator'
+
+describe ProvisionConfigGenerator do
+  subject { ProvisionConfigGenerator.new(["name"]) }
+
+  describe "#local_keys" do
+    include FakeFS::SpecHelpers
+
+    def write_fixture(path, contents)
+      FileUtils.mkdir_p(File.dirname(path))
+      File.open(path, "w") { |f| f.write(contents) }
+    end
+
+    it "returns the contents of id_rsa.pub when it exists" do
+      write_fixture(File.expand_path("~/.ssh/id_rsa.pub"), "RSA-public-key")
+      subject.send(:local_keys).should == ["RSA-public-key"]
+    end
+
+    it "returns the contents of id_dsa.pub when it exists" do
+      write_fixture(File.expand_path("~/.ssh/id_dsa.pub"), "DSA-public-key")
+      subject.send(:local_keys).should == ["DSA-public-key"]
+    end
+
+    it "returns the contents of id_ecdsa.pub when it exists" do
+      write_fixture(File.expand_path("~/.ssh/id_ecdsa.pub"), "ECDSA-public-key")
+      subject.send(:local_keys).should == ["ECDSA-public-key"]
+    end
+
+    it "returns the contents of id_dsa.pub when both id_dsa.pub and id_rsa.pub exist" do
+      write_fixture(File.expand_path("~/.ssh/id_dsa.pub"), "DSA-public-key")
+      write_fixture(File.expand_path("~/.ssh/id_rsa.pub"), "RSA-public-key")
+      subject.send(:local_keys).should == ["DSA-public-key"]
+    end
+
+    it "ignores trailing newlines" do
+      write_fixture(File.expand_path("~/.ssh/id_rsa.pub"), "RSA-public-key\n\n")
+      subject.send(:local_keys).should == ["RSA-public-key"]
+    end
+
+    it "ignores blank lines" do
+      write_fixture(File.expand_path("~/.ssh/id_rsa.pub"), "\n\nRSA-public-key\n\n\n")
+      subject.send(:local_keys).should == ["RSA-public-key"]
+    end
+  end
+
+  describe "#ssh_agent_keys" do
+    it "retrieves keys from ssh agent" do
+      subject.should_receive("`").with("ssh-add -L") do
+        system("true")
+        "my-public-key\nanother-public-key"
+      end
+      subject.send(:ssh_agent_keys).should == ["my-public-key", "another-public-key"]
+    end
+
+    it "ignores output from ssh-add when execution fails" do
+      subject.stub("`") do
+        system("false")
+        # Actual message that comes back from failed call
+        "The agent has no entities"
+      end
+      subject.send(:ssh_agent_keys).should == []
+    end
+  end
+
+  describe "#fetch_keys" do
+    it "returns local keys when they exist" do
+      subject.stub(:local_keys).and_return(["key-from-local-file"])
+      subject.stub(:ssh_agent_keys).and_return(["key-from-ssh-agent"])
+      RelevanceRails::PublicKeyFetcher.stub(:public_keys).and_return([])
+      subject.send(:fetch_keys).should == ["key-from-local-file"]
+    end
+
+    it "returns keys from ssh agent when local keys do NOT exist" do
+      subject.stub(:local_keys).and_return([])
+      subject.stub(:ssh_agent_keys).and_return(["key-from-ssh-agent"])
+      RelevanceRails::PublicKeyFetcher.stub(:public_keys).and_return([])
+      subject.send(:fetch_keys).should == ["key-from-ssh-agent"]
+    end
+
+    it "combines local keys with those from PublicKeyFetcher" do
+      subject.stub(:local_keys).and_return(["key-from-local-file"])
+      RelevanceRails::PublicKeyFetcher.stub(:public_keys).and_return(["key-from-git-repo"])
+      subject.send(:fetch_keys).should == ["key-from-local-file", "key-from-git-repo"]
+    end
+
+    it "combines ssh agent keys with those from PublicKeyFetcher" do
+      subject.stub(:local_keys).and_return([])
+      subject.stub(:ssh_agent_keys).and_return(["key-from-ssh-agent"])
+      RelevanceRails::PublicKeyFetcher.stub(:public_keys).and_return(["key-from-git-repo"])
+      subject.send(:fetch_keys).should == ["key-from-ssh-agent", "key-from-git-repo"]
+    end
+
+    it "excludes duplicate keys" do
+      subject.stub(:local_keys).and_return(["key-1", "key-2", "key-1"])
+      RelevanceRails::PublicKeyFetcher.stub(:public_keys).and_return(["key-3", "key-2", "key-3"])
+      subject.send(:fetch_keys).should == ["key-1", "key-2", "key-3"]
+    end
+  end
+
+  describe "#check_authorized_keys" do
+    it "aborts if no ssh-keys are found" do
+      subject.stub(:fetch_keys).and_return([])
+      should_abort_with(/^No SSH public keys were found!/) do
+        subject.check_authorized_keys
+      end
+    end
+
+    it "doesn't abort if ssh-keys are found" do
+      subject.should_receive(:fetch_keys).and_return(['ssh-rsa ZZZZ'])
+      expect { subject.check_authorized_keys }.to_not raise_error
+    end
+  end
+end

data/spec/lib/{runner_spec.rb → relevance_rails/runner_spec.rb}

@@ -15,10 +15,9 @@ describe RelevanceRails::Runner do
     it "new calls exec" do
       RelevanceRails::Runner.should_receive(:exec).with(anything,
         '-S', 'rails', 'new', 'the_app', '-m',
-        File.expand_path(File.dirname(__FILE__) +
-                         "/../../lib/relevance_rails/relevance_rails_template.rb"))
+        File.expand_path("../../../lib/relevance_rails/relevance_rails_template.rb", File.dirname(__FILE__)))
       RelevanceRails::Runner.should_receive(:install_relevance_rails)
-      env = mock :environment_name => '1.9.3@default'
+      env = mock(:environment_name => '1.9.3@default')
       RelevanceRails::Runner.should_receive(:setup_rvm).and_return(env)
       start('new', 'the_app')
     end

data/spec/spec_helper.rb

@@ -44,6 +44,7 @@ RSpec.configure do |config|
     config.include TestHelpers
     config.filter_run :focused => true
     config.filter_run_excluding :acceptance => true
+    config.filter_run_excluding :ci => true
     config.filter_run_excluding :disabled => true
     config.run_all_when_everything_filtered = true
   end

data/techdebt.md

@@ -1,20 +1,18 @@
 * TECHDEBT BY COMPONENT *
 
 * GENERAL
-** remove heredocs, replace by erb templates
 ** move all general configuration to a ~/.relevance_rails.yml file (AWS stuff, keys git repo stuff)
-** cleaner rvm version detection - intermittenly picks up no version
 ** intermittent mysql::server failures (mysql server not up yet) on `vagrant up`. Attempt fix in site_cookbooks
-** intermittent setup failure - apt-get update fails with 404s or ruby not found
 ** when generating an app with --database=postgresql, provision_config
    generator intermittently fails at the beginning with different gem not found
    errors. Generating the app more than once or inspecting the problem solves it
 ** provision_config generator intermittently can't detect current working directory which breaks
    git commands. Current solution of sprinkling Dir.chdir is a bandaid at best.
-
-* Provisioning an instance
-** Don't hardcode path to chef binstub, caused by ubuntu installing weirdness
 ** Make the deployment generator idempotent
-** Better error handling when the aws.yml is not present
-** On an uncaught exception, destroy the ec2 instances (?)
-** RelevanceRails::Provision.wait_for_ssh intermittently hangs
+** Have pg and mysql recipes depend on a unified gem install method. This method would call
+   gem_package for mri and ree_gem for ree. When this is done, we can add --dont-install-useful-gems
+   back to the ree installer.
+** Upgrade to haml > 3.1.5 once AbstractController::Rendering#render_to_body bug is resolved
+** bundle exec rake elzar_nightly breaks due to fakefs being activated early in require chain.
+   Calling the rake task works fine locally and on CI. Attempting to not require fakefs in the
+   Gemfile didn't work.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relevance_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000 Z
+date: 2012-05-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -28,21 +44,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: slushy
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +76,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.14.6
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: elzar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +124,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  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: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -123,6 +171,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2.2
+- !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'
 description: A Rails 3 wrapper which forces template use and includes a plethora of
   generators for standard Relevance bits.
 email:
@@ -137,6 +201,7 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - README.md
 - Rakefile
 - USAGE.md
@@ -146,7 +211,6 @@ files:
 - lib/generators/fixtures/fixtures_generator.rb
 - lib/generators/provision_config/provision_config_generator.rb
 - lib/generators/provision_config/templates/Capfile
-- lib/generators/provision_config/templates/authorized_keys.json.erb
 - lib/generators/provision_config/templates/deploy.rb.erb
 - lib/generators/provision_config/templates/recipes_deploy.rb
 - lib/generators/provision_config/templates/vagrant.rb
@@ -158,7 +222,6 @@ files:
 - lib/generators/relevance_file/templates/database.example.yml.postgresql.erb
 - lib/generators/relevance_file/templates/spec_helper.rb
 - lib/relevance_rails.rb
-- lib/relevance_rails/chef_dna.rb
 - lib/relevance_rails/fog_ext/ssh.rb
 - lib/relevance_rails/generator_overrides.rb
 - lib/relevance_rails/provision.rb
@@ -171,13 +234,14 @@ files:
 - relevance_rails.gemspec
 - script/ci
 - script/ci_nightly
+- script/elzar_nightly
 - spec/acceptance_spec.rb
-- spec/lib/provision_config_generator_spec.rb
-- spec/lib/provision_spec.rb
-- spec/lib/runner_spec.rb
+- spec/elzar_recipes_spec.rb
+- spec/lib/generators/provision_config/provision_config_generator_spec.rb
+- spec/lib/relevance_rails/runner_spec.rb
 - spec/spec_helper.rb
 - techdebt.md
-homepage: ''
+homepage: http://github.com/relevance/relevance_rails
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -189,16 +253,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3573380774667230504
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3573380774667230504
 requirements: []
-rubyforge_project: relevance_rails
-rubygems_version: 1.8.21
+rubyforge_project: 
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rails 3 Relevance style, with all infrastructure bits automated away.
-test_files: []
+test_files:
+- spec/acceptance_spec.rb
+- spec/elzar_recipes_spec.rb
+- spec/lib/generators/provision_config/provision_config_generator_spec.rb
+- spec/lib/relevance_rails/runner_spec.rb
+- spec/spec_helper.rb

data/lib/generators/provision_config/templates/authorized_keys.json.erb

@@ -1,6 +0,0 @@
-{
-  "id":"authorized_keys",
-  "keys": [
-<%= authorized_keys.join(",\n") %>
-   ]
-}

data/lib/relevance_rails/chef_dna.rb

@@ -1,34 +0,0 @@
-module RelevanceRails::ChefDNA
-  def self.gene_splice(json, database)
-    set_ruby(json)
-    set_database(json, database)
-  end
-
-  def self.set_database(json, database)
-    if database == 'postgresql'
-      db_index = json['run_list'].find_index { |e| e == 'mysql::server' || e == 'role[postgres_database]'}
-      json['run_list'][db_index] = 'role[postgres_database]'
-    elsif database.nil? || database == 'mysql'
-      db_index = json['run_list'].find_index { |e| e == 'mysql::server' || e == 'role[postgres_database]'}
-      json['run_list'][db_index] = 'mysql::server'
-    end
-  end
-
-  def self.set_ruby(json)
-    if RelevanceRails.ruby_version =~ /^ree-(.*)/i
-      json['ruby_enterprise']['version'] = $1
-      json['ruby_enterprise']['url'] = "http://rubyenterpriseedition.googlecode.com/files/ruby-enterprise-#{$1}"
-      appstack_index = json['run_list'].find_index {|e| e[/^role\[.*_appstack\]$/] }
-      json['run_list'][appstack_index] = 'role[enterprise_appstack]'
-    elsif RelevanceRails.ruby_version =~ /^ruby-(.*)/i
-      full_version = $1
-      json['ruby']['version'] = full_version
-      major_version = full_version[/(\d\.\d).*/, 1]
-      json['ruby']['url'] = "http://ftp.ruby-lang.org/pub/ruby/#{major_version}/ruby-#{full_version}.tar.gz"
-      appstack_index = json['run_list'].find_index {|e| e[/^role\[.*_appstack\]$/] }
-      json['run_list'][appstack_index] = 'role[ruby_appstack]'
-    else
-      raise "Your ruby is NOT SUPPORTED. Please use ree or ruby."
-    end
-  end
-end

data/spec/lib/provision_config_generator_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-require 'generators/provision_config/provision_config_generator'
-
-describe ProvisionConfigGenerator do
-  context '#check_authorized_keys' do
-    subject { ProvisionConfigGenerator.new(['name']) }
-
-    it "aborts if no ssh-keys are found" do
-      subject.should_receive(:`).and_return do
-        system('exit 1')
-        # Actual message that comes back from failed call
-        'The agent has no entities'
-      end
-      RelevanceRails::PublicKeyFetcher.should_receive(:public_keys).and_return([])
-
-      should_abort_with(/^No ssh keys were found!/) do
-        subject.check_authorized_keys
-      end
-    end
-
-    it "doesn't abort if ssh-keys are found" do
-      subject.should_receive(:fetch_keys).and_return(['ssh-rsa ZZZZ'])
-      expect { subject.check_authorized_keys }.to_not raise_error
-    end
-  end
-end

data/spec/lib/provision_spec.rb

@@ -1,68 +0,0 @@
-require 'spec_helper'
-require 'relevance_rails/provision'
-
-describe RelevanceRails::Provision do
-  def job(options={})
-    options = {:stdout => '', :stderr => '', :status => 0}.update options
-    mock(options)
-  end
-
-  describe '.run_commands' do
-    it "fails fast if a command fails" do
-      server = mock(:ssh => [job(:status => 1, :command => 'exit 1', :stderr => 'FAIL WHALE')])
-      capture_stdout do
-        expect do
-          RelevanceRails::Provision.run_commands server
-        end.to raise_error SystemExit
-      end.should =~ /STDERR: FAIL WHALE/
-    end
-  end
-
-  describe '.wait_for_ssh' do
-
-    let(:server) { mock("server") }
-
-    before do
-      server.should_receive(:wait_for).ordered.and_return(true)
-    end
-
-    it 'retries if the first attempt fails' do
-      server.should_receive(:ssh).ordered.and_raise(Errno::ECONNREFUSED)
-      server.should_receive(:ssh).ordered.and_return([job(:command => 'echo')])
-      RelevanceRails::Provision.should_receive(:sleep).twice.with(10).and_return(10)
-      expect do
-        capture_stdout { RelevanceRails::Provision.wait_for_ssh(server) }
-      end.to_not raise_error
-    end
-
-    it 'retries up to five times, then fails' do
-      server.should_receive(:ssh).ordered.exactly(5).times.and_raise(Errno::ECONNREFUSED)
-      RelevanceRails::Provision.should_receive(:sleep).exactly(5).times.with(10).and_return(10)
-      expect do
-        capture_stdout { RelevanceRails::Provision.wait_for_ssh(server) }
-      end.to raise_error SystemExit
-    end
-  end
-
-  describe '.apt_installs' do
-    it 'retries if the first attempt fails' do
-      server = mock("server")
-      server.should_receive(:ssh).ordered.with('sudo apt-get update').and_return([job(:command => 'sudo apt-get update')])
-      server.should_receive(:ssh).ordered.with('sudo apt-get -y install ruby').and_return([job(:status => 1, :command => 'sudo apt-get -y install ruby')])
-      server.should_receive(:ssh).ordered.with('sudo apt-get update').and_return([job(:command => 'sudo apt-get update')])
-      server.should_receive(:ssh).ordered.with('sudo apt-get -y install ruby').and_return([job(:command => 'sudo apt-get -y install ruby')])
-      server.should_receive(:ssh).ordered.with('sudo apt-get -y install rubygems1.8').and_return([job(:command => 'sudo apt-get -y install rubygems1.8')])
-      expect do
-        capture_stdout { RelevanceRails::Provision.apt_installs(server) }
-      end.to_not raise_error
-    end
-
-    it 'tries twice, then fails' do
-      server = mock("server")
-      server.should_receive(:ssh).exactly(3).with('sudo apt-get update').and_return([job(:status => 1, :command => 'sudo apt-get update')])
-      expect do
-        capture_stdout { RelevanceRails::Provision.apt_installs(server) }
-      end.to raise_error SystemExit
-    end
-  end
-end