sunshine 1.2.2 → 1.2.3

data/lib/sunshine/binder.rb

@@ -1,8 +1,7 @@
 module Sunshine
 
   ##
-  # Instantiated per deploy server and used to pass bindings to the config's
-  # ERB build method:
+  # Create a selective binding. Useful for controlling ERB builds:
   #   binder.set :server_name, "blah.com"
   #   binder.forward :server_method, ...
   #   binder.get_binding

data/lib/sunshine/daemon.rb

@@ -14,7 +14,7 @@ module Sunshine
     START_FAILED_CODE   = 10
     STOP_FAILED_CODE    = 11
     RESTART_FAILED_CODE = 12
-    STATUS_DOWN_CODE  = 13
+    STATUS_DOWN_CODE    = 13
 
     ##
     # Returns an array of method names to assign to the binder

data/lib/sunshine/daemons/apache.rb

@@ -14,7 +14,7 @@ module Sunshine
     def initialize app, options={}
       super
 
-      @bin = options[:bin] || 'apachectl'
+      @bin = options[:bin] || 'apache2ctl'
 
       @sigkill = 'WINCH'
 

data/lib/sunshine/remote_shell.rb

@@ -37,7 +37,7 @@ module Sunshine
     end
 
 
-    attr_reader :host, :user, :pid
+    attr_reader :host, :user, :parent_pid
     attr_accessor :ssh_flags, :rsync_flags
 
 
@@ -69,7 +69,7 @@ module Sunshine
       @ssh_flags.concat ["-l", @user] if @user
       @ssh_flags.concat [*options[:ssh_flags]] if options[:ssh_flags]
 
-      @pid, @inn, @out, @err = nil
+      @parent_pid = nil
 
       self.class.register self
     end
@@ -94,15 +94,15 @@ module Sunshine
 
       cmd = ssh_cmd quote_cmd(LOGIN_LOOP), :sudo => false
 
-      @pid, @inn, @out, @err = popen4 cmd.join(" ")
-      @inn.sync = true
+      @parent_pid, inn, out, err = popen4 cmd.join(" ")
+      inn.sync = true
 
       data  = ""
       ready = nil
       start_time = Time.now.to_i
 
-      until ready || @out.eof?
-        data << @out.readpartial(1024)
+      until ready || out.eof?
+        data << out.readpartial(1024)
         ready = data =~ /ready/
 
         raise TimeoutError if timed_out?(start_time, LOGIN_TIMEOUT)
@@ -114,8 +114,11 @@ module Sunshine
         raise ConnectionError, "Can't connect to #{host_info}"
       end
 
-      @inn.close
-      @pid
+      inn.close rescue nil
+      out.close rescue nil
+      err.close rescue nil
+
+      @parent_pid
     end
 
 
@@ -123,7 +126,7 @@ module Sunshine
     # Check if SSH session is open and returns process pid
 
     def connected?
-      Process.kill(0, @pid) && @pid rescue false
+      Process.kill(0, @parent_pid) && @parent_pid rescue false
     end
 
 
@@ -131,13 +134,8 @@ module Sunshine
     # Disconnect from host
 
     def disconnect
-      @inn.close rescue nil
-      @out.close rescue nil
-      @err.close rescue nil
-
-      kill_process @pid, "HUP" rescue nil
-
-      @pid = nil
+      kill_process @parent_pid, "HUP" rescue nil
+      @parent_pid = nil
     end
 
 

data/lib/sunshine/repos/git_repo.rb

@@ -100,7 +100,7 @@ module Sunshine
     end
 
 
-    NAME_MATCH = /\/([^\/]+)\.git/
+    NAME_MATCH = /\/([^\/]+)(\/?)\.git/
 
     def name
       @url.match(NAME_MATCH)[1]

data/lib/sunshine/server_app.rb

@@ -95,7 +95,7 @@ module Sunshine
     app_attr :root_path, :checkout_path, :current_path
     app_attr :deploys_path, :log_path, :shared_path, :scripts_path
 
-    attr_accessor :app, :roles, :scripts, :info, :shell, :crontab, :health
+    attr_accessor :app, :roles, :scripts, :info, :shell, :crontab
     attr_writer :pkg_manager
 
     ##
@@ -131,7 +131,6 @@ module Sunshine
                end
 
       @crontab = Crontab.new name, @shell
-      @health  = Healthcheck.new shared_path, @shell
 
       @all_deploy_names = nil
       @previous_deploy_name = nil
@@ -180,7 +179,7 @@ module Sunshine
         write_script name, bash
       end
 
-      symlink_scripts_to_root
+      symlink_scripts_to_root @scripts.keys, "env"
     end
 
 
@@ -222,6 +221,7 @@ module Sunshine
 
     def deploy_details reload=false
       return @deploy_details if @deploy_details && !reload
+
       @deploy_details =
         YAML.load @shell.call("cat #{self.root_path}/info") rescue nil
 
@@ -259,7 +259,7 @@ module Sunshine
     # Builds a hash with information about the deploy at hand.
 
     def get_deploy_info
-      { :deployed_at => Time.now.to_s,
+      { :deployed_at => @shell.call("date"),
         :deployed_as => @shell.call("whoami"),
         :deployed_by => Sunshine.shell.user,
         :deploy_name => File.basename(self.checkout_path),
@@ -272,29 +272,6 @@ module Sunshine
     end
 
 
-    ##
-    # Decrypt a file using gpg. Allows options:
-    # :output:: str - the path the output file should go to
-    # :passphrase:: str - the passphrase gpg should use
-
-    def gpg_decrypt gpg_file, options={}
-      output_file     = options[:output] || gpg_file.gsub(/\.gpg$/, '')
-
-      passphrase      = options[:passphrase]
-      passphrase_file = "#{self.root_path}/tmp/gpg_passphrase"
-
-      gpg_cmd = "gpg --batch --no-tty --yes --output #{output_file} "+
-        "--passphrase-file #{passphrase_file} --decrypt #{gpg_file}"
-
-      @shell.call "mkdir -p #{File.dirname(passphrase_file)}"
-
-      @shell.make_file passphrase_file, passphrase
-
-      @shell.call "cd #{self.checkout_path} && #{gpg_cmd}"
-      @shell.call "rm -f #{passphrase_file}"
-    end
-
-
     ##
     # Check if this server app includes the specified roles:
     #   server_app.has_roles? :web
@@ -418,7 +395,7 @@ fi
     # Adds the app to the deploy server's deployed-apps list
 
     def register_as_deployed
-      AddCommand.exec self.root_path, 'servers' => [@shell]
+      AddCommand.exec "#{self.name}:#{self.root_path}", 'servers' => [@shell]
     end
 
 
@@ -523,7 +500,7 @@ fi
     def run_script! name, options=nil, &block
       options ||= {}
 
-      script_path = File.join self.root_path, name.to_s
+      script_path = File.join self.scripts_path, name.to_s
       @shell.call script_path, options, &block
     end
 
@@ -638,15 +615,13 @@ fi
 
 
     ##
-    # Creates a symlink of every script in the scripts_path dir in the
+    # Creates a symlink of every script_name from the scripts_path dir to the
     # app's root directory for easy access.
 
-    def symlink_scripts_to_root
-      scripts = @shell.call("ls -1 #{self.scripts_path}").split("\n")
-
-      scripts.each do |name|
-        script_file = File.join self.scripts_path, name
-        pointer_file = File.join self.root_path, name
+    def symlink_scripts_to_root *script_names
+      script_names.flatten.each do |name, val|
+        script_file  = File.join self.scripts_path, name.to_s
+        pointer_file = File.join self.root_path, name.to_s
 
         @shell.symlink script_file, pointer_file
       end
@@ -669,45 +644,6 @@ fi
     end
 
 
-    ##
-    # Upload common rake tasks from a local path or the sunshine lib.
-    #   app.upload_tasks
-    #     #=> upload all tasks
-    #   app.upload_tasks 'app', 'common', ...
-    #     #=> upload app and common rake files
-    #
-    # File paths may also be used instead of the file's base name but
-    # directory structures will not be followed:
-    #   app.upload_tasks 'lib/common/app.rake', 'lib/do_thing.rake'
-    #
-    # Allows options:
-    # :local_path:: str - the path to get rake tasks from
-    # :remote_path:: str - the remote absolute path to upload the files to
-
-    def upload_tasks *files
-      options     = Hash === files[-1] ? files.delete_at(-1) : {}
-      remote_path = options[:remote_path] || "#{self.checkout_path}/lib/tasks"
-      local_path  = options[:local_path] || "#{Sunshine::ROOT}/templates/tasks"
-
-      @shell.call "mkdir -p #{remote_path}"
-
-      files.map! do |file|
-        if File.basename(file) == file
-          File.join(local_path, "#{file}.rake")
-        else
-          file
-        end
-      end
-
-      files = Dir.glob("#{Sunshine::ROOT}/templates/tasks/*") if files.empty?
-
-      files.each do |file|
-        remote_file = File.join remote_path, File.basename(file)
-        @shell.upload file, remote_file
-      end
-    end
-
-
     ##
     # Write an executable bash script to the app's scripts dir
     # on the deploy server, and symlink them to the root dir.
@@ -738,7 +674,7 @@ fi
       @shared_path   = "#{@root_path}/shared"
       @log_path      = "#{@shared_path}/log"
       @checkout_path = "#{@deploys_path}/#{@deploy_name}"
-      @scripts_path  = "#{@checkout_path}/sunshine_scripts"
+      @scripts_path  = "#{@current_path}/script"
     end
   end
 end

data/lib/sunshine/shell.rb

@@ -25,7 +25,7 @@ module Sunshine
     self.sudo_failed_matcher = /^Sorry, try again./
     self.sudo_prompt_matcher = /^Password:/
 
-    attr_reader :user, :host, :password, :input, :output, :mutex
+    attr_reader :user, :host, :password, :input, :output, :mutex, :pid
     attr_accessor :env, :sudo, :timeout
 
     def initialize output = $stdout, options={}
@@ -42,8 +42,9 @@ module Sunshine
       @password = options[:password]
 
       @timeout = options[:timeout] || Sunshine.timeout
+      @idle_time = options[:idle_after] || 1
 
-      @mutex = nil
+      @mutex = @pid = nil
     end
 
 
@@ -149,6 +150,31 @@ module Sunshine
     end
 
 
+    ##
+    # Checks if timeout occurred.
+
+    def timed_out? start_time=@cmd_activity, max_time=@timeout
+      return unless max_time
+      Time.now.to_f - start_time.to_f > max_time
+    end
+
+
+    ##
+    # Update the time of the last command activity
+
+    def update_activity
+      @cmd_activity = Time.now
+    end
+
+
+    ##
+    # Checks if shell is still receiving data.
+
+    def idle? start_time=@cmd_activity, max_time=@idle_time
+      timed_out? start_time, max_time
+    end
+
+
     ##
     # Start an interactive shell with preset permissions and env.
     # Optionally pass a command to be run first.
@@ -273,15 +299,6 @@ module Sunshine
     end
 
 
-    ##
-    # Checks if timeout occurred.
-
-    def timed_out? start_time, max_time=@timeout
-      return unless max_time
-      Time.now.to_i - start_time.to_i > max_time
-    end
-
-
     ##
     # Execute a block while setting the shell's mutex.
     # Sets the mutex to its original value on exit.
@@ -336,29 +353,28 @@ module Sunshine
 
     def execute cmd
       cmd = [cmd] unless Array === cmd
-      pid, inn, out, err = popen4(*cmd)
+      @pid, inn, out, err = popen4(*cmd)
 
       inn.sync = true
       log_methods = {out => :debug, err => :error}
 
-      result, status = process_streams(pid, out, err) do |stream, data|
+      result, status = process_streams(@pid, out, err) do |stream, data|
         stream_name = :out if stream == out
         stream_name = :err if stream == err
         stream_name = :inn if stream == inn
 
+        Sunshine.logger.send log_methods[stream],
+          "#{@host}:#{stream_name}", data
 
         # User blocks should run with sync threads to avoid badness.
         sync do
-          Sunshine.logger.send log_methods[stream],
-            "#{@host}:#{stream_name}", data
-
           yield(stream_name, data, inn) if block_given?
         end
 
 
         if password_required?(stream_name, data) then
 
-          kill_process(pid) unless Sunshine.interactive?
+          kill_process(@pid) unless Sunshine.interactive?
 
           send_password_to_stream(inn, data)
         end
@@ -372,6 +388,7 @@ module Sunshine
       inn.close rescue nil
       out.close rescue nil
       err.close rescue nil
+      @pid = nil
     end
 
 
@@ -405,7 +422,7 @@ module Sunshine
 
     def process_streams pid, *streams
       result = Hash.new{|h,k| h[k] = []}
-      start_time = Time.now
+      update_activity
 
       # Handle process termination ourselves
       status = nil
@@ -417,13 +434,14 @@ module Sunshine
         # don't busy loop
         selected, = select streams, nil, nil, 0.1
 
-        raise TimeoutError if timed_out? start_time
+        puts "#{@host} IDLE..." if idle?
+        raise TimeoutError if timed_out?
 
         next if selected.nil? or selected.empty?
 
         selected.each do |stream|
 
-          start_time = Time.now
+          update_activity
 
           if stream.eof? then
             streams.delete stream if status # we've quit, so no more writing

data/templates/apache/apache.conf.erb

@@ -1,4 +1,3 @@
-LoadModule log_config_module modules/mod_log_config.so
 LoadModule authz_host_module modules/mod_authz_host.so
 
 ErrorLog    <%= expand_path log_file(:stderr) %>
@@ -25,7 +24,6 @@ MaxClients <%= connections %>
 
 <% if sudo == true || sudo == 'root' -%>
 User nobody
-Group nobody
 <% end -%>
 
 Listen <%= port %>

data/templates/sunshine/sunshine.rake

@@ -92,12 +92,6 @@ namespace :sunshine do
 
   # Post-deploy control tasks:
 
-  desc "Run db:migrate on remote :db servers"
-  task :db_migrate => :app do
-    @app.rake 'db:migrate', :role => :db
-  end
-
-
   desc "Run the remote start script"
   task :start => :app do
     @app.start
@@ -129,31 +123,4 @@ namespace :sunshine do
   task :info => :app do
     puts @app.deploy_details.to_yaml
   end
-
-
-  desc "Get the health state"
-  task :health => :app do
-    puts @app.health.to_yaml
-  end
-
-
-  namespace :health do
-
-    desc "Turn on health check"
-    task :enable => :app do
-      puts @app.health(:enable).to_yaml
-    end
-
-
-    desc "Turn off health check"
-    task :disable => :app do
-      puts @app.health(:disable).to_yaml
-    end
-
-
-    desc "Remove health check"
-    task :remove => :app do
-      puts @app.health(:remove).to_yaml
-    end
-  end
 end