foreverb 0.2.6 → 0.3.0.a

data/CHANGES.md

@@ -1,3 +1,9 @@
+# Version 0.3.0 - October 4, 2011
+
+* Added fork backend
+* Improved queue
+* Added before/after each/all filters
+
 # Version 0.2.6 - August 27, 2011
 
 * Added back support for update the daemon config

data/README.md

@@ -14,6 +14,8 @@ In my servers I've several daemons and what I need is:
 * easily manage exceptions
 * easily see logs
 * easily start/stop/restart daemon
+* no blocking jobs
+* no blocking queue
 
 As like [sinatra](https://github.com/sinatra/sinatra) and [padrino](https://github.com/padrino/padrino-framework) I need a
 **thin** framework to do these jobs in few seconds. This mean that:
@@ -61,7 +63,7 @@ Forever.run do
     end
   end
 
-  on_ready do
+  before :each do # or if you prefer before :all
     require 'bundler/setup'
     require 'foo'
     Foo.start_loop
@@ -124,7 +126,7 @@ So looking our [example](https://github.com/DAddYE/foreverb/blob/master/examples
 Forever.run do
   dir File.expand_path('../', __FILE__) # Default is ../../__FILE__
 
-  on_ready do
+  before :all do
     puts "All jobs will will wait me for 1 second"; sleep 1
   end
 
@@ -146,6 +148,7 @@ Forever.run do
 
   every 15.seconds do
     puts "Every 15 seconds, but my task require 10 seconds"; sleep 10
+    # This doesn't block other jobs and your queue !!!!!!!
   end
 
   every 10.seconds, :at => [":#{Time.now.min+1}", ":#{Time.now.min+2}"] do
@@ -207,6 +210,30 @@ you should see:
 [14/07 15:48:40] Bye bye
 ```
 
+## Filters
+
+In foreverb we have a couple of filters, `before` and `after`, like rspec you should be able to filter `before :all` or `before :each`.
+
+``` rb
+before :all do
+  puts "This will be ran only at start"
+end
+
+before :each do
+  puts "Do that before each job"
+end
+
+# ...  here jobs ...
+
+after :all do
+  puts "This will be ran only at shutdown"
+end
+
+after :each do
+  puts "Do that after each job"
+end
+```
+
 ## CLI
 
 ### Help:
@@ -307,6 +334,8 @@ as for stop we allow `--all` and `-y`
 
 ## HACKS
 
+### Bundler
+
 Bundler has the bad behavior to load `Gemfile` from your current path, so if your `daemons` (ex: [githubwatcher](https://github.com/daddye/githubwatcher))
 is shipped with their own `Gemfile` to prevent errors you must insert that line:
 
@@ -314,6 +343,37 @@ is shipped with their own `Gemfile` to prevent errors you must insert that line:
 ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__) # edit matching your Gemfile path
 ```
 
+### Rails/Padrino prevent memory leaks
+
+I highly suggest to use `fork` and `before` filters when you are using `forever` with frameworks, this since running same job on our ruby will eat a lot of
+ram, so the better way that I found is that:
+
+```rb
+Forever.run :fork => true do
+  before :each do
+    require '/config/boot' # here the rails/padrino environment
+  end
+
+  every 10.seconds, :at => ['12:00', '00:00'] do
+    Project.all(&:perform_long_task)
+  end
+
+  every 1.minute do
+    Account.all.map(&:send_emails)
+  end
+end
+```
+
+This is similar to create a new process i.e.:
+
+```rb
+Process.fork do
+  require '/config/boot'
+  my_long_jobs
+end
+Process.waitall
+```
+
 ## Extras
 
 To see a most comprensive app running _foreverb_ + _growl_ see [githubwatcher gem](https://github.com/daddye/githubwatcher)
@@ -336,4 +396,4 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM,
 DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rubygems' unless defined?(Gem)
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rake/testtask'
 
 %w(install release).each do |task|
   Rake::Task[task].enhance do
@@ -8,9 +9,9 @@ require 'rspec/core/rake_task'
   end
 end
 
-desc "Bump version on github"
+desc 'Bump version on github'
 task :bump do
-  if `git status -s`.strip == ""
+  if `git status -s`.strip == ''
     puts "\e[31mNothing to commit (working directory clean)\e[0m"
   else
     version  = Bundler.load_gemspec(Dir[File.expand_path('../*.gemspec', __FILE__)].first).version
@@ -18,13 +19,22 @@ task :bump do
   end
 end
 
-task :release => :bump
+Rake::TestTask.new(:spec) do |t|
+  t.test_files = Dir['spec/**/*_spec.rb']
+  t.verbose = true
+end
 
-desc "Run complete application spec suite"
-RSpec::Core::RakeTask.new("spec") do |t|
-  t.skip_bundler = true
-  t.pattern = './spec/**/*_spec.rb'
-  t.rspec_opts = %w(-fs --color --fail-fast)
+namespace :example do
+  Dir['./examples/*'].each do |path|
+    next if File.directory?(path)
+    name = File.basename(path)
+    desc "Run example #{name}"
+    task name, :fork do |t, args|
+      ENV['FORK'] = args[:fork]
+      exec "#{Gem.ruby} #{path} && sleep 3 && tail -f -n 150 #{path}/../log/#{name}.log; #{path} stop"
+    end
+  end
 end
 
+task :release => :bump
 task :default => :spec

data/examples/{sample → complex}

@@ -3,7 +3,7 @@ require 'rubygems' unless defined?(Gem)
 require 'bundler/setup'
 require 'forever'
 
-Forever.run do
+Forever.run :fork => ENV['FORK'] do
   dir File.expand_path('../', __FILE__) # Default is ../../__FILE__
 
   every 5.seconds do
@@ -14,19 +14,11 @@ Forever.run do
     puts "All jobs will will wait me for 1 second"; sleep 1
   end
 
-  every 5.seconds, :last => Time.now do
-    puts "Every 5 seconds from start"
-  end
-
-  every 30.seconds, :last => Time.now do
+  every 30.seconds do
     puts "Every 30 seconds from start with boom"
     raise "woooooa"
   end
 
-  every 10.seconds, :at => "#{Time.now.hour}:00" do
-    puts "Every 10 seconds but first call at #{Time.now.hour}:00"
-  end
-
   every 1.seconds, :at => "#{Time.now.hour}:#{Time.now.min+1}" do
     puts "Every one second but first call at #{Time.now.hour}:#{Time.now.min}"
   end
@@ -40,7 +32,7 @@ Forever.run do
   end
 
   every 15.seconds do
-    puts "Every 15 seconds, but my task require 10 seconds"; sleep 10
+    puts "Every 15 seconds, but my task requires 10 seconds"; sleep 10
   end
 
   every 10.seconds, :at => [":#{Time.now.min+1}", ":#{Time.now.min+2}"] do

data/examples/simple

@@ -0,0 +1,32 @@
+#!/usr/bin/ruby
+require 'rubygems' unless defined?(Gem)
+require 'bundler/setup'
+require 'forever'
+
+Forever.run :fork => ENV['FORK'] do
+  dir File.expand_path('../', __FILE__) # Default is ../../__FILE__
+
+  before :each do
+    puts 'before all'
+  end
+
+  after :each do
+    puts 'after all'
+  end
+
+  every 1.seconds do
+    puts 'wait me 10 seconds'; sleep 10
+  end
+
+  every 2.seconds do
+    puts 'every 2 seconds'
+  end
+
+  on_ready do
+    puts "All jobs will will wait me for 1 second"; sleep 1
+  end
+
+  on_exit do
+    puts "Bye bye"
+  end
+end

data/examples/stress

@@ -0,0 +1,12 @@
+#!/usr/bin/ruby
+require 'rubygems' unless defined?(Gem)
+require 'bundler/setup'
+require 'forever'
+
+Forever.run :fork => ENV['FORK'] do
+  dir File.expand_path('../', __FILE__) # Default is ../../__FILE__
+
+  (1..40).each do |i|
+    every(i.seconds) { puts 'Every %d seconds' % i; sleep i }
+  end
+end

data/foreverb.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = %w(lib)
   s.add_dependency 'thor', '~>0.14.6'
-  s.add_development_dependency 'rspec', '~>2.6.0'
+  s.add_development_dependency 'minitest'
 end

data/lib/forever.rb

@@ -1,10 +1,10 @@
 require 'yaml' unless defined?(YAML)
-require "forever/extensions"
-require "forever/every"
-require "forever/base"
-require "forever/version"
+require 'forever/extensions'
+require 'forever/every'
+require 'forever/base'
+require 'forever/version'
 
-YAML::ENGINE.yamler = "syck" if defined?(YAML::ENGINE)
+YAML::ENGINE.yamler = 'syck' if defined?(YAML::ENGINE)
 
 FOREVER_PATH = ENV['FOREVER_PATH'] ||= File.expand_path("~/.foreverb") unless defined?(FOREVER_PATH)
 path = File.dirname(FOREVER_PATH)
@@ -15,8 +15,8 @@ module Forever
 
   def run(options={}, &block)
     caller_file = caller(1).map { |line| line.split(/:(?=\d|in )/)[0,1] }.flatten.first
-    options[:dir]    ||= File.expand_path('../../', caller_file) # => we presume we are calling it from a bin|script dir
-    options[:file]   ||= File.expand_path(caller_file)
+    options[:file] ||= File.expand_path(caller_file)
+    options[:dir]  ||= File.expand_path('../../', options[:file]) # => we presume we are calling it from a bin|script dir
     Base.new(options, &block)
   end # run
-end # Forever
+end # Forever

data/lib/forever/base.rb

@@ -4,12 +4,18 @@ module Forever
 
   class Base
     include Every
+    attr_reader :started_at
 
     def initialize(options={}, &block)
+      forking = options.delete(:fork)
+
+      # Run others methods
       options.each { |k,v| send(k, v) }
 
       instance_eval(&block)
 
+      raise 'No jobs defined!' if jobs.empty?
+
       Dir.chdir(dir) if exists?(dir)
       Dir.mkdir(File.dirname(log)) if log && !File.exist?(File.dirname(log))
       Dir.mkdir(File.dirname(pid)) if pid && !File.exist?(File.dirname(pid))
@@ -48,9 +54,13 @@ module Forever
           exit
       end
 
+      # Enable REE - http://www.rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
+      GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly=)
+
       fork do
         $0 = "Forever: #{$0}"
-        print "[\e[90m%s\e[0m] Process demonized with pid \e[1m%d\e[0m with Forever v.%s\n" % [name, Process.pid, Forever::VERSION]
+        print "[\e[90m%s\e[0m] Process demonized with pid \e[1m%d\e[0m with \e[1m%s\e[0m and Forever v.%s\n" %
+          [name, Process.pid, forking ? :fork : :thread, Forever::VERSION]
 
         %w(INT TERM KILL).each { |signal| trap(signal)  { stop! } }
         trap(:HUP) do
@@ -65,27 +75,34 @@ module Forever
         STDOUT.reopen(stream)
         STDERR.reopen(STDOUT)
 
-        threads = []
-        safe_call(on_ready) if on_ready
-        started_at = Time.now
-
-        jobs.each do |job|
-          threads << Thread.new do
-            loop do
-              break if File.exist?(stop_txt) && File.mtime(stop_txt) > started_at
-              job.time?(Time.now) ? safe_call(job) : sleep(1)
+        @started_at = Time.now
+
+        # Invoke our before :all filters
+        before_filters[:all].each { |block| safe_call(block) }
+
+        # Start deamons
+        until stopping?
+          if forking
+            begin
+              jobs.select { |job| job.time?(Time.now) }.each do |job|
+                Process.fork { job_call(job) }
+              end
+            rescue Errno::EAGAIN
+              puts "\n\nWait all processes since os cannot create a new one\n\n"
+              Process.waitall
             end
+          else
+            jobs.each { |job| Thread.new { job_call(job) } if job.time?(Time.now) }
           end
+          sleep 0.5
         end
 
-        # Launch our workers
-        threads.map(&:join)
-
         # 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)
 
-        on_exit.call if on_exit
+        # Invoke our after :all filters
+        after_filters[:all].each { |block| safe_call(block) }
       end
 
       self
@@ -141,7 +158,7 @@ module Forever
         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]
-        on_exit.call if on_exit
+        after_filters[:all].each { |block| safe_call(block) }
         Process.kill(:KILL, pid_was)
       else
         print "[\e[90m%s\e[0m] Process with \e[1mnot found\e[0m" % name
@@ -174,14 +191,14 @@ module Forever
     # Callback raised when at exit
     #
     def on_exit(&block)
-      block_given? ? @_on_exit = block : @_on_exit
+      after(:all, &block)
     end
 
     ##
     # Callback to fire when the daemon start (blocking, not in thread)
     #
     def on_ready(&block)
-      block_given? ? @_on_ready = block : @_on_ready
+      before(:all, &block)
     end
 
     ##
@@ -214,29 +231,58 @@ module Forever
       { :dir => dir, :file => file, :log => log, :pid => pid }
     end
 
-    private
-      def write_config!
-        config_was = File.exist?(FOREVER_PATH) ? YAML.load_file(FOREVER_PATH) : []
-        config_was.delete_if { |conf| conf[:file] == file }
-        config_was << config
-        File.open(FOREVER_PATH, "w") { |f| f.write config_was.to_yaml }
-      end
+    def before(filter, &block)
+      raise "Filter #{filter.inspect} not supported, available options are: :each, :all" unless [:each, :all].include?(filter)
+      before_filters[filter] << block
+    end
 
-      def exists?(*values)
-        values.all? { |value| value && File.exist?(value) }
-      end
+    def after(filter, &block)
+      raise "Filter #{filter.inspect} not supported, available options are: :each, :all" unless [:each, :all].include?(filter)
+      after_filters[filter] << block
+    end
 
-      def safe_call(block)
-        begin
-          block.call
-        rescue Exception => e
-          puts "\n\n%s\n  %s\n\n" % [e.message, e.backtrace.join("\n  ")]
-          on_error[e] if on_error
-        end
-      end
+  private
+    def before_filters
+      @_before_filters ||= Hash.new { |hash, k| hash[k] = [] }
+    end
 
-      def stop_txt
-        @_stop_txt ||= File.join(dir, 'stop.txt')
+    def after_filters
+      @_after_filters ||= Hash.new { |hash, k| hash[k] = [] }
+    end
+
+    def stopping?
+      File.exist?(stop_txt) && File.mtime(stop_txt) > started_at
+    end
+
+    def write_config!
+      config_was = File.exist?(FOREVER_PATH) ? YAML.load_file(FOREVER_PATH) : []
+      config_was.delete_if { |conf| conf[:file] == file }
+      config_was << config
+      File.open(FOREVER_PATH, "w") { |f| f.write config_was.to_yaml }
+    end
+
+    def exists?(*values)
+      values.all? { |value| value && File.exist?(value) }
+    end
+
+    def job_call(job)
+      return unless job.time?(Time.now)
+      before_filters[:each].each { |block| safe_call(block) }
+      safe_call(job)
+      after_filters[:each].each { |block| safe_call(block) }
+    end
+
+    def safe_call(block)
+      begin
+        block.call
+      rescue Exception => e
+        puts "\n\n%s\n  %s\n\n" % [e.message, e.backtrace.join("\n  ")]
+        on_error[e] if on_error
       end
+    end
+
+    def stop_txt
+      @_stop_txt ||= File.join(dir, 'stop.txt')
+    end
   end # Base
 end # Forever

data/lib/forever/every.rb

@@ -1,26 +1,39 @@
+require 'tmpdir'
+
 module Forever
   module Every
     class Job
-      attr_accessor :period, :option, :last, :running
 
       def initialize(period, options, block)
-        @period, @options, @running = period, options, false
-        @at    = options[:at] ? parse_at(*@options[:at]) : []
-        @last  = options[:last].to_i
-        @block = 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
-        @last, @running = Time.now, true
+        File.open(@tmp, 'w') { |f| f.write('running') }
+        FileUtils.touch(@tmp)
         @block.call
       ensure
-        @running = false
+        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)
-        ellapsed_ready = (t - @last).to_i >= @period
+        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 && ellapsed_ready && time_ready
+        !running? && elapsed_ready && time_ready
       end
 
       private
@@ -43,4 +56,4 @@ module Forever
       @_jobs ||= []
     end
   end # Every
-end # Forever
+end # Forever

data/lib/forever/version.rb

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

data/spec/cli_spec.rb

@@ -1,34 +1,34 @@
-require 'spec_helper'
+require File.expand_path('../spec_helper', __FILE__)
 
-describe "CLI" do
-
-  it "should list no daemons" do
-    cli('list').should match(/Your config is empty/)
-    cli('list').should match(FOREVER_PATH)
-    cli('list -m').should match(/PID  RSS  CPU  CMD/)
+describe 'CLI' do
+  def cli(task)
+    `#{Gem.ruby} #{File.expand_path('../../bin/foreverb', __FILE__)} #{task}`
   end
 
-  it "should list a daemon" do
+  it 'should list daemons' do
+    cli('list').must_match(/Your config is empty/)
+    cli('list').must_match(FOREVER_PATH)
+    cli('list -m').must_match(/PID  RSS  CPU  CMD/)
     run_example
-    cli('list').should match(/RUNNING/)
-    cli('list -m').should match(/Forever:\s/)
+    cli('list').must_match(/RUNNING/)
+    cli('list -m').must_match(/Forever:\s/)
   end
 
   it "should stop daemons" do
     run_example
-    cli('list').should match(/RUNNING/)
+    cli('list').must_match(/RUNNING/)
     result = cli('stop -a -y')
-    result.should match(/STOPPING/)
-    result.should_not match(/ERROR/)
-    cli('list').should match(/NOT RUNNING/)
+    result.must_match(/STOPPING/)
+    result.wont_match(/ERROR/)
+    cli('list').must_match(/NOT RUNNING/)
   end
 
-  it "should kill daemons" do
+  it 'should kill daemons' do
     run_example
-    cli('list').should match(/RUNNING/)
+    cli('list').must_match(/RUNNING/)
     result = cli('kill -a -y')
-    result.should match(/KILLING/)
-    result.should_not match(/ERROR/)
-    cli('list').should match(/NOT RUNNING/)
+    result.must_match(/KILLING/)
+    result.wont_match(/ERROR/)
+    cli('list').must_match(/NOT RUNNING/)
   end
 end

data/spec/foreverb_spec.rb

@@ -1,48 +1,48 @@
-require 'spec_helper'
+require File.expand_path('../spec_helper', __FILE__)
 
 describe Forever do
 
-  before :each do
-    $stdout = StringIO.new
-    ARGV << 'up'
-  end
-
   it 'should set a basic config' do
-    @forever = Forever.run {}
-    @forever.dir.should == File.expand_path("../../", __FILE__)
-    @forever.log.should == File.join(@forever.dir, 'log', File.basename(__FILE__) + '.log')
-    @forever.pid.should == File.join(@forever.dir, 'tmp', File.basename(__FILE__) + '.pid')
-    @forever.file.should == __FILE__
+    run_example
+    @forever.dir.must_equal File.expand_path("../../", __FILE__)
+    @forever.log.must_equal File.join(@forever.dir, 'log', File.basename(example_filename, '.*') + '.log')
+    @forever.pid.must_equal File.join(@forever.dir, 'tmp', File.basename(example_filename, '.*') + '.pid')
+    @forever.file.must_equal example_filename
     config = YAML.load_file(FOREVER_PATH)
-    config[0][:file].should == __FILE__
-    config[0][:log].should == @forever.log
-    config[0][:pid].should == @forever.pid
+    config[0][:file].must_equal example_filename
+    config[0][:log].must_equal @forever.log
+    config[0][:pid].must_equal @forever.pid
   end
 
   it 'should set a custom config' do
-    @forever = Forever.run do
-      dir File.expand_path('../', __FILE__)
-    end
-    @forever.dir.should == File.expand_path('../', __FILE__)
-    @forever.log.should == File.join(@forever.dir, 'log', File.basename(__FILE__) + '.log')
-    @forever.pid.should == File.join(@forever.dir, 'tmp', File.basename(__FILE__) + '.pid')
-    @forever.file.should == __FILE__
+    run_example(:dir => Dir.tmpdir)
+    @forever.dir.must_equal Dir.tmpdir
+    @forever.log.must_equal File.join(@forever.dir, 'log', File.basename(example_filename, '.*') + '.log')
+    @forever.pid.must_equal File.join(@forever.dir, 'tmp', File.basename(example_filename, '.*') + '.pid')
+    @forever.file.must_equal example_filename
     config = YAML.load_file(FOREVER_PATH)
-    config[0][:file].should == __FILE__
-    config[0][:log].should == @forever.log
-    config[0][:pid].should == @forever.pid
+    config[0][:file].must_equal example_filename
+    config[0][:log].must_equal @forever.log
+    config[0][:pid].must_equal @forever.pid
+  end
+
+  it 'should launch a daemon with threads with soft stop' do
+    run_example
+    sleep 0.1 while !File.exist?(@forever.pid)
+    pid = File.read(@forever.pid).to_i
+    sleep 1
+    out, err = capture_io { @forever.stop }
+    out.must_match(/waiting the daemon's death/i)
+    out.must_match(/#{pid}/)
   end
 
-  it 'should launch a daemon' do
-    ARGV.clear
-    stdout_was, $stdout = $stdout, StringIO.new
-    @forever = Forever.run do
-      on_ready { sleep 2 }
-    end
+  it 'should launch a daemon with threads with soft stop' do
+    run_example(:fork => true)
     sleep 0.1 while !File.exist?(@forever.pid)
     pid = File.read(@forever.pid).to_i
-    Process.waitpid(pid)
-    $stdout.string.should match(/not found/i)
-    $stdout = stdout_was
+    sleep 1
+    out, err = capture_io { @forever.stop }
+    out.must_match(/waiting the daemon's death/i)
+    out.must_match(/#{pid}/)
   end
 end

data/spec/spec_helper.rb

@@ -1,48 +1,36 @@
 FOREVER_PATH = ENV['FOREVER_PATH'] ||= File.expand_path("../tmp/db.yaml", __FILE__)
 require 'rubygems' unless defined?(Gem)
 require 'bundler/setup'
-require 'rspec'
+require 'minitest/autorun'
 require 'forever'
 require 'fileutils'
+require 'tmpdir'
 
-module Helper
-  def capture_stdout(&block)
-    stdout_was, $stdout = $stdout, StringIO.new
-    block.call
-    return $stdout
-  ensure
-    $stdout = stdout_was
-  end
+$dir = File.expand_path('.')
 
-  def run_example
-    capture_stdout do
-      @forever = Forever.run do
-        on_ready { sleep }
-      end
-    end
+class MiniTest::Spec
+  def run_example(options={}, &block)
+    block = proc { every(1.second) { puts 'foo' } } unless block_given?
+    capture_io { @forever = Forever.run(options, &block) }
   end
 
-  def cli(task)
-    output = `#{Gem.ruby} #{File.expand_path('../../bin/foreverb', __FILE__)} #{task}`
-  end
-end
-
-RSpec.configure do |config|
-  config.include(Helper)
+  let(:example_filename) { File.expand_path(__FILE__) }
 
-  config.before :each do
+  before do
+    Dir.chdir($dir)
     FileUtils.rm_rf File.dirname(FOREVER_PATH)
     Dir.mkdir File.dirname(FOREVER_PATH)
     ARGV.clear
   end
 
-  config.after :each do
+  after do
     FileUtils.rm_rf(File.dirname(FOREVER_PATH))
     if @forever
-      capture_stdout { @forever.stop! }
+      capture_io { @forever.stop! }
       FileUtils.rm_rf(File.dirname(@forever.log)) if @forever.log
       FileUtils.rm_rf(File.dirname(@forever.pid)) if @forever.pid
     end
+    Dir.chdir($dir)
     ARGV.clear
   end
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: foreverb
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
+  hash: 50
+  prerelease: 6
   segments: 
   - 0
-  - 2
-  - 6
-  version: 0.2.6
+  - 3
+  - 0
+  - a
+  version: 0.3.0.a
 platform: ruby
 authors: 
 - DAddYE
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-27 00:00:00 +02:00
+date: 2011-10-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,19 +36,17 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: minitest
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
-        - 2
-        - 6
         - 0
-        version: 2.6.0
+        version: "0"
   type: :development
   version_requirements: *id002
 description: Small daemon framework for ruby, with logging, error handler, scheduling and much more.
@@ -66,7 +65,10 @@ files:
 - README.md
 - Rakefile
 - bin/foreverb
-- examples/sample
+- examples/complex
+- examples/simple
+- examples/stress
+- examples/tmp/complex.pid
 - foreverb.gemspec
 - lib/forever.rb
 - lib/forever/base.rb
@@ -97,12 +99,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: foreverb