freyr 0.3.7 → 0.3.8

data/Freyrfile

@@ -1,3 +1,7 @@
 service :sleep do
+  start 'sleep 20'
+end
+
+service :sudosleep do
   start 'sudo sleep 20'
-end
+end

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

data/lib/freyr/cli/helpers.rb

@@ -3,6 +3,11 @@ module Freyr
     
     def initialize(*)
       super
+      
+      if options.trace?
+        Freyr.logger = Logger.new(STDOUT)
+      end
+      
       get_services
     end
     
@@ -107,6 +112,7 @@ module Freyr
       
       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
       
@@ -118,6 +124,7 @@ module Freyr
         end
       end
       
+      Freyr.logger.debug('getting service') {group.inspect}
       group
     end
     

data/lib/freyr/cli/launching.rb

@@ -6,6 +6,7 @@ module Freyr
     def start(name=nil)
       services = get_from_name(name)
       if !services.empty?
+        Freyr.logger.debug('starting services') {services.inspect}
         names = services.collect {|s| s.name}
         say "Starting the " << set_color(names.join(', '), :blue) << ' services'
         
@@ -23,6 +24,7 @@ module Freyr
     def stop(name=nil)
       services = get_from_name(name)
       if !services.empty?
+        Freyr.logger.debug('stopping services') {services.inspect}
         names = services.collect {|s| s.name}
         say "Stopping the " << set_color(names.join(', '), :blue) << ' services'
         
@@ -40,6 +42,7 @@ module Freyr
     def restart(name=nil)
       services = get_from_name(name)
       if !services.empty?
+        Freyr.logger.debug('restarting services') {services.inspect}
         say "Restarting the " << set_color(services.collect {|s| s.name}.join(', '), :blue) << ' services'
         
         names = services.restart

data/lib/freyr/cli/monitor.rb

@@ -22,6 +22,8 @@ module Freyr
     method_option :'no-follow', :type => :boolean, :default => false, :desc => 'Disable auto follow, just print tail and exit'
     def tail(name=nil)
       services = get_from_name(name)
+      Freyr.logger.debug('tail args') {"Lines: #{options.lines}, following: #{!options['no-follow']}"}
+      Freyr.logger.debug('tailing service') {services.first.inspect}
       if !services.empty?
         
         services.first.tail!(options.lines, !options['no-follow'])

data/lib/freyr/cli.rb

@@ -11,6 +11,7 @@ module Freyr
     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
     class_option :namespace, :type => :string, :desc => 'namespace to look in'
+    class_option :trace, :type => :boolean, :default => false
     map "-v" => :version
     
     desc 'version', 'displays current gem version'

data/lib/freyr/command.rb

@@ -93,9 +93,11 @@ module Freyr
       total_time = Time.now
       
       pid = spawn(command)
-        
+      
+      Freyr.logger.debug("attempting to run command") {command.inspect}
+      
       @pid = pid
-        
+      
       Process.detach(@pid)
       
       if proc_match
@@ -178,6 +180,8 @@ module Freyr
       require_admin
       sig ||= stop_sig || 'KILL'
       
+      Freyr.logger.debug("sending signal to process") {"Signal: #{sig}, PID: #{pid}"}
+      
       if pid(true)
         Process.kill(sig, pid)
       end

data/lib/freyr/service.rb

@@ -61,8 +61,11 @@ module Freyr
     
     def tail!(size = 600, follow = true)
       f = follow ? 'f' : ''
-      Dir.chdir dir
-      exec("tail -#{size}#{f} #{log}")
+      if log
+        cmd = "tail -#{size}#{f} #{File.join(dir||'/',log)}"
+        Freyr.logger.debug("tailing cmd") {cmd.inspect}
+        exec("tail -#{size}#{f} #{log}")
+      end
     end
     
     def describe
@@ -97,10 +100,13 @@ module Freyr
       def add_file f
         s
         
+        Freyr.logger.debug('adding file') {f}
+        
         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]
           @all_groups |= ser.groups
+          Freyr.logger.debug('adding service') {ser.name.inspect}
           new(ser)
         end
         

data/lib/freyr/service_group.rb

@@ -36,6 +36,7 @@ module Freyr
           end
         end
         
+        Freyr.logger.debug('starting service') {svc.name}
         pid = svc.start!
         names << svc.name if pid
       end
@@ -47,6 +48,7 @@ module Freyr
     def stop
       changed_names = collect {|s| s.name if s.alive?}.compact
       each do |svc|
+        Freyr.logger.debug('stopping service') {svc.name}
         svc.stop!
       end
       
@@ -57,6 +59,7 @@ module Freyr
       names = collect {|s| s.name}
       
       each do |s|
+        Freyr.logger.debug('restart service') {svc.name}
         s.restart!
         names.delete(s.name)
       end

data/lib/freyr.rb

@@ -1,7 +1,14 @@
 require 'forwardable'
+require 'logger'
 
 module Freyr
+  def self.logger
+    @logger ||= Logger.new("/dev/null")
+  end
   
+  def self.logger= logger
+    @logger = logger
+  end
 end
 
 %w{version service_group service command service_info pinger process_info}.each do |f|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: freyr
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Tal Atlas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-20 00:00:00 -04:00
+date: 2011-07-25 00:00:00 -04:00
 default_executable: freyr
 dependencies: 
 - !ruby/object:Gem::Dependency