sunshine 1.0.0.pre → 1.0.0

data/History.txt

@@ -2,6 +2,12 @@
 
 * Improvements:
 
+  * Added auto_dependencies config to turn on/off auto installing things.
+
+  * Added healthcheck middleware support.
+
+  * Added support for Apache2 and its passenger implementation.
+
   * Removed all Atti-specific code for public release.
 
 * Bugfixes:

data/Manifest.txt

@@ -19,6 +19,7 @@ lib/sunshine/app.rb
 lib/sunshine/binder.rb
 lib/sunshine/crontab.rb
 lib/sunshine/daemon.rb
+lib/sunshine/daemons/apache.rb
 lib/sunshine/daemons/ar_sendmail.rb
 lib/sunshine/daemons/delayed_job.rb
 lib/sunshine/daemons/nginx.rb
@@ -41,12 +42,14 @@ lib/sunshine/repos/rsync_repo.rb
 lib/sunshine/repos/svn_repo.rb
 lib/sunshine/server_app.rb
 lib/sunshine/shell.rb
+templates/apache/apache.conf.erb
 templates/logrotate/logrotate.conf.erb
 templates/nginx/nginx.conf.erb
 templates/nginx/nginx_optimize.conf
 templates/nginx/nginx_proxy.conf
 templates/rainbows/rainbows.conf.erb
-templates/tasks/sunshine.rake
+templates/sunshine/middleware/health.rb
+templates/sunshine/sunshine.rake
 templates/unicorn/unicorn.conf.erb
 test/fixtures/app_configs/test_app.yml
 test/fixtures/sunshine_test/test_upload
@@ -56,6 +59,7 @@ test/test_helper.rb
 test/unit/test_app.rb
 test/unit/test_binder.rb
 test/unit/test_crontab.rb
+test/unit/test_daemon.rb
 test/unit/test_git_repo.rb
 test/unit/test_healthcheck.rb
 test/unit/test_nginx.rb

data/lib/commands/default.rb

@@ -15,13 +15,35 @@ module Sunshine
     # and optionally an accompanying message.
 
     def self.exec argv, config
-      template_rakefile = "#{Sunshine::ROOT}/templates/tasks/sunshine.rake"
 
-      target_rakefile = config['rakefile']
+      copy_rakefile(config['rakefile'])     if config.has_key? 'rakefile'
+      copy_middleware(config['middleware']) if config.has_key? 'middleware'
 
-      FileUtils.cp template_rakefile, target_rakefile
+      return true
+    end
+
+
+    ##
+    # Copy template rakefile to specified location.
 
-      return true, "Copied Sunshine template rakefile to #{target_rakefile}"
+    def self.copy_rakefile path
+      template_rakefile = "#{Sunshine::ROOT}/templates/sunshine/sunshine.rake"
+
+      FileUtils.cp template_rakefile, path
+
+      puts "Copied Sunshine template rakefile to #{path}"
+    end
+
+
+    ##
+    # Copy middleware to specified location.
+
+    def self.copy_middleware path
+      middleware_dir = "#{Sunshine::ROOT}/templates/sunshine/middleware/."
+
+      FileUtils.cp_r middleware_dir, path
+
+      puts "Copied Sunshine middleware to #{path}"
     end
 
 
@@ -83,6 +105,12 @@ Sunshine is an object oriented deploy tool for rack applications.
           options['rakefile'] = path || File.join(Dir.pwd, "sunshine.rake")
         end
 
+        opt.on('--middleware [PATH]',
+               'Copy Sunshine rack middleware files.') do |path|
+          options['middleware'] =
+            path || File.join(Dir.pwd, ".")
+        end
+
         opt.separator nil
         opt.separator "For more help on sunshine commands, "+
                       "use '#{opt.program_name} COMMAND --help'"

data/lib/sunshine.rb

@@ -72,7 +72,7 @@ module Sunshine
 
   ##
   # Sunshine version.
-  VERSION = '1.0.0.pre'
+  VERSION = '1.0.0'
 
 
   ##
@@ -91,6 +91,14 @@ module Sunshine
   end
 
 
+  ##
+  # Automatically install dependencies as needed. Defaults to true.
+  # Overridden in the ~/.sunshine config file or at setup time.
+
+  def self.auto_dependencies?
+    @config['auto_dependencies']
+  end
+
   ##
   # Returns the main Sunshine dependencies library.
 
@@ -101,8 +109,8 @@ module Sunshine
 
   ##
   # The default directory where apps should be deployed to:
-  # '/var/www' by default. Overridden in the ~/.sunshine config file.
-  # See also App#deploy_path.
+  # '/var/www' by default. Overridden in the ~/.sunshine config file
+  # or at setup time. See also App#deploy_path.
 
   def self.web_directory
     @config['web_directory']
@@ -226,7 +234,8 @@ module Sunshine
     'deploy_env'          => :development,
     'auto'                => false,
     'max_deploy_versions' => 5,
-    'web_directory'       => '/var/www'
+    'web_directory'       => '/var/www',
+    'auto_dependencies'   => true
   }
 
   ##
@@ -361,6 +370,7 @@ module Sunshine
 
   require 'sunshine/daemon'
   require 'sunshine/daemons/server'
+  require 'sunshine/daemons/apache'
   require 'sunshine/daemons/nginx'
   require 'sunshine/daemons/unicorn'
   require 'sunshine/daemons/rainbows'

data/lib/sunshine/daemon.rb

@@ -342,6 +342,10 @@ module Sunshine
         shell.expand_path path
       end
 
+      binder.set :target_server do
+        target.server_name || server_name
+      end
+
       binder
     end
 

data/lib/sunshine/daemons/apache.rb

@@ -0,0 +1,37 @@
+module Sunshine
+
+  ##
+  # A wrapper for configuring the apache2 server.
+
+  class Apache < Server
+
+    def initialize app, options={}
+      super
+
+      @bin = options[:bin] || 'apachectl'
+
+      @sudo = options[:sudo] || @port < 1024
+
+      @sigkill = 'WINCH'
+
+      # TODO: have a separate max_clients and processes
+      @max_clients = options[:max_clients] || options[:processes] || 128
+
+      @dep_name = options[:dep_name] ||
+        use_passenger? ? 'passenger-apache' : 'apache2'
+    end
+
+
+    def start_cmd
+      "#{@bin} -f #{self.config_file_path} -E #{log_file :stderr}"
+    end
+
+
+    def setup
+      super do |server_app, binder|
+        binder.set :max_clients, @max_clients
+        yield(server_app, binder) if block_given?
+      end
+    end
+  end
+end

data/lib/sunshine/daemons/nginx.rb

@@ -8,97 +8,15 @@ module Sunshine
     def initialize app, options={}
       super
 
-      @sudo ||= @port < 1024
+      @sudo = options[:sudo] || @port < 1024
 
-      @dep_name = use_passenger? ? 'passenger-nginx' : 'nginx'
+      @dep_name = options[:dep_name] ||
+        use_passenger? ? 'passenger-nginx' : 'nginx'
     end
 
 
     def start_cmd
       "#{@bin} -c #{self.config_file_path}"
     end
-
-
-    def stop_cmd
-      cmd = "test -f #{@pid} && kill -QUIT $(cat #{@pid})"+
-        " || echo 'No #{@name} process to stop for #{@app.name}';"
-      cmd << "sleep 2 ; rm -f #{@pid};"
-    end
-
-
-    def setup
-      super do |server_app, binder|
-
-        binder.forward :use_passenger?
-
-        binder.set :passenger_root do
-          passenger_root server_app.shell
-        end
-
-        binder.set :nginx_conf_path do
-          nginx_bin = server_app.shell.call "which nginx"
-          File.join File.dirname(nginx_bin), '..', 'conf'
-        end
-
-        yield(server_app, binder) if block_given?
-      end
-    end
-
-
-    ##
-    # Check if passenger is required to run the application.
-    # Returns true if the server's target is a Sunshine::App
-
-    def use_passenger?
-      Sunshine::App === @target
-    end
-
-
-    ##
-    # Gets the root of the installer passenger gem.
-
-    def passenger_root shell
-      str     = shell.call "gem list passenger -d"
-      version = $1 if str =~ /passenger\s\((.*)\)$/
-      gempath = $1 if str =~ /Installed\sat:\s(.*)$/
-
-      return unless version && gempath
-
-      File.join(gempath, "gems/passenger-#{version}")
-    end
-
-
-    ##
-    # Run passenger installation for nginx
-
-    def setup_passenger server_app
-      server_app.install_deps 'passenger'
-
-      server_app.shell.call \
-        'passenger-install-nginx-module --auto --auto-download',
-                                        :sudo => true do |stream, data, inn|
-
-        if data =~ /Please specify a prefix directory \[(.*)\]:/
-
-          dir = $1
-          inn.puts dir
-
-          required_dirs = [
-            File.join(dir, 'fastcgi_temp'),
-            File.join(dir, 'proxy_temp')
-          ]
-
-          server_app.shell.call \
-            "mkdir -p #{required_dirs.join(" ")}", :sudo => true
-
-          error_log = File.join(dir, "logs/error.log")
-
-          server_app.shell.call \
-            "touch #{error_log} && chmod a+rw #{error_log}", :sudo => true
-
-          server_app.add_shell_paths File.join(dir, 'sbin')
-        end
-      end
-    end
   end
 end

data/lib/sunshine/daemons/server.rb

@@ -17,6 +17,7 @@ module Sunshine
 
 
     attr_reader :server_name, :port
+    attr_accessor :sigkill
 
 
     # Server objects need only an App object to be instantiated.
@@ -35,8 +36,67 @@ module Sunshine
 
       super app, options
 
-      @port        = options[:port] || 80
-      @server_name = options[:server_name]
+      @port          = options[:port] || 80
+      @server_name   = options[:server_name]
+      @sigkill       = 'QUIT'
+      @supports_rack = false
+    end
+
+
+    ##
+    # Check if passenger is required to run the application.
+    # Returns true if the server's target is a Sunshine::App
+
+    def use_passenger?
+      Sunshine::App === @target && !supports_rack?
+    end
+
+
+    ##
+    # Gets the root of the installer passenger gem.
+
+    def self.passenger_root shell
+      str     = shell.call "gem list passenger -d"
+      version = $1 if str =~ /passenger\s\((.*)\)$/
+      gempath = $1 if str =~ /Installed\sat:\s(.*)$/
+
+      return unless version && gempath
+
+      File.join(gempath, "gems/passenger-#{version}")
+    end
+
+
+    ##
+    # Add passenger information to the binder at setup time.
+
+    def setup
+      super do |server_app, binder|
+
+        binder.forward :use_passenger?
+
+        binder.set :passenger_root do
+          Server.passenger_root server_app.shell
+        end
+
+        yield(server_app, binder) if block_given?
+      end
+    end
+
+
+    ##
+    # Default server stop command.
+
+    def stop_cmd
+      "test -f #{@pid} && kill -#{@sigkill} $(cat #{@pid}) && sleep 1 && "+
+        "rm -f #{@pid} || echo 'No #{@name} process to stop for #{@app.name}';"
+    end
+
+
+    ##
+    # Defines if this server supports interfacing with rack.
+
+    def supports_rack?
+      @supports_rack
     end
 
 

data/lib/sunshine/daemons/unicorn.rb

@@ -7,7 +7,10 @@ module Sunshine
 
     def initialize app, options={}
       super
+
       @timeout = options[:timeout] || 3.0
+
+      @supports_rack = true
     end
 
 
@@ -15,12 +18,5 @@ module Sunshine
       "cd #{@app.current_path} && #{@bin} -D -E"+
         " #{@app.deploy_env} -p #{@port} -c #{self.config_file_path};"
     end
-
-
-    def stop_cmd
-      "test -f #{@pid} && kill -QUIT $(cat #{@pid})"+
-        " || echo 'No #{@name} process to stop for #{@app.name}';"+
-        "sleep 2; rm -f #{@pid};"
-    end
   end
 end

data/lib/sunshine/dependencies.rb

@@ -4,14 +4,17 @@
 #class Sunshine::Dependencies < Settler
 Sunshine.dependencies.instance_eval do
 
-  yum 'tpkg'
-
   apt 'svn', :pkg => 'subversion'
   yum 'svn', :pkg => 'subversion'
 
   apt 'git', :pkg => 'git-core'
   yum 'git', :pkg => 'git-core'
 
+  yum 'httpd-devel'
+
+  apt 'apache2', :pkg => 'apache2-mpm-prefork'
+  yum 'apache2', :pkg => 'httpd', :requires => 'httpd-devel'
+
   apt 'nginx'
   yum 'nginx'
 
@@ -53,19 +56,16 @@ Sunshine.dependencies.instance_eval do
   yum 'sqlite-devel'
 
 
-  # Define gems used by Sunshine
+  ##
+  # Define phusion passenger dependencies
 
-  gem 'bundler', :version => ">=0.9"
-
-  gem 'isolate', :version => ">=1.3.0"
+  gem 'passenger', :version => ">=2.2.11"
 
-  gem 'rake', :version => ">=0.8"
+  dependency 'passenger-nginx' do
+    requires 'passenger'
 
-  gem 'passenger-nginx', :pkg => 'passenger' do
     install do |shell, sudo|
 
-      shell.call "gem install passenger --no-ri --no-rdoc", :sudo => sudo
-
       shell.call 'passenger-install-nginx-module --auto --auto-download',
                                         :sudo => true do |stream, data, inn|
 
@@ -86,8 +86,38 @@ Sunshine.dependencies.instance_eval do
         end
       end
     end
+
+
+    check do |shell, sudo|
+      shell.call("nginx -V 2>&1") =~ /gems\/passenger-\d+(\.\d+)+\/ext\/nginx/
+    end
+  end
+
+
+  dependency 'passenger-apache' do
+    requires 'passenger', 'apache2'
+
+    install 'passenger-install-apache2-module --auto'
+
+    check do |shell, sudo|
+      passenger_dir = Server.passenger_root shell
+      passenger_mod = File.join passenger_dir, 'ext/apache2/mod_passenger.so'
+
+      shell.call("test -f #{passenger_mod}", :sudo => true) &&
+        shell.call("apachectl -v")
+    end
   end
 
+
+  ##
+  # Define gems used by Sunshine
+
+  gem 'bundler', :version => ">=0.9"
+
+  gem 'isolate', :version => ">=1.3.0"
+
+  gem 'rake', :version => ">=0.8"
+
   gem 'geminstaller', :version => ">=0.5"
 
   gem 'unicorn', :version => ">=0.9"

data/lib/sunshine/healthcheck.rb

@@ -4,6 +4,21 @@ module Sunshine
   # Healthcheck objects handle enabling and disabling health checking for
   # load balancers by touching health.enabled and health.disabled files on
   # an app's shell.
+  #
+  # If you would like to use Sunshine's healthcheck rack middleware, use
+  # the following command:
+  #   sunshine --middleware your_middleware_dir
+  #
+  # Then simply specify the following in your config.ru:
+  #   require 'your_middleware_dir/health'
+  #   use Sunshine::Health
+  #
+  # Sunshine::Health supports the following options:
+  # :uri_path::    The path that healthcheck will be used on.
+  # :health_file:: The file to check for health.
+  #
+  #   use SunshineHealth, :uri_path    => "/health.txt",
+  #                       :health_file => "health.txt"
 
   class Healthcheck
 

data/lib/sunshine/repo.rb

@@ -57,7 +57,7 @@ module Sunshine
     end
 
 
-    attr_reader :url
+    attr_reader :url, :scm
 
     def initialize url, options={}
       @scm = self.class.name.split("::").last.sub('Repo', '').downcase
@@ -78,9 +78,6 @@ module Sunshine
       Sunshine.logger.info @scm,
         "Checking out to #{shell.host} #{path}" do
 
-        Sunshine.dependencies.install @scm, :call => shell if
-          Sunshine.dependencies.exist? @scm
-
         shell.call "test -d #{path} && rm -rf #{path} || echo false"
         shell.call "mkdir -p #{path}"
 

data/lib/sunshine/server_app.rb

@@ -142,11 +142,11 @@ module Sunshine
     end
 
 
-
     ##
     # Checks out the app's codebase to the checkout path.
 
     def checkout_repo repo
+      install_deps repo.scm
       @info[:scm] = repo.checkout_to self.checkout_path, @shell
     end
 
@@ -257,8 +257,11 @@ module Sunshine
 
     ##
     # Install dependencies previously defined in Sunshine.dependencies.
+    # Will not execute if Sunshine.auto_dependencies? is false.
 
     def install_deps(*deps)
+      return unless Sunshine.auto_dependencies?
+
       options = {:call => @shell, :prefer => pkg_manager}
       options.merge! deps.delete_at(-1) if Hash === deps.last
 

data/templates/apache/apache.conf.erb

@@ -0,0 +1,54 @@
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule authz_host_module modules/mod_authz_host.so
+
+ErrorLog    <%= expand_path log_file(:stderr) %>
+TransferLog <%= expand_path log_file(:stdout) %>
+
+<% if use_passenger? %>
+LoadModule passenger_module <%= passenger_root %>/ext/apache2/mod_passenger.so
+
+PassengerRuby <%= shell.call "which ruby" %>
+PassengerRoot <%= passenger_root %>
+PassengerMaxPoolSize <%= processes %>
+<% end %>
+
+<% unless Sunshine::App === target %>
+LoadModule proxy_module         modules/mod_proxy.so
+LoadModule proxy_connect_module modules/mod_proxy_connect.so
+LoadModule proxy_http_module    modules/mod_proxy_http.so
+<% end %>
+
+
+PidFile <%= expand_path pid %>
+MaxClients <%= max_clients %>
+
+<% if sudo == true || sudo == 'root' %>
+User nobody
+Group nobody
+<% end %>
+
+Listen <%= port %>
+
+
+NameVirtualHost *:<%= port %>
+
+<VirtualHost *:<%= port %>>
+  ServerName  <%= server_name %>
+  ServerAlias www.<%= server_name %>
+
+  <% if Sunshine::App === target %>
+
+  DocumentRoot <%= expand_path app.current_path %>/public
+
+  <Directory <%= app.current_path %>/public>
+      Allow from all
+      Options -MultiViews
+  </Directory>
+
+  <% else %>
+
+  ProxyPass / http://0.0.0.0:<%= target.port %>/
+  ProxyPassReverse / http://0.0.0.0:<%= target.port %>/
+
+  <% end %>
+</VirtualHost>

data/templates/nginx/nginx.conf.erb

@@ -18,12 +18,12 @@ http {
 
   <% if use_passenger? %>
   passenger_root <%= passenger_root %>;
+  passenger_ruby <%= shell.call "which ruby" %>;
   <% end %>
 
   client_body_temp_path <%= darwin ? '/var/tmp/nginx' : '/dev/shm' %>;
   proxy_temp_path <%= darwin ? '/var/tmp/nginx' : '/dev/shm' %>;
 
-  include       <%= File.join nginx_conf_path, 'mime.types' %>;
   default_type  application/octet-stream;
 
   log_format sunshine '$remote_addr - $remote_user [$time_local] '
@@ -48,7 +48,7 @@ http {
   gzip_proxied      any;
   gzip_types        text/plain text/html text/css application/x-javascript application/xml application/xml+rss text/javascript;
 
-  <% if target.is_a?(Sunshine::Server) %>
+  <% if Sunshine::Server === target %>
   upstream app_server {
     server 0:<%= target.port %> fail_timeout=<%= timeout %>;
   }
@@ -91,7 +91,7 @@ http {
       include  <%= expand_path config_path %>/nginx_proxy.conf;
       expires -1;
 
-      <% if target.is_a?(Sunshine::Server) %>
+      <% if Sunshine::Server === target %>
       if (!-f $request_filename) {
         proxy_pass http://app_server;
         break;

data/templates/sunshine/middleware/health.rb

@@ -0,0 +1,58 @@
+module Sunshine
+
+  class Health
+
+    ##
+    # Default healthcheck request path.
+
+    DEFAULT_REQUEST_PATH = '/_health'
+
+
+    ##
+    # The healthcheck-enabled file.
+
+    HEALTHCHECK_FILE = 'health.enabled'
+
+
+    ##
+    # Creates a new SunshineHealth middleware. Supported options are:
+    # :uri_path::    The path that healthcheck will be used on.
+    # :health_file:: The file to check for health.
+
+    def initialize app, options={}
+      @app              = app
+      @uri_path         = options[:uri_path]    || DEFAULT_REQUEST_PATH
+      @healthcheck_file = options[:health_file] || HEALTHCHECK_FILE
+    end
+
+
+    def call env
+      check_health?(env) ? health_response : @app.call(env)
+    end
+
+
+    ##
+    # Given the rack env, do we need to perform a health check?
+
+    def check_health? env
+      env['REQUEST_PATH'] == @uri_path
+    end
+
+
+    ##
+    # Check if healthcheck is enabled.
+
+    def health_enabled?
+      File.file? @healthcheck_file
+    end
+
+
+    ##
+    # Get a rack response for the current health status.
+
+    def health_response
+      status, body = health_enabled? ? [200, "OK"] : [404, "404"]
+      [status, {'Content-Type' => 'text/html'}, body]
+    end
+  end
+end

data/test/test_helper.rb

@@ -183,6 +183,8 @@ unless MockObject === Sunshine.shell
   Sunshine.shell.mock :write, :return => nil
 end
 
+YAML.extend MockObject unless MockObject === YAML
+
 unless Sunshine::Dependency.include? MockObject
   Sunshine::Dependency.send(:include, MockObject)
 end

data/test/unit/test_daemon.rb

@@ -0,0 +1,33 @@
+require 'test/test_helper'
+
+class TestDaemon < Test::Unit::TestCase
+
+  def setup
+    mock_remote_shell_popen4
+    @app    = Sunshine::App.new(TEST_APP_CONFIG_FILE).extend MockObject
+    @server_app = @app.server_apps.first.extend MockObject
+    @app.server_apps.first.shell.extend MockObject
+
+    use_remote_shell @server_app.shell
+  end
+
+
+  def test_missing_start_stop_cmd
+    daemon = Sunshine::Daemon.new @app
+
+    begin
+      daemon.start_cmd
+      raise "Should have thrown CriticalDeployError but didn't :("
+    rescue Sunshine::CriticalDeployError => e
+      assert_equal "@start_cmd undefined. Can't start daemon", e.message
+    end
+
+    begin
+      daemon.stop_cmd
+      raise "Should have thrown CriticalDeployError but didn't :("
+    rescue Sunshine::CriticalDeployError => e
+      assert_equal "@stop_cmd undefined. Can't stop daemon", e.message
+    end
+  end
+
+end

data/test/unit/test_nginx.rb

@@ -22,6 +22,9 @@ passenger (2.2.4)
 
     Apache module for Ruby on Rails support.
     STR
+
+    @nginx_passenger_check =
+      "/opt/ruby-ypc/lib/ruby/gems/1.8/gems/passenger-2.2.11/ext/nginx"
   end
 
 
@@ -66,7 +69,10 @@ passenger (2.2.4)
 
   def test_setup_passenger
     ds = @passenger.app.server_apps.first.shell
-    ds.set_mock_response 0, "gem list passenger -d" => [:out, @gemout]
+
+    ds.set_mock_response 0,
+      "gem list passenger -d" => [:out, @gemout],
+      "nginx -V 2>&1" => [:out, @nginx_passenger_check]
 
     @passenger.setup do |ds, binder|
       assert binder.sudo
@@ -92,16 +98,14 @@ passenger (2.2.4)
 
   ## Helper methods
 
-  def start_cmd svr, sudo=false
-    sudo = sudo ? "sudo " : ""
-    "#{sudo}#{svr.bin} -c #{svr.config_file_path}"
+  def start_cmd svr
+    "#{svr.bin} -c #{svr.config_file_path}"
   end
 
 
-  def stop_cmd svr, sudo=false
-    sudo = sudo ? "sudo " : ""
-    cmd = "#{sudo }test -f #{svr.pid} && kill -QUIT $(cat #{svr.pid})"+
-      " || echo 'No #{svr.name} process to stop for #{svr.app.name}';"
-    cmd << "sleep 2 ; rm -f #{svr.pid};"
+  def stop_cmd svr
+    "test -f #{svr.pid} && kill -#{svr.sigkill} $(cat #{svr.pid}) && "+
+      "sleep 1 && rm -f #{svr.pid} || "+
+      "echo 'No #{svr.name} process to stop for #{svr.app.name}';"
   end
 end

data/test/unit/test_server.rb

@@ -173,25 +173,6 @@ class TestServer < Test::Unit::TestCase
   end
 
 
-  def test_missing_start_stop_cmd
-    server = Sunshine::Server.new @app
-
-    begin
-      server.start_cmd
-      raise "Should have thrown CriticalDeployError but didn't :("
-    rescue Sunshine::CriticalDeployError => e
-      assert_equal "@start_cmd undefined. Can't start server", e.message
-    end
-
-    begin
-      server.stop_cmd
-      raise "Should have thrown CriticalDeployError but didn't :("
-    rescue Sunshine::CriticalDeployError => e
-      assert_equal "@stop_cmd undefined. Can't stop server", e.message
-    end
-  end
-
-
   def test_log_files
     @server.log_files :test_log => "/path/test_log.log",
                       :another_test => "/path/another_test.log"

data/test/unit/test_sunshine.rb

@@ -3,6 +3,7 @@ require 'test/test_helper'
 class TestSunshine < Test::Unit::TestCase
 
   def setup
+    mock_yaml_load_file
   end
 
 
@@ -64,10 +65,10 @@ class TestSunshine < Test::Unit::TestCase
 
       assert_equal servers, Sunshine.setup['servers']
 
-
       Sunshine.run %w{thing1 thing2 -v}.unshift(name)
       servers = [Sunshine.shell]
 
+      args = [%w{thing1 thing2}, Sunshine.setup]
       assert_command cmd, args
 
       assert_equal servers, Sunshine.setup['servers']
@@ -154,4 +155,9 @@ class TestSunshine < Test::Unit::TestCase
     end
   end
 
+  def mock_yaml_load_file
+    YAML.mock :load_file, :args   => [Sunshine::USER_CONFIG_FILE],
+                          :return => Sunshine::DEFAULT_CONFIG
+  end
+
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sunshine
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 1
   - 0
   - 0
-  - pre
-  version: 1.0.0.pre
+  version: 1.0.0
 platform: ruby
 authors: 
 - Jeremie Castagna
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 -07:00
+date: 2010-03-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,7 +60,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rubyforge
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
@@ -69,11 +68,39 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
+        - 0
         - 3
-        - 3
-        version: 2.3.3
+        version: 2.0.3
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: gemcutter
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 0
+        version: 0.5.0
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 5
+        - 0
+        version: 2.5.0
+  type: :development
+  version_requirements: *id006
 description: |-
   Sunshine is an object-oriented api for rack application deployment.
   
@@ -116,6 +143,7 @@ files:
 - lib/sunshine/binder.rb
 - lib/sunshine/crontab.rb
 - lib/sunshine/daemon.rb
+- lib/sunshine/daemons/apache.rb
 - lib/sunshine/daemons/ar_sendmail.rb
 - lib/sunshine/daemons/delayed_job.rb
 - lib/sunshine/daemons/nginx.rb
@@ -138,12 +166,14 @@ files:
 - lib/sunshine/repos/svn_repo.rb
 - lib/sunshine/server_app.rb
 - lib/sunshine/shell.rb
+- templates/apache/apache.conf.erb
 - templates/logrotate/logrotate.conf.erb
 - templates/nginx/nginx.conf.erb
 - templates/nginx/nginx_optimize.conf
 - templates/nginx/nginx_proxy.conf
 - templates/rainbows/rainbows.conf.erb
-- templates/tasks/sunshine.rake
+- templates/sunshine/middleware/health.rb
+- templates/sunshine/sunshine.rake
 - templates/unicorn/unicorn.conf.erb
 - test/fixtures/app_configs/test_app.yml
 - test/fixtures/sunshine_test/test_upload
@@ -153,6 +183,7 @@ files:
 - test/unit/test_app.rb
 - test/unit/test_binder.rb
 - test/unit/test_crontab.rb
+- test/unit/test_daemon.rb
 - test/unit/test_git_repo.rb
 - test/unit/test_healthcheck.rb
 - test/unit/test_nginx.rb
@@ -184,13 +215,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: sunshine
@@ -203,6 +232,7 @@ test_files:
 - test/unit/test_app.rb
 - test/unit/test_binder.rb
 - test/unit/test_crontab.rb
+- test/unit/test_daemon.rb
 - test/unit/test_git_repo.rb
 - test/unit/test_healthcheck.rb
 - test/unit/test_nginx.rb