appjob 0.0.9 → 0.0.10

data/lib/appjob.rb

@@ -1,33 +1,114 @@
-require 'appjob/version'
-
 class Appjob
     include Singleton
-    EVERY_PATH = File.join(Rails.root,'config','every.rb')
 
-    def self.job(at, to_job)
+    EVERY_FILE = File.join(Rails.root,'config','every.rb')
+    FLAG_FILE  = File.join(Rails.root,'tmp','appjob_flag')
+    CMD_FILE   = File.join(Rails.root,'script','appjob')
+
+    @threads = {}
+    @monitor = false
+
+    def self.configure
+      raise "Appjob: No rails app detected" unless
+          defined? Rails and RAILS_ENV and RAILS_ROOT
+      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
+
+    def self.configured?
+      (File.exist?(EVERY_FILE) and
+         File.exist?(CMD_FILE))
+    end
+
+    def self.every period, name=nil
       t = Thread.new do
-        loop { sleep(at.to_i); eval(to_job) }
+        loop { sleep(period.to_i); yield }
       end
+      t[:name] = name if name
+      @threads[t[:name]] = t
     end
 
-    def self.run
-      if defined? Rails and RAILS_ENV and RAILS_ROOT
-        log 'Init ok, env='+Rails.env.to_s
-        Thread.abort_on_exception = true
-        FileUtils.cp(File.join(File.dirname(__FILE__),'appjob','every.rb'), EVERY_PATH) unless File.exist? EVERY_PATH
-        eval(File.read(EVERY_PATH))
+    def self.start
+      if @threads.size < 1
+        configure unless configured?
+        log "Init ok, RAILS_ENV=#{Rails.env.to_s}"
+        eval File.read(EVERY_FILE)
+        monitor unless @monitor
       else
-        puts 'Appjob: No rails app detected'
+        log "Already started"
       end
     end
 
-    def self.every attrs, &block
-      job(attrs, (instance_eval &block if block_given?))
+    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
+      else
+        log "nothing to stop"
+      end
+    end
+
+    def self.list
+      @threads
     end
 
     def self.log(message)
-      RAILS_DEFAULT_LOGGER.warn("** [Appjob] #{message}")
+      RAILS_DEFAULT_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
+        }
+      end
+    end
+
+    def self.get_command
+      cmd = File.exist?(FLAG_FILE) ? File.read(FLAG_FILE) : nil
+      cmd.strip unless cmd.nil?
+    end
+
+    def self.clean_command
+      File.delete(FLAG_FILE) if File.exist?(FLAG_FILE)
     end
-  end
+end
 
-Appjob.run
+Appjob.start

data/lib/appjob/appjob

@@ -0,0 +1,13 @@
+#!/home/programmer/.rvm/bin/ruby
+
+case ARGV[0]
+  when 'start'
+    File.open(File.join(File.dirname(__FILE__),'..','tmp','appjob_flag'),'w') do |f|
+      f << 'start'
+    end
+  when 'stop'
+    File.open(File.join(File.dirname(__FILE__),'..','tmp','appjob_flag'),'w') do |f|
+      postfix = ARGV[1].nil? ? '' : ARGV[1]
+      f << 'stop '+postfix
+    end
+end

data/lib/appjob/every.rb

@@ -1,4 +1,20 @@
-every 10.seconds do 'log "10 sec task"' end
-every 15.seconds do 'log "15 sec task"' end
+#fixed appjob task, started once at app run
 log "find me at app/config/every.rb"
 
+#repeated appjob-task, first argument - repeat interval, second - task name(must be unique)
+every 3.seconds, "live" do
+  log "Live! 3 sec"
+end
+
+every 20.seconds, "killer" do
+  log "killer 20 sec"
+end
+
+every 6.seconds, "victim" do
+  log "victim 6 sec"
+end
+
+every 7.seconds, "list" do
+  log list
+  log "list task every 7 sec"
+end

data/lib/appjob/version.rb

@@ -1,3 +1,3 @@
 class Appjob
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appjob
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Jeks
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-26 00:00:00 +04:00
+date: 2011-11-02 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -35,6 +35,7 @@ files:
 - Rakefile
 - appjob.gemspec
 - lib/appjob.rb
+- lib/appjob/appjob
 - lib/appjob/every.rb
 - lib/appjob/version.rb
 has_rdoc: true