freyr 0.3.5 → 0.3.6

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/lib/freyr/cli/helpers.rb

@@ -85,7 +85,7 @@ module Freyr
             
             proc = ProcessInfo[pid]
             
-            str << " CPU: #{proc.pcpu}% - MEM: #{proc.mem_in_mb}mb" if proc
+            str << " CPU: #{proc.pcpu}% - MEM: #{proc.mem_in_mb.to_i}mb" if proc
           # rescue => e
           end
         end

data/lib/freyr/command.rb

@@ -13,12 +13,6 @@ module Freyr
       Dir.mkdir(FREYR_PIDS)
     end
     
-    ServiceInfo::ATTRS.each do |meth|
-      define_method(meth) do |*args|
-        @service.__send__(meth,*args) if @service
-      end
-    end
-    
     attr_reader :command, :name, :service
     
     def initialize(name, command=nil, args = {})
@@ -263,6 +257,16 @@ module Freyr
       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
   
   class AdminRequired < Errno::EACCES; end

data/lib/freyr/process_info.rb

@@ -19,8 +19,14 @@ module Freyr
       info
     end
     
+    def port
+      `lsof -p #{pid} -P | egrep TCP.+LISTEN`.match(/\*:(\d+)/)[1].to_i
+    rescue
+      nil
+    end
+    
     def mem_in_mb
-      @rss/1024
+      @rss/1024.0
     end
     
     class << self

data/lib/freyr/service.rb

@@ -1,6 +1,11 @@
 module Freyr
   class Service
     extend Forwardable
+    class << self
+      def add_service_method *methods
+        def_delegators :@service_info, *methods
+      end
+    end
     
     attr_reader :service_info, :command
     
@@ -9,8 +14,7 @@ module Freyr
       @command = Command.new(self)
     end
     
-    def_delegators :@service_info, *ServiceInfo::ATTRS
-    def_delegator  :@service_info, :start, :start_command
+    add_service_method :start, :start_command
     
     def env
       service_info.env || {}
@@ -93,7 +97,7 @@ module Freyr
         
         services = ServiceInfo.from_file(f).collect do |ser|
           raise 'Cannot have two things of the same name' if selectors.include?(ser.name)
-          names << ser.name
+          names |= [ser.name]
           @all_groups |= ser.groups
           new(ser)
         end

data/lib/freyr/service_info.rb

@@ -2,9 +2,20 @@ module Freyr
   class ServiceInfo
     attr_reader :groups
     
-    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,:dependencies,:read_log]
+    class << self
+      def add_service_method *methods
+        Service.send :add_service_method, *methods
+        Command.send :add_service_method, *methods
+        methods.each do |method|
+          ATTRS << methods
+        end
+      end
+    end
+    
+    ATTRS = []
+    add_service_method :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,:dependencies,:read_log
     
     def initialize(name=nil, args={}, &block)
       @groups = []
@@ -36,17 +47,18 @@ module Freyr
       @also |= val
     end
     
-    MODIFIERS = {
-      :start => :_sudo_checker,
-      :restart => :_sudo_checker,
-      :stop => :_sudo_checker
-    }
+    MODIFIERS = Hash.new {|h,k| h[k] = []}
+    MODIFIERS[:start] << :_sudo_checker
+    MODIFIERS[:stop] << :_sudo_checker
+    MODIFIERS[:restart] << :_sudo_checker
     
     def method_missing key, val=nil
       key = key.to_s.gsub(/\=$/,'').to_sym
       
       if val
-        val = send(MODIFIERS[key],val) if MODIFIERS[key]
+        MODIFIERS[key].each do |modifier|
+          val = send(modifier,val)
+        end
         instance_variable_set("@#{key}", val)
       else
         instance_variable_get("@#{key}")

data/lib/freyr.rb

@@ -4,6 +4,6 @@ module Freyr
   
 end
 
-%w{version service_info service_group service command pinger process_info}.each do |f|
+%w{version service_group service command service_info pinger process_info}.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: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Tal Atlas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-15 00:00:00 -04:00
+date: 2011-07-20 00:00:00 -04:00
 default_executable: freyr
 dependencies: 
 - !ruby/object:Gem::Dependency