freyr 0.4.2 → 0.5.0

data/.irbrc

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/lib/freyr.rb'
+Freyr.logger = Logger.new(STDOUT)
 include Freyr
 
 Service.add_file("Freyrfile")

data/Freyrfile

@@ -1,7 +1,21 @@
 service :sleep do
+  group :sleepers
+
+  also_as :short_sleep
+  start 'sleep 20'
+  # rvm 'ree-1.8.7-2011.03@foobar'
+
+  proc_match /sleep 20/
+end
+
+service :sleep2 do
+  requires :sleep, :sudosleep
   start 'sleep 20'
+  proc_match /sleep 20/
 end
 
 service :sudosleep do
+  group :sleepers
   start 'sudo sleep 20'
+  proc_match /sleep 20/
 end

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.5.0

data/bin/freyr

@@ -4,4 +4,6 @@ $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 require 'freyr'
 require 'freyr/cli'
 
+trap("SIGINT") { exit(false) }
+
 Freyr::CLI.start

data/lib/freyr/cli/helpers.rb

@@ -5,7 +5,7 @@ module Freyr
       super
       
       if options.trace?
-        Freyr.logger = Logger.new(STDOUT)
+        Freyr.logger.level = Logger::DEBUG
       end
       
       get_services
@@ -21,18 +21,19 @@ module Freyr
       
       groups_join = '|'
       
-      lengths = Service.s.collect do |s|
+      lengths = {}
+      Service.s.each do |name,s|
         n = "   #{s.name}(#{s.groups.join(groups_join)})"
         max_length = n.length if n.length > max_length
-        n.length
+        lengths[name] = n.length
       end
       
       max_length += 3 # min distance between name and group
       
       strs = []
-      Service.s.each_with_index do |s,i|
+      Service.s.each do |i,s|
         str = '  '
-        if s.sudo
+        if s.info.sudo
           str << set_color('*', :yellow)
         else
           str << ' '
@@ -86,11 +87,11 @@ module Freyr
         
         if args[:procinfo]
           begin
-            pid = s.command.pid
+            pid = s.pid_file.pid
             
             proc = ProcessInfo[pid]
             
-            str << " CPU: #{proc.pcpu}% - MEM: #{proc.mem_in_mb.to_i}mb" if proc
+            str << " CPU: #{proc.pcpu}% - MEM: #{proc.mem_in_mb.to_i}mb PID: #{pid}" if proc
           # rescue => e
           end
         end
@@ -108,24 +109,19 @@ module Freyr
     end
     
     def get_from_name name
-      group = ServiceGroup.new
-      
-      unless name
-        s = Service.s.find {|svc| svc.dir == Dir.pwd}
-        Freyr.logger.debug('getting service from directory') {"in #{Dir.pwd} found service: #{s.inspect}"}
-        return group << s if s
-      end
-      
-      if options.namespace && s = Service["#{options.namespace}:#{name}"].first
-        group << s # only pickng one because if it's namespaced it's not a group
+      if name
+        group = Service[name.to_sym]
+        Freyr.logger.debug('find service by name') {"#{name.to_sym} #{group.inspect}"}
+        group
       else
-        Service[name].each do |s|
-          group << s
+        if s = Service.by_dir[Dir.pwd]
+          Freyr.logger.debug('getting service from directory') {"in #{Dir.pwd} found service: #{s.inspect}"}
+        else
+          Freyr.logger.debug('getting service from directory') {"in #{Dir.pwd} unable to find any service"}
         end
+        
+        Service[s.name]
       end
-      
-      Freyr.logger.debug('getting service') {group.inspect}
-      group
     end
     
     def get_services

data/lib/freyr/cli/launching.rb

@@ -5,9 +5,9 @@ module Freyr
     desc 'start [SERVICE=dirname]', 'Start particular service'
     def start(name=nil)
       services = get_from_name(name)
-      if !services.empty?
+      if services && !services.empty?
         Freyr.logger.debug('starting services') {services.inspect}
-        names = services.collect {|s| s.name}
+        names = services.call_order.collect {|s| s.name}
         say "Starting the " << set_color(names.join(', '), :blue) << ' services'
         
         changed_names = services.run
@@ -15,15 +15,20 @@ module Freyr
         list_all_services(:highlight_state => changed_names).each {|l| say(l)}
       else
         say "Can't find the #{name} service", :red
+        exit(false)
       end
     rescue AdminRequired
       say "Please run in sudo to launch #{name}.", :red
+      exit(false)
+    rescue Service::MissingDependency => e
+      say "Missing dependency, could not launch service: #{e.to_s}"
+      exit(false)
     end
     
     desc 'stop [SERVICE=dirname]', 'Stop particular service'
     def stop(name=nil)
       services = get_from_name(name)
-      if !services.empty?
+      if services && !services.empty?
         Freyr.logger.debug('stopping services') {services.inspect}
         names = services.collect {|s| s.name}
         say "Stopping the " << set_color(names.join(', '), :blue) << ' services'
@@ -33,15 +38,17 @@ module Freyr
         list_all_services(:highlight_state => changed_names).each {|l| say(l)}
       else
         say "Can't find the #{name} service", :red
+        exit(false)
       end  
     rescue AdminRequired
       say "Please run in sudo to stop #{name}.", :red
+      exit(false)
     end
     
     desc 'restart [SERVICE=dirname]', 'restart particular service'
     def restart(name=nil)
       services = get_from_name(name)
-      if !services.empty?
+      if services && !services.empty?
         Freyr.logger.debug('restarting services') {services.inspect}
         say "Restarting the " << set_color(services.collect {|s| s.name}.join(', '), :blue) << ' services'
         
@@ -50,11 +57,13 @@ module Freyr
         list_all_services(:highlight_state => names).each {|l| say(l)}
       else
         say "Can't find the #{name} service", :red
+        exit(false)
       end
       
     rescue AdminRequired
       say "Please run in sudo to launch #{name}.", :red
+      exit(false)
     end
     
   end
-end
+end

data/lib/freyr/cli/management.rb

@@ -1,21 +1,21 @@
 module Freyr
   class CLI < Thor
     
-    desc 'update_pid [SERVICE=dirname]', 'Update pid from proc_match (good to use if service already launched)'
-    def update_pid(name=nil)
-      services = get_from_name(name)
-      if s = services.first
-        if pid = s.command.update_pid
-          say "Updated pid for "<< set_color(s.name,:blue) << ' to ' << set_color(pid,:red)
-        elsif s.proc_match
-          say "Couldn't find pid for process matcher #{s.proc_match.inspect}", :red
-        else
-          say "Service #{s.name} doesn't have a value for proc_match set.", :red
-        end
-      else
-        say "Couldn't find service with name #{name}.", :red
-      end
-    end
+    # desc 'update_pid [SERVICE=dirname]', 'Update pid from proc_match (good to use if service already launched)'
+    # def update_pid(name=nil)
+    #   services = get_from_name(name)
+    #   if s = services.first
+    #     if pid = s.command.update_pid
+    #       say "Updated pid for "<< set_color(s.name,:blue) << ' to ' << set_color(pid,:red)
+    #     elsif s.proc_match
+    #       say "Couldn't find pid for process matcher #{s.proc_match.inspect}", :red
+    #     else
+    #       say "Service #{s.name} doesn't have a value for proc_match set.", :red
+    #     end
+    #   else
+    #     say "Couldn't find service with name #{name}.", :red
+    #   end
+    # end
     
   end
 end

data/lib/freyr/command.rb

@@ -3,96 +3,22 @@ module Freyr
   class Command
     extend Forwardable
     
-    ROOT_PIDS = '/var/run/freyr'
-    USER_PIDS = File.expand_path('.freyr', '~')
+    attr_reader :name, :service
     
-    if !File.exist?(USER_PIDS)
-      Dir.mkdir(USER_PIDS)
-    elsif !File.directory?(USER_PIDS)
-      File.delete(USER_PIDS)
-      Dir.mkdir(USER_PIDS)
+    def initialize(service, command=nil, args = {})
+      @service = service
     end
-    
-    attr_reader :command, :name, :service
-    
-    def initialize(name, command=nil, args = {})
-      if name.is_a?(Service)
-        @service = name
-        @name = service.name
-        @command = service.start_command
-        @env = service.env
-      else
-        @name = name
-        @command = command
-        
-        @env = args[:env]
-      end
-    end
-    
-    def pid_file
-      path = File.join(file_dir,"#{@name}.pid")
-      if File.exist?(path)
-        path
-      else
-        File.join(file_dir(true),"#{@name}.pid")
-      end
-    end
-    
-    def file_dir(force_user = false)
-      return USER_PIDS if force_user
-      admin? ? ROOT_PIDS : USER_PIDS
-    end
-    
-    def read_pid
-      return unless File.exist?(pid_file)
-      p = File.open(pid_file).read
-      p ? p.to_i : nil
-    end
-    
-    def pid(force = false)
-      @pid = nil if force
-      @pid ||= read_pid
-    end
-    
-    def alive?
-      return unless pid
-      Process.getpgid(pid)
-      true
-    rescue Errno::ESRCH
-      retried = false unless defined?(retried)
-      
-      if !retried && @pid = pid_from_procname
-        save
-        retried = true
-        retry
-      end
-      
-      if pid(true)
-        File.delete(pid_file) unless admin? && !is_root?
-      end
-      
-      false
-    end
-    
-    def delete_if_dead
-      !alive?
-    end
-    
-    def save
-      if File.exist?(pid_file)
-        old_pid = read_pid
-        begin
-          Process.kill('KILL', old_pid) if old_pid && old_pid.to_s != @pid.to_s
-        rescue Errno::ESRCH
-        end
-      end
-      
-      File.open(pid_file, 'w') {|f| f.write(@pid)}
+
+    def_delegators :'@service', :info
+    def_delegators :info, :name, :env
+
+    def command
+      info.start
     end
     
     def run!
       return unless command
-      kill! if alive?
+      kill! if service.alive?
       
       require_admin
       
@@ -101,90 +27,31 @@ module Freyr
       pid = spawn(command)
       
       Freyr.logger.debug("attempting to run command") {command.inspect}
+      str = "\nStarting #{info.name} with #{command.inspect}"
+      OUT.puts '',"Starting #{info.name} with #{command.inspect}", '='*str.length
+      Process.detach(pid)
       
-      @pid = pid
-      
-      Process.detach(@pid)
-      
-      if proc_match
-        puts "Waiting for pid from match of #{proc_match.inspect}"
-        
-        start = Time.now
-        until (pid = pid_from_procname) || (Time.now-start) > 40
-          print '.'; STDOUT.flush
-          sleep(0.2)
-        end
-        
-        raise "\nCouldnt find pid after 40 seconds" unless pid
-        
-        puts '*'
-        
-        @pid = pid
-      end
+      pid = service.pid_file.wait_for_pid
       
-      puts "PID of new #{name} process is #{@pid}"
-      save
+      OUT.puts "PID of new #{info.name} process is #{pid}"
       
-      if ping
-        pinger = Pinger.new(self)
-        
-        puts '',"Waiting for response from #{pinger.url}"
+      if info.ping
+        pinger = Pinger.new(@service)
         
-        # Move this pinger code somewhere else
-        start = Time.now
-        begin
-          print '.'; STDOUT.flush
-          pinger.ping
-          sleep(0.6)
-        end until pinger.server_probably_launched? || (Time.now-start) > 40 || !alive?
-        
-        if alive?
-          
-          if pinger.response
-            puts '*',"Last response recieved with code #{pinger.response.code}"
-          else
-            puts 'x',"Couldn't reach #{name} service"
-          end
-        else
-          puts 'x', "Service died durring launch"
-        end
+        pinger.wait_for_resp { @service.alive? }
       end
       
-      if alive?
-        puts "Launch took about #{(Time.now-total_time).ceil} seconds"
-        
-        @pid
+      if @service.alive?
+        OUT.puts "Launch took about #{(Time.now-total_time).ceil} seconds"
+        pid
       else
-        puts "#{name} service wasn't launched correctly. For details see: #{log}"
-        delete_if_dead
-      end
-    end
-    
-    def update_pid
-      if @pid = pid_from_procname
-        save
-        @pid
-      end
-    end
-    
-    def pid_from_procname
-      return unless proc_match
-      
-      pids = `ps -eo pid,command`.split("\n").inject({}) do |r, pid|
-        if m = pid.match(/^\s*(\d+)\s(.+)$/)
-          r[m[2]] = m[1].to_i
-        end
-        r
-      end
-      
-      if procline = pids.keys.find {|p| p.match(proc_match)}
-        pids[procline]
+        OUT.puts "#{info.name} service wasn't launched correctly. For details see: #{info.log}"
       end
     end
     
     def kill!(sig=nil)
       require_admin
-      sig ||= stop_sig || 'KILL'
+      sig ||= info.stop_sig || 'KILL'
       
       Freyr.logger.debug("sending signal to process") {"Signal: #{sig}, PID: #{pid}"}
       
@@ -192,64 +59,71 @@ module Freyr
         Process.kill(sig, pid)
       end
     end
+
+    def pid force = false
+      @service.pid_file.pid(force)
+    end
     
     def restart!
       require_admin
       
-      if restart
+      if info.restart
         chdir
-        system(restart)
-        update_pid
-      elsif restart_sig
-        kill!(restart_sig)
+        system(info.restart)
+      elsif info.restart_sig
+        kill!(info.restart_sig)
       else
         run!
       end
     end
     
-    def admin?
-      sudo
-    end
-    
     private
     
     def require_admin
-      raise AdminRequired if admin? && !is_root?
-    end
-    
-    def is_root?
-      ENV['USER'] == 'root'
+      raise AdminRequired if info.sudo && !Freyr.is_root?
     end
     
     def chdir
-      Dir.chdir File.expand_path(dir||'/')
+      Dir.chdir File.expand_path(info.dir||'/')
     end
     
     def spawn(command)
+      if info.rvm && RVM.installed?
+        Freyr.logger.debug('attempting to set rvm') {info.rvm}
+        if RVM.installed?(info.rvm)
+          command = "rvm #{info.rvm} exec #{command}"
+          Freyr.logger.debug('changed command to') {command}
+        else
+          abort("must setup rvm correctly, run: rvm --install --create #{info.rvm}")
+        end
+      elsif info.rvm
+        Freyr.logger.debug("rvm not installed so can't switch to") {info.rvm}
+      end
+
       fork do
-        File.umask self.umask if self.umask
-        uid_num = Etc.getpwnam(self.uid).uid if uid
-        gid_num = Etc.getgrnam(self.gid).gid if gid
+        File.umask info.umask if info.umask
+        uid_num = Etc.getpwnam(info.uid).uid if info.uid
+        gid_num = Etc.getgrnam(info.gid).gid if info.gid
         
-        ::Dir.chroot(self.chroot) if self.chroot
+        ::Dir.chroot(info.chroot) if info.chroot
         ::Process.setsid
-        ::Process.groups = [gid_num] if self.gid
-        ::Process::Sys.setgid(gid_num) if self.gid
-        ::Process::Sys.setuid(uid_num) if self.uid
+        ::Process.groups = [info.guid] if info.gid
+        ::Process::Sys.setgid(info.guid) if info.gid
+        ::Process::Sys.setuid(info.guid) if info.uid
         chdir
         $0 = "freyr - #{name} (#{command})"
         STDIN.reopen "/dev/null"
-        if log_cmd
+        if info.log_cmd
           STDOUT.reopen IO.popen(log_cmd, "a")
-        elsif log && service.write_log?
-          STDOUT.reopen log, "a"
+        elsif info.log && !info.dont_write_log
+          STDOUT.reopen info.log, "a"
         else
           STDOUT.reopen "/dev/null"
         end
-        if err_log_cmd
-          STDERR.reopen IO.popen(err_log_cmd, "a") 
-        elsif err_log && (log_cmd || err_log != log)
-          STDERR.reopen err_log, "a"
+        if info.err_log_cmd
+          STDERR.reopen IO.popen(info.err_log_cmd, "a") 
+        elsif info.err_log && (info.log_cmd || info.err_log != info.log)
+          STDERR.reopen info.err_log, "a"
         else
           STDERR.reopen STDOUT
         end
@@ -263,18 +137,13 @@ module Freyr
           end
         end
         
-        exec(command) unless command.empty?
+        exec(command)
       end
     end
     
 
     class << self
       def add_service_method *methods
-        methods.each do |meth|
-          define_method(meth) do |*args|
-            @service.__send__(meth,*args) if @service
-          end
-        end
       end
     end
   end

data/lib/freyr/helpers.rb

@@ -0,0 +1,10 @@
+module Freyr
+  def is_root?
+    Process.euid == 0
+  end
+
+  def has_rvm?
+    ENV["rvm_loaded_flag"] == "1"
+  end
+  class Timeout < StandardError; end
+end

data/lib/freyr/pid_file.rb

@@ -0,0 +1,73 @@
+module Freyr
+  class PidFile
+    def initialize path, procname=nil
+      @path = path
+      @procname = procname
+    end
+
+    def process_info
+      @proces_info ||= ProcessInfo.new(@pid) if @pid
+    end
+
+    def alive?
+      return unless pid
+      Process.getpgid(pid)
+      true
+    rescue Errno::ESRCH
+      false
+    end
+
+    def pid_from_file
+      return unless File.exist?(@path)
+      p = File.open(@path).read.chomp
+      p ? p.to_i : nil
+    end
+
+    def pid force=false
+      if !force && File.exist?(@path)
+        pid_from_file
+      elsif @procname
+        pid_from_procname
+      else
+        pid_from_file
+      end
+    end
+
+    def pid_from_procname force=false
+      pids = PidFile.pid_command_hash(force)
+      
+      if procline = pids.keys.find {|p| p.match(@procname)}
+        pids[procline]
+      end
+    end
+
+    def wait_for_pid wait = 40, interval=0.2
+      OUT.puts "Waiting #{wait}s for pid from match of #{@procname}"
+
+      start = Time.now
+
+      until (pid = pid_from_procname(true)) || (Time.now-start) > wait
+        OUT.print '.';OUT.flush
+        sleep(interval)
+      end
+
+      raise Timeout, "\n Couldn't find pid after" unless pid
+      OUT.puts '*'
+      pid
+    end
+
+    class << self
+
+      def pid_command_hash force=false
+        @pid_command_hash = nil if force
+        @pid_command_hash ||= `ps -eo pid,command`.split("\n").inject({}) do |r, pid|
+          if m = pid.match(/^\s*(\d+)\s(.+)$/)
+            r[m[2]] = m[1].to_i
+          end
+          r
+        end
+      end
+
+    end
+  end
+end

data/lib/freyr/pinger.rb

@@ -9,9 +9,32 @@ module Freyr
     # Response object
     attr_reader :response
     
-    def initialize(command)
-      @command = command
-      @url = command.ping
+    def initialize(service)
+      @service = service
+      @url = service.info.ping
+    end
+
+    def wait_for_resp wait=40, interval = 0.6, &blk
+      OUT.puts "\nWaiting for response from #{url}"
+      start = Time.now
+
+      blk ||= lambda {true}
+
+      begin
+        OUT.print '.'; OUT.flush
+        ping
+        sleep(interval)
+      end until server_probably_launched? || (Time.now-start) > wait || !blk.call
+
+      if blk.call
+        if response
+          OUT.puts '*', "Last response received with code #{response.code}"
+        else
+          OUT.puts 'x', "Couldn't reach #{@service.name} service"
+        end
+      else
+        OUT.puts 'x',"Service died durring launch"
+      end
     end
     
     # The URI object for the given URL
@@ -35,7 +58,7 @@ module Freyr
     
     # Did the response recieve a success http code
     def success?
-      response.is_a?(Net::HTTPSuccess)
+      response.is_a?(Net::HTTPSuccess) || response.is_a?(Net::HTTPRedirection)
     end
     
     # Did the response recieve a 500 error
@@ -43,7 +66,7 @@ module Freyr
       response.is_a?(Net::HTTPInternalServerError)
     end
     
-    # Did it recieve 2xx or 500
+    # Did it receive 2xx or 500
     def server_probably_launched?
       success? || server_error?
     end