foreverb 0.3.0.a → 0.3.0.b

data/lib/forever.rb

@@ -1,6 +1,6 @@
 require 'yaml' unless defined?(YAML)
 require 'forever/extensions'
-require 'forever/every'
+require 'forever/job'
 require 'forever/base'
 require 'forever/version'
 

data/lib/forever/base.rb

@@ -3,7 +3,6 @@ require 'fileutils'
 module Forever
 
   class Base
-    include Every
     attr_reader :started_at
 
     def initialize(options={}, &block)
@@ -16,9 +15,11 @@ module Forever
 
       raise 'No jobs defined!' if jobs.empty?
 
-      Dir.chdir(dir) if exists?(dir)
+      # Setup directories
+      Dir.chdir(dir)
+      FileUtils.rm_rf(tmp) if File.exist?(tmp)
+      Dir.mkdir(tmp)
       Dir.mkdir(File.dirname(log)) if log && !File.exist?(File.dirname(log))
-      Dir.mkdir(File.dirname(pid)) if pid && !File.exist?(File.dirname(pid))
 
       write_config!
 
@@ -82,32 +83,56 @@ module Forever
 
         # Start deamons
         until stopping?
-          if forking
-            begin
-              jobs.select { |job| job.time?(Time.now) }.each do |job|
+          current_queue = 1
+          jobs.select { |job| job.time?(Time.now) }.each do |job|
+            if queue && queue > current_queue
+              puts "\n\nThe queue limit has been exceeded\n\n"
+              sleep 60
+              break
+            end
+            if forking
+              begin
                 Process.fork { job_call(job) }
+              rescue Errno::EAGAIN
+                puts "\n\nWait all processes since os cannot create a new one\n\n"
+                Process.waitall
               end
-            rescue Errno::EAGAIN
-              puts "\n\nWait all processes since os cannot create a new one\n\n"
-              Process.waitall
+            else
+              Thread.new { job_call(job) }
             end
-          else
-            jobs.each { |job| Thread.new { job_call(job) } if job.time?(Time.now) }
+            current_queue += 1
           end
-          sleep 0.5
         end
 
-        # If we are here it means we are exiting so we can remove the pid and pending stop.txt
-        FileUtils.rm_f(pid)
-        FileUtils.rm_f(stop_txt)
-
         # Invoke our after :all filters
         after_filters[:all].each { |block| safe_call(block) }
+
+        # If we are here it means we are exiting so we can remove the pid and pending stop.txt
+        FileUtils.rm_rf(tmp)
       end
 
       self
     end
 
+    ##
+    # Define a new job task
+    #
+    # Example:
+    #   every 1.second, :at => '12:00' do
+    #     my_long_task
+    #   end
+    #
+    def every(period, options={}, &block)
+      jobs << Forever::Job.new(period, options.merge!(:dir => dir), &block)
+    end
+
+    ##
+    # Our job list
+    #
+    def jobs
+      @_jobs ||= []
+    end
+
     ##
     # Caller file
     #
@@ -122,12 +147,27 @@ module Forever
       File.basename(file, '.*')
     end
 
+    ##
+    # Queue size
+    #
+    def queue(value=nil)
+      value ? @_queue = value : @_queue
+    end
+
     ##
     # Base working Directory
     #
     def dir(value=nil)
       value ? @_dir = value : @_dir
     end
+    alias :workspace :dir
+
+    ##
+    # Temp directory, used to store pids and jobs status
+    #
+    def tmp
+      File.join(dir, 'tmp')
+    end
 
     ##
     # File were we redirect STOUT and STDERR, can be false.
@@ -145,7 +185,7 @@ module Forever
     # Default: dir + 'tmp/[process_name].pid'
     #
     def pid(value=nil)
-      @_pid ||= File.join(dir, "tmp/#{name}.pid") if exists?(dir, file)
+      @_pid ||= File.join(tmp, "#{name}.pid") if exists?(dir, file)
       value.nil? ? @_pid : @_pid = value
     end
 
@@ -156,9 +196,9 @@ module Forever
       FileUtils.rm_f(stop_txt)
       if running?
         pid_was = File.read(pid).to_i
-        FileUtils.rm_f(pid)
         print "[\e[90m%s\e[0m] Killing process \e[1m%d\e[0m...\n" % [name, pid_was]
         after_filters[:all].each { |block| safe_call(block) }
+        FileUtils.rm_rf(tmp)
         Process.kill(:KILL, pid_was)
       else
         print "[\e[90m%s\e[0m] Process with \e[1mnot found\e[0m" % name
@@ -267,9 +307,12 @@ module Forever
 
     def job_call(job)
       return unless job.time?(Time.now)
+      job.run!
       before_filters[:each].each { |block| safe_call(block) }
       safe_call(job)
       after_filters[:each].each { |block| safe_call(block) }
+    ensure
+      job.stop!
     end
 
     def safe_call(block)
@@ -282,7 +325,7 @@ module Forever
     end
 
     def stop_txt
-      @_stop_txt ||= File.join(dir, 'stop.txt')
+      @_stop_txt ||= File.join(tmp, 'stop.txt')
     end
   end # Base
 end # Forever

data/lib/forever/job.rb

@@ -0,0 +1,50 @@
+module Forever
+  class Job
+
+    def initialize(period, options, &block)
+      @period = period
+      @at     = options[:at] ? parse_at(*options[:at]) : []
+      @pid    = File.join(options[:dir], "/tmp/#{object_id}.job")
+      @block  = block
+    end
+
+    def call
+      @block.call
+    end
+
+    def run!
+      File.open(@pid, 'w') { |f| f.write('running') }
+    end
+
+    def stop!
+      File.open(@pid, 'w') { |f| f.write('idle') }
+    end
+
+    def running?
+      File.exist?(@pid) && File.read(@pid) == 'running'
+    end
+
+    def last
+      File.mtime(@pid)
+    rescue Errno::ENOENT
+      0
+    end
+
+    def time?(t)
+      elapsed_ready = (t - last).to_i >= @period
+      time_ready = @at.empty? || @at.any? { |at| (at[0].empty? || t.hour == at[0].to_i) && (at[1].empty? || t.min == at[1].to_i) }
+      !running? && elapsed_ready && time_ready
+    end
+
+  private
+    def parse_at(*args)
+      args.map do |at|
+        raise "#{at} must be a string" unless at.is_a?(String)
+        raise "#{at} has not a colon separator" unless at =~ /:/
+        hour, min = at.split(":")
+        raise "Failed to parse #{at}" if hour.to_i >= 24 || min.to_i >= 60
+        [hour, min]
+      end
+    end
+  end # Job
+end # Forever

data/lib/forever/version.rb

@@ -1,3 +1,3 @@
 module Forever
-  VERSION = "0.3.0.a" unless defined?(Forever::VERSION)
+  VERSION = "0.3.0.b" unless defined?(Forever::VERSION)
 end

data/spec/spec_helper.rb

@@ -28,7 +28,7 @@ class MiniTest::Spec
     if @forever
       capture_io { @forever.stop! }
       FileUtils.rm_rf(File.dirname(@forever.log)) if @forever.log
-      FileUtils.rm_rf(File.dirname(@forever.pid)) if @forever.pid
+      FileUtils.rm_rf(File.dirname(@forever.pid)) if @forever.pid # this is deleted by Forever
     end
     Dir.chdir($dir)
     ARGV.clear

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: foreverb
 version: !ruby/object:Gem::Version 
-  hash: 50
+  hash: 51
   prerelease: 6
   segments: 
   - 0
   - 3
   - 0
-  - a
-  version: 0.3.0.a
+  - b
+  version: 0.3.0.b
 platform: ruby
 authors: 
 - DAddYE
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-04 00:00:00 +02:00
+date: 2011-10-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,12 +68,11 @@ files:
 - examples/complex
 - examples/simple
 - examples/stress
-- examples/tmp/complex.pid
 - foreverb.gemspec
 - lib/forever.rb
 - lib/forever/base.rb
-- lib/forever/every.rb
 - lib/forever/extensions.rb
+- lib/forever/job.rb
 - lib/forever/version.rb
 - spec/cli_spec.rb
 - spec/foreverb_spec.rb

data/lib/forever/every.rb

@@ -1,59 +0,0 @@
-require 'tmpdir'
-
-module Forever
-  module Every
-    class Job
-
-      def initialize(period, options, block)
-        @period   = period
-        @at_start = options[:at] == :start && options.delete(:at) ? true : false
-        @at       = options[:at] ? parse_at(*options[:at]) : []
-        @tmp      = File.join(Dir.tmpdir, '%x' % rand(255**10))
-        @block    = block
-      end
-
-      def call
-        File.open(@tmp, 'w') { |f| f.write('running') }
-        FileUtils.touch(@tmp)
-        @block.call
-      ensure
-        File.open(@tmp, 'w') { |f| f.write('idle') }
-      end
-
-      def running?
-        File.exist?(@tmp) && File.read(@tmp) == 'running'
-      end
-
-      def last
-        File.mtime(@tmp)
-      rescue Errno::ENOENT
-        0
-      end
-
-      def time?(t)
-        elapsed_ready = (t - last).to_i >= @period
-        time_ready = @at.empty? || @at.any? { |at| (at[0].empty? || t.hour == at[0].to_i) && (at[1].empty? || t.min == at[1].to_i) }
-        !running? && elapsed_ready && time_ready
-      end
-
-      private
-        def parse_at(*args)
-          args.map do |at|
-            raise "#{at} must be a string" unless at.is_a?(String)
-            raise "#{at} has not a colon separator" unless at =~ /:/
-            hour, min = at.split(":")
-            raise "Failed to parse #{at}" if hour.to_i >= 24 || min.to_i >= 60
-            [hour, min]
-          end
-        end
-    end # Job
-
-    def every(period, options={}, &block)
-      jobs << Job.new(period, options, block)
-    end
-
-    def jobs
-      @_jobs ||= []
-    end
-  end # Every
-end # Forever