engineyard-serverside 1.6.5 → 1.7.0.pre2

data/spec/rails31_deploy_spec.rb

@@ -3,62 +3,54 @@ require 'spec_helper'
 describe "Deploying a Rails 3.1 application" do
   context "with default production settings" do
     before(:all) do
-      deploy_test_application
+      deploy_test_application('assets_enabled')
     end
 
     it "precompiles assets" do
-      File.exist?(File.join(@deploy_dir, 'current', 'precompiled')).should be_true
+      @deploy_dir.join('current', 'precompiled').should exist
+    end
+  end
+
+  context "with asset compilation enabled in ey.yml, despite not otherwise being enabled" do
+    before(:all) do
+      deploy_test_application('assets_enabled_in_ey_yml')
+    end
+
+    it "precompiles assets" do
+      @deploy_dir.join('current', 'precompiled').should exist
     end
   end
 
   context "with asset support disabled in its config" do
     before(:all) do
-      deploy_test_application(with_assets = false)
+      deploy_test_application('assets_disabled')
     end
 
     it "does not precompile assets" do
-      File.exist?(File.join(@deploy_dir, 'current', 'precompiled')).should be_false
+      @deploy_dir.join('current', 'precompiled').should_not exist
     end
   end
 
-  context "and failing with errors" do
+  context "with asset compilation disabled in ey.yml, despite all other configuration would enable assets" do
     before(:all) do
-      begin
-        deploy_test_application(with_assets = false) do
-          deploy_dir = File.join(@config.repository_cache, 'deploy')
-          FileUtils.mkdir_p(deploy_dir)
-          hook = File.join(deploy_dir, 'before_migrate.rb')
-          hook_contents = %Q[raise 'aaaaaaahhhhh']
-          File.open(hook, 'w') {|f| f.puts(hook_contents) }
-          File.chmod(0755, hook)
-        end
-      rescue EY::Serverside::RemoteFailure
-      end
+      deploy_test_application('assets_disabled_in_ey_yml')
     end
 
-    it "retains the failed release" do
-      release_name = File.basename(@config.release_path)
-      File.directory?(File.join(@deploy_dir, 'releases_failed', release_name)).should be_true
+    it "precompiles assets" do
+      @deploy_dir.join('current', 'precompiled').should_not exist
     end
   end
 
   context "with existing precompilation in a deploy hook" do
     before(:all) do
-      deploy_test_application do
-        deploy_dir = File.join(@config.repository_cache, 'deploy')
-        FileUtils.mkdir_p(deploy_dir)
-        hook = File.join(deploy_dir, 'before_migrate.rb')
-        hook_contents = %Q[run 'touch custom_compiled && mkdir public/assets']
-        File.open(hook, 'w') {|f| f.puts(hook_contents) }
-        File.chmod(0755, hook)
-      end
+      deploy_test_application('assets_in_hook')
     end
 
     it "does not replace the public/assets directory" do
-      File.exist?(File.join(@deploy_dir, 'current', 'custom_compiled')).should be_true
-      File.exist?(File.join(@deploy_dir, 'current', 'precompiled')).should be_false
-      File.directory?(File.join(@deploy_dir, 'current', 'public', 'assets')).should be_true
-      File.symlink?(File.join(@deploy_dir, 'current', 'public', 'assets')).should be_false
+      @deploy_dir.join('current', 'custom_compiled').should exist
+      @deploy_dir.join('current', 'precompiled').should_not exist
+      @deploy_dir.join('current', 'public', 'assets').should be_directory
+      @deploy_dir.join('current', 'public', 'assets').should_not be_symlink
     end
   end
 end

data/spec/services_deploy_spec.rb

@@ -1,95 +1,40 @@
 require 'spec_helper'
 
 describe "Deploying an application with services" do
-  before(:each) do
-    #$DISABLE_GEMFILE = true # Don't generate Gemfile/Gemfile.lock
-    #$DISABLE_LOCKFILE = true
-    @deploy_dir = Pathname.new(Dir.tmpdir).join("serverside-deploy-#{Time.now.to_i}-#{$$}")
-
-    # set up EY::Serverside::Server like we're on a solo
-    EY::Serverside::Server.reset
-    EY::Serverside::Server.add(:hostname => 'localhost', :roles => %w[solo])
-  end
-
-  def setup_deploy
-    # run a deploy
-    config = EY::Serverside::Deploy::Configuration.new({
-        "strategy"      => "IntegrationSpec",
-        "deploy_to"     => @deploy_dir.to_s,
-        "group"         => `id -gn`.strip,
-        "stack"         => 'nginx_passenger',
-        "migrate"       => nil,
-        'app'           => 'foo',
-        'framework_env' => 'staging'
-      })
-
-    EY::Serverside::LoggedOutput.verbose = true
-    @binpath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
-    FullTestDeploy.new(config)
-  end
-
-  def exist
-    be_exist
-  end
-
   describe "a deploy without ey_config" do
-    before do
-      @deployer = setup_deploy
-      @deployer.mock_gemfile_contents <<-EOF
-source :rubygems
-gem 'rake'
-gem 'pg'
-      EOF
-      @deployer.mock_lockfile_contents <<-EOF
-GEM
-  remote: http://rubygems.org/
-  specs:
-    pg (0.11.0)
-    rake (0.9.2.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  pg
-  rake
-      EOF
-    end
-
     describe "with services" do
       before do
-        @shared_services_file    = @deploy_dir.join('shared',  'config', 'ey_services_config_deploy.yml')
-        @services_yml = {"servicio" => {"foo" => "bar"}}.to_yaml
-        @deployer.mock_services_setup!("echo '#{@services_yml}' > #{@shared_services_file}")
-        @deployer.deploy
+        deploy_test_application('no_ey_config') do |deployer|
+          @shared_services_file = deployer.shared_path.join('config', 'ey_services_config_deploy.yml')
+          @services_yml = {"servicio" => {"foo" => "bar"}}.to_yaml
+          deployer.mock_services_setup!("echo '#{@services_yml}' > #{@shared_services_file}")
+        end
       end
 
       it "warns about missing ey_config" do
-        @deployer.infos.should be_any { |info| info =~ /WARNING: Gemfile.lock does not contain ey_config/ }
+        read_stderr.should include("WARNING: Gemfile.lock does not contain ey_config")
       end
-
     end
+
     describe "without services" do
       before do
-        @deployer.deploy
+        deploy_test_application('no_ey_config')
       end
 
       it "works without warnings" do
-        @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
+        read_output.should_not =~ /WARNING/
       end
-
     end
   end
 
   describe "deploy with invalid yaml ey_services_config_deploy" do
     before do
-      @shared_services_file    = @deploy_dir.join('shared',  'config', 'ey_services_config_deploy.yml')
-      @symlinked_services_file = @deploy_dir.join('current', 'config', 'ey_services_config_deploy.yml')
-      @invalid_services_yml = "42"
-
-      @deployer = setup_deploy
-      @deployer.mock_services_setup!("echo '#{@invalid_services_yml}' > #{@shared_services_file}")
-      @deployer.deploy
+      deploy_test_application do |deployer|
+        @shared_services_file    = deployer.shared_path.join('config', 'ey_services_config_deploy.yml')
+        @symlinked_services_file = deployer.release_path.join('config', 'ey_services_config_deploy.yml')
+        @invalid_services_yml = "42"
+        deployer.mock_services_setup!("echo '#{@invalid_services_yml}' > #{@shared_services_file}")
+      end
     end
 
     it "works without warning" do
@@ -101,19 +46,19 @@ DEPENDENCIES
       @symlinked_services_file.should be_symlink
       @shared_services_file.read.should == "#{@invalid_services_yml}\n"
 
-      @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
+      read_output.should_not =~ /WARNING/
     end
   end
 
   describe "a succesful deploy" do
     before do
-      @shared_services_file    = @deploy_dir.join('shared',  'config', 'ey_services_config_deploy.yml')
-      @symlinked_services_file = @deploy_dir.join('current', 'config', 'ey_services_config_deploy.yml')
-      @services_yml = {"servicio" => {"foo" => "bar"}}.to_yaml
+      deploy_test_application do |deployer|
+        @shared_services_file    = deployer.shared_path.join('config', 'ey_services_config_deploy.yml')
+        @symlinked_services_file = deployer.release_path.join('config', 'ey_services_config_deploy.yml')
+        @services_yml = {"servicio" => {"foo" => "bar"}}.to_yaml
 
-      @deployer = setup_deploy
-      @deployer.mock_services_setup!("echo '#{@services_yml}' > #{@shared_services_file}")
-      @deployer.deploy
+        deployer.mock_services_setup!("echo '#{@services_yml}' > #{@shared_services_file}")
+      end
     end
 
     it "creates and symlinks ey_services_config_deploy.yml" do
@@ -125,14 +70,14 @@ DEPENDENCIES
       @symlinked_services_file.should be_symlink
       @shared_services_file.read.should == "#{@services_yml}\n"
 
-      @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
+      read_output.should_not =~ /WARNING/
     end
 
     describe "followed by a deploy that can't find the command" do
       before do
-        @deployer = setup_deploy
-        @deployer.mock_services_command_check!("which nonexistatncommand")
-        @deployer.deploy
+        redeploy_test_application do |deployer|
+          deployer.mock_services_command_check!("which nonexistatncommand")
+        end
       end
 
       it "silently fails" do
@@ -144,20 +89,16 @@ DEPENDENCIES
         @symlinked_services_file.should be_symlink
         @shared_services_file.read.should == "#{@services_yml}\n"
 
-        @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
+        read_output.should_not =~ /WARNING/
       end
 
     end
 
     describe "followed by a deploy that fails to fetch services" do
-      before do
-        @deployer = setup_deploy
-        @deployer.mock_services_setup!("notarealcommandsoitwillexitnonzero")
-      end
-
       it "logs a warning and symlinks the existing config file when there is existing services file" do
-        @deployer.deploy
-
+        redeploy_test_application do |deployer|
+          deployer.mock_services_setup!("notarealcommandsoitwillexitnonzero")
+        end
         @shared_services_file.should exist
         @shared_services_file.should_not be_symlink
         @shared_services_file.read.should == "#{@services_yml}\n"
@@ -166,28 +107,29 @@ DEPENDENCIES
         @symlinked_services_file.should be_symlink
         @shared_services_file.read.should == "#{@services_yml}\n"
 
-        @deployer.infos.should be_any { |info| info =~ /WARNING: External services configuration not updated/ }
+        read_output.should include('WARNING: External services configuration not updated')
       end
 
       it "does not log a warning or symlink a config file when there is no existing services file" do
-        FileUtils.rm(@shared_services_file)
-        @deployer.deploy
+        redeploy_test_application do |deployer|
+          deployer.mock_services_setup!("notarealcommandsoitwillexitnonzero")
+          @shared_services_file.delete
+        end
 
         @shared_services_file.should_not exist
         @symlinked_services_file.should_not exist
 
-        @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
+        read_output.should_not =~ /WARNING/
       end
 
     end
 
     describe "followed by another successfull deploy" do
       before do
-        @deployer = setup_deploy
-        @services_yml = {"servicio" => {"foo" => "bar2"}}.to_yaml
-
-        @deployer.mock_services_setup!("echo '#{@services_yml}' > #{@shared_services_file}")
-        @deployer.deploy
+        redeploy_test_application do |deployer|
+          @services_yml = {"servicio" => {"foo" => "bar2"}}.to_yaml
+          deployer.mock_services_setup!("echo '#{@services_yml}' > #{@shared_services_file}")
+        end
       end
 
       it "replaces the config with the new one (and symlinks)" do
@@ -199,9 +141,8 @@ DEPENDENCIES
         @symlinked_services_file.should be_symlink
         @shared_services_file.read.should == "#{@services_yml}\n"
 
-        @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
+        read_output.should_not =~ /WARNING/
       end
-
     end
 
   end

data/spec/shell_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+require 'tempfile'
+require 'timecop'
+
+describe EY::Serverside::Shell do
+  it "has a timestamp before each line" do
+    time1 = Time.local(2008, 9, 1, 12, 0, 0)
+    time2 = Time.local(2008, 9, 1, 12, 3, 5)
+    time3 = Time.local(2008, 9, 1, 12, 10, 25)
+
+    @output = StringIO.new
+    @shell = EY::Serverside::Shell.new(:verbose => true, :stdout => @output, :stderr => @output, :log_path => Pathname.new(Dir.tmpdir).join("engineyard-serverside-#{Time.now.to_i}-${$$}.log"), :start_time => time1)
+
+    Timecop.freeze(time1) do
+      @shell.debug('debug')
+      @shell.notice('notice')
+    end
+    Timecop.freeze(time2) do
+      @shell.status('STATUS')
+      @shell.debug("multi\nline\ndebug")
+      @shell.warning("multi\nline\nwarning")
+    end
+    Timecop.freeze(time3) do
+      @shell.substatus("multi\nline\nsubstatus")
+    end
+
+    tstp_1 = "+    00s "
+    tstp_2 = "+ 3m 05s "
+    tstp_3 = "+10m 25s "
+    notstp = "         "
+    @output.rewind
+    @output.read.should == <<-OUTPUT
+#{notstp} debug
+
+\e[1m\e[33m#{tstp_1} !> notice
+\e[0m
+\e[1m\e[37m#{tstp_2} ~> STATUS
+\e[0m#{notstp} multi
+#{notstp} line
+#{notstp} debug
+
+\e[1m\e[33m#{tstp_2} !> WARNING: multi
+#{tstp_2} !> line
+#{tstp_2} !> warning
+\e[0m#{notstp}  ~ multi
+#{notstp}  ~ line
+#{notstp}  ~ substatus
+    OUTPUT
+  end
+end

data/spec/spec_helper.rb

@@ -1,15 +1,24 @@
 $LOAD_PATH.push File.expand_path("../lib", File.dirname(__FILE__))
 
-if defined?(Bundler)
-  Bundler.require :default, :test
-else
+unless defined?(Bundler)
   require 'rubygems'
 end
 
+if ENV['COVERAGE']
+  # Ruby 1.9.x only.
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "lib/vendor/"
+  end
+end
+
 require 'pp'
 require 'engineyard-serverside'
 require File.expand_path('../support/integration', __FILE__)
 
+FIXTURES_DIR = Pathname.new(__FILE__).dirname.join("fixtures")
+GROUP = `id -gn`.strip
+
 module EY
   module Serverside
     def self.dna_json=(j)
@@ -17,24 +26,12 @@ module EY
       @node = nil
     end
 
-    module LoggedOutput
-      def self.enable_actual_info!
-        @use_actual_info = true
-      end
-
-      def self.disable_actual_info!
-        @use_actual_info = false
-      end
-
-      def self.use_actual_info?
-        @use_actual_info
-      end
-
-      alias old_info info
-      def info(*args)
-        if EY::Serverside::LoggedOutput.use_actual_info?
-          old_info(*args)
-        end
+    class Future
+      def inspect
+        <<-EOM
+#{self.class.name} result below: (run with DEBUG=1 to see the full log)
+#{result.inspect}
+        EOM
       end
     end
 
@@ -44,29 +41,60 @@ module EY
   end
 end
 
-FIXTURES_DIR = File.expand_path("../fixtures", __FILE__)
-GITREPO_DIR = "#{FIXTURES_DIR}/gitrepo"
-
-FileUtils.rm_rf GITREPO_DIR if File.exists? GITREPO_DIR
-Kernel.system "tar xzf #{GITREPO_DIR}.tar.gz -C #{FIXTURES_DIR}"
-
 Spec::Runner.configure do |config|
-  `which npm 2>&1`
-  $NPM_INSTALLED = ($? == 0)
+  $NPM_INSTALLED = system('which npm 2>&1')
   unless $NPM_INSTALLED
     $stderr.puts "npm not found; skipping Node.js specs."
   end
 
   config.before(:all) do
-    $DISABLE_GEMFILE = false
-    $DISABLE_LOCKFILE = false
     EY::Serverside.dna_json = {}.to_json
   end
 
-  def deploy_test_application(assets_enabled = true, &block)
-    $DISABLE_GEMFILE = false
-    $DISABLE_LOCKFILE = false
-    @deploy_dir = File.join(Dir.tmpdir, "serverside-deploy-#{Time.now.to_i}-#{$$}")
+  class VerboseStringIO < StringIO
+    def <<(str)
+      if ENV['VERBOSE'] || ENV['DEBUG']
+        $stderr << str
+      end
+      super
+    end
+  end
+
+  def stdout
+    @stdout ||= VerboseStringIO.new
+  end
+
+  def stderr
+    @stderr ||= VerboseStringIO.new
+  end
+
+  def read_stdout
+    stdout.rewind
+    stdout.read
+  end
+
+  def read_stderr
+    stderr.rewind
+    stderr.read
+  end
+
+  def read_output
+    read_stdout + "\n" + read_stderr
+  end
+
+  def test_shell
+    log_path =  Pathname.new(Dir.tmpdir).join("serverside-deploy-#{Time.now.to_i}-#{$$}.log")
+    EY::Serverside::Shell.new(:verbose => true, :log_path => log_path, :stdout => stdout, :stderr => stderr)
+  end
+
+  def exist
+    be_exist
+  end
+
+  # When a repo fixture name is specified, the files found in the specified
+  # spec/fixtures/repos dir are copied into the test github repository.
+  def deploy_test_application(repo_fixture_name = 'default', extra_config = {}, &block)
+    @deploy_dir = Pathname.new(Dir.tmpdir).join("serverside-deploy-#{Time.now.to_i}-#{$$}")
 
     # set up EY::Serverside::Server like we're on a solo
     EY::Serverside::Server.reset
@@ -75,47 +103,33 @@ Spec::Runner.configure do |config|
     # run a deploy
     @config = EY::Serverside::Deploy::Configuration.new({
       "strategy"      => "IntegrationSpec",
-      "deploy_to"     => @deploy_dir,
-      "group"         => `id -gn`.strip,
+      "deploy_to"     => @deploy_dir.to_s,
+      "group"         => GROUP,
       "stack"         => 'nginx_passenger',
       "migrate"       => "ruby -e 'puts ENV[\"PATH\"]' > #{@deploy_dir}/path-when-migrating",
       'app'           => 'rails31',
-      'framework_env' => 'staging'
-    })
+      'environment_name' => 'env',
+      'account_name'  => 'acc',
+      'framework_env' => 'staging',
+      'branch'        => 'somebranch',
+      'repo'          => FIXTURES_DIR.join('repos', repo_fixture_name)
+    }.merge(extra_config))
 
     # pretend there is a shared bundled_gems directory
-    FileUtils.mkdir_p(File.join(@deploy_dir, 'shared', 'bundled_gems'))
+    @deploy_dir.join('shared', 'bundled_gems').mkpath
     %w(RUBY_VERSION SYSTEM_VERSION).each do |name|
-      File.open(File.join(@deploy_dir, 'shared', 'bundled_gems', name), "w") { |f| f.write("old\n") }
+      @deploy_dir.join('shared', 'bundled_gems', name).open("w") { |f| f.write("old\n") }
     end
 
-    # Set up the application directory to have the requested asset options.
-    prepare_rails31_app(assets_enabled)
-
     @binpath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
-    @deployer = FullTestDeploy.new(@config)
-    @deployer.deploy(&block)
+    @deployer = FullTestDeploy.new(@config, test_shell)
+    yield @deployer if block_given?
+    @deployer.deploy
   end
 
-  def prepare_rails31_app(assets_enabled)
-    FileUtils.mkdir_p(File.join(@config.release_path, 'config'))
-      app_rb = File.join(@config.release_path, 'config', 'application.rb')
-      app_rb_contents = <<-EOF
-module Rails31
-  class Application < Rails::Application
-    config.assets.enabled = #{assets_enabled ? 'true' : 'false'}
-  end
-end
-EOF
-      File.open(app_rb, 'w') {|f| f.write(app_rb_contents)}
-      rakefile = File.join(@config.release_path, 'Rakefile')
-      rakefile_contents = <<-EOF
-desc 'Precompile yar assetz'
-task 'assets:precompile' do
-  sh 'touch precompiled'
-end
-EOF
-    File.open(rakefile, 'w') {|f| f.write(rakefile_contents)}
-    FileUtils.mkdir_p(File.join(@config.release_path, 'app', 'assets'))
+  def redeploy_test_application(&block)
+    raise "Please deploy_test_application first" unless @deployer
+    yield @deployer if block_given?
+    @deployer.deploy
   end
 end