loop_dance 0.2.5 → 0.3.1

data/README.rdoc

@@ -41,6 +41,14 @@ By the rake tasks (TODO):
     rake loop_dance:dancer1:stop
     rake loop_dance:dancer1:status
 
+
+== Settings
+
+    class Dancer1 < LoopDance::Dancer
+      mute_log            # mute redundant logging, just start, stop and errors
+      disable_autostart   # disable autostart at rails server startup
+
+
 == Contributing to loop_dance
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.3.1

data/lib/loop_dance/commands.rb

@@ -2,8 +2,19 @@ module LoopDance
   
   module Commands
 
-    attr_accessor :tasks, :timeout, :maximal_timeout
-    
+    attr_accessor :tasks, :timeout, :maximal_timeout, :muted_log, :autostart
+
+    @autostart = true
+
+    def mute_log
+      @muted_log = true
+    end
+
+    def disable_autostart
+      @autostart = false
+    end
+
+
     def every( interval, &block )
       @tasks = [] unless @tasks
       @tasks << LoopDance::Task.new( interval, &block )
@@ -14,7 +25,7 @@ module LoopDance
     def dance
       loop_init
       if @tasks.empty?
-        log "No tasks defined."
+        log "No tasks defined.", true
       else
         while (@run) do
           @tasks.each_with_index do |task, index|
@@ -28,7 +39,7 @@ module LoopDance
             sleep @timeout.to_i if @run
           end
         end
-      log "shutting down"
+      log "shutting down", true
     end
     
     def stop
@@ -39,8 +50,8 @@ module LoopDance
       "log/#{name.underscore}.pid"
     end
       
-    def log(text)
-      puts "#{Time.now} #{self}: #{text}"
+    def log(text, forced=false)
+      puts "#{Time.now} #{self}: #{text}" if forced || !muted_log
     end
 
     def print_status
@@ -75,7 +86,7 @@ module LoopDance
       
       def trap_signals
         sigtrap = proc { 
-          log "caught trapped signal, shutting down"
+          log "caught trapped signal, shutting down", true
           @run = false 
         }
         ["SIGTERM", "SIGINT", "SIGHUP"].each do |signal|
@@ -89,7 +100,7 @@ module LoopDance
         write_pid
         trap_signals
         @run = true
-        log "Process started and sleep for #{timeout.inspect}. kill #{Process.pid} to stop"
+        log "Process started and sleep for #{timeout.inspect}. kill #{Process.pid} to stop", true
       end
 
       def write_pid

data/lib/loop_dance/controller.rb

@@ -3,9 +3,7 @@ require 'daemon_controller'
 module LoopDance
   class Controller < DaemonController
 
-    cattr_accessor :dancer, :start_timeout
-
-    self.start_timeout = 45
+    cattr_accessor :dancer
 
     class << self
 
@@ -17,9 +15,7 @@ module LoopDance
           :start_command => start_command,
           :ping_command => lambda { true },
           :pid_file => dancer.pid_file,
-          :log_file => log_file,
-          :start_timeout => start_timeout,
-          :log_file_activity_timeout => dancer.maximal_timeout + 3  # 3 seconds to stock
+          :log_file => log_file
         }
         super h
       end

data/lib/loop_dance/dancer.rb

@@ -12,8 +12,6 @@ module LoopDance
     class << self
 
       # Can start daemon automatically at rails server startup? true by default
-      cattr_accessor :start_automatic
-      self.start_automatic = true
       
       def controller
         @controller ||= LoopDance::Controller.new self

data/lib/loop_dance.rb

@@ -8,7 +8,7 @@ module LoopDance
     def start_all( force=false )
       return puts "LoopDance: No dancers defined" if LoopDance::Dancer.subclasses.empty?
       LoopDance::Dancer.subclasses.each do |dancer|
-        dancer.controller.safely_start if force || dancer.start_automatic
+        dancer.controller.safely_start if force || dancer.autostart
       end
     end
 

data/loop_dance.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{loop_dance}
-  s.version = "0.2.5"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Danil Pismenny"]

data/spec/dancer_spec.rb

@@ -43,9 +43,22 @@ describe LoopDance do
       it { Dancer2.tasks.count.should == 2 }
       it { Dancer2.timeout.should == 1 }
       it { Dancer2.maximal_timeout.should == 11 }
+      it { Dancer2.muted_log.should be_nil }
+      it { Dancer1.autostart.should be_true }
       
     end
 
+    describe "muting log and disabling autostart" do
+      before(:all) do
+        class Dancer1 < LoopDance::Dancer
+          mute_log
+          disable_autostart
+        end
+      end
+      it { Dancer1.muted_log.should be_true }
+      it { Dancer1.autostart.should be_false }
+    end
+
     describe "find right minimal timeout" do
       
       before(:all) do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: loop_dance
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 17
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 5
-  version: 0.2.5
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Danil Pismenny