Permalink
Browse files

r534: don't really need to touch cc_context_webapp at startup

  • Loading branch information...
1 parent 55a25e2 commit 8a4ab304c54921636582276a6a94c5ff826ff013 @alexeyv alexeyv committed Sep 11, 2007
Showing with 62 additions and 51 deletions.
  1. +32 −30 config/recipes/cruisecontrol.rb
  2. +1 −1 cruise
  3. +2 −1 cruisecontrol.iml
  4. +27 −15 cruisecontrol.ipr
  5. +0 −4 script/server
@@ -1,37 +1,39 @@
-Capistrano.configuration(:must_exist).load do
+Capistrano::Configuration.instance(:must_exist).load do
+ namespace :deploy do
- desc 'deploy CC.rb'
- task :deploy_ccrb do
- stop_ccrb
+ desc 'deploy CC.rb'
+ task :ccrb do
+ stop_ccrb
- update_code
- after_update_code
- symlink
+ update_code
+ after_update_code
+ symlink
- start_ccrb
- end
+ start_ccrb
+ end
- desc 'stop CC.rb'
- task :stop_ccrb do
- sudo "sv force-stop ccrb_dashboard_1" rescue nil
- sudo "sv force-stop ccrb_dashboard_2" rescue nil
- end
+ desc 'stop CC.rb'
+ task :stop_ccrb do
+ sudo "sv force-stop ccrb_dashboard_1" rescue nil
+ sudo "sv force-stop ccrb_dashboard_2" rescue nil
+ end
- desc "start CC.rb"
- task :start_ccrb do
- sudo "sv start ccrb_dashboard_1" rescue nil
- sudo "sv start ccrb_dashboard_2" rescue nil
- end
+ desc "start CC.rb"
+ task :start_ccrb do
+ sudo "sv start ccrb_dashboard_1" rescue nil
+ sudo "sv start ccrb_dashboard_2" rescue nil
+ end
- desc 'Update symlink for projects directory'
- task :after_update_code do
- sudo "rm -rf #{release_path}/projects"
- sudo "mkdir -p #{shared_path}/projects"
- sudo "chown deployer #{shared_path}/projects"
- sudo "chgrp rails #{shared_path}/projects"
- sudo "ln -nfs #{shared_path}/projects #{release_path}/projects"
- sudo "touch #{shared_path}/site_config.rb"
- sudo "ln -nfs #{shared_path}/site_config.rb #{release_path}/config/site_config.rb"
- end
+ desc 'Update symlink for projects directory'
+ task :after_update_code do
+ sudo "rm -rf #{release_path}/projects"
+ sudo "mkdir -p #{shared_path}/projects"
+ sudo "chown deployer #{shared_path}/projects"
+ sudo "chgrp rails #{shared_path}/projects"
+ sudo "ln -nfs #{shared_path}/projects #{release_path}/projects"
+ sudo "touch #{shared_path}/site_config.rb"
+ sudo "ln -nfs #{shared_path}/site_config.rb #{release_path}/config/site_config.rb"
+ end
-end
+ end
+end
View
2 cruise
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/binjjruby /env ruby
load "#{File.dirname(__FILE__)}/lib/cruise_control/version.rb"
View
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="RUBY_MODULE" version="4">
+<module version="4" relativePaths="true" type="RUBY_MODULE">
+ <component name="ModuleRootManager" />
<component name="NewModuleRootManager" inherit-compiler-output="false">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
View
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project relativePaths="false" version="4">
+<project version="4" relativePaths="false">
<component name="AntConfiguration">
<defaultAnt bundledAnt="true" />
</component>
@@ -24,15 +24,6 @@
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
</value>
</option>
- <ADDITIONAL_INDENT_OPTIONS fileType="js">
- <option name="INDENT_SIZE" value="4" />
- <option name="CONTINUATION_INDENT_SIZE" value="8" />
- <option name="TAB_SIZE" value="4" />
- <option name="USE_TAB_CHARACTER" value="false" />
- <option name="SMART_TABS" value="false" />
- <option name="LABEL_INDENT_SIZE" value="0" />
- <option name="LABEL_INDENT_ABSOLUTE" value="false" />
- </ADDITIONAL_INDENT_OPTIONS>
</value>
</option>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
@@ -56,12 +47,11 @@
<entry name="?*.tld" />
</wildcardResourcePatterns>
</component>
+ <component name="DataSourceManagerImpl" />
<component name="DependenciesAnalyzeManager">
<option name="myForwardDirection" value="false" />
</component>
- <component name="DependencyValidationManager">
- <option name="SKIP_IMPORT_STATEMENTS" value="false" />
- </component>
+ <component name="DependencyValidationManager" />
<component name="EclipseCompilerSettings">
<option name="DEBUGGING_INFO" value="true" />
<option name="GENERATE_NO_WARNINGS" value="true" />
@@ -77,13 +67,14 @@
<option name="MAXIMUM_HEAP_SIZE" value="128" />
</component>
<component name="EntryPointsManager">
- <entry_points version="2.0" />
+ <entry_points />
</component>
<component name="ExportToHTMLSettings">
<option name="PRINT_LINE_NUMBERS" value="false" />
<option name="OPEN_IN_BROWSER" value="false" />
<option name="OUTPUT_DIRECTORY" />
</component>
+ <component name="GUI Designer component loader factory" />
<component name="IdProvider" IDEtalkID="05736CB51757D63C002269C1E72B307B" />
<component name="InspectionProjectProfileManager">
<option name="PROJECT_PROFILE" value="Project Default" />
@@ -93,9 +84,26 @@
<profile version="1.0" is_locked="false">
<option name="myName" value="Project Default" />
<option name="myLocal" value="false" />
+ <used_levels>
+ <error>
+ <option name="myName" value="ERROR" />
+ <option name="myVal" value="300" />
+ </error>
+ <warning>
+ <option name="myName" value="WARNING" />
+ <option name="myVal" value="200" />
+ </warning>
+ <information>
+ <option name="myName" value="INFO" />
+ <option name="myVal" value="100" />
+ </information>
+ <server>
+ <option name="myName" value="SERVER PROBLEM" />
+ <option name="myVal" value="100" />
+ </server>
+ </used_levels>
</profile>
</profiles>
- <list size="0" />
</component>
<component name="JavacSettings">
<option name="DEBUGGING_INFO" value="true" />
@@ -265,6 +273,8 @@
<component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="Ruby SDK 1.8.5" project-jdk-type="RUBY_SDK">
<output url="file://$PROJECT_DIR$/classes" />
</component>
+ <component name="ProjectRunConfigurationManager" />
+ <component name="RAILS_PROJECT_VIEW_PANE" />
<component name="RUBY_DOC_SETTINGS">
<RUBY_DOC NAME="DEFAULTS" VALUE="TRUE" />
<RUBY_DOC NAME="NUMBER" VALUE="0" />
@@ -293,10 +303,12 @@
</value>
</option>
</component>
+ <component name="libraryTable" />
<component name="uidesigner-configuration">
<option name="INSTRUMENT_CLASSES" value="true" />
<option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
<option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" />
</component>
+ <UsedPathMacros />
</project>
View
@@ -39,8 +39,4 @@ if (ARGV & ['-e', '--environment']).empty?
ARGV << '-e' << 'production'
end
-tmp_dir = File.dirname(__FILE__) + "/../tmp"
-FileUtils.mkdir tmp_dir unless File.exist? tmp_dir
-FileUtils.touch "#{tmp_dir}/cc_context_webapp"
-
require 'commands/server'

0 comments on commit 8a4ab30

Please sign in to comment.