public/javascripts/jquery/jquery.js @@ -1,11 +1,11 @@ class SitesController < ApplicationController + before_filter :find_site, :only => [:show, :deploy, :log] def index @sites = Site.all end def show - @site = Site.find_by_url!(params[:id]) render :"show_#{@site.state}" end @@ -23,4 +23,24 @@ class SitesController < ApplicationController end end + def deploy + @site.deploy! + redirect_to site_path(@site) + end + + def log + if File.exists?(@site.log_file) + render :text => `tail -n 1000 #{@site.log_file}`, :content_type => 'text/plain', :status => (@site.complete? ? :ok : :partial_content) + else + render :nothing => true + end + end + + + protected + + def find_site + @site = Site.find_by_url!(params[:id]) + end + end app/controllers/sites_controller.rb @@ -34,6 +34,10 @@ class Site < ActiveRecord::Base [self.url, App.server[:domain]].join('.') end + def log_file + File.join(Rails.root, 'log', "#{self.url}.log") + end + protected def generate_token app/models/site.rb @@ -1,2 +1,4 @@ - content_for :title, @site.name -- content_for :meta, "current state: #{@site.state}" \ No newline at end of file +- content_for :meta, "current state: #{@site.state}" + +%pre.log{:"data-location" => log_site_url(@site)}= h render(:file => @site.log_file) if File.exists?(@site.log_file) \ No newline at end of file app/views/sites/show_deploying.html.haml @@ -1,4 +1,4 @@ ActionController::Routing::Routes.draw do |map| - map.resources :sites, :member => {:deploy => :put} + map.resources :sites, :member => {:deploy => :put, :log => :get} map.root :controller => :sites end config/routes.rb @@ -0,0 +1,29 @@ +$(function(){ + $('.log').each(function(){ + scrollToBottom(this); + }) + tailLog(); +}); + +function scrollToBottom(scrollable) { + $(scrollable).attr('scrollTop', $(scrollable).attr('scrollHeight')); +} + +function tailLog() { + if($('.log').length) { + $('.log').load( + $('.log').attr('data-location'), + '', + function(responseText, textStatus, XMLHttpRequest){ + scrollToBottom(this); + if(XMLHttpRequest.statusText == 'Success') { + alert('Install Complete'); + } else { + // Status == 'Partial Content' + // lets get more + setTimeout("tailLog()", 3000); + } + } + ); + } +} \ No newline at end of file public/javascripts/application.js @@ -146,4 +146,10 @@ table .main { width: 100%; } } .html ul, .html ol { margin-left: 2em; margin-bottom: 1em; } .html ul li { margin-bottom: 0.5em; list-style: disc; } -.html ol li { margin-bottom: 0.5em; list-style: decimal; } \ No newline at end of file +.html ol li { margin-bottom: 0.5em; list-style: decimal; } + +/* Log File */ +.log { + height: 400px; overflow: auto; padding: 10px; + border: 1px solid #C6C6C6; background-color: #F9F9F9; +} \ No newline at end of file public/stylesheets/application.css @@ -69,4 +69,16 @@ class SitesControllerTest < ActionController::TestCase end end + context 'PUT /sites/:url/deploy' do + setup do + @site = Factory.build(:site, :url => 'site') + Site.expects(:find_by_url!).with(@site.url).returns(@site) + @site.expects(:deploy!).returns(true) + put :deploy, :id => @site.to_param + end + + should_assign_to(:site) { @site } + should_redirect_to('the site page again') { site_path(@site) } + end + end test/functional/sites_controller_test.rb 015effd7b49169b614bbef440cd299cebb060c50 jdpace jared@codewordstudios.com http://github.com/jdpace/wp-automator/commit/d005b11936baf711ce875906955e699f230bf975 d005b11936baf711ce875906955e699f230bf975 2009-09-29T15:35:48-07:00 2009-09-29T15:35:48-07:00 A site can have a log file that a user can view while deploying to see what's going on. e66c5c9cf7bf62e671744cf582be42cc97961fe2 jdpace jared@codewordstudios.com