sunshine 1.0.3 → 1.1.0

data/templates/mongrel_rails/mongrel_rails.conf.erb

@@ -0,0 +1,9 @@
+---
+:environment: <%= app.deploy_env %>
+:host: 0.0.0.0
+:num_processors: <%= connections %>
+:port: <%= port %>
+:daemon: true
+:log_file: <%= expand_path log_file(:stdout) %>
+:pid_file: <%= expand_path pid %>
+:timeout: <%= timeout %>

data/templates/nginx/nginx.conf.erb

@@ -8,7 +8,7 @@ pid               <%= expand_path pid %>;
 error_log         <%= expand_path log_file(:stderr) %> info;
 
 events {
-  worker_connections  1024;
+  worker_connections <%= connections %>;
   <% unless darwin %>
   use epoll;
   <% end %>
@@ -25,6 +25,7 @@ http {
   client_body_temp_path <%= darwin ? '/var/tmp/nginx' : '/dev/shm' %>;
   proxy_temp_path <%= darwin ? '/var/tmp/nginx' : '/dev/shm' %>;
 
+  include <%= File.dirname shell.call("which nginx") %>/../conf/mime.types;
   default_type  application/octet-stream;
 
   log_format sunshine '$remote_addr - $remote_user [$time_local] '
@@ -49,11 +50,13 @@ http {
   gzip_proxied      any;
   gzip_types        text/plain text/html text/css application/x-javascript application/xml application/xml+rss text/javascript;
 
-  <% if Sunshine::Server === target %>
-  upstream app_server {
-    server 0:<%= target.port %> fail_timeout=<%= timeout %>;
+  <% unless App === target -%>
+  upstream <%= proxy_name %> {
+    <% [*target].each do |server| -%>
+    server 0:<%= server.port %> fail_timeout=<%= timeout %>;
+    <% end -%>
   }
-  <% end %>
+  <% end -%>
 
   ##
   # 301 redirect www to non-www host.
@@ -82,9 +85,9 @@ http {
     ##
     # Main proxy
     location / {
-      <% if darwin %>
+      <% if darwin -%>
       ssi on;
-      <% end %>
+      <% end -%>
       if (-f $request_filename) {
         break;
       }
@@ -92,9 +95,9 @@ http {
       include  <%= expand_path config_path %>/nginx_proxy.conf;
       expires -1;
 
-      <% if Sunshine::Server === target %>
+      <% unless App === target %>
       if (!-f $request_filename) {
-        proxy_pass http://app_server;
+        proxy_pass http://<%= proxy_name %>;
         break;
       }
       <% end %>

data/templates/thin/thin.conf.erb

@@ -0,0 +1,12 @@
+--- 
+address: 0.0.0.0
+timeout: <%= timeout %>
+port: <%= port %>
+log: <%= expand_path log_file(:stdout) %>
+max_conns: <%= connections %>
+require: []
+
+environment: <%= app.deploy_env %>
+max_persistent_conns: <%= connections / 2 %>
+servers: <%= processes %>
+daemonize: true

data/test/helper_methods.rb

@@ -0,0 +1,161 @@
+module HelperMethods
+
+  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
+    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
+end

data/test/unit/test_daemon.rb

@@ -12,7 +12,7 @@ class TestDaemon < Test::Unit::TestCase
   end
 
 
-  def test_missing_start_stop_cmd
+  def test_missing_start_cmd
     daemon = Sunshine::Daemon.new @app
 
     begin
@@ -21,13 +21,6 @@ class TestDaemon < Test::Unit::TestCase
     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

@@ -106,6 +106,6 @@ passenger (2.2.4)
   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}';"
+      "echo 'Could not kill #{svr.name} pid for #{svr.app.name}';"
   end
 end

data/test/unit/test_server.rb

@@ -98,6 +98,22 @@ class TestServer < Test::Unit::TestCase
   end
 
 
+  def test_new_cluster
+    cluster = Sunshine::Server.new_cluster 3, @app, :port => 5000
+
+    assert_equal Sunshine::ServerCluster, cluster.class
+    assert Array === cluster
+    assert_equal 3, cluster.length
+
+    cluster.each_with_index do |server, index|
+      port = 5000 + index
+      assert_equal Sunshine::Server, server.class
+      assert_equal port, server.port
+      assert_equal "server.#{port}", server.name
+    end
+  end
+
+
   def test_start
     server = @rainbows
     @server_app.shell.mock :file?, :args => [server.config_file_path],

data/test/unit/test_server_cluster.rb

@@ -0,0 +1,46 @@
+require 'test/test_helper'
+
+class TestServerCluster < Test::Unit::TestCase
+
+  def setup
+    @cluster =
+      Sunshine::ServerCluster.new Sunshine::Unicorn, 3, mock_app, :port => 2000
+
+    @cluster.each{|server| server.extend MockObject }
+  end
+
+
+  def test_initialize
+    name = "someserver.3333"
+
+    cluster =
+      Sunshine::ServerCluster.new Sunshine::Thin, 3, mock_app,
+      :port => 3000, :name => name
+
+    assert_equal Sunshine::ServerCluster, cluster.class
+    assert Array === cluster
+    assert_equal 3, cluster.length
+
+    cluster.each_with_index do |server, index|
+      port = 3000 + index
+      assert_equal Sunshine::Thin, server.class
+      assert_equal port, server.port
+      assert_equal "#{name}.#{port}", server.name
+    end
+  end
+
+
+  def test_forwarded_methods
+    [:has_setup?, :status, :setup, :start, :stop, :restart].each do |method|
+      @cluster.each do |server|
+        server.mock method, :return => true
+      end
+
+      @cluster.send method
+
+      @cluster.each do |server|
+        assert server.method_called?(method)
+      end
+    end
+  end
+end

data/test/unit/test_sunshine.rb

@@ -28,12 +28,13 @@ class TestSunshine < Test::Unit::TestCase
 
   def test_find_command
     assert !Sunshine.find_command('st')
-    assert_equal 'start', Sunshine.find_command('sta')
-    assert_equal 'stop', Sunshine.find_command('sto')
-    assert_equal 'add', Sunshine.find_command('a')
+    assert_equal Sunshine::StartCommand, Sunshine.find_command('sta')
+    assert_equal Sunshine::StopCommand, Sunshine.find_command('sto')
+    assert_equal Sunshine::AddCommand, Sunshine.find_command('a')
 
     Sunshine::COMMANDS.each do |cmd|
-      assert_equal cmd, Sunshine.find_command(cmd)
+      const = Sunshine.const_get "#{cmd.capitalize}Command"
+      assert_equal const, Sunshine.find_command(cmd)
     end
   end
 
@@ -44,7 +45,7 @@ class TestSunshine < Test::Unit::TestCase
 
     Sunshine.run %w{run somefile.rb -l debug -e prod --no-trace}
 
-    assert_command Sunshine::RunCommand, [['somefile.rb'], Sunshine.setup]
+    assert_command Sunshine::RunCommand, [['somefile.rb'], Sunshine.config]
   end
 
 
@@ -56,23 +57,28 @@ class TestSunshine < Test::Unit::TestCase
 
       mock_sunshine_command cmd
 
-      Sunshine.run %w{thing1 thing2 -r remoteserver.com}.unshift(name)
+      argv = [name, 'thing1', 'thing2', '-r', 'remoteserver.com']
+
+      Sunshine.run argv
 
       servers = [Sunshine::RemoteShell.new("remoteserver.com")]
 
-      args = [%w{thing1 thing2}, Sunshine.setup]
+      args = [%w{thing1 thing2}, Sunshine.config]
       assert_command cmd, args
 
-      assert_equal servers, Sunshine.setup['servers']
+      assert_equal servers, Sunshine.config['servers']
+
+
+      argv = [name, 'thing1', 'thing2', '-v']
 
-      Sunshine.run %w{thing1 thing2 -v}.unshift(name)
+      Sunshine.run argv
       servers = [Sunshine.shell]
 
-      args = [%w{thing1 thing2}, Sunshine.setup]
+      args = [%w{thing1 thing2}, Sunshine.config]
       assert_command cmd, args
 
-      assert_equal servers, Sunshine.setup['servers']
-      assert Sunshine.setup['verbose']
+      assert_equal servers, Sunshine.config['servers']
+      assert Sunshine.config['verbose']
     end
   end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 3
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jeremie Castagna
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-26 00:00:00 -07:00
+date: 2010-04-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,12 +88,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 description: |-
-  Sunshine is an object-oriented api for rack application deployment.
-  
-  Sunshine is open and it can do a lot! It's meant to be dug into and understood.
-  Knowing how it works will let you do really neat things: classes are
-  decoupled as much as possible to allow for optimal flexibility,
-  and most can be used independently.
+  Sunshine is a framework for rack and rails application deployment.
   
   This gem was made possible by the sponsoring of AT&T Interactive
   (http://attinteractive.com).
@@ -132,9 +127,12 @@ files:
 - lib/sunshine/daemons/apache.rb
 - lib/sunshine/daemons/ar_sendmail.rb
 - lib/sunshine/daemons/delayed_job.rb
+- lib/sunshine/daemons/mongrel_rails.rb
 - lib/sunshine/daemons/nginx.rb
 - lib/sunshine/daemons/rainbows.rb
 - lib/sunshine/daemons/server.rb
+- lib/sunshine/daemons/server_cluster.rb
+- lib/sunshine/daemons/thin.rb
 - lib/sunshine/daemons/unicorn.rb
 - lib/sunshine/dependencies.rb
 - lib/sunshine/dependency_lib.rb
@@ -154,15 +152,18 @@ files:
 - lib/sunshine/shell.rb
 - templates/apache/apache.conf.erb
 - templates/logrotate/logrotate.conf.erb
+- templates/mongrel_rails/mongrel_rails.conf.erb
 - templates/nginx/nginx.conf.erb
 - templates/nginx/nginx_optimize.conf
 - templates/nginx/nginx_proxy.conf
 - templates/rainbows/rainbows.conf.erb
 - templates/sunshine/middleware/health.rb
 - templates/sunshine/sunshine.rake
+- templates/thin/thin.conf.erb
 - templates/unicorn/unicorn.conf.erb
 - test/fixtures/app_configs/test_app.yml
 - test/fixtures/sunshine_test/test_upload
+- test/helper_methods.rb
 - test/mocks/mock_object.rb
 - test/mocks/mock_open4.rb
 - test/test_helper.rb
@@ -178,12 +179,13 @@ files:
 - test/unit/test_repo.rb
 - test/unit/test_server.rb
 - test/unit/test_server_app.rb
+- test/unit/test_server_cluster.rb
 - test/unit/test_shell.rb
 - test/unit/test_sunshine.rb
 - test/unit/test_svn_repo.rb
 - test/unit/test_unicorn.rb
 has_rdoc: true
-homepage: http://betalabs.yellowpages.com/
+homepage: http://github.com/yaksnrainbows/sunshine
 licenses: []
 
 post_install_message: 
@@ -212,7 +214,7 @@ rubyforge_project: sunshine
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Sunshine is an object-oriented api for rack application deployment
+summary: Sunshine is a framework for rack and rails application deployment
 test_files: 
 - test/test_helper.rb
 - test/unit/test_app.rb
@@ -227,6 +229,7 @@ test_files:
 - test/unit/test_repo.rb
 - test/unit/test_server.rb
 - test/unit/test_server_app.rb
+- test/unit/test_server_cluster.rb
 - test/unit/test_shell.rb
 - test/unit/test_sunshine.rb
 - test/unit/test_svn_repo.rb