sunshine 1.0.2 → 1.0.3

data/History.txt

@@ -1,3 +1,19 @@
+=== 1.0.3 / 2010
+
+ * Improvements:
+
+  * Added App#call method.
+
+  * Added App#with_session and Shell#with_session to reduce login prompts.
+
+* Bugfixes:
+
+  * Geminstaller now always installs with sudo.
+
+  * Fixed permissions issues with running servers on ports < 1024.
+
+  * Fixed healthcheck middleware.
+
 === 1.0.2 / 2010-03-25
 
 * Bugfixes:

data/lib/commands/default.rb

@@ -97,7 +97,7 @@ Sunshine is an object oriented deploy tool for rack applications.
     start     Start a deployed app
     stop      Stop a deployed app
 
-   Options:
+  Options:
         EOF
 
         opt.on('--rakefile [PATH]',

data/lib/commands/list.rb

@@ -54,20 +54,20 @@ module Sunshine
       success   = true
 
       shells.each do |shell|
-        shell.connect
+        shell.with_session do
 
-        begin
-          state, response = yield(shell)
-        rescue => e
-          state = false
-          response = "#{e.class}: #{e.message}\n#{e.backtrace.join("\n")}"
-        end
+          begin
+            state, response = yield(shell)
 
-        host            = shell.host
-        success         = state if success
-        responses[host] = build_response state, response
+          rescue => e
+            state = false
+            response = "#{e.class}: #{e.message}\n#{e.backtrace.join("\n")}"
+          end
 
-        shell.disconnect
+          host            = shell.host
+          success         = state if success
+          responses[host] = build_response state, response
+        end
       end
 
       output = format ? self.send(format, responses) : responses

data/lib/sunshine.rb

@@ -74,7 +74,7 @@ module Sunshine
 
   ##
   # Sunshine version.
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 
 
   ##

data/lib/sunshine/app.rb

@@ -90,7 +90,18 @@ module Sunshine
 
 
     ##
-    # Connect server apps.
+    # Call a command on specified server apps.
+    # Supports any App#find and Shell#call options.
+
+    def call cmd, options=nil, &block
+      with_server_apps options, :msg => "Running #{cmd}" do |server_app|
+        server_app.shell.call cmd, options, &block
+      end
+    end
+
+
+    ##
+    # Connect server apps. Supports any App#find options.
 
     def connect options=nil
       with_server_apps options,
@@ -101,7 +112,7 @@ module Sunshine
 
 
     ##
-    # Check if server apps are connected.
+    # Check if server apps are connected. Supports any App#find options.
 
     def connected? options=nil
       with_server_apps options, :no_threads => true do |server_app|
@@ -113,7 +124,7 @@ module Sunshine
 
 
     ##
-    # Disconnect server apps.
+    # Disconnect server apps. Supports any App#find options.
 
     def disconnect options=nil
       with_server_apps options,
@@ -128,53 +139,61 @@ module Sunshine
     # call user's post-deploy code. Supports any App#find options.
 
     def deploy options=nil
-      Sunshine.logger.info :app, "Beginning deploy of #{@name}" do
-        connect options
-      end
+      prev_connection = connected?
 
       deploy_trap = Sunshine.add_trap "Reverting deploy of #{@name}" do
         revert! options
+        start options
+        disconnect options unless prev_connection
       end
 
-      with_filter options do |app|
-        make_app_directories
-        checkout_codebase
-        symlink_current_dir
+      Sunshine.logger.info :app, "Beginning deploy of #{@name}"
+
+      with_session options do
+
+        with_filter options do |app|
+          make_app_directories
+          checkout_codebase
 
-        yield(self) if block_given?
+          stop
 
-        run_post_user_lambdas
+          symlink_current_dir
 
-        health :enable
+          yield(self) if block_given?
 
-        build_control_scripts
-        build_deploy_info_file
-        build_crontab
+          run_post_user_lambdas
 
-        register_as_deployed
-        remove_old_deploys
+          health :enable
+
+          build_control_scripts
+          build_deploy_info_file
+          build_crontab
+
+          register_as_deployed
+          remove_old_deploys
+        end
       end
 
+      Sunshine.logger.info :app, "Ending deploy of #{@name}"
+
     rescue => e
       message = "#{e.class}: #{e.message}"
 
       Sunshine.logger.error :app, message do
         Sunshine.logger.error '>>', e.backtrace.join("\n")
-        revert!
+        revert! options
+        start options
+        disconnect options unless prev_connection
       end
 
     ensure
       Sunshine.delete_trap deploy_trap
-
-      Sunshine.logger.info :app, "Ending deploy of #{@name}" do
-        disconnect options
-      end
     end
 
 
     ##
     # Symlink current directory to previous checkout and remove
-    # the current deploy directory.
+    # the current deploy directory. Supports any App#find options.
 
     def revert!(options=nil)
       with_server_apps options,
@@ -775,6 +794,21 @@ module Sunshine
     end
 
 
+    ##
+    # Runs block ensuring a connection to remote_shells.
+    # Connecting and disconnecting will be ignored if a session
+    # already exists. Supports all App#find options.
+
+    def with_session options=nil
+      prev_connection = connected? options
+      connect options unless prev_connection
+
+      yield
+
+      disconnect options unless prev_connection
+    end
+
+
     private
 
 

data/lib/sunshine/daemon.rb

@@ -138,8 +138,8 @@ module Sunshine
           # Build erb binding
           binder = config_binding server_app.shell
 
-          server_app.shell.call "mkdir -p #{remote_dirs.join(" ")}",
-            :sudo => binder.sudo
+          configure_remote_dirs server_app.shell
+          touch_log_files server_app.shell
 
           yield(server_app, binder) if block_given?
 
@@ -277,7 +277,7 @@ module Sunshine
     # Append or override daemon log file paths:
     #   daemon.log_files :stderr => "/all_logs/stderr.log"
 
-    def log_files(hash)
+    def log_files hash
       @log_files.merge!(hash)
     end
 
@@ -287,7 +287,7 @@ module Sunshine
     #  daemon.log_file(:stderr)
     #  #=> "/all_logs/stderr.log"
 
-    def log_file(key)
+    def log_file key
       @log_files[key]
     end
 
@@ -327,7 +327,8 @@ module Sunshine
     end
 
 
-    private
+    ##
+    # Create and setup a binding for a given shell.
 
     def config_binding shell
       binder = Binder.new self
@@ -350,33 +351,70 @@ module Sunshine
     end
 
 
+    ##
+    # Pick which sudo to use between the daemon sudo and shell sudo.
+    # (Useful when running servers on ports < 1024)
+
     def pick_sudo shell
-      case shell.sudo
-      when true
-        self.sudo || shell.sudo
-      when String
-        String === self.sudo ? self.sudo : shell.sudo
-      else
-        self.sudo
-      end
+      self.sudo.nil? ? shell.sudo : self.sudo
     end
 
 
-    def remote_dirs
+    ##
+    # Make sure all the remote directories needed by the daemon exist.
+
+    def configure_remote_dirs shell
       dirs = @log_files.values.map{|f| File.dirname(f)}
-      dirs.concat [@config_path, File.dirname(@pid)]
+
+      dirs << File.dirname(@pid)
+      dirs << @config_path
       dirs.delete_if{|d| d == "."}
-      dirs
+      dirs = dirs.join(" ")
+
+      shell.call "mkdir -p #{dirs}"
+    end
+
+
+    ##
+    # Make sure log files are owned by the daemon's user.
+
+    def touch_log_files shell
+      files = @log_files.values.join(" ")
+
+      sudo = pick_sudo(shell)
+      user = case sudo
+             when true then 'root'
+             when String then sudo
+             else
+               nil
+             end
+
+      shell.call "touch #{files}", :sudo => true
+      shell.call "chown #{user} #{files}", :sudo => true if user
     end
 
 
+    ##
+    # Setup what should be run after the user block on App#deploy.
+
     def register_after_user_script
       @app.after_user_script do |app|
         each_server_app do |sa|
-          sa.scripts[:start]   << start_cmd
-          sa.scripts[:stop]    << stop_cmd
-          sa.scripts[:restart] << restart_cmd
-          sa.scripts[:status]  << status_cmd
+          sudo = pick_sudo sa.shell
+
+          %w{start stop restart status}.each do |script|
+            script_file = "#{@config_path}/#{script}"
+
+            cmd = send "#{script}_cmd".to_sym
+
+            sa.shell.make_file script_file, cmd,
+              :flags => '--chmod=ugo=rwx'
+
+
+            cmd = sa.shell.sudo_cmd script_file, sudo
+
+            sa.scripts[script.to_sym] << [*cmd].join(" ")
+          end
         end
       end
     end

data/lib/sunshine/daemons/apache.rb

@@ -10,8 +10,6 @@ module Sunshine
 
       @bin = options[:bin] || 'apachectl'
 
-      @sudo = options[:sudo] || @port < 1024
-
       @sigkill = 'WINCH'
 
       # TODO: have a separate max_clients and processes

data/lib/sunshine/daemons/nginx.rb

@@ -8,8 +8,6 @@ module Sunshine
     def initialize app, options={}
       super
 
-      @sudo = options[:sudo] || @port < 1024
-
       @dep_name = options[:dep_name] ||
         use_passenger? ? 'passenger-nginx' : 'nginx'
     end

data/lib/sunshine/daemons/server.rb

@@ -37,6 +37,7 @@ module Sunshine
       super app, options
 
       @port          = options[:port] || 80
+      @sudo          = options[:sudo] || @port < 1024 || nil
       @server_name   = options[:server_name]
       @sigkill       = 'QUIT'
       @supports_rack = false

data/lib/sunshine/daemons/unicorn.rb

@@ -15,8 +15,8 @@ module Sunshine
 
 
     def start_cmd
-      "cd #{@app.current_path} && #{@bin} -D -E"+
-        " #{@app.deploy_env} -p #{@port} -c #{self.config_file_path};"
+      "cd #{@app.current_path} && #{@bin} -D -E #{@app.deploy_env} "+
+        "-p #{@port} -c #{self.config_file_path};"
     end
   end
 end

data/lib/sunshine/dependencies.rb

@@ -102,11 +102,10 @@ Sunshine.dependencies.instance_eval do
     end
 
     check do |shell, sudo|
-      passenger_dir = Server.passenger_root shell
+      passenger_dir = Sunshine::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")
+      shell.call("test -f #{passenger_mod} && apachectl -v")
     end
   end
 

data/lib/sunshine/package_managers/apt.rb

@@ -11,6 +11,8 @@ module Sunshine
 
   class Apt < Dependency
 
+    self.sudo = true
+
     def initialize(name, options={}, &block)
       super(name, options) do
         pkg_name = build_pkg_name @pkg.dup, options

data/lib/sunshine/remote_shell.rb

@@ -228,7 +228,9 @@ module Sunshine
     end
 
 
-    def ssh_cmd string, options={}
+    def ssh_cmd string, options=nil
+      options ||= {}
+
       cmd = sh_cmd string
       cmd = env_cmd cmd
       cmd = sudo_cmd cmd, options

data/lib/sunshine/server_app.rb

@@ -348,7 +348,7 @@ fi
       rm_deploys = deploys[0..-lim]
       rm_deploys.map!{|d| "#{self.deploys_path}/#{d}"}
 
-      @shell.call("rm -rf #{rm_deploys.join(" ")}")
+      @shell.call "rm -rf #{rm_deploys.join(" ")}"
     end
 
 
@@ -375,10 +375,6 @@ fi
 
         Sunshine.logger.info @shell.host, "Reverted to #{last_deploy}"
 
-        unless start :force => true
-          Sunshine.logger.error @shell.host, "Failed #{@name} startup"
-        end
-
       else
         @crontab.delete!
 
@@ -402,7 +398,8 @@ fi
 
     def run_geminstaller
       install_deps 'geminstaller', :type => Gem
-      @shell.call "cd #{self.checkout_path} && geminstaller -e"
+      # Without sudo gems get installed to ~user/.gems
+      @shell.call "cd #{self.checkout_path} && geminstaller -e", :sudo => true
     end
 
 
@@ -411,7 +408,8 @@ fi
     # Post-deploy only.
 
     def running?
-      @shell.call "#{self.root_path}/status" rescue false
+      # Permissions are handled by the script, use: :sudo => false
+      @shell.call "#{self.root_path}/status", :sudo => false rescue false
     end
 
 
@@ -451,7 +449,8 @@ fi
         stop
       end
 
-      @shell.call "#{self.root_path}/start" rescue false
+      # Permissions are handled by the script, use: :sudo => false
+      @shell.call "#{self.root_path}/start", :sudo => false rescue false
     end
 
 
@@ -468,7 +467,8 @@ fi
     # Post-deploy only.
 
     def stop
-      @shell.call "#{self.root_path}/stop" rescue false
+      # Permissions are handled by the script, use: :sudo => false
+      @shell.call "#{self.root_path}/stop", :sudo => false rescue false
     end
 
 

data/lib/sunshine/shell.rb

@@ -254,6 +254,23 @@ module Sunshine
     end
 
 
+    ##
+    # Runs the passed block within a connection session.
+    # If the shell is already connected, connecting and disconnecting
+    # is ignored; otherwise, the session method will ensure that
+    # the shell's connection gets closed after the block has been
+    # executed.
+
+    def with_session
+      prev_connection = connected?
+      connect unless prev_connection
+
+      yield
+
+      disconnect unless prev_connection
+    end
+
+
     ##
     # Write string to stdout (by default).
 

data/templates/nginx/nginx.conf.erb

@@ -17,6 +17,7 @@ events {
 http {
 
   <% if use_passenger? %>
+  passenger_default_user nobody;
   passenger_root <%= passenger_root %>;
   passenger_ruby <%= shell.call "which ruby" %>;
   <% end %>

data/templates/sunshine/middleware/health.rb

@@ -35,7 +35,7 @@ module Sunshine
     # Given the rack env, do we need to perform a health check?
 
     def check_health? env
-      env['REQUEST_PATH'] == @uri_path
+      env['PATH_INFO'] == @uri_path
     end
 
 

data/templates/sunshine/sunshine.rake

@@ -29,6 +29,18 @@ namespace :sunshine do
   task :deploy => :app do
     Sunshine.setup 'trace' => true
 
+    # If you're not able to add your public key to remote servers,
+    # you can setup your tasks to use the App#with_session method
+    # to avoid having to login multiple times:
+    #
+    #   @app.with_session do
+    #     @app.deploy do |app|
+    #       ...
+    #     end
+    #
+    #     @app.start :force => true
+    #   end
+
     @app.deploy do |app|
 
       # Do deploy-specific stuff here, e.g.

data/test/test_helper.rb

@@ -1,180 +1,18 @@
 require 'sunshine'
 require 'test/unit'
 
-def no_mocks
-  ENV['mocks'] == "false"
-end
+require 'helper_methods'
+include HelperMethods
 
-unless no_mocks
-  require 'test/mocks/mock_object'
-  require 'test/mocks/mock_open4'
-end
+
+require 'test/mocks/mock_object'
+require 'test/mocks/mock_open4'
 
 unless defined? TEST_APP_CONFIG_FILE
   TEST_APP_CONFIG_FILE = "test/fixtures/app_configs/test_app.yml"
 end
 
 
-def mock_app
-  Sunshine::App.new(TEST_APP_CONFIG_FILE).extend MockObject
-end
-
-
-def mock_remote_shell host=nil
-  host ||= "user@some_server.com"
-  remote_shell = Sunshine::RemoteShell.new host
-
-  remote_shell.extend MockOpen4
-  remote_shell.extend MockObject
-
-  use_remote_shell remote_shell
-
-  remote_shell.connect
-  remote_shell
-end
-
-
-def mock_svn_response url=nil
-  url ||= "svn://subversion/path/to/my_app/trunk"
-
-  svn_response = <<-STR
-    <?xml version="1.0"?>
-    <log>
-    <logentry
-      revision="777">
-    <author>user</author>
-    <date>2010-01-26T01:49:17.372152Z</date>
-    <msg>finished testing server.rb</msg>
-    </logentry>
-    </log>
-  STR
-
-  Sunshine::SvnRepo.extend(MockObject) unless
-    Sunshine::SvnRepo.is_a?(MockObject)
-
-  Sunshine::SvnRepo.mock :svn_log, :return => svn_response
-  Sunshine::SvnRepo.mock :get_svn_url, :return => url
-end
-
-
-def mock_remote_shell_popen4
-  return if no_mocks
-  Sunshine::RemoteShell.class_eval{ include MockOpen4 }
-end
-
-
-def set_mock_response_for obj, code, stream_vals={}, options={}
-  case obj
-  when Sunshine::App then
-    obj.each do |sa|
-      sa.shell.set_mock_response code, stream_vals, options
-    end
-  when Sunshine::ServerApp then
-    obj.shell.set_mock_response code, stream_vals, options
-  when Sunshine::RemoteShell then
-    obj.set_mock_response code, stream_vals, options
-  end
-end
-
-
-def assert_dep_install dep_name, type=Sunshine::Yum
-  prefered = type rescue nil
-  args = [{:call => @remote_shell, :prefer => prefered}]
-
-  dep = if Sunshine::Dependency === dep_name
-          dep_name
-        else
-          Sunshine.dependencies.get(dep_name, :prefer => prefered)
-        end
-
-
-  assert dep.method_called?(:install!, :args => args),
-    "Dependency '#{dep_name}' install was not called."
-end
-
-
-def assert_not_called *args
-  assert !@remote_shell.method_called?(:call, :args => [*args]),
-    "Command called by #{@remote_shell.host} but should't have:\n #{args[0]}"
-end
-
-
-def assert_server_call *args
-  assert @remote_shell.method_called?(:call, :args => [*args]),
-    "Command was not called by #{@remote_shell.host}:\n #{args[0]}"
-end
-
-
-def assert_bash_script name, cmds, check_value
-  cmds = cmds.map{|cmd| "(#{cmd})" }
-  cmds << "echo true"
-
-  bash = <<-STR
-#!/bin/bash
-if [ "$1" == "--no-env" ]; then
-  #{cmds.flatten.join(" && ")}
-else
-  #{@app.root_path}/env #{@app.root_path}/#{name} --no-env
-fi
-  STR
-
-  assert_equal bash, check_value
-end
-
-
-def assert_ssh_call expected, ds=@remote_shell, options={}
-  expected = ds.send(:ssh_cmd, expected, options).join(" ")
-
-  error_msg = "No such command in remote_shell log [#{ds.host}]\n#{expected}"
-  error_msg << "\n\n#{ds.cmd_log.select{|c| c =~ /^ssh/}.join("\n\n")}"
-
-  assert ds.cmd_log.include?(expected), error_msg
-end
-
-
-def assert_rsync from, to, ds=@remote_shell, sudo=false
-  received = ds.cmd_log.last
-
-  rsync_path = if sudo
-    path = ds.sudo_cmd('rsync', sudo).join(' ')
-    "--rsync-path='#{ path }' "
-  end
-
-  rsync_cmd = "rsync -azP #{rsync_path}-e \"ssh #{ds.ssh_flags.join(' ')}\""
-
-  error_msg = "No such command in remote_shell log [#{ds.host}]\n#{rsync_cmd}"
-  error_msg << "#{from.inspect} #{to.inspect}"
-  error_msg << "\n\n#{ds.cmd_log.select{|c| c =~ /^rsync/}.join("\n\n")}"
-
-  if Regexp === from
-    found = ds.cmd_log.select do |cmd|
-
-      cmd_from = cmd.split(" ")[-2]
-      cmd_to   = cmd.split(" ").last
-
-      cmd_from =~ from && cmd_to == to && cmd.index(rsync_cmd) == 0
-    end
-
-    assert !found.empty?, error_msg
-  else
-    expected = "#{rsync_cmd} #{from} #{to}"
-    assert ds.cmd_log.include?(expected), error_msg
-  end
-end
-
-
-def use_remote_shell remote_shell
-  @remote_shell = remote_shell
-end
-
-
-def each_remote_shell app=@app
-  app.server_apps.each do |sa|
-    use_remote_shell sa.shell
-    yield(sa.shell) if block_given?
-  end
-end
-
 Sunshine.setup({}, true)
 
 unless MockObject === Sunshine.shell

data/test/unit/test_app.rb

@@ -233,6 +233,23 @@ class TestApp < Test::Unit::TestCase
   end
 
 
+  def test_call
+    calls = 0
+
+    @app.call "test call", :sudo => true do |type, data, inn|
+      calls += 1
+    end
+
+    assert_equal calls, @app.server_apps.length
+
+    args = ["test call", {:sudo => true}]
+
+    @app.each do |server_app|
+      assert server_app.shell.method_called?(:call, :args => args)
+    end
+  end
+
+
   def test_checkout_codebase
     @app.checkout_codebase
 
@@ -252,15 +269,25 @@ class TestApp < Test::Unit::TestCase
 
 
   def test_deployed?
+    set_mock_response_for @app, 0,
+      "cat #{@app.current_path}/info" => [:out,
+          "---\n:deploy_name: '#{@app.deploy_name}'"]
+
     deployed = @app.deployed?
 
     state = true
     @app.server_apps.each do |sa|
       assert sa.method_called? :deployed?
+
+      set_mock_response_for sa.shell, 0,
+        "cat #{@app.current_path}/info" => [:out,
+            "---\n:deploy_name: '#{@app.deploy_name}'"]
+
       state = false unless sa.deployed?
     end
 
     assert_equal state, deployed
+    assert deployed
   end
 
 
@@ -327,6 +354,43 @@ class TestApp < Test::Unit::TestCase
   end
 
 
+  def test_find_all
+    app = Sunshine::App.new :repo => {:type => "svn", :url => @svn_url},
+            :remote_shells => [
+              "user@some_server.com",
+              ["server2.com", {:roles => "web db"}]
+            ]
+
+    server_apps = app.server_apps
+
+    assert_equal server_apps, app.find
+    assert_equal server_apps, app.find({})
+    assert_equal server_apps, app.find(:all)
+    assert_equal server_apps, app.find(nil)
+  end
+
+
+  def test_find
+    app = Sunshine::App.new :repo => {:type => "svn", :url => @svn_url},
+            :remote_shells => [
+              "user@some_server.com",
+              ["server2.com", {:roles => "web db"}]
+            ]
+
+    server_apps = app.server_apps
+
+    assert_equal server_apps, app.find(:role => :web)
+    assert_equal server_apps, app.find(:role => :db)
+
+    assert_equal [server_apps[0]], app.find(:role => :all)
+    assert_equal [server_apps[0]], app.find(:role => :blarg)
+    assert_equal [server_apps[0]], app.find(:user => 'user')
+    assert_equal [server_apps[0]], app.find(:host => 'some_server.com')
+
+    assert_equal [server_apps[1]], app.find(:host => 'server2.com')
+  end
+
+
   def test_make_app_directories
     @app.make_app_directories
 

data/test/unit/test_server.rb

@@ -65,14 +65,14 @@ class TestServer < Test::Unit::TestCase
       assert_equal @rainbows.send(:pick_sudo, sa.shell), binder.sudo
     end
 
-    args = ["rainbows"]
     server.each_server_app do |sa|
-      assert sa.method_called?(:install_deps, :args => args)
-    end
+      assert sa.method_called?(:install_deps, :args => ["rainbows"])
 
-    assert server.method_called?(:upload_config_files)
+      assert server.method_called?(:configure_remote_dirs, :args => [sa.shell])
+      assert server.method_called?(:touch_log_files, :args => [sa.shell])
+      assert server.method_called?(:upload_config_files, :args => [sa.shell])
+    end
 
-    assert_ssh_call "mkdir -p #{server.send(:remote_dirs).join(" ")}"
 
     assert_rsync(/rainbows\.conf/, "some_server.com:"+
       "/usr/local/my_user/other_app/current/daemons/rainbows/rainbows.conf")
@@ -103,13 +103,12 @@ class TestServer < Test::Unit::TestCase
     @server_app.shell.mock :file?, :args => [server.config_file_path],
                                    :return => false
 
-    server.start do |ds|
-      assert_equal @server_app, ds
+    server.start do |sa|
+      assert_equal @server_app, sa
+      assert_ssh_call server.start_cmd, sa.shell, :sudo => true
     end
 
     assert server.method_called?(:setup)
-
-    assert_ssh_call server.start_cmd
   end
 
 
@@ -118,31 +117,32 @@ class TestServer < Test::Unit::TestCase
     @server_app.shell.mock :file?, :args => [server.config_file_path],
                                    :return => true
 
-    server.start
+    server.start do |sa|
+      assert_equal @server_app, sa
+      assert_ssh_call server.start_cmd, sa.shell, :sudo => true
+    end
 
     assert !server.method_called?(:setup)
-
-    assert_ssh_call server.start_cmd
   end
 
 
   def test_stop
     server = @rainbows
 
-    server.stop do |ds|
-      assert_equal @server_app, ds
+    server.stop do |sa|
+      assert_equal @server_app, sa
+      assert_ssh_call server.stop_cmd, sa.shell, :sudo => true
     end
-
-    assert_ssh_call server.stop_cmd
   end
 
 
   def test_restart
     server = @rainbows
 
-    server.restart
-
-    assert_ssh_call server.restart_cmd
+    server.restart do |sa|
+      assert_equal @server_app, sa
+      assert_ssh_call server.restart_cmd, sa.shell, :sudo => true
+    end
   end
 
 
@@ -152,10 +152,7 @@ class TestServer < Test::Unit::TestCase
                                    :return => true
 
     server.restart
-
     assert !server.method_called?(:setup)
-
-    assert_ssh_call server.restart_cmd
   end
 
 
@@ -166,10 +163,12 @@ class TestServer < Test::Unit::TestCase
     @server_app.shell.mock :file?, :args => [server.config_file_path],
                                    :return => false
 
-    server.restart
+    server.restart do |sa|
+      assert_equal @server_app, sa
+      assert_ssh_call server.restart_cmd, sa.shell, :sudo => true
+    end
 
     assert server.method_called?(:setup)
-    assert_ssh_call server.restart_cmd
   end
 
 
@@ -207,18 +206,6 @@ class TestServer < Test::Unit::TestCase
   end
 
 
-  def test_remote_dirs
-    server = @rainbows
-
-    dirs = server.send :remote_dirs
-
-    assert_dir_in dirs, server.pid
-    assert_dir_in dirs, server.config_file_path
-    assert_dir_in dirs, server.log_file(:stderr)
-    assert_dir_in dirs, server.log_file(:stdout)
-  end
-
-
   def test_register_after_user_script
     server = @rainbows
 
@@ -227,11 +214,12 @@ class TestServer < Test::Unit::TestCase
     @app.run_post_user_lambdas
 
     server.each_server_app do |sa|
+      %w{start stop restart status}.each do |script|
+        script_file = "#{server.config_path}/#{script}"
+        cmd = sa.shell.sudo_cmd script_file, server.send(:pick_sudo, sa.shell)
 
-      assert sa.scripts[:start].include?(server.start_cmd)
-      assert sa.scripts[:stop].include?(server.stop_cmd)
-      assert sa.scripts[:status].include?(server.status_cmd)
-      assert sa.scripts[:restart].include?(server.restart_cmd)
+        assert sa.scripts[script.to_sym].include?(cmd.join(" "))
+      end
 
       assert_equal server.port, sa.info[:ports][server.pid]
     end
@@ -240,18 +228,18 @@ class TestServer < Test::Unit::TestCase
 
   def test_pick_sudo
     ds = @rainbows.app.server_apps.first.shell
-    assert_equal nil, @rainbows.send(:pick_sudo, ds)
+    assert_equal true, @rainbows.send(:pick_sudo, ds)
 
     @rainbows.sudo = true
     assert_equal true, @rainbows.send(:pick_sudo, ds)
 
     ds.sudo = true
     @rainbows.sudo = false
-    assert_equal true, @rainbows.send(:pick_sudo, ds)
+    assert_equal false, @rainbows.send(:pick_sudo, ds)
 
     ds.sudo = "blah"
     @rainbows.sudo = true
-    assert_equal "blah", @rainbows.send(:pick_sudo, ds)
+    assert_equal true, @rainbows.send(:pick_sudo, ds)
 
     @rainbows.sudo = "local"
     assert_equal "local", @rainbows.send(:pick_sudo, ds)

data/test/unit/test_server_app.rb

@@ -280,8 +280,6 @@ class TestServerApp < Test::Unit::TestCase
 
     last_deploy = "#{@app.deploys_path}/ploy5"
     assert_server_call "ln -sfT #{last_deploy} #{@app.current_path}"
-
-    assert @sa.method_called?(:start, :args =>[:force => true])
   end
 
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Jeremie Castagna
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-25 00:00:00 -07:00
+date: 2010-03-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,7 +74,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: hoe
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
@@ -82,39 +82,11 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 0
         - 3
-        version: 2.0.3
+        - 3
+        version: 2.3.3
   type: :development
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: gemcutter
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 0
-        version: 0.5.0
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 5
-        - 0
-        version: 2.5.0
-  type: :development
-  version_requirements: *id007
 description: |-
   Sunshine is an object-oriented api for rack application deployment.