loop_dance 0.3.1 → 0.4.0

data/README.rdoc

@@ -1,7 +1,8 @@
 = LoopDance
 
-No forks. No threads. Just looped scheduler based on `daemon_controller` and `looper`.
-We call it 'Dancer'.
+No forks. No threads. Just looped pseudo-scheduler based on `daemon_controller` and `looper`.
+
+One dancer is one daemon.
 
 == Easy to install
 
@@ -29,7 +30,7 @@ LoopDance automatically starts at the rails 3 server startup.
 
 From the rails application:
 
-    Dancer1.controller.start unless Dancer1.controller.running?
+    Dancer1.start unless Dancer1.running?
 
 By the rake tasks (TODO):
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/loop_dance/commands.rb

@@ -4,16 +4,13 @@ module LoopDance
 
     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 mute_log
+      @muted_log = true
+    end
 
     def every( interval, &block )
       @tasks = [] unless @tasks

data/lib/loop_dance/controller.rb

@@ -46,6 +46,21 @@ module LoopDance
       log_exception exception
     end
 
+    def safely_restart
+      dancer.log  "Retarting.. (#{@start_command})"
+      if running?
+        dancer.log "Dancer is already running, stop"
+        stop
+        dancer.log "Start"
+        start
+      else
+        start
+        dancer.log "Started"
+      end
+    rescue => exception # DaemonController::StartTimeout
+      log_exception exception
+    end
+
     def safely_stop
       dancer.log  "Stopping.."
       stop if running?

data/lib/loop_dance/dancer.rb

@@ -8,15 +8,29 @@ module LoopDance
   class Dancer
     
     extend LoopDance::Commands
-
+    
     class << self
-
-      # Can start daemon automatically at rails server startup? true by default
+      
+      def inherited(subclass)
+        subclass.autostart = true
+      end
       
       def controller
         @controller ||= LoopDance::Controller.new self
       end
 
+      def stop
+        controller.stop
+      end
+      
+      def start
+        controller.start
+      end
+
+      def running?
+        controller.running?
+      end
+
     end
     
   end

data/lib/loop_dance/railtie.rb

@@ -12,7 +12,7 @@ module LoopDance
     initializer 'loop_dance.initialize' do
       self.class.load_dancers
       # Do not start dancers if rake or other tasks
-      LoopDance.start_all if server_startup?
+      LoopDance.restart_all if server_startup?
     end
 
 

data/lib/loop_dance.rb

@@ -12,6 +12,13 @@ module LoopDance
       end
     end
 
+    def restart_all( force=false )
+      return puts "LoopDance: No dancers defined" if LoopDance::Dancer.subclasses.empty?
+      LoopDance::Dancer.subclasses.each do |dancer|
+        dancer.controller.safely_restart if force || dancer.autostart
+      end
+    end
+
     def stop_all
       return puts "LoopDance: No dancers defined" if LoopDance::Dancer.subclasses.empty?
       LoopDance::Dancer.subclasses.each do |dancer|

data/loop_dance.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{loop_dance}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Danil Pismenny"]
-  s.date = %q{2011-01-02}
+  s.date = %q{2011-01-21}
   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 = [
@@ -51,6 +51,7 @@ Gem::Specification.new do |s|
     "rails_example/config/initializers/session_store.rb",
     "rails_example/config/locales/en.yml",
     "rails_example/config/routes.rb",
+    "rails_example/db/schema.rb",
     "rails_example/db/seeds.rb",
     "rails_example/lib/dancers.rb",
     "rails_example/lib/tasks/.gitkeep",
@@ -77,7 +78,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/dapi/loop_dance}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{Daemon builder and controller. Easy setup and managed from the rails application or rake tasks. Autostart at rails server startup}
   s.test_files = [
     "spec/dancer_spec.rb",
@@ -86,7 +87,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/rails_example/Gemfile

@@ -7,7 +7,7 @@ gem 'rails', '3.0.3'
 
 gem "loop_dance", :path => '../'
 
-#gem 'sqlite3-ruby', :require => 'sqlite3'
+gem 'sqlite3-ruby', :require => 'sqlite3'
 
 # Use unicorn as the web server
 # gem 'unicorn'

data/rails_example/db/schema.rb

@@ -0,0 +1,15 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 0) do
+
+end

data/spec/dancer_spec.rb

@@ -2,13 +2,10 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe LoopDance do 
 
-  describe "setup" do
-  end
-
-  describe "finds minimal interval"
-
+  # describe "finds minimal interval"
+  
   describe "examples" do 
-
+    
     before(:all) do
       class Dancer1 < LoopDance::Dancer
         every 2.seconds do
@@ -25,8 +22,10 @@ describe LoopDance do
 
     it { Dancer1.tasks.count.should == 4 }
     it { Dancer1.timeout.should == 2 }
-    it { LoopDance::Dancer.tasks.should be_blank }
     it { Dancer1.maximal_timeout.should == 10 }
+    it { Dancer1.autostart.should be_true }
+    
+    it { LoopDance::Dancer.tasks.should be_blank }
 
 
     describe "another dancer not change first dancer's tasks" do
@@ -44,7 +43,7 @@ describe LoopDance do
       it { Dancer2.timeout.should == 1 }
       it { Dancer2.maximal_timeout.should == 11 }
       it { Dancer2.muted_log.should be_nil }
-      it { Dancer1.autostart.should be_true }
+      it { Dancer2.autostart.should be_true }
       
     end
 
@@ -57,6 +56,7 @@ describe LoopDance do
       end
       it { Dancer1.muted_log.should be_true }
       it { Dancer1.autostart.should be_false }
+      it { Dancer1.autostart.should_not be_nil }
     end
 
     describe "find right minimal timeout" do

data/tasks/loop_dance.rake

@@ -12,6 +12,11 @@ namespace :loop_dance do
     LoopDance.start_all
   end
 
+  desc "Start restart all dancers"
+  task :restart_all => :loop_dance do 
+    LoopDance.restart_all
+  end
+
   desc "Stop all dancers"
   task :stop_all => :loop_dance do
     LoopDance.stop_all
@@ -34,6 +39,10 @@ namespace :loop_dance do
         dancer.controller.safely_start
       end
       
+      task :restart => :loop_dance do
+        dancer.controller.safely_restart
+      end
+      
       desc "Stop #{dancer}"
       task :stop => :loop_dance do
         dancer.controller.safely_stop

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: loop_dance
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Danil Pismenny
@@ -15,12 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-02 00:00:00 +03:00
+date: 2011-01-21 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: activesupport
+  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,10 +31,10 @@ dependencies:
         - 0
         version: "3.0"
   requirement: *id001
-  type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: i18n
+  name: activesupport
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,10 +45,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id002
-  type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: daemon_controller
+  name: i18n
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,10 +61,10 @@ dependencies:
         - 5
         version: 0.2.5
   requirement: *id003
-  type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: bundler
+  name: daemon_controller
+- !ruby/object:Gem::Dependency 
+  type: :development
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,10 +77,10 @@ dependencies:
         - 0
         version: 1.0.0
   requirement: *id004
-  type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: jeweler
+  name: bundler
+- !ruby/object:Gem::Dependency 
+  type: :development
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -94,10 +93,10 @@ dependencies:
         - 2
         version: 1.5.2
   requirement: *id005
-  type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rcov
+  name: jeweler
+- !ruby/object:Gem::Dependency 
+  type: :development
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -108,10 +107,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id006
-  type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: ruby-debug
+  name: rcov
+- !ruby/object:Gem::Dependency 
+  type: :development
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -122,10 +121,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id007
-  type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rspec
+  name: ruby-debug
+- !ruby/object:Gem::Dependency 
+  type: :development
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -136,10 +135,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id008
-  type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: shoulda
+  name: rspec
+- !ruby/object:Gem::Dependency 
+  type: :development
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -150,7 +149,8 @@ dependencies:
         - 0
         version: "0"
   requirement: *id009
-  type: :development
+  prerelease: false
+  name: shoulda
 description: Really simple daemon builder and manager. Based on the looper and daemon_controller
 email: danil@orionet.ru
 executables: []
@@ -195,6 +195,7 @@ files:
 - rails_example/config/initializers/session_store.rb
 - rails_example/config/locales/en.yml
 - rails_example/config/routes.rb
+- rails_example/db/schema.rb
 - rails_example/db/seeds.rb
 - rails_example/lib/dancers.rb
 - rails_example/lib/tasks/.gitkeep
@@ -247,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Daemon builder and controller. Easy setup and managed from the rails application or rake tasks. Autostart at rails server startup