sunshine 1.1.1 → 1.1.2

data/History.txt

@@ -1,3 +1,23 @@
+=== 1.1.2 / 2010-04-15
+
+* Improvements:
+
+  * Added array support to App#find.
+
+  * Added auto registration of Dependency subclasses for scalability.
+
+  * Added call to App#start in App#deploy.
+
+* Bugfixes:
+
+  * Fixed bug where env wouldn't be applied correctly in control scripts.
+
+  * Changed App#with_filter to actually change the App#server_apps attribute.
+
+  * Shell#env_cmd now returns a flattened array.
+
+  * Added actual check of running process to Daemon#status_cmd.
+
 === 1.1.1 / 2010-04-05
 
 * Improvements:

data/Manifest.txt

@@ -3,9 +3,9 @@ Manifest.txt
 README.txt
 Rakefile
 bin/sunshine
-examples/deploy.rb
 examples/deploy_tasks.rake
 examples/standalone_deploy.rb
+examples/sunshine_deploy.rb
 lib/commands/add.rb
 lib/commands/default.rb
 lib/commands/list.rb

data/README.txt

@@ -17,16 +17,32 @@ This gem was made possible by the sponsoring of AT&T Interactive
 
 Installing sunshine:
 
-  gem install sunshine
+  $ gem install sunshine
+
+Call sunshine to create the config file:
+
+  $ sunshine
+
+  Missing config file was created for you: /Users/jsmith/.sunshine
+
+  --- 
+  web_directory: /var/www
+  max_deploy_versions: 5
+  auto_dependencies: true
+  level: info
+  auto: false
+  remote_checkouts: false
+  deploy_env: :development
+
 
 You can either use sunshine by requiring the gem in your script, such as
 in a rakefile (which is more common):
 
-  rake sunshine:deploy
+  $ rake sunshine:deploy
 
 Or you can also call built-in sunshine commands:
 
-  sunshine run my_deploy.rb -e qa
+  $ sunshine run my_deploy.rb -e qa
 
 
 == Rake Deploy Tasks in 5 Minutes
@@ -43,7 +59,7 @@ specific deploy. Rake tasks are great for that, and Sunshine comes with a
 template rake file that you can modify to fit your needs.
 
 You can copy the template rake file to lib/tasks/ by running:
-  sunshine --rakefile lib/tasks/.
+  $ sunshine --rakefile lib/tasks/.
 
 If you open the file, you'll see a variety of tasks that handle deployment, to
 application start/stop/restart-ing, to health checks. Most likely, the two tasks
@@ -86,8 +102,6 @@ to the @app.deploy block. Here's a sample of completed :app and :deploy tasks:
         rainbows.setup
         nginx.setup
       end
-
-      @app.start :force => true
     end
 
     ...
@@ -217,6 +231,27 @@ In this example, :prod inherits top level values from :qa (only :repo in this
 instance). The :inherits key also supports an array as its value.
 All environments also inherit from the :default environment. The :default is
 also used if the app's deploy_env is not found in the config.
+
+Finally, yaml configs get parsed by erb, exposing any options passed to the
+App's constuctor, along with the deploy environment, letting your write configs
+such as:
+
+  # deploy.rb
+
+  app = App.new "deploy.yml", :name => "my_app", :deploy_name => "release_001"
+
+
+  # deploy.yml
+  ---
+  :default :
+    :repo :
+      :type : svn
+      :url :  svn://subversion/<%= name %>/tags/<%= deploy_name %>
+
+    :remote_shells :
+      - <%= deploy_env %>1.<%= name %>.domain.com
+      - <%= deploy_env %>2.<%= name %>.domain.com
+
 See Sunshine::App for more information.
 
 
@@ -237,8 +272,6 @@ Using Sunshine, this is most commonly defined as a part of the deploy process:
     nginx.setup
   end
 
-  app.start :force => true
-
 When a new Server is instantiated and its setup method is run, it is added to
 the app's control scripts. This means that when the deploy is complete, those
 servers can be controlled by the app's start/stop/restart/status methods.

data/examples/deploy_tasks.rake

@@ -38,8 +38,6 @@ namespace :sunshine do
       rainbows.setup
       nginx.setup
     end
-
-    @app.start :force => true
   end
 
 

data/examples/standalone_deploy.rb

@@ -15,8 +15,8 @@ Sunshine::App.deploy :name => 'my_app' do |app|
 
   app.run_geminstaller
 
-  rainbows.restart
-  nginx.restart
+  rainbows.setup
+  nginx.setup
 end
 
 

data/examples/{deploy.rb → sunshine_deploy.rb}

@@ -7,20 +7,17 @@ Sunshine::App.deploy do |app|
 
   app.gem_install 'isolate', :version => '1.3.0'
 
-  app.install_deps 'libxml2-devel', 'libxslt-devel', 'libaio', 'sqlite-devel',
+  app.yum_install 'libxml2-devel', 'libxslt-devel', 'libaio', 'sqlite-devel',
                   'sqlite', 'ruby-devel', 'activerecord-oracle_enhanced-adapter'
 
-
   app.run_bundler
 
-
   app.with_filter :role => :db do
 
     app.rake 'config/database.yml'
     app.rake 'db:migrate'
   end
 
-
   app.with_filter :role => :cdn do
 
     sass_yml_file = "#{app.checkout_path}/config/asset_packages.yml"
@@ -32,17 +29,14 @@ Sunshine::App.deploy do |app|
   end
 
 
-  delayed_job = Sunshine::DelayedJob.new app
-  delayed_job.restart
-
-  mail = Sunshine::ARSendmail.new app
-  mail.restart
+  Sunshine::DelayedJob.new(app).setup
+  Sunshine::ARSendmail.new(app).setup
 
   unicorn = Sunshine::Unicorn.new app, :port => 10001, :processes => 8
-  unicorn.restart
+  nginx   = Sunshine::Nginx.new app, :point_to => unicorn
 
-  nginx = Sunshine::Nginx.new app, :point_to => unicorn, :port => 10000
-  nginx.restart
+  unicorn.setup
+  nginx.setup
 end
 
 

data/lib/sunshine.rb

@@ -19,7 +19,7 @@ module Sunshine
 
   ##
   # Sunshine version.
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 
   ##
   # Path to the list of installed sunshine apps.
@@ -36,13 +36,14 @@ module Sunshine
   ##
   # Default configuration.
   DEFAULT_CONFIG = {
-    'level'               => 'info',
-    'deploy_env'          => :development,
     'auto'                => false,
-    'max_deploy_versions' => 5,
-    'web_directory'       => '/var/www',
     'auto_dependencies'   => true,
-    'remote_checkouts'    => false
+    'deploy_env'          => :development,
+    'level'               => 'info',
+    'max_deploy_versions' => 5,
+    'remote_checkouts'    => false,
+    'timeout'             => 300,
+    'web_directory'       => '/var/www'
   }
 
   ##
@@ -106,24 +107,6 @@ module Sunshine
   end
 
 
-  ##
-  # Handles input/output to the shell. See Sunshine::Shell.
-
-  def self.shell
-    @shell ||= Sunshine::Shell.new
-  end
-
-
-  ##
-  # The default directory where apps should be deployed to:
-  # '/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']
-  end
-
-
   ##
   # Should sunshine ever ask for user input? True by default; overridden with
   # the -a option.
@@ -143,7 +126,7 @@ module Sunshine
 
   ##
   # Maximum number of deploys (history) to keep on the remote server,
-  # 5 by default. Overridden in the ~/.sunshine config file.
+  # 5 by default. Overridden in the config.
 
   def self.max_deploy_versions
     @config['max_deploy_versions']
@@ -152,13 +135,31 @@ module Sunshine
 
   ##
   # Check if the codebase should be checked out remotely, or checked out
-  # locally and rsynced up. Overridden in the ~/.sunshine config file.
+  # locally and rsynced up. Overridden in the config.
 
   def self.remote_checkouts?
     @config['remote_checkouts']
   end
 
 
+  ##
+  # Handles input/output to the shell. See Sunshine::Shell.
+
+  def self.shell
+    @shell ||= Sunshine::Shell.new
+  end
+
+
+  ##
+  # How long to wait on a command to finish when no output is received.
+  # Defaults to 300 (seconds). Overridden in the config.
+  # Set to false to disable timeout.
+
+  def self.timeout
+    @config['timeout']
+  end
+
+
   ##
   # Check if trace log should be output at all.
   # This value can be assigned by default in ~/.sunshine
@@ -170,6 +171,16 @@ module Sunshine
   end
 
 
+  ##
+  # The default directory where apps should be deployed to:
+  # '/var/www' by default. Overridden in the config.
+  # See also App#deploy_path.
+
+  def self.web_directory
+    @config['web_directory']
+  end
+
+
   ##
   # Adds an INT signal trap with its description on the stack.
   # Returns a trap_item Array.
@@ -207,7 +218,6 @@ module Sunshine
   end
 
 
-
   ##
   # Global value of sudo to use. Returns true, nil, or a username.
   # This value can be assigned by default in ~/.sunshine
@@ -356,10 +366,15 @@ module Sunshine
   require 'sunshine/exceptions'
 
   require 'sunshine/shell'
+  require 'sunshine/remote_shell'
+
   require 'sunshine/output'
 
   require 'sunshine/binder'
 
+  require 'sunshine/server_app'
+  require 'sunshine/app'
+
   require 'sunshine/dependency_lib'
   require 'sunshine/package_managers/dependency'
   require 'sunshine/package_managers/apt'
@@ -387,11 +402,6 @@ module Sunshine
 
   require 'sunshine/healthcheck'
 
-  require 'sunshine/remote_shell'
-
-  require 'sunshine/server_app'
-  require 'sunshine/app'
-
   require 'commands/default'
   require 'commands/list'
   require 'commands/add'

data/lib/sunshine/app.rb

@@ -178,8 +178,6 @@ module Sunshine
 
       @deploy_name = options[:deploy_name] || Time.now.to_i.to_s
 
-      @server_app_filter = nil
-
       set_deploy_paths options[:root_path]
 
       @server_apps = server_apps_from_config options[:remote_shells]
@@ -195,6 +193,8 @@ module Sunshine
       shell_env options[:shell_env]
 
       @post_user_lambdas = []
+
+      @has_session = false
     end
 
 
@@ -213,9 +213,10 @@ module Sunshine
     # Connect server apps. Supports any App#find options.
 
     def connect options=nil
-      with_server_apps options,
-        :msg => "Connecting..." do |server_app|
-        server_app.shell.connect
+      Sunshine.logger.info :app, "Connecting..." do
+        threaded_each options do |server_app|
+          server_app.shell.connect
+        end
       end
     end
 
@@ -224,7 +225,7 @@ module Sunshine
     # 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|
+      each options do |server_app|
         return false unless server_app.shell.connected?
       end
 
@@ -236,9 +237,10 @@ module Sunshine
     # Disconnect server apps. Supports any App#find options.
 
     def disconnect options=nil
-      with_server_apps options,
-        :msg => "Disconnecting..." do |server_app|
-        server_app.shell.disconnect
+      Sunshine.logger.info :app, "Disconnecting..." do
+        threaded_each options do |server_app|
+          server_app.shell.disconnect
+        end
       end
     end
 
@@ -246,6 +248,12 @@ module Sunshine
     ##
     # Deploy the application to deploy servers and
     # call user's post-deploy code. Supports any App#find options.
+    #
+    # Note: The deploy method will stop the former deploy just before
+    # symlink and the passed block is run.
+    #
+    # Note: Once deployment is complete, the deploy method will attempt to
+    # run App#start.
 
     def deploy options=nil
       prev_connection = connected?
@@ -280,6 +288,8 @@ module Sunshine
 
           register_as_deployed
           remove_old_deploys
+
+          start :force => true
         end
       end
 
@@ -473,23 +483,21 @@ module Sunshine
     #   find :user => 'db'
     #   find :host => 'someserver.com'
     #   find :role => :web
+    #
+    # The find method also supports passing arrays and will match
+    # any server app that matches any one condition:
+    #   find :user => ['root', 'john']
+    #
+    # Returns all server apps who's user is either 'root' or 'john'.
 
     def find query=nil
-      if @server_app_filter
-        if Hash === query && Hash === @server_app_filter
-          query.merge! @server_app_filter
-        else
-          query = @server_app_filter
-        end
-      end
-
       return @server_apps if query.nil? || query == :all
 
       @server_apps.select do |sa|
-        next unless sa.shell.user == query[:user] if query[:user]
-        next unless sa.shell.host == query[:host] if query[:host]
+        next unless [*query[:user]].include? sa.shell.user if query[:user]
+        next unless [*query[:host]].include? sa.shell.host if query[:host]
 
-        next unless sa.has_roles?(query[:role])   if query[:role]
+        next unless sa.has_roles?(query[:role], true)      if query[:role]
 
         true
       end
@@ -514,22 +522,6 @@ module Sunshine
     end
 
 
-    %w{gem yum apt}.each do |dep_type|
-      self.class_eval <<-STR, __FILE__, __LINE__ + 1
-        ##
-        # Install one or more #{dep_type} packages.
-        # See Settler::#{dep_type.capitalize}#new for supported options.
-
-        def #{dep_type}_install(*names)
-          options = names.last if Hash === names.last
-          with_server_apps options,
-            :msg  => "Installing #{dep_type} packages",
-            :send => [:#{dep_type}_install, *names]
-        end
-      STR
-    end
-
-
     ##
     # Gets or sets the healthcheck state. Returns a hash of host/state
     # pairs. State values are :enabled, :disabled, and :down. The method
@@ -711,7 +703,7 @@ module Sunshine
 
     def run_post_user_lambdas
       Sunshine.logger.info :app, "Running post deploy lambdas" do
-        @post_user_lambdas.each{|l| l.call self}
+        with_session{ @post_user_lambdas.each{|l| l.call self} }
       end
     end
 
@@ -819,23 +811,29 @@ module Sunshine
     def threaded_each(options=nil, &block)
       mutex   = Mutex.new
       threads = []
+      error   = nil
 
       return_val = each(options) do |server_app|
 
         thread = Thread.new do
           server_app.shell.with_mutex mutex do
-            yield server_app
+
+            begin
+              yield server_app
+
+            rescue => e
+              error = e
+            end
           end
         end
 
-        # We don't want deploy servers to keep doing things if one fails
-        thread.abort_on_exception = true
-
         threads << thread
       end
 
       threads.each{|t| t.join }
 
+      raise error if error
+
       return_val
     end
 
@@ -870,17 +868,19 @@ module Sunshine
     #   end
 
     def with_filter filter_hash
-      old_filter, @server_app_filter = @server_app_filter, filter_hash
+      old_server_apps, @server_apps = @server_apps, find(filter_hash)
 
       yield self
 
-      @server_app_filter = old_filter
+    ensure
+      @server_apps = old_server_apps
     end
 
 
     ##
     # Calls a method for server_apps found with the passed options,
-    # and with an optional log message. Supports all App#find
+    # and with an optional log message. Will attempt to run the methods in
+    # a session to avoid multiple ssh login prompts. Supports all App#find
     # options, plus:
     # :no_threads:: bool - disable threaded execution
     # :msg:: "some message" - log message
@@ -912,11 +912,13 @@ module Sunshine
       end
 
 
-      if message
-        Sunshine.logger.info(:app, message, &block)
+      with_session options do
+        if message
+          Sunshine.logger.info(:app, message, &block)
 
-      else
-        block.call
+        else
+          block.call
+        end
       end
     end
 
@@ -927,11 +929,13 @@ module Sunshine
     # already exists. Supports all App#find options.
 
     def with_session options=nil
-      prev_connection = connected? options
+
+      prev_connection = connected?(options)
       connect options unless prev_connection
 
       yield
 
+    ensure
       disconnect options unless prev_connection
     end
 

data/lib/sunshine/daemon.rb

@@ -285,7 +285,7 @@ module Sunshine
     # Get the command to check if the daemon is running.
 
     def status_cmd
-      @status_cmd || "test -f #{@pid}"
+      @status_cmd || "test -f #{@pid} && kill -0 $(cat #{@pid})"
     end
 
 
@@ -425,7 +425,7 @@ module Sunshine
               :flags => '--chmod=ugo=rwx'
 
 
-            cmd = sa.shell.sudo_cmd script_file, sudo
+            cmd = sa.shell.sudo_cmd "#{@app.root_path}/env #{script_file}", sudo
 
             sa.scripts[script.to_sym] << [*cmd].join(" ")
           end

data/lib/sunshine/daemons/apache.rb

@@ -9,6 +9,8 @@ module Sunshine
 
   class Apache < Server
 
+    attr_accessor :rails_base_uri
+
     def initialize app, options={}
       super
 
@@ -21,6 +23,8 @@ module Sunshine
 
       @connections = options[:connections] || 256
 
+      @rails_base_uri = options[:rails_base_uri]
+
       @timeout = 1 if @timeout < 1
 
       @dep_name = options[:dep_name] ||
@@ -35,7 +39,7 @@ module Sunshine
 
     def setup
       super do |server_app, binder|
-        binder.set :max_clients, @max_clients
+        binder.set :rails_base_uri, @rails_base_uri
         yield(server_app, binder) if block_given?
       end
     end

data/lib/sunshine/daemons/server.rb

@@ -79,13 +79,7 @@ module Sunshine
     # 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}")
+      shell.call "passenger-config --root"
     end
 
 

data/lib/sunshine/dependencies.rb

@@ -20,8 +20,6 @@ Sunshine.dependencies do
   apt 'nginx'
   yum 'nginx'
 
-  apt 'logrotate'
-  yum 'logrotate'
 
   apt 'ruby', :pkg => 'ruby-full'
   yum 'ruby'
@@ -29,33 +27,9 @@ Sunshine.dependencies do
   apt 'ruby-devel', :pkg => 'ruby-dev'
   yum 'ruby-devel'
 
-  apt 'irb'
-  yum 'irb', :pkg => 'ruby-irb'
 
-  apt 'rubygems' do
-    requires 'ruby', 'ruby-devel'
-  end
-  yum 'rubygems' do
-    requires 'ruby', 'ruby-devel'
-  end
-
-  apt 'logrotate'
-  yum 'logrotate'
-
-  apt 'curl-devel', :pkg => 'libcurl-dev'
-  yum 'curl-devel'
-
-  apt 'libxml2-devel', :pkg => 'libxml2-dev'
-  yum 'libxml2-devel'
-
-  apt 'libxslt-devel', :pkg => 'libxslt-dev'
-  yum 'libxslt-devel'
-
-  apt 'sqlite', :pkg => 'sqlite3'
-  yum 'sqlite'
-
-  apt 'sqlite-devel', :pkg => 'libsqlite3-dev'
-  yum 'sqlite-devel'
+  apt 'rubygems', :requires => ['ruby', 'ruby-devel']
+  yum 'rubygems', :requires => ['ruby', 'ruby-devel']
 
 
   ##
@@ -117,8 +91,6 @@ Sunshine.dependencies do
 
   gem 'bundler', :version => ">=0.9"
 
-  gem 'isolate', :version => ">=1.3.0"
-
   gem 'rake', :version => ">=0.8"
 
   gem 'geminstaller', :version => ">=0.5"

data/lib/sunshine/dependency_lib.rb

@@ -47,6 +47,34 @@ module Sunshine
     end
 
 
+    ##
+    # Registers a new dependency class, creates its constructor method
+    # (DependencyLib#[dep_class.short_name]).
+
+    def self.register_type dep_class
+      class_eval <<-STR, __FILE__, __LINE__ + 1
+
+        def #{dep_class.short_name}(name, options={}, &block)
+          dep = #{dep_class}.new(name, options.merge(:tree => self), &block)
+          self.add dep
+          dep
+        end
+      STR
+
+      dependency_types << dep_class
+    end
+
+
+    ##
+    # Define if sudo should be used
+
+    def self.sudo= value
+      dependency_types.each do |dep_class|
+        dep_class.sudo = value
+      end
+    end
+
+
     attr_reader :dependencies
 
     def initialize
@@ -186,15 +214,5 @@ module Sunshine
         dep.send method, options
       end
     end
-
-
-    ##
-    # Define if sudo should be used
-
-    def self.sudo= value
-      dependency_types.each do |dep_class|
-        dep_class.sudo = value
-      end
-    end
   end
 end

data/lib/sunshine/package_managers/dependency.rb

@@ -317,8 +317,13 @@ module Sunshine
     end
 
 
-    def self.short_class_name str
-      str.to_s.split(":").last
+    ##
+    # Returns an underscored short version of the class name:
+    #   Sunshine::Yum.short_name
+    #   #=> "yum"
+
+    def self.short_name
+      @short_name ||= underscore self.name.to_s.split(":").last
     end
 
 
@@ -328,19 +333,13 @@ module Sunshine
     end
 
 
-    def self.inherited(subclass)
-      class_name  = short_class_name subclass.to_s
-      method_name = underscore class_name
-
-      DependencyLib.class_eval <<-STR, __FILE__, __LINE__ + 1
-      def #{method_name}(name, options={}, &block)
-        dep = #{class_name}.new(name, options.merge(:tree => self), &block)
-        self.add dep
-        dep
-      end
-      STR
+    ##
+    # Auto register the new Dependency class with DependencyLib and ServerApp
+    # when inherited.
 
-      DependencyLib.dependency_types << subclass
+    def self.inherited subclass
+      DependencyLib.register_type subclass
+      ServerApp.register_dependency_type subclass
     end
 
     inherited self

data/lib/sunshine/remote_shell.rb

@@ -212,8 +212,6 @@ module Sunshine
     end
 
 
-    private
-
     ##
     # Figure out which rsync flags to use.
 

data/lib/sunshine/repo.rb

@@ -22,7 +22,7 @@ module Sunshine
       # Turn Sunshine::ScmNameRepo into :scm_name
       class_key = subclass.to_s.split("::").last
       class_key = $1 if class_key =~ /(\w+)Repo$/
-      class_key.gsub! /([a-z0-9])([A-Z])/, '\1_\2'
+      class_key.gsub!(/([a-z0-9])([A-Z])/, '\1_\2')
       class_key = class_key.downcase
 
       @@repo_types[class_key] = subclass

data/lib/sunshine/server_app.rb

@@ -47,6 +47,33 @@ module Sunshine
     end
 
 
+    ##
+    # Creates dependency instance methods such as gem_install, yum_install, etc
+    # on both App and ServerApp classes.
+
+    def self.register_dependency_type dep_class
+      class_eval <<-STR, __FILE__, __LINE__ + 1
+        def #{dep_class.short_name}_install(*names)
+          options = Hash === names.last ? names.delete_at(-1) : Hash.new
+
+          names.each do |name|
+            dep = #{dep_class}.new(name, options)
+            dep.install! :call => @shell
+          end
+        end
+      STR
+
+      App.class_eval <<-STR, __FILE__, __LINE__ + 1
+        def #{dep_class.short_name}_install(*names)
+          options = names.last if Hash === names.last
+          with_server_apps options,
+            :msg  => "Installing #{dep_class.short_name} packages",
+            :send => [:#{dep_class.short_name}_install, *names]
+        end
+      STR
+    end
+
+
     app_attr :name, :deploy_name
     app_attr :root_path, :checkout_path, :current_path
     app_attr :deploys_path, :log_path, :shared_path
@@ -193,7 +220,7 @@ module Sunshine
 
 
     ##
-    # Returns information about the deploy at hand.
+    # Builds a hash with information about the deploy at hand.
 
     def get_deploy_info
       { :deployed_at => Time.now.to_s,
@@ -231,33 +258,22 @@ module Sunshine
 
     ##
     # Check if this server app includes the specified roles:
+    #   server_app.has_roles? :web
+    #   server_app.has_roles? [:web, :app]
+    #
+    # The boolean operator may be changed to OR by passing true as the
+    # second argument:
+    #   server_app.roles = [:web, :app]
+    #   server_app.has_roles? [:web, :db]         #=> false
+    #   server_app.has_roles? [:web, :db], true   #=> true
 
-    def has_roles? *roles
-      return true if @roles.include? :all
-
-      roles.each do |role|
-        return false unless @roles.include? role
-      end
-
-      true
-    end
-
-
-    %w{gem yum apt}.each do |dep_type|
-      self.class_eval <<-STR, __FILE__, __LINE__ + 1
-        ##
-        # Install one or more #{dep_type} packages.
-        # See #{dep_type.capitalize}#new for supported options.
+    def has_roles? roles, match_any=false
+      roles = [*roles]
 
-        def #{dep_type}_install(*names)
-          options = Hash === names.last ? names.delete_at(-1) : Hash.new
+      return true                     if @roles.include? :all
+      return !(roles & @roles).empty? if match_any
 
-          names.each do |name|
-            dep = #{dep_type.capitalize}.new(name, options)
-            dep.install! :call => @shell
-          end
-        end
-      STR
+      (roles & @roles).length == roles.length
     end
 
 

data/lib/sunshine/shell.rb

@@ -7,11 +7,7 @@ module Sunshine
 
     include Open4
 
-    class TimeoutError < FatalDeployError; end
-
-    ##
-    # Time to wait with no activity until giving up on a command.
-    TIMEOUT = 120
+    class TimeoutError < CriticalDeployError; end
 
     LOCAL_USER = `whoami`.chomp
     LOCAL_HOST = `hostname`.chomp
@@ -20,7 +16,7 @@ module Sunshine
     SUDO_PROMPT = /^Password:/
 
     attr_reader :user, :host, :password, :input, :output, :mutex
-    attr_accessor :env, :sudo
+    attr_accessor :env, :sudo, :timeout
 
     def initialize output = $stdout, options={}
       @output = output
@@ -35,6 +31,8 @@ module Sunshine
       @env      = options[:env] || {}
       @password = options[:password]
 
+      @timeout = options[:timeout] || Sunshine.timeout
+
       @cmd_activity = nil
 
       @mutex = nil
@@ -153,7 +151,8 @@ module Sunshine
     # Prompt the user for a password
 
     def prompt_for_password
-      @password = ask("#{@user}@#{@host} Password:") do |q|
+      host_info = [@user, @host].compact.join("@")
+      @password = ask("#{host_info} Password:") do |q|
         q.echo = false
       end
     end
@@ -165,7 +164,7 @@ module Sunshine
     def env_cmd cmd, env_hash=@env
       if env_hash && !env_hash.empty?
         env_vars = env_hash.map{|e| e.join("=")}
-        cmd = ["env", env_vars, cmd]
+        cmd = ["env", env_vars, cmd].flatten
       end
       cmd
     end
@@ -236,7 +235,8 @@ module Sunshine
     ##
     # Checks if timeout occurred.
 
-    def timed_out? start_time=@cmd_activity, max_time=TIMEOUT
+    def timed_out? start_time=@cmd_activity, max_time=@timeout
+      return unless max_time
       Time.now.to_i - start_time.to_i > max_time
     end
 

data/templates/apache/apache.conf.erb

@@ -39,11 +39,15 @@ NameVirtualHost *:<%= port %>
 
   DocumentRoot <%= expand_path app.current_path %>/public
 
-  <Directory <%= app.current_path %>/public>
+  <Directory <%= expand_path app.current_path %>/public>
+    Options FollowSymLinks -MultiViews
+    AllowOverride None
+    Order allow,deny
     Allow from all
-    Options -MultiViews
   </Directory>
 
+  <%= "RailsBaseURI #{rails_base_uri}" if rails_base_uri %>
+
   <% unless App === target -%>
 
   <Proxy balancer://<%= proxy_name %>>

data/templates/sunshine/middleware/health.rb

@@ -11,7 +11,7 @@ module Sunshine
     ##
     # The healthcheck-enabled file.
 
-    HEALTHCHECK_FILE = 'health.enabled'
+    HEALTHCHECK_FILE = '../../health.enabled'
 
 
     ##

data/templates/sunshine/sunshine.rake

@@ -1,5 +1,3 @@
-require 'sunshine'
-
 namespace :sunshine do
 
   ##
@@ -8,8 +6,10 @@ namespace :sunshine do
   #     ...
   #   end
 
-  desc "Instantiate Sunshine"
+  desc "Instantiate app"
   task :app do
+    require 'sunshine'
+
     deploy_env = ENV['env'] || ENV['RACK_ENV'] || ENV['RAILS_ENV']
 
     Sunshine.setup 'deploy_env' => ( deploy_env || "development" )
@@ -29,18 +29,6 @@ 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.
@@ -52,8 +40,36 @@ namespace :sunshine do
       #   unicorn.setup
 
     end
+  end
+
 
-    @app.start :force => true
+  desc "Sets up deploy servers"
+  task :setup => :app do
+    Sunshine.setup 'trace' => true
+
+    # Setup servers here
+    #
+    #   @app.with_filter :role => :app do |app|
+    #     app.yum_install 'libxml2', 'libxml2-devel'
+    #     app.gem_install 'mechanize'
+    #   end
+    #
+    #   @app.with_filter :role => :db do |app|
+    #     app.yum_install 'sqlite'
+    #     app.gem_install 'sqlite3'
+    #   end
+    #
+    # 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.with_filter :role => :app do |app|
+    #       app.yum_install 'libxml2', 'libxml2-devel'
+    #       app.gem_install 'mechanize'
+    #     end
+    #     ...
+    #   end
   end
 
 

data/test/unit/test_app.rb

@@ -10,7 +10,8 @@ class TestApp < Test::Unit::TestCase
       :name => "app_name",
       :remote_checkout => true,
       :repo => {:type => "svn", :url => @svn_url},
-      :remote_shells => ["user@some_server.com"],
+      :remote_shells => ["user@some_server.com",
+        ["server2.com", {:roles => "web db"}]],
       :root_path => "/usr/local/my_user/app_name"}
 
     @app = Sunshine::App.new @config
@@ -343,7 +344,6 @@ class TestApp < Test::Unit::TestCase
 
     @app.install_deps 'rake', bundler_dep
 
-
     each_remote_shell do |ds|
       [rake_dep, bundler_dep].each do |dep|
 
@@ -486,6 +486,28 @@ class TestApp < Test::Unit::TestCase
   end
 
 
+  def test_threaded_each_errors
+    err_host = "some_server.com"
+    finished = 0
+
+    @app.threaded_each do |server_app|
+      if server_app.shell.host == err_host
+        raise Sunshine::CriticalDeployError, server_app.shell.host
+      else
+        finished = finished.next
+      end
+    end
+
+    raise "Didn't raise threaded error when it should have"
+
+  rescue Sunshine::CriticalDeployError => e
+    host = @app.server_apps.first.shell.host
+
+    assert_equal host, e.message
+    assert_equal (@app.server_apps.length - 1), finished
+  end
+
+
   def test_upload_tasks
     path = "/path/to/tasks"
 
@@ -493,15 +515,17 @@ class TestApp < Test::Unit::TestCase
       :host => 'some_server.com',
       :remote_path => path
 
-    each_remote_shell do |ds|
-      assert_ssh_call "mkdir -p /path/to/tasks"
+    shell = @app.find(:host => 'some_server.com').first.shell
 
-      %w{common tpkg}.each do |task|
-        from = "#{Sunshine::ROOT}/templates/tasks/#{task}.rake"
-        to   = "#{ds.host}:#{path}/#{task}.rake"
+    use_remote_shell shell
 
-        assert_rsync from, to
-      end
+    assert_ssh_call "mkdir -p /path/to/tasks"
+
+    %w{common tpkg}.each do |task|
+      from = "#{Sunshine::ROOT}/templates/tasks/#{task}.rake"
+      to   = "#{shell.host}:#{path}/#{task}.rake"
+
+      assert_rsync from, to
     end
   end
 
@@ -527,6 +551,21 @@ class TestApp < Test::Unit::TestCase
   end
 
 
+  def test_with_filter
+    app = Sunshine::App.new :repo => {:type => "svn", :url => @svn_url},
+            :remote_shells => ["user@server1.com", "user@server2.com"]
+
+    assert_equal 2, app.server_apps.length
+
+    app.with_filter :host => 'server1.com' do |app|
+      assert_equal 1, app.server_apps.length
+      assert_equal 'server1.com', app.server_apps.first.shell.host
+    end
+
+    assert_equal 2, app.server_apps.length
+  end
+
+
   def test_sudo_assignment
     @app.sudo = "someuser"
 
@@ -545,10 +584,8 @@ class TestApp < Test::Unit::TestCase
     assert_equal attr_hash[:root_path], app.root_path
 
     attr_hash[:remote_shells].each_with_index do |server_def, i|
-      server_def = server_def.first if Array === server_def
-      user, host = server_def.split("@")
-      assert_equal host, app.server_apps[i].shell.host
-      assert_equal user, app.server_apps[i].shell.user
+      shell = Sunshine::RemoteShell.new(*server_def)
+      assert_equal shell, app.server_apps[i].shell
     end
   end
 

data/test/unit/test_nginx.rb

@@ -10,27 +10,16 @@ class TestNginx < Test::Unit::TestCase
 
     @passenger = Sunshine::Nginx.new @app
     @nginx = Sunshine::Nginx.new @app, :port => 5000, :point_to => @passenger
-    @gemout = <<-STR
 
-*** LOCAL GEMS ***
+    @passenger_root = "/Library/Ruby/Gems/1.8/gems/passenger-2.2.11"
 
-passenger (2.2.4)
-    Author: Phusion - http://www.phusion.nl/
-    Rubyforge: http://rubyforge.org/projects/passenger
-    Homepage: http://www.modrails.com/
-    Installed at: /Library/Ruby/Gems/1.8
-
-    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"
+    @nginx_passenger_check = "#{@passenger_root}/ext/nginx"
   end
 
 
   def test_cmd
     ds = @nginx.app.server_apps.first.shell
-    ds.set_mock_response 0, "gem list passenger -d" => [:out, @gemout]
+    ds.set_mock_response 0, "passenger-config --root" => [:out, @passenger_root]
 
     @nginx.start
     @nginx.stop
@@ -42,7 +31,7 @@ passenger (2.2.4)
 
   def test_custom_sudo_cmd
     ds = @nginx.app.server_apps.first.shell
-    ds.set_mock_response 0, "gem list passenger -d" => [:out, @gemout]
+    ds.set_mock_response 0, "passenger-config --root" => [:out, @passenger_root]
 
     @nginx.sudo = "someuser"
 
@@ -70,14 +59,13 @@ 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],
-      "nginx -V 2>&1" => [:out, @nginx_passenger_check]
+    ds.set_mock_response 0, "passenger-config --root" => [:out, @passenger_root]
+    ds.set_mock_response 0, "nginx -V 2>&1" => [:out, @nginx_passenger_check]
 
     @passenger.setup do |ds, binder|
       assert binder.sudo
       assert binder.use_passenger?
-      assert_equal "/Library/Ruby/Gems/1.8/gems/passenger-2.2.4",
+      assert_equal "/Library/Ruby/Gems/1.8/gems/passenger-2.2.11",
         binder.passenger_root
     end
   end
@@ -85,12 +73,12 @@ passenger (2.2.4)
 
   def test_setup
     ds = @nginx.app.server_apps.first.shell
-    ds.set_mock_response 0, "gem list passenger -d" => [:out, @gemout]
+    ds.set_mock_response 0, "passenger-config --root" => [:out, @passenger_root]
 
     @nginx.setup do |ds, binder|
       assert !binder.sudo
       assert !binder.use_passenger?
-      assert_equal "/Library/Ruby/Gems/1.8/gems/passenger-2.2.4",
+      assert_equal "/Library/Ruby/Gems/1.8/gems/passenger-2.2.11",
         binder.passenger_root
     end
   end

data/test/unit/test_server.rb

@@ -231,7 +231,7 @@ class TestServer < Test::Unit::TestCase
 
     server.each_server_app do |sa|
       %w{start stop restart status}.each do |script|
-        script_file = "#{server.config_path}/#{script}"
+        script_file = "#{@app.root_path}/env #{server.config_path}/#{script}"
         cmd = sa.shell.sudo_cmd script_file, server.send(:pick_sudo, sa.shell)
 
         assert sa.scripts[script.to_sym].include?(cmd.join(" "))

data/test/unit/test_server_app.rb

@@ -169,6 +169,23 @@ class TestServerApp < Test::Unit::TestCase
   end
 
 
+  def test_has_all_roles
+    assert @sa.has_roles?([:web, :app, :blarg])
+    assert @sa.has_roles?([:web, :app, :blarg], true)
+  end
+
+
+  def test_has_roles
+    @sa.roles = [:web, :app]
+
+    assert @sa.has_roles?(:web)
+    assert @sa.has_roles?([:web, :app])
+
+    assert !@sa.has_roles?([:blarg, :web, :app])
+    assert @sa.has_roles?([:blarg, :web, :app], true)
+  end
+
+
   def test_install_deps
     nginx_dep = Sunshine.dependencies.get 'nginx', :prefer => @sa.pkg_manager
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Jeremie Castagna
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-06 00:00:00 -07:00
+date: 2010-04-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,9 +108,9 @@ files:
 - README.txt
 - Rakefile
 - bin/sunshine
-- examples/deploy.rb
 - examples/deploy_tasks.rake
 - examples/standalone_deploy.rb
+- examples/sunshine_deploy.rb
 - lib/commands/add.rb
 - lib/commands/default.rb
 - lib/commands/list.rb