foreverb 0.3.0 → 0.3.1

data/README.md

@@ -127,7 +127,7 @@ Forever.run do
   dir File.expand_path('../', __FILE__) # Default is ../../__FILE__
 
   before :all do
-    puts "All jobs will will wait me for 1 second"; sleep 1
+    puts "All jobs will wait me for 1 second"; sleep 1
   end
 
   every 10.seconds, :at => "#{Time.now.hour}:00" do

data/foreverb.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   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_dependency 'thor', '~>0.16.0'
   s.add_development_dependency 'minitest'
+  s.add_development_dependency 'rspec'
 end

data/lib/forever/base.rb

@@ -6,10 +6,11 @@ module Forever
     attr_reader :started_at
 
     def initialize(options={}, &block)
+      @options = options
       forking = options.delete(:fork)
 
       # Run others methods
-      options.each { |k,v| send(k, v) }
+      options.each { |k,v| send(k, v) if respond_to?(k) }
 
       instance_eval(&block)
 
@@ -26,6 +27,9 @@ module Forever
           exit
         when 'start', 'restart', 'up', nil
           stop
+        when 'run'
+          detach = false
+          stop
         when 'stop'
           stop
           exit
@@ -62,12 +66,12 @@ module Forever
       # 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
-        Process.setsid
+      maybe_fork(detach) do
+        Process.setsid if detach != false
 
-        $0 = "Forever: #{$0}"
-        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]
+        $0 = "Forever: #{$0}" unless ENV['DONT_TOUCH_PS']
+        print "[\e[90m%s\e[0m] Process %s with pid \e[1m%d\e[0m with \e[1m%s\e[0m and Forever v.%s\n" %
+          [name, detach != false ? :daemonized : :running, Process.pid, forking ? :fork : :thread, Forever::VERSION]
 
         %w(INT TERM KILL).each { |signal| trap(signal)  { stop! } }
         trap(:HUP) do
@@ -76,7 +80,7 @@ module Forever
 
         File.open(pid, "w") { |f| f.write(Process.pid.to_s) } if pid
 
-        stream      = log ? File.new(log, "w") : File.open('/dev/null', 'w')
+        stream      = log ? File.new(log, @options[:append_log] ? 'a' : 'w') : File.open('/dev/null', 'w')
         stream.sync = true
 
         STDOUT.reopen(stream)
@@ -340,6 +344,14 @@ module Forever
       File.exist?(stop_txt) && File.mtime(stop_txt) > started_at
     end
 
+    def maybe_fork(detach,&block)
+      if detach != false
+        fork &block
+      else
+        yield
+      end
+    end
+    
     def write_config!
       config_was = File.exist?(FOREVER_PATH) ? YAML.load_file(FOREVER_PATH) : []
       config_was.delete_if { |conf| conf.nil? || conf.empty? || conf[:file] == file }

data/lib/forever/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: foreverb
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - DAddYE
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-25 00:00:00 Z
+date: 2012-09-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 95
         segments: 
         - 0
-        - 14
-        - 6
-        version: 0.14.6
+        - 16
+        - 0
+        version: 0.16.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: Small daemon framework for ruby, with logging, error handler, scheduling and much more.
 email: 
 - d.dagostino@lipsiasoft.com
@@ -104,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: foreverb
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Small daemon framework for ruby