freyr 0.3.0 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.2

data/freyr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{freyr}
-  s.version = "0.3.0"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tal Atlas"]
-  s.date = %q{2011-01-24}
+  s.date = %q{2011-06-09}
   s.default_executable = %q{freyr}
   s.description = %q{Define all services you need to run and this will launch,daemonize,and monitor them for you.}
   s.email = %q{me@tal.by}
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
     "lib/freyr/command.rb",
     "lib/freyr/pinger.rb",
     "lib/freyr/service.rb",
+    "lib/freyr/service_group.rb",
     "lib/freyr/service_info.rb",
     "spec/freyr_spec.rb",
     "spec/spec.opts",
@@ -44,7 +45,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/Talby/freyr}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{Service manager and runner}
   s.test_files = [
     "spec/freyr_spec.rb",
@@ -52,7 +53,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/freyr/cli/helpers.rb

@@ -1,6 +1,11 @@
 module Freyr
   class CLI < Thor
     
+    def initialize(*)
+      super
+      get_services
+    end
+    
   private
     # Ugh, this is ugly, colorizing stuff is rough
     def list_all_services(args={})
@@ -87,13 +92,22 @@ module Freyr
     end
     
     def get_from_name name
-      name ||= Dir.pwd.match(/.*\/(.+)/)[1]
+      group = ServiceGroup.new
+      
+      unless name
+        s = Service.s.find {|svc| svc.dir == Dir.pwd}
+        return group << s if s
+      end
       
       if options.namespace && s = Service["#{options.namespace}:#{name}"].first
-        [s] # only pickng one because if it's namespaced it's not a group
+        group << s # only pickng one because if it's namespaced it's not a group
       else
-        Service[name]
+        Service[name].each do |s|
+          group << s
+        end
       end
+      
+      group
     end
     
     def get_services

data/lib/freyr/cli/launching.rb

@@ -9,20 +9,14 @@ module Freyr
         names = services.collect {|s| s.name}
         say "Starting the " << set_color(names.join(', '), :blue) << ' services'
         
-        changed_names = services.collect do |s|
-          begin
-            pid = s.start!
-            s.name if pid
-          rescue AdminRequired
-            say "Please run in sudo to launch #{s.name}.", :red
-            nil
-          end
-        end.compact
+        changed_names = services.run
         
         list_all_services(:highlight_state => changed_names).each {|l| say(l)}
       else
         say "Can't find the #{name} service", :red
       end
+    rescue AdminRequired
+      say "Please run in sudo to launch #{name}.", :red
     end
     
     desc 'stop [SERVICE=dirname]', 'Stop particular service'
@@ -31,43 +25,32 @@ module Freyr
       if !services.empty?
         names = services.collect {|s| s.name}
         say "Stopping the " << set_color(names.join(', '), :blue) << ' services'
-        changed_names = services.collect {|s| s.name if s.alive?}.compact
         
-        services.each do |s|
-          begin
-            s.stop!
-          rescue AdminRequired
-            say "Please run in sudo to stop #{s.name}.", :red
-          end
-        end
+        changed_names = services.stop
         
         list_all_services(:highlight_state => changed_names).each {|l| say(l)}
       else
         say "Can't find the #{name} service", :red
-      end
+      end  
+    rescue AdminRequired
+      say "Please run in sudo to stop #{name}.", :red
     end
     
     desc 'restart [SERVICE=dirname]', 'restart particular service'
     def restart(name=nil)
       services = get_from_name(name)
       if !services.empty?
-        names = services.collect {|s| s.name}
-        say "Restarting the " << set_color(names.join(', '), :blue) << ' services'
+        say "Restarting the " << set_color(services.collect {|s| s.name}.join(', '), :blue) << ' services'
         
-        services.each do |s|
-          begin
-            s.restart!
-          rescue AdminRequired
-            say "Please run in sudo to launch #{s.name}.", :red
-            name.delete(s.name)
-            nil
-          end
-        end
+        names = services.restart
         
         list_all_services(:highlight_state => names).each {|l| say(l)}
       else
         say "Can't find the #{name} service", :red
       end
+      
+    rescue AdminRequired
+      say "Please run in sudo to launch #{name}.", :red
     end
     
   end

data/lib/freyr/cli.rb

@@ -7,11 +7,6 @@ module Freyr
   class CLI < Thor
     include Thor::Actions
     
-    def initialize(*)
-      super
-      get_services
-    end
-    
     default_task :list
     class_option :'config-file', :desc => 'config file to use', :type => :string
     class_option :'ignore-local', :desc => "don't use the local Freyrfile or .freyrrc", :type => :boolean, :default => false

data/lib/freyr/command.rb

@@ -75,8 +75,7 @@ module Freyr
     end
     
     def delete_if_dead
-      return if admin? && !is_root?
-      File.delete(pid_file) unless alive?
+      !alive?
     end
     
     def save
@@ -145,7 +144,7 @@ module Freyr
             puts 'x',"Couldn't reach #{name} service"
           end
         else
-          puts 'x'
+          puts 'x', "Service died durring launch"
         end
       end
       
@@ -224,22 +223,24 @@ module Freyr
     
     def spawn(command)
       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 self.umask if self.umask
+        uid_num = Etc.getpwnam(self.uid).uid if uid
+        gid_num = Etc.getgrnam(self.gid).gid if gid
         
-        # ::Dir.chroot(self.chroot) if self.chroot
+        ::Dir.chroot(self.chroot) if self.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 = [gid_num] if self.gid
+        ::Process::Sys.setgid(gid_num) if self.gid
+        ::Process::Sys.setuid(uid_num) if self.uid
         chdir
         $0 = "freyr - #{name} (#{command})"
         STDIN.reopen "/dev/null"
         if log_cmd
           STDOUT.reopen IO.popen(log_cmd, "a")
-        elsif log
+        elsif log && service.write_log?
           STDOUT.reopen log, "a"
+        else
+          STDOUT.reopen "/dev/null"
         end
         if err_log_cmd
           STDERR.reopen IO.popen(err_log_cmd, "a") 

data/lib/freyr/service.rb

@@ -17,7 +17,11 @@ module Freyr
     end
     
     def log
-      @service_info.log || File.join(command.file_dir,"#{name}.log")
+      @service_info.read_log || @service_info.log || File.join(command.file_dir,"#{name}.log")
+    end
+    
+    def write_log?
+      @service_info.log && !@service_info.read_log
     end
     
     def start!
@@ -51,6 +55,7 @@ module Freyr
     
     def tail!(size = 600, follow = true)
       f = follow ? 'f' : ''
+      Dir.chdir dir
       exec("tail -#{size}#{f} #{log}")
     end
     
@@ -96,12 +101,26 @@ module Freyr
         @all_services += services
       end
       
+      def alive?(name)
+        !!self[name].find do |ser|
+          ser.alive?
+        end
+      end
+      
       def [](name)
+        group = ServiceGroup.new
+        
         if ser = s.find {|sr| sr.matches?(name)}
-          [ser]
+          group << ser
         else
-          s.select {|sr| sr.is_group?(name)}
+          s.each do |sr|
+            if sr.is_group?(name)
+              group << sr
+            end
+          end
         end
+        
+        group
       end
       
     end

data/lib/freyr/service_group.rb

@@ -0,0 +1,68 @@
+module Freyr
+  class ServiceGroup < Array
+    
+    def initialize(*args)
+      super(*args)
+    end
+    
+    def find_by_name(n)
+      find {|s| s.name == n}
+    end
+    
+    # Take care this can make a stack overflow
+    def run
+      return [] if empty?
+      
+      needs_to_run = ServiceGroup.new
+      
+      kill = false
+      names = []
+      
+      each do |svc|
+        
+        unless svc.dependencies.empty?
+          if n = svc.dependencies.find {|s| !Service.alive?(s)}
+            if find_by_name(n)
+              needs_to_run << svc
+            elsif s = Service[n].first
+              needs_to_run << s
+              needs_to_run << svc
+            else
+              puts "Can't run #{svc.name} because dependency #{n} cannot be found"
+              kill = true
+            end
+            
+            next
+          end
+        end
+        
+        pid = svc.start!
+        names << svc.name if pid
+      end
+      
+      names += needs_to_run.run unless kill
+      names
+    end
+    
+    def stop
+      changed_names = collect {|s| s.name if s.alive?}.compact
+      each do |svc|
+        svc.stop!
+      end
+      
+      changed_names
+    end
+    
+    def restart
+      names = collect {|s| s.name}
+      
+      each do |s|
+        s.restart!
+        names.delete(s.name)
+      end
+      
+      names
+    end
+    
+  end
+end

data/lib/freyr/service_info.rb

@@ -4,11 +4,12 @@ module Freyr
     
     ATTRS = [:name,:dir,:log_cmd,:log,:err_log_cmd,:err_log,:umask,
               :uid,:gid,:chroot,:proc_match,:restart,:stop,:stop_sig,
-              :restart_sig,:sudo,:groups,:ping,:also]
+              :restart_sig,:sudo,:groups,:ping,:also,:dependencies,:read_log]
     
     def initialize(name=nil, args={}, &block)
       @groups = []
       @also = []
+      @dependencies = []
       if name.is_a?(Hash)
         @name = name.keys.first
         @groups << name[@name]
@@ -27,6 +28,10 @@ module Freyr
       @groups |= val
     end
     
+    def requires *val
+      @dependencies |= val
+    end
+    
     def also_as(*val)
       @also |= val
     end

data/lib/freyr.rb

@@ -4,6 +4,6 @@ module Freyr
   VERSION = File.open(File.expand_path(File.dirname(__FILE__)+'/../VERSION')).read
 end
 
-%w{service_info service command pinger}.each do |f|
+%w{service_info service_group service command pinger}.each do |f|
   require File.expand_path(File.dirname(__FILE__)+"/freyr/#{f}.rb")
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: freyr
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Tal Atlas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 -05:00
+date: 2011-06-09 00:00:00 -04:00
 default_executable: freyr
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,6 +91,7 @@ files:
 - lib/freyr/command.rb
 - lib/freyr/pinger.rb
 - lib/freyr/service.rb
+- lib/freyr/service_group.rb
 - lib/freyr/service_info.rb
 - spec/freyr_spec.rb
 - spec/spec.opts
@@ -125,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Service manager and runner