foreverb 0.2.3 → 0.2.4

data/CHANGES.md

@@ -1,3 +1,10 @@
+# Version 0.2.4 (unreleased)
+
+* Ruby 1.9.2 compatibility
+* Stop process using pid instead of file
+* Added specs
+* Fixed `foreverb list` where in some scenarios don't return a list of processes
+
 # Version 0.2.3
 
 * Added global monitoring, to easily watch each `foreverb` daemon

data/Gemfile

@@ -2,3 +2,7 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in forever.gemspec
 gemspec
+
+gem 'guard'
+gem 'guard-rspec'
+gem 'growl'

data/Guardfile

@@ -0,0 +1,5 @@
+guard 'rspec', :cli => '--color' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems' unless defined?(Gem)
 require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 %w(install release).each do |task|
   Rake::Task[task].enhance do
@@ -9,9 +10,18 @@ end
 
 desc "Bump version on github"
 task :bump do
-  puts "Nothing to commit (working directory clean)" and return if `git status -s`.strip == ""
+  puts "\e[31mNothing to commit (working directory clean)\e[0m" and return unless `git status -s`.chomp!
   version  = Bundler.load_gemspec(Dir[File.expand_path('../*.gemspec', __FILE__)].first).version
-  sh "git add .; git commit -m \"Bump to version #{version}\""
+  sh "git add .; git commit -a -m \"Bump to version #{version}\""
 end
 
-task :release => :bump
+task :release => :bump
+
+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)
+end
+
+task :default => :spec

data/bin/foreverb

@@ -3,6 +3,7 @@ require 'rubygems' unless defined?(Gem)
 require File.expand_path('../../lib/forever/version.rb', __FILE__)
 require 'thor'
 require 'yaml'
+require 'fileutils'
 
 FOREVER_PATH = ENV['FOREVER_PATH'] ||= File.expand_path("~/.foreverb") unless defined?(FOREVER_PATH)
 
@@ -11,19 +12,20 @@ class CLI < Thor
   desc "list", "List Forever running daemons"
   method_option :monitor, :type => :boolean, :aliases => "-m", :default => false, :desc => "Show memory and cpu usage with ps"
   def list
-    say "No deamons running", :red if config.empty?
+    say "Your config is empty, so no deamons was found.", :red if config.empty? && !options.monitor
 
     if options.monitor
       print_table([%w(PID RSS CPU CMD), *ps])
     else
       config.each do |conf|
         status = begin
-          "WRONG CONFIG" and return unless File.exist?(conf[:pid])
           pid = File.read(conf[:pid]).to_i
           Process.kill(0, pid)
           "RUNNING"
         rescue Errno::ESRCH, Errno::ENOENT
           "NOT RUNNING"
+        rescue Errno::EPERM
+          "RUNNING"
         end
         say_status status, conf[:file], status =~ /^RUNNING/ ? :green : :red
       end
@@ -38,7 +40,12 @@ class CLI < Thor
     find(daemon, :multiple => options.all).each do |conf|
       if options.yes || yes?("Do you want really stop \e[1m#{conf[:file]}\e[0m?")
         say_status "STOPPING", conf[:file]
-        system(conf[:file], 'stop')
+        begin
+          pid = File.read(conf[:pid]).to_i
+          Process.kill(:INT, pid)
+        rescue Exception => e
+          say_status "ERROR", e.message, :red
+        end
       end
     end
   end
@@ -71,7 +78,10 @@ class CLI < Thor
   method_option :all, :type => :boolean, :aliases => "-a", :desc => "All matching daemons"
   method_option :yes, :type => :boolean, :aliases => "-y", :desc => "Don't ask permission to start the daemon"
   def update(daemon=nil)
-    find(daemon, :multiple => options.all).each do |conf|
+    match = find(daemon, :multiple => options.all)
+    return if match.empty?
+    FileUtils.rm_rf(FOREVER_PATH)
+    match.each do |conf|
       system(conf[:file], 'up') if options.yes || yes?("Do you want really update config from \e[1m#{conf[:file]}\e[0m?")
     end
   end

data/foreverb.gemspec

@@ -18,4 +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'
 end

data/lib/forever.rb

@@ -1,9 +1,14 @@
+require 'yaml' unless defined?(YAML)
 require "forever/extensions"
 require "forever/every"
 require "forever/base"
 require "forever/version"
 
+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)
+Dir.mkdir(path) unless File.exist?(path)
 
 module Forever
   extend self

data/lib/forever/base.rb

@@ -53,6 +53,8 @@ module Forever
         end
         threads.map(&:join)
       end
+
+      self
     end
 
     ##

data/lib/forever/extensions.rb

@@ -22,4 +22,5 @@ module Kernel
     print text; $stdout.flush
     text
   end
+  alias :log :puts
 end

data/lib/forever/version.rb

@@ -1,3 +1,3 @@
 module Forever
-  VERSION = "0.2.3"
+  VERSION = "0.2.4" unless defined?(Forever::VERSION)
 end

data/spec/cli_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+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/)
+  end
+
+  it "should list a daemon" do
+    run_example
+    cli('list').should match(/RUNNING/)
+    cli('list -m').should match(/Forever:\s/)
+  end
+
+  it "should stop daemons" do
+    run_example
+    cli('list').should match(/RUNNING/)
+    result = cli('stop -a -y')
+    result.should match(/STOPPING/)
+    result.should_not match(/ERROR/)
+    cli('list').should match(/NOT RUNNING/)
+  end
+end

data/spec/foreverb_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe Forever do
+
+  before :each do
+    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__
+    config = YAML.load_file(FOREVER_PATH)
+    config[0][:file].should == __FILE__
+    config[0][:log].should == @forever.log
+    config[0][:pid].should == @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__
+    config = YAML.load_file(FOREVER_PATH)
+    config[0][:file].should == __FILE__
+    config[0][:log].should == @forever.log
+    config[0][:pid].should == @forever.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
+    sleep 0.1 while !File.exist?(@forever.pid)
+    pid = File.read(@forever.pid).to_i
+    Process.waitpid(pid)
+    $stdout.string.should match(/pid not found/i)
+    $stdout = stdout_was
+  end
+end

data/spec/spec_helper.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: foreverb
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - DAddYE
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-22 00:00:00 +02:00
+date: 2011-07-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,6 +34,22 @@ dependencies:
         version: 0.14.6
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  type: :development
+  version_requirements: *id002
 description: Small daemon framework for ruby, with logging, error handler, scheduling and much more.
 email: 
 - d.dagostino@lipsiasoft.com
@@ -47,6 +63,7 @@ files:
 - .gitignore
 - CHANGES.md
 - Gemfile
+- Guardfile
 - README.md
 - Rakefile
 - bin/foreverb
@@ -57,6 +74,9 @@ files:
 - lib/forever/every.rb
 - lib/forever/extensions.rb
 - lib/forever/version.rb
+- spec/cli_spec.rb
+- spec/foreverb_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: https://github.com/daddye/forever
 licenses: []
@@ -91,5 +111,7 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Small daemon framework for ruby
-test_files: []
-
+test_files: 
+- spec/cli_spec.rb
+- spec/foreverb_spec.rb
+- spec/spec_helper.rb