loop_dance 0.4.1 → 0.4.3

data/README.rdoc

@@ -24,8 +24,6 @@ Create file 'lib/loop_dance.rb':
 
     end
 
-LoopDance automatically starts at the rails 3 server startup.
-
 == Useful management
 
 From the rails application:
@@ -47,7 +45,7 @@ By the rake tasks (TODO):
 
     class Dancer1 < LoopDance::Dancer
       mute_log            # mute redundant logging, just start, stop and errors
-      disable_autostart   # disable autostart at rails server startup
+      enable_autostart    # enable autostart at rails server startup
 
 
 == Contributing to loop_dance

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.3

data/lib/loop_dance/commands.rb

@@ -2,10 +2,14 @@ module LoopDance
   
   module Commands
 
-    attr_accessor :tasks, :timeout, :maximal_timeout, :muted_log, :autostart
+    # internal vars
+    attr_accessor :tasks, :timeout, :maximal_timeout
 
-    def disable_autostart
-      @autostart = false
+    # options
+    attr_accessor :muted_log, :autostart, :start_timeout, :stop_timeout, :log_file_activity_timeout
+
+    def enable_autostart
+      @autostart = true
     end
 
     def mute_log

data/lib/loop_dance/controller.rb

@@ -15,7 +15,10 @@ module LoopDance
           :start_command => start_command,
           :ping_command => lambda { true },
           :pid_file => dancer.pid_file,
-          :log_file => log_file
+          :log_file => log_file,
+          :start_timeout => dancer.start_timeout,
+          :stop_timeout => dancer.stop_timeout,
+          :log_file_activity_timeout => dancer.log_file_activity_timeout
         }
         super h
       end

data/lib/loop_dance/dancer.rb

@@ -11,9 +11,8 @@ module LoopDance
     
     class << self
       
-      def inherited(subclass)
-        subclass.autostart = true
-      end
+      # def inherited(subclass)
+      # end
       
       def controller
         @controller ||= LoopDance::Controller.new self

data/lib/loop_dance/railtie.rb

@@ -6,7 +6,7 @@ module LoopDance
     def self.load_dancers
       require 'dancers'
     rescue LoadError => err
-      puts "LoopDance: file 'lib/dancers.rb' doesn't exist."
+      puts "LoopDance: can't load file 'lib/dancers.rb'."
     end
 
     initializer 'loop_dance.initialize' do

data/lib/loop_dance/task.rb

@@ -5,7 +5,9 @@ class LoopDance::Task
     run_count=0
     self.interval = interval
     self.block = block
-    self.last_run_at = Time.now
+    
+    # Run tasks when start dancer
+    # self.last_run_at = Time.now
   end
   
   def time_to_run?

data/loop_dance.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{loop_dance}
-  s.version = "0.4.1"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Danil Pismenny"]
-  s.date = %q{2011-01-21}
+  s.date = %q{2011-01-25}
   s.description = %q{Really simple daemon builder and manager. Based on the looper and daemon_controller}
   s.email = %q{danil@orionet.ru}
   s.extra_rdoc_files = [

data/spec/dancer_spec.rb

@@ -23,7 +23,7 @@ describe LoopDance do
     it { Dancer1.tasks.count.should == 4 }
     it { Dancer1.timeout.should == 2 }
     it { Dancer1.maximal_timeout.should == 10 }
-    it { Dancer1.autostart.should be_true }
+    it { Dancer1.autostart.should be_false }
     
     it { LoopDance::Dancer.tasks.should be_blank }
 
@@ -43,20 +43,19 @@ describe LoopDance do
       it { Dancer2.timeout.should == 1 }
       it { Dancer2.maximal_timeout.should == 11 }
       it { Dancer2.muted_log.should be_nil }
-      it { Dancer2.autostart.should be_true }
+      it { Dancer2.autostart.should be_false }
       
     end
 
-    describe "muting log and disabling autostart" do
+    describe "muting log and enabling autostart" do
       before(:all) do
         class Dancer1 < LoopDance::Dancer
           mute_log
-          disable_autostart
+          enable_autostart
         end
       end
       it { Dancer1.muted_log.should be_true }
-      it { Dancer1.autostart.should be_false }
-      it { Dancer1.autostart.should_not be_nil }
+      it { Dancer1.autostart.should be_true }
     end
 
     describe "find right minimal timeout" do

data/spec/task_spec.rb

@@ -28,12 +28,13 @@ describe LoopDance::Task do
       subject.last_run_at.should < Time.now
     end
 
-    it "should not run straight away" do
-      should_not be_time_to_run
+    it "should  run straight away" do
+      should be_time_to_run
     end
 
     it "should run if it's time" do
-      Time.stub(:now).and_return(subject.last_run_at + interval)
+      t = Time.now()
+      Time.stub(:now).and_return(t + interval)
       should be_time_to_run
     end
     

data/tasks/loop_dance.rake

@@ -36,12 +36,12 @@ namespace :loop_dance do
       
       desc "Start #{dancer}"
       task :start => :loop_dance do
-        dancer.controller.safely_start
+        dancer.controller.safely_start( true )
       end
       
       desc "Restart #{dancer}"
       task :restart => :loop_dance do
-        dancer.controller.safely_restart
+        dancer.controller.safely_restart( true )
       end
       
       desc "Stop #{dancer}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: loop_dance
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Danil Pismenny
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 +03:00
+date: 2011-01-25 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency