appjob 0.0.13 → 0.0.14

data/lib/appjob.rb

@@ -6,14 +6,18 @@ class Appjob
     CMD_FILE   = File.join(Rails.root,'script','appjob')
 
     @threads = {}
-    @monitor = false
+    @monitor = nil
 
     def self.configure
       raise "Appjob: No rails app detected" unless
           defined? Rails and RAILS_ENV and RAILS_ROOT
+
+      %w(EVERY_FILE CMD_FILE).each do |f|
+        FileUtils.cp(File.join(File.dirname(__FILE__),'appjob', File.basename(eval(f))), eval(f))
+      end
+
       Thread.abort_on_exception = true
-      FileUtils.cp(File.join(File.dirname(__FILE__),'appjob','every.rb'), EVERY_FILE)
-      FileUtils.cp(File.join(File.dirname(__FILE__),'appjob','appjob'), CMD_FILE)
+
       log "succefully configured" if configured?
     end
 
@@ -22,11 +26,11 @@ class Appjob
          File.exist?(CMD_FILE))
     end
 
-    def self.every period, name=nil
+    def self.every period, tname=nil
       t = Thread.new do
         loop { sleep(period.to_i); yield }
       end
-      t[:name] = name if name
+      t[:name] = tname if tname
       @threads[t[:name]] = t
     end
 
@@ -35,82 +39,58 @@ class Appjob
         configure unless configured?
         log "Init ok, RAILS_ENV=#{Rails.env.to_s}"
         eval File.read(EVERY_FILE)
-        monitor unless @monitor
+        monitor if @monitor.nil?
       else
-        log "Already started"
+        log "already started"
       end
     end
 
-    def self.stop(name=nil)
-      if @threads.size > 0
-        if name.nil?
-          list = @threads
-        else
-          if @threads.has_key?(name)
-            list = {}
-            list[name]=@threads.fetch(name)
-          else
-            log "No victims with name=#{name}"
-            return
-          end
-        end
-
-        list.each do |name, t|
-          if t.is_a?(Thread)
-            t.kill
-            list.delete(name)
-            @threads.delete(name) if list.empty?
-            log "task #{name} killed"
-          else
-            log "task #{name} is not a Thread "
-          end
-        end
+    def self.stop_all
+      if @threads.empty?
+        log "nothing to stop, task list is empty"
       else
-        log "nothing to stop"
+        @threads.each_key { |tname| stop(tname) }
+        @threads = {}
       end
     end
 
-    def self.list
-      @threads
+    def self.stop(tname)
+      if @threads.has_key?(tname)
+        @threads.fetch(tname).kill
+        @threads.delete(tname)
+        log "task #{tname} killed"
+      else
+        log "no valid victim with name=#{tname}"
+      end
     end
 
     def self.log(message)
-      RAILS_DEFAULT_LOGGER.info("[appjob] #{message}")
+      Rails.logger.info("[appjob] #{message}")
     end
 
     def self.monitor
       @monitor = Thread.new do
         loop {
-          sleep 2;
-          if get_command
-            todo = get_command.split
-            case todo[0]
-              when 'start'
-                start
-                clean_command
-              when 'stop'
-                if todo[1]
-                  stop(todo[1])
-                else
-                  stop
-                end
-                clean_command
-            end
-          end
+          sleep 1
+          case flag[:cmd]
+            when 'start' then start
+            when 'stop'
+              flag[:task] ? stop(flag[:task]) : stop_all
+          end unless flag.nil?
+          clear_flag if flag
         }
       end
     end
 
-    def self.get_command
-      cmd = File.exist?(FLAG_FILE) ? File.read(FLAG_FILE) : nil
-      cmd.strip unless cmd.nil?
+    def self.flag
+      cmd = File.exist?(FLAG_FILE) ? File.read(FLAG_FILE).to_s.strip.split : nil
+      { :cmd=>cmd[0], :task=>cmd[1] } unless cmd.nil?
     end
 
-    def self.clean_command
+    def self.clear_flag
       File.delete(FLAG_FILE) if File.exist?(FLAG_FILE)
     end
-    
-    #попахивает ?!
+    # уже лучше
 end
 
-Appjob.start
+Appjob.start

data/lib/appjob/version.rb

@@ -1,3 +1,3 @@
 class Appjob
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appjob
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Jeks
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-02 00:00:00 +04:00
+date: 2011-11-07 00:00:00 +04:00
 default_executable: 
 dependencies: []