engineyard-serverside 1.4.13 → 1.4.14

data/lib/engineyard-serverside/configuration.rb

@@ -119,7 +119,7 @@ module EY
       end
 
       def framework_envs
-        "RAILS_ENV=#{environment} RACK_ENV=#{environment} MERB_ENV=#{environment}"
+        "RAILS_ENV=#{environment} RACK_ENV=#{environment} NODE_ENV=#{environment} MERB_ENV=#{environment}"
       end
 
       def current_path

data/lib/engineyard-serverside/deploy.rb

@@ -2,11 +2,13 @@
 require 'base64'
 require 'fileutils'
 require 'json'
+require 'engineyard-serverside/rails_asset_support'
 
 module EY
   module Serverside
     class DeployBase < Task
       include LoggedOutput
+      include ::EY::Serverside::RailsAssetSupport
 
       # default task
       def deploy
@@ -29,7 +31,10 @@ module EY
           symlink_configs
           conditionally_enable_maintenance_page
           run_with_callbacks(:migrate)
+          run_with_callbacks(:compile_assets) # defined in RailsAssetSupport
           callback(:before_symlink)
+          # We don't use run_with_callbacks for symlink because we need
+          # to clean up manually if it fails.
           symlink
         end
 
@@ -127,6 +132,10 @@ module EY
         "/engineyard/bin/app_#{c.app} deploy"
       end
 
+      def clean_environment
+        "env -i PATH=$PATH HOME=$HOME GEM_PATH=$GEM_PATH GEM_HOME=$GEM_HOME"
+      end
+
       # task
       def bundle
         if File.exist?("#{c.release_path}/Gemfile")
@@ -140,7 +149,7 @@ module EY
                                 get_default_bundler_installer
                               end
 
-          sudo "#{serverside_bin} install_bundler #{bundler_installer.version}"
+          sudo "#{clean_environment} #{serverside_bin} install_bundler #{bundler_installer.version}"
 
           bundled_gems_path = File.join(c.shared_path, "bundled_gems")
           ruby_version_file = File.join(bundled_gems_path, "RUBY_VERSION")
@@ -160,10 +169,19 @@ module EY
             end
           end
 
-          run "cd #{c.release_path} && bundle _#{bundler_installer.version}_ install #{bundler_installer.options}"
+          run "cd #{c.release_path} && #{clean_environment} ruby -S bundle _#{bundler_installer.version}_ install #{bundler_installer.options}"
 
           run "mkdir -p #{bundled_gems_path} && ruby -v > #{ruby_version_file} && uname -m > #{system_version_file}"
         end
+
+        if File.exist?("#{c.release_path}/package.json")
+          unless run("which npm")
+            abort "*** [Error] package.json detected, but npm was not installed"
+          else
+            info "~> package.json detected, installing npm packages"
+            run "cd #{c.release_path} && npm install"
+          end
+        end
       end
 
       # task
@@ -219,24 +237,31 @@ module EY
       end
 
       def symlink_configs(release_to_link=c.release_path)
-        info "~> Symlinking configs"
-        [ "chmod -R g+w #{release_to_link}",
-          "rm -rf #{release_to_link}/log #{release_to_link}/public/system #{release_to_link}/tmp/pids",
-          "mkdir -p #{release_to_link}/tmp",
-          "ln -nfs #{c.shared_path}/log #{release_to_link}/log",
-          "mkdir -p #{release_to_link}/public",
-          "mkdir -p #{release_to_link}/config",
-          "ln -nfs #{c.shared_path}/system #{release_to_link}/public/system",
-          "ln -nfs #{c.shared_path}/pids #{release_to_link}/tmp/pids",
-          "find #{c.shared_path}/config -type f -exec ln -s {} #{release_to_link}/config \\;",
-          "ln -nfs #{c.shared_path}/config/database.yml #{release_to_link}/config/database.yml",
-          "ln -nfs #{c.shared_path}/config/mongrel_cluster.yml #{release_to_link}/config/mongrel_cluster.yml",
-        ].each do |cmd|
-          run cmd
+        info "~> Preparing shared resources for release"
+        symlink_tasks(release_to_link).each do |what, cmd|
+          info "~> #{what}"
+          run(cmd)
         end
+        owner = [c.user, c.group].join(':')
+        info "~> Setting ownership to #{owner}"
+        sudo "chown -R #{owner} #{release_to_link}"
+      end
 
-        sudo "chown -R #{c.user}:#{c.group} #{release_to_link}"
-        run "if [ -f \"#{c.shared_path}/config/newrelic.yml\" ]; then ln -nfs #{c.shared_path}/config/newrelic.yml #{release_to_link}/config/newrelic.yml; fi"
+      def symlink_tasks(release_to_link)
+        [
+          ["Set group write permissions", "chmod -R g+w #{release_to_link}"],
+          ["Remove revision-tracked shared directories from deployment", "rm -rf #{release_to_link}/log #{release_to_link}/public/system #{release_to_link}/tmp/pids"],
+          ["Create tmp directory", "mkdir -p #{release_to_link}/tmp"],
+          ["Symlink shared log directory", "ln -nfs #{c.shared_path}/log #{release_to_link}/log"],
+          ["Create public directory if needed", "mkdir -p #{release_to_link}/public"],
+          ["Create config directory if needed", "mkdir -p #{release_to_link}/config"],
+          ["Create system directory if needed", "ln -nfs #{c.shared_path}/system #{release_to_link}/public/system"],
+          ["Symlink shared pids directory", "ln -nfs #{c.shared_path}/pids #{release_to_link}/tmp/pids"],
+          ["Symlink other shared config files", "find #{c.shared_path}/config -type f -not -name 'database.yml' -exec ln -s {} #{release_to_link}/config \\;"],
+          ["Symlink mongrel_cluster.yml", "ln -nfs #{c.shared_path}/config/mongrel_cluster.yml #{release_to_link}/config/mongrel_cluster.yml"],
+          ["Symlink database.yml", "ln -nfs #{c.shared_path}/config/database.yml #{release_to_link}/config/database.yml"],
+          ["Symlink newrelic.yml if needed", "if [ -f \"#{c.shared_path}/config/newrelic.yml\" ]; then ln -nfs #{c.shared_path}/config/newrelic.yml #{release_to_link}/config/newrelic.yml; fi"],
+        ]
       end
 
       # task
@@ -364,6 +389,5 @@ module EY
         super
       end
     end
-
   end
 end

data/lib/engineyard-serverside/rails_asset_support.rb

@@ -0,0 +1,96 @@
+module EY
+  module Serverside
+    module RailsAssetSupport
+      def compile_assets
+        asset_dir = "#{c.release_path}/app/assets"
+        return unless app_needs_assets?
+        rails_version = bundled_rails_version
+        roles :app_master, :app, :solo do
+          keep_existing_assets
+          cmd = "cd #{c.release_path} && PATH=#{c.binstubs_path}:$PATH #{c.framework_envs} rake assets:precompile"
+          if rails_version
+            info "~> Precompiling assets for rails v#{version}"
+          else
+            info "~> [WARN] Precompiling assets even though Rails was not bundled."
+          end
+          run(cmd)
+        end
+      end
+
+      def app_needs_assets?
+        app_rb_path = File.join(c.release_path, 'config', 'application.rb')
+        return unless File.readable?(app_rb_path) # Not a Rails app in the first place.
+        return unless File.directory?(File.join(c.release_path, 'app', 'assets'))
+        if app_builds_own_assets?
+          info "~> public/assets already exists, skipping pre-compilation."
+          return
+        end
+        if app_disables_assets?(app_rb_path)
+          info "~> application.rb has disabled asset compilation. Skipping."
+          return
+        end
+        unless app_has_asset_task?
+          info "~> No 'assets:precompile' Rake task found. Skipping."
+          return
+        end
+        true
+      end
+
+      def app_disables_assets?(path)
+        disabled = nil
+        File.open(path) do |fd|
+          pattern = /^[^#].*config\.assets\.enabled\s+=\s+(false|nil)/
+          contents = fd.read
+          disabled = contents.match(pattern)
+        end
+        disabled
+      end
+
+      # Runs 'rake -T' to see if there is an assets:precompile task.
+      def app_has_asset_task?
+        # We just run this locally on the app master; everybody else should
+        # have the same code anyway.
+        task_check = "PATH=#{c.binstubs_path}:$PATH #{c.framework_envs} rake -T assets:precompile |grep 'assets:precompile'"
+        cmd = "cd #{c.release_path} && #{task_check}"
+        logged_system "cd #{c.release_path} && #{task_check}"
+        $? == 0
+      end
+
+      def app_builds_own_assets?
+        File.directory?(File.join(c.release_path, 'public', 'assets'))
+      end
+
+      # To support operations like Unicorn's hot reload, it is useful to have
+      # the prior release's assets as well. Otherwise, while a deploy is running,
+      # clients may request stale assets that you just deleted.
+      # Making use of this requires a properly-configured front-end HTTP server.
+      def keep_existing_assets
+        current = File.join(c.shared_path, 'assets')
+        last_asset_path = File.join(c.shared_path, 'last_assets')
+        # If there are current shared assets, move them under a 'last_assets' directory.
+        run <<-COMMAND
+if [ -d #{current} ]; then
+  rm -rf #{last_asset_path} && mkdir #{last_asset_path} && mv #{current} #{last_asset_path} && mkdir -p #{current};
+else
+  mkdir -p #{current} #{last_asset_path};
+fi;
+ln -nfs #{current} #{last_asset_path} #{c.release_path}/public
+        COMMAND
+       end
+
+      def bundled_rails_version(lockfile_path = nil)
+        lockfile_path ||= File.join(c.release_path, 'Gemfile.lock')
+        lockfile = File.open(lockfile_path) {|f| f.read}
+        lockfile.each_line do |line|
+          # scan for gemname (version) toplevel deps.
+          # Likely doesn't handle ancient Bundler versions, but
+          # we only call this when something looks like it is Rails 3.
+          next unless line =~ /^\s{4}([-\w_.0-9]+)\s*\((.*)\)/
+          return $2 if $1 == 'rails'
+        end
+        nil
+      end
+    end
+  end
+end
+

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.4.13'
+    VERSION = '1.4.14'
   end
 end

data/spec/basic_deploy_spec.rb

@@ -39,6 +39,8 @@ describe "Deploying an application without Bundler" do
     File.exist?(File.join(@deploy_dir, 'current', 'after_bundle.ran'  )).should be_true
     File.exist?(File.join(@deploy_dir, 'current', 'before_migrate.ran')).should be_true
     File.exist?(File.join(@deploy_dir, 'current', 'after_migrate.ran' )).should be_true
+    File.exist?(File.join(@deploy_dir, 'current', 'before_compile_assets.ran')).should be_true
+    File.exist?(File.join(@deploy_dir, 'current', 'after_compile_assets.ran' )).should be_true
     File.exist?(File.join(@deploy_dir, 'current', 'before_symlink.ran')).should be_true
     File.exist?(File.join(@deploy_dir, 'current', 'after_symlink.ran' )).should be_true
     File.exist?(File.join(@deploy_dir, 'current', 'before_restart.ran')).should be_true

data/spec/bundler_deploy_spec.rb

@@ -1,6 +1,11 @@
 require 'spec_helper'
 
 describe "Deploying an application that uses Bundler" do
+  before(:each) do
+    @bundler_version = ::EY::Serverside::LockfileParser.default_version
+    @version_pattern = Regexp.quote(@bundler_version)
+  end
+
   def deploy_test_application
     @deploy_dir = File.join(Dir.tmpdir, "serverside-deploy-#{Time.now.to_i}-#{$$}")
 
@@ -40,11 +45,11 @@ describe "Deploying an application that uses Bundler" do
     it "runs the right bundler command" do
       install_bundler_command_ran = @deployer.commands.detect{ |command| command.index("install_bundler") }
       install_bundler_command_ran.should_not be_nil
-      install_bundler_command_ran.should == "#{@binpath} install_bundler 1.0.10"
+      install_bundler_command_ran.should include("#{@binpath} install_bundler #{@bundler_version}")
     end
 
     it "runs 'bundle install' with --deployment" do
-      bundle_install_cmd = @deployer.commands.grep(/bundle _\S+_ install/).first
+      bundle_install_cmd = @deployer.commands.grep(/bundle _#{@version_pattern}_ install/).first
       bundle_install_cmd.should_not be_nil
       bundle_install_cmd.should include('--deployment')
     end
@@ -83,14 +88,15 @@ describe "Deploying an application that uses Bundler" do
       deploy_test_application
     end
 
-    it "default to Bundler 1.0.10" do
+    it "installs the proper Bundler version" do
+      @bundler_version.should == "1.0.10" # Something should break when the default changes.
       install_bundler_command_ran = @deployer.commands.detect{ |command| command.index("install_bundler") }
       install_bundler_command_ran.should_not be_nil
-      install_bundler_command_ran.should == "#{@binpath} install_bundler 1.0.10"
+      install_bundler_command_ran.should include("#{@binpath} install_bundler #{@bundler_version}")
     end
 
     it "runs 'bundle install' without --deployment" do
-      bundle_install_cmd = @deployer.commands.grep(/bundle _\S+_ install/).first
+      bundle_install_cmd = @deployer.commands.grep(/bundle _#{@version_pattern}_ install/).first
       bundle_install_cmd.should_not be_nil
       bundle_install_cmd.should_not include('--deployment')
     end

data/spec/custom_deploy_spec.rb

@@ -24,6 +24,7 @@ describe "the EY::Serverside::Deploy API" do
       def bundle()                                 @call_order << 'bundle'                                 end
       def symlink_configs()                        @call_order << 'symlink_configs'                        end
       def migrate()                                @call_order << 'migrate'                                end
+      def compile_assets()                         @call_order << 'compile_assets'                         end
       def symlink()                                @call_order << 'symlink'                                end
       def restart()                                @call_order << 'restart'                                end
       def cleanup_old_releases()                   @call_order << 'cleanup_old_releases'                   end
@@ -41,6 +42,7 @@ describe "the EY::Serverside::Deploy API" do
       symlink_configs
       conditionally_enable_maintenance_page
       migrate
+      compile_assets
       symlink
       restart
       disable_maintenance_page

data/spec/nodejs_deploy_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe "Deploying an application that uses Node.js and NPM" do
+  def deploy_test_application
+    @deploy_dir = File.join(Dir.tmpdir, "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])
+
+    # run a deploy
+    config = EY::Serverside::Deploy::Configuration.new({
+        "strategy"      => "NodeIntegrationSpec",
+        "deploy_to"     => @deploy_dir,
+        "group"         => `id -gn`.strip,
+        "stack"         => 'nginx_nodejs',
+        'app'           => 'nodeapp',
+        'framework_env' => 'staging'
+      })
+
+    @binpath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
+    @deployer = FullTestDeploy.new(config)
+    @deployer.deploy
+  end
+
+  before(:all) do
+    deploy_test_application
+  end
+
+  it "runs 'npm install'" do
+    install_cmd = @deployer.commands.grep(/npm install/).first
+    install_cmd.should_not be_nil
+  end
+end if $NPM_INSTALLED
+
+

data/spec/rails31_deploy_spec.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+describe "Deploying a Rails 3.1 application" do
+  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}-#{$$}")
+
+    # set up EY::Serverside::Server like we're on a solo
+    EY::Serverside::Server.reset
+    EY::Serverside::Server.add(:hostname => 'localhost', :roles => %w[solo])
+
+    # run a deploy
+    @config = EY::Serverside::Deploy::Configuration.new({
+      "strategy"      => "IntegrationSpec",
+      "deploy_to"     => @deploy_dir,
+      "group"         => `id -gn`.strip,
+      "stack"         => 'nginx_passenger',
+      "migrate"       => "ruby -e 'puts ENV[\"PATH\"]' > #{@deploy_dir}/path-when-migrating",
+      'app'           => 'rails31',
+      'framework_env' => 'staging'
+    })
+
+    # pretend there is a shared bundled_gems directory
+    FileUtils.mkdir_p(File.join(@deploy_dir, 'shared', 'bundled_gems'))
+    %w(RUBY_VERSION SYSTEM_VERSION).each do |name|
+      File.open(File.join(@deploy_dir, 'shared', 'bundled_gems', name), "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)
+  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'))
+  end
+
+  context "with default production settings" do
+    before(:all) do
+      deploy_test_application
+    end
+
+    it "precompiles assets" do
+      File.exist?(File.join(@deploy_dir, 'current', 'precompiled')).should be_true
+    end
+  end
+
+  context "with asset support disabled in its config" do
+    before(:all) do
+      deploy_test_application(with_assets = false)
+    end
+
+    it "does not precompile assets" do
+      File.exist?(File.join(@deploy_dir, 'current', 'precompiled')).should be_false
+    end
+  end
+
+  context "with existing precompilation in a deploy hook" do
+    before(:all) do
+      deploy_test_application do
+        deploy_dir = File.join(@config.shared_path, 'cached-copy', '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
+    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
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -23,8 +23,12 @@ module EY
       def logged_system(cmd)
         output = `#{cmd} 2>&1`
         successful = ($? == 0)
-        if ENV['VERBOSE'] && !successful
-          $stderr.puts "\nCommand `#{cmd}` exited with status #{$?.exitstatus}: '#{output.strip}'"
+        if ENV['VERBOSE']
+          if successful
+            $stdout.puts "#{cmd}\n#{output.strip}".chomp
+          else
+            $stderr.puts "\nCommand `#{cmd}` exited with status #{$?.exitstatus}: '#{output.strip}'"
+          end
         end
         successful
       end
@@ -43,6 +47,12 @@ 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)
+  unless $NPM_INSTALLED
+    $stderr.puts "npm not found; skipping Node.js specs."
+  end
+
   config.before(:all) do
     $DISABLE_GEMFILE = false
     $DISABLE_LOCKFILE = false

data/spec/support/integration.rb

@@ -51,10 +51,13 @@ class FullTestDeploy < EY::Serverside::Deploy
   def bundle
     my_env = ENV.to_hash
 
-    ENV.delete("BUNDLE_GEMFILE")
-    ENV.delete("BUNDLE_BIN_PATH")
-
-    result = super
+    if defined?(Bundler)
+      Bundler.with_clean_env do
+        result = super
+      end
+    else
+      result = super
+    end
 
     ENV.replace(my_env)
     result
@@ -65,6 +68,11 @@ class FullTestDeploy < EY::Serverside::Deploy
     installer.options << ' --quiet'   # stfu already!
     installer
   end
+
+  def deploy
+    yield if block_given?
+    super
+  end
 end
 
 module EY::Serverside::Strategies::IntegrationSpec
@@ -75,10 +83,12 @@ module EY::Serverside::Strategies::IntegrationSpec
 
       deploy_hook_dir = File.join(cached_copy, 'deploy')
       FileUtils.mkdir_p(deploy_hook_dir)
-      %w[bundle migrate symlink restart].each do |action|
+      %w[bundle compile_assets migrate symlink restart].each do |action|
         %w[before after].each do |prefix|
           hook = "#{prefix}_#{action}"
-          File.open(File.join(deploy_hook_dir, "#{hook}.rb"), 'w') do |f|
+          hook_path = File.join(deploy_hook_dir, "#{hook}.rb")
+          next if File.exist?(hook_path)
+          File.open(hook_path, 'w') do |f|
             f.write(%Q{run 'touch "#{c.release_path}/#{hook}.ran"'})
           end
         end
@@ -99,13 +109,12 @@ module EY::Serverside::Strategies::IntegrationSpec
 
     def gemfile_contents
       <<-EOF
-source :gemcutter
-
-gem "bundler", "~> 1.0.0.rc.6"
-gem "rake"
+source 'http://rubygems.org'
+gem 'rake', '= 0.8.7'
 EOF
     end
 
+    # Generated using Bundler v1.0.10
     def lockfile_contents
       <<-EOF
 GEM
@@ -117,8 +126,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0.rc.6)
-  rake
+  rake (= 0.8.7)
 EOF
     end
 
@@ -137,3 +145,30 @@ EOF
   end
 end
 
+module EY::Serverside::Strategies::NodeIntegrationSpec
+  module Helpers
+    include EY::Serverside::Strategies::IntegrationSpec::Helpers
+
+    def generate_gemfile_in(dir)
+      generate_package_json_in(dir)
+      super(dir)
+    end
+
+    def generate_package_json_in(dir)
+      npm_file = File.join(dir, 'package.json')
+      File.open(npm_file, 'w') {|f| f.write(npm_content)}
+    end
+
+    def npm_content
+      <<-EOF
+{
+  "name": "node-example",
+  "version": "0.0.1",
+  "dependencies": {
+    "express": "2.2.0"
+  }
+}
+EOF
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 4
-  - 13
-  version: 1.4.13
+  - 14
+  version: 1.4.14
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-21 00:00:00 -07:00
+date: 2011-09-27 00:00:00 -04:00
 default_executable: engineyard-serverside
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,6 +67,7 @@ files:
 - lib/engineyard-serverside/deprecation.rb
 - lib/engineyard-serverside/lockfile_parser.rb
 - lib/engineyard-serverside/logged_output.rb
+- lib/engineyard-serverside/rails_asset_support.rb
 - lib/engineyard-serverside/server.rb
 - lib/engineyard-serverside/strategies/git.rb
 - lib/engineyard-serverside/task.rb
@@ -274,6 +275,8 @@ files:
 - spec/fixtures/valid_hook.rb
 - spec/git_strategy_spec.rb
 - spec/lockfile_parser_spec.rb
+- spec/nodejs_deploy_spec.rb
+- spec/rails31_deploy_spec.rb
 - spec/restart_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
@@ -333,6 +336,8 @@ test_files:
 - spec/fixtures/valid_hook.rb
 - spec/git_strategy_spec.rb
 - spec/lockfile_parser_spec.rb
+- spec/nodejs_deploy_spec.rb
+- spec/rails31_deploy_spec.rb
 - spec/restart_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb